version.json update

Added support for new tags in XMLTV
2026-03-14 13:40:47 +01:00 · 2026-03-14 13:40:31 +01:00 · 2026-03-14 13:38:52 +01:00 · 2026-03-14 13:36:12 +01:00 · 2026-03-14 13:16:29 +01:00 · 2026-03-14 13:16:09 +01:00
69 changed files with 2165 additions and 1325 deletions
@@ -0,0 +1,9 @@
+.git
+.gitignore
+.DS_Store
+*.swp
+data
+assets/preview.png
+assets/.DS_Store
+src/.DS_Store
+.version.json.swp
@@ -0,0 +1,32 @@
+name: Deploy GridTV
+
+on:
+  push:
+    branches:
+      - main
+      - beta
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Start SSH agent
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.SSH_KEY }}
+
+      - name: Add server to known_hosts
+        run: |
+          mkdir -p ~/.ssh
+          ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Deploy main
+        if: github.ref == 'refs/heads/main'
+        run: |
+          ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} main
+
+      - name: Deploy beta
+        if: github.ref == 'refs/heads/beta'
+        run: |
+          ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} beta
@@ -1,4 +1,3 @@
 config.json
+data/
 .DS_Store
-generate_epg.php
-epg.xml
@@ -4,8 +4,18 @@ RUN docker-php-ext-install curl && \
    a2enmod rewrite

 COPY . /var/www/html/
+COPY docker/docker-entrypoint.sh /usr/local/bin/gridtv-entrypoint.sh

-RUN chown -R www-data:www-data /var/www/html && \
-    chmod -R 775 /var/www/html
+RUN mkdir -p /data && \
+    chown -R www-data:www-data /var/www/html /data && \
+    find /var/www/html -type d -exec chmod 755 {} \; && \
+    find /var/www/html -type f -exec chmod 644 {} \; && \
+    chmod 755 /usr/local/bin/gridtv-entrypoint.sh
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \
+  CMD php -r "exit(@file_get_contents('http://127.0.0.1/') === false ? 1 : 0);"
+
+ENTRYPOINT ["gridtv-entrypoint.sh"]
+CMD ["apache2-foreground"]

 EXPOSE 80
@@ -40,10 +40,12 @@ This demo runs with sample XMLTV feeds to showcase the interface.
 - 📡 **Multi-EPG sources** — configure multiple EPG/M3U sources, switch from the topbar
 - 👤 **Personal EPG** — optionally let visitors use your instance with their own EPG/M3U URLs (saved in localStorage)
 - 🔍 **Search** — filter the grid by channel name or program title/synopsis (debounced)
+- ⭐ **Favorites** — pin channels to the top of the grid, persisted in localStorage
 - 🌍 **i18n** — auto-detects browser language, supports EN / FR / ES (add your own in `locales/`)
- ⚙️ **Guided setup** on first launch — no config files to edit manually
+- ⚙️ **Re-editable setup** — protected by an admin key, no SSH required to update config
+- 🔔 **Update notifications** — a badge appears in the topbar when a new release is available on GitHub
 - 🔄 **Auto-reload** EPG every 30 minutes
- 0️⃣ **Zero JS dependencies** — vanilla PHP, hls.js loaded from CDN
+- 0️⃣ **Zero build tooling** — vanilla PHP/JS/CSS, with bundled local assets

 ---

@@ -68,15 +70,19 @@ docker compose up -d

 Then open `http://localhost:8080` and follow the setup wizard.

+Docker stores the generated configuration in `./data/config.json` on the host.
+
 To run on a custom port:

 ```bash
 PORT=9000 docker compose up -d
 ```

+To back up or migrate your Docker setup, keep the `data/` directory.
+
 ---

-### Option B — Apache / Nginx
+### Option B — Native PHP host

 #### 1. Clone the repo

@@ -92,7 +98,25 @@ chmod 775 /var/www/gridtv
 chown -R www-data:www-data /var/www/gridtv
 ```

-#### 3a. Configure Nginx
+#### 3. Install php-curl
+
+The built-in player uses `proxy.php` to relay HTTP streams over HTTPS. This requires the **php-curl** extension:
+
+```bash
+# Debian/Ubuntu — adjust version to match your PHP
+apt install php8.4-curl
+systemctl reload apache2   # or: systemctl reload nginx
+```
+
+#### 4. Reverse proxy examples
+
+<details>
+<summary>Show reverse proxy / vhost examples</summary>
+
+These examples are intentionally minimal. Replace `guide.your-domain.com` with your domain and adjust the PHP socket or upstream target to match your host.
+
+<details>
+<summary>Nginx + PHP-FPM</summary>

 ```nginx
 server {
@@ -113,13 +137,16 @@ server {
 }
 ```

-> 💡 Adjust the PHP version (`php8.2-fpm`) to match the one installed on your server.
-
 ```bash
 nginx -t && systemctl reload nginx
 ```

-#### 3b. Configure Apache
+> Adjust `php8.2-fpm.sock` to match the PHP-FPM version installed on your server.
+
+</details>
+
+<details>
+<summary>Apache vhost</summary>

 ```apache
 <VirtualHost *:80>
@@ -138,16 +165,52 @@ a2enmod php8.4 rewrite
 systemctl reload apache2
 ```

-#### 4. Install php-curl
+</details>

-The built-in player uses `proxy.php` to relay HTTP streams over HTTPS. This requires the **php-curl** extension:
+<details>
+<summary>Caddy</summary>
+
+```caddy
+guide.your-domain.com {
+    root * /var/www/gridtv
+    php_fastcgi unix//run/php/php8.2-fpm.sock
+    file_server
+}
+```

 ```bash
-# Debian/Ubuntu — adjust version to match your PHP
-apt install php8.4-curl
-systemctl reload apache2   # or: systemctl reload nginx
+systemctl reload caddy
 ```

+> If you use `xcaddy` or a distro package, keep the same site block and only adapt the PHP-FPM socket path.
+
+</details>
+
+<details>
+<summary>Traefik (Docker labels)</summary>
+
+Use this if GridTV runs in Docker and Traefik is your front proxy:
+
+```yaml
+services:
+  gridtv:
+    build: .
+    volumes:
+      - ./data:/data
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.gridtv.rule=Host(`guide.your-domain.com`)"
+      - "traefik.http.routers.gridtv.entrypoints=websecure"
+      - "traefik.http.routers.gridtv.tls=true"
+      - "traefik.http.services.gridtv.loadbalancer.server.port=80"
+```
+
+You still need a running Traefik instance with `websecure` configured and DNS pointing to it.
+
+</details>
+
+</details>
+
 #### 5. First launch — Setup

 Open your browser at `http://guide.your-domain.com`.
@@ -164,6 +227,9 @@ Once submitted, `config.json` is created on the server. **The setup page becomes

 ---

+<details>
+<summary>Editing the config later</summary>
+
 ### Editing the config later

 You can re-open the setup page at any time using the admin key generated during first setup:
@@ -172,6 +238,8 @@ You can re-open the setup page at any time using the admin key generated during
 http://guide.your-domain.com/setup.php
 ```

+Enter your admin key to unlock the configuration form. The key is stored in `config.json` under `admin_key` — if you lose it, you can retrieve it there via SSH.
+
 Or edit `config.json` directly:

 ```bash
@@ -201,13 +269,19 @@ nano /var/www/gridtv/config.json

 ---

+</details>
+
+<details>
+<summary>Project structure</summary>
+
 ## 📁 Project structure

 ```
 gridtv/
 ├── index.php            # Entry point
-├── setup.php            # First-launch + re-configuration page
+├── setup.php            # Setup + re-configuration (admin key protected)
 ├── proxy.php            # HTTP→HTTPS stream proxy
+├── version.json         # Current version (used for update check)
 ├── config.example.json  # Config template
 ├── Dockerfile
 ├── docker-compose.yml
@@ -223,13 +297,24 @@ gridtv/
 │   └── steampunk.css
 └── src/
    ├── config.php       # Config loader, migration, locale detection
+    ├── css/             # CSS modules (one file per feature)
+    │   ├── base.css     # Variables, reset, global layout
+    │   ├── topbar.css   # Topbar, nav, source switcher, theme selector
+    │   ├── grid.css     # Grid, channels, programs, ruler, tooltip, loading
+    │   ├── mobile.css   # Mobile list view
+    │   ├── player.css   # HLS PiP player
+    │   ├── modals.css   # Personal EPG modal
+    │   ├── search.css   # Search bar + highlight
+    │   ├── program.css  # Program info modal + midnight marker
+    │   ├── favorites.css# Favorite button + separator
+    │   └── updater.css  # Update notification badge
    ├── tpl/             # HTML templates
-    │   ├── head.php     # DOCTYPE, <head>, CSS
+    │   ├── head.php     # DOCTYPE, <head>, includes CSS modules
    │   ├── topbar.php   # Topbar (nav, source switcher, search, theme)
    │   ├── grid.php     # Grid + mobile + PiP + overlays
    │   ├── modals.php   # Program info modal + Personal EPG modal
    │   └── footer.php   # JS modules loader, </body></html>
-    └── js/              # JavaScript modules
+    └── js/              # JavaScript modules (one file per feature)
        ├── config.js    # Constants + PHP-injected vars (incl. locale)
        ├── utils.js     # Helpers, clock, EPG fetch
        ├── epg.js       # Grid rendering
@@ -241,6 +326,8 @@ gridtv/
        ├── themes.js    # Theme switcher
        ├── search.js    # Search + filter (debounced)
        ├── program.js   # Program info modal + IMDb link
+        ├── favorites.js # Favorites (localStorage)
+        ├── updater.js   # GitHub update checker
        └── live.js      # Live updates + responsive
 ```

@@ -248,6 +335,11 @@ gridtv/

 ---

+</details>
+
+<details>
+<summary>Themes</summary>
+
 ## 🎨 Themes

 GridTV ships with 4 built-in themes. To add your own, create a CSS file in `themes/` with these metadata comments at the top:
@@ -268,6 +360,11 @@ Drop it in `themes/` — it appears in the theme selector automatically.

 ---

+</details>
+
+<details>
+<summary>Multiple EPG Sources</summary>
+
 ## 📡 Multiple EPG Sources

 Configure as many EPG/M3U sources as you want in `config.json`. A dropdown appears in the topbar when more than one source is defined.
@@ -276,6 +373,11 @@ If `allow_personal_epg` is `true`, a **"✏ Personal EPG"** option appears in th

 ---

+</details>
+
+<details>
+<summary>Built-in Player</summary>
+
 ## ▶️ Built-in Player

 Click on any **channel name** or **currently airing program** to open a PiP player in the bottom-right corner.
@@ -284,6 +386,11 @@ Requires an **M3U URL** in the active source and the **php-curl** extension. The

 ---

+</details>
+
+<details>
+<summary>Advanced configuration</summary>
+
 ## ⚙️ Advanced configuration

 Tweak these constants in `src/js/config.js`:
@@ -296,6 +403,11 @@ const ROW_H      = 80;   // Channel row height (px)

 ---

+</details>
+
+<details>
+<summary>EPG Compatibility</summary>
+
 ## 🧩 EPG Compatibility

 GridTV parses the standard **XMLTV format**. Tested with:
@@ -308,6 +420,11 @@ GridTV parses the standard **XMLTV format**. Tested with:

 ---

+</details>
+
+<details>
+<summary>Internationalization</summary>
+
 ## 🌍 Internationalization

 GridTV auto-detects the visitor's browser language and serves the matching locale. Supported out of the box: **English**, **French**, **Spanish**.
@@ -323,18 +440,33 @@ GridTV will automatically pick it up for browsers with that language set — no

 ---

+</details>
+
+<details>
+<summary>Contributing</summary>
+
 ## 🤝 Contributing

 PRs are welcome! Got an idea, a fix, or a feature request — open an issue or send a PR.

 ---

+</details>
+
+<details>
+<summary>License</summary>
+
 ## 📄 License

 GNU Affero General Public License v3.0 (AGPLv3)

 ---

+</details>
+
+<details>
+<summary>Roadmap</summary>
+
 ## 🗺️ Roadmap

 ### ✅ Done
@@ -345,15 +477,17 @@ GNU Affero General Public License v3.0 (AGPLv3)
 - Theme system (4 built-in themes)
 - Multi-EPG sources with topbar switcher
 - Personal EPG (localStorage)
- Modular codebase (src/tpl + src/js)
+- Modular codebase (src/tpl + src/js + src/css)
 - Docker support
 - **Search** — filter grid by channel name or program title/synopsis (debounced)
 - **Date in timebar** — midnight markers with day/date in the ruler
 - **Program popup** — full details + IMDb search link on any program click
 - **i18n** — EN / FR / ES with browser auto-detection, extensible via locales/
+- **Favorites** — pin channels to the top of the grid (localStorage)
+- **Setup re-editable** — protected by an admin key, auto-generated on first setup
+- **Update notifications** — topbar badge links to latest GitHub release

 ### 🔜 Coming soon
- **Favorites** — pin channels to the top of the grid (localStorage)
- **Setup re-editable** — reopen setup.php with an admin key, no SSH required
 - **Dark/Light auto mode** — follow system preference when using the default theme
 - **Grid export** — export today's schedule as PDF or image
+</details>
@@ -0,0 +1,87 @@
+@font-face {
+  font-family: 'Barlow Condensed';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('/assets/fonts/barlow-condensed-300.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Barlow Condensed';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('/assets/fonts/barlow-condensed-400.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Barlow Condensed';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url('/assets/fonts/barlow-condensed-600.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Barlow Condensed';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('/assets/fonts/barlow-condensed-700.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Share Tech Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('/assets/fonts/share-tech-mono-400.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Rajdhani';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('/assets/fonts/rajdhani-400.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Rajdhani';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url('/assets/fonts/rajdhani-600.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Rajdhani';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('/assets/fonts/rajdhani-700.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'IM Fell English';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('/assets/fonts/im-fell-english-400.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'IM Fell English';
+  font-style: italic;
+  font-weight: 400;
+  font-display: swap;
+  src: url('/assets/fonts/im-fell-english-400-italic.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Special Elite';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('/assets/fonts/special-elite-400.ttf') format('truetype');
+}
@@ -1,5 +0,0 @@
-{
-  "group_name": "MonGroupe TV",
-  "epg_url": "http://votre-serveur/api/xmltv.xml",
-  "m3u_url": "http://votre-serveur/api/channels.m3u"
-}
@@ -4,5 +4,5 @@ services:
    ports:
      - "${PORT:-8080}:80"
    volumes:
-      - ./config.json:/var/www/html/config.json
+      - ./data:/data
    restart: unless-stopped
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -eu
+
+mkdir -p /data
+chown -R www-data:www-data /data
+chmod 775 /data
+
+rm -f /var/www/html/config.json
+ln -s /data/config.json /var/www/html/config.json
+
+exec docker-php-entrypoint "$@"
@@ -1,6 +1,27 @@
 {
-  "days":   ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
-  "months": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+  "days": [
+    "Sun",
+    "Mon",
+    "Tue",
+    "Wed",
+    "Thu",
+    "Fri",
+    "Sat"
+  ],
+  "months": [
+    "Jan",
+    "Feb",
+    "Mar",
+    "Apr",
+    "May",
+    "Jun",
+    "Jul",
+    "Aug",
+    "Sep",
+    "Oct",
+    "Nov",
+    "Dec"
+  ],
  "now": "Now",
  "channels": "Channels",
  "live": "LIVE",
@@ -11,7 +32,7 @@
  "search_placeholder": "Search channel or program...",
  "copy_epg": "EPG",
  "copy_m3u": "M3U",
-  "copied":     "\u2713 copied",
+  "copied": "✓ copied",
  "program_info": "Program info",
  "watch_now": "Watch now",
  "imdb_search": "Search on IMDb",
@@ -25,6 +46,10 @@
  "cancel": "Cancel",
  "apply": "Apply",
  "setup_already_done": "Configuration already done. Use your admin key to access setup again.",
-  "shift_back": "\u25c4 1h",
-  "shift_fwd":  "1h \u25ba"
+  "shift_back": "◄ 1h",
+  "shift_fwd": "1h ►",
+  "fav_add": "Add to favorites",
+  "fav_remove": "Remove from favorites",
+  "update_available": "&#8593; Update available:",
+  "update_title": "Click to download the latest version"
 }
@@ -1,17 +1,38 @@
 {
-  "days":   ["Dom", "Lun", "Mar", "Mi\u00e9", "Jue", "Vie", "S\u00e1b"],
-  "months": ["Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic"],
+  "days": [
+    "Dom",
+    "Lun",
+    "Mar",
+    "Mié",
+    "Jue",
+    "Vie",
+    "Sáb"
+  ],
+  "months": [
+    "Ene",
+    "Feb",
+    "Mar",
+    "Abr",
+    "May",
+    "Jun",
+    "Jul",
+    "Ago",
+    "Sep",
+    "Oct",
+    "Nov",
+    "Dic"
+  ],
  "now": "Ahora",
  "channels": "Canales",
  "live": "LIVE",
-  "loading":    "Cargando gu\u00eda...",
+  "loading": "Cargando guía...",
  "epg_error": "No se puede cargar el EPG",
  "epg_error_sub": "Comprueba la URL de tu fuente XMLTV.",
  "load": "Cargar",
  "search_placeholder": "Buscar canal o programa...",
  "copy_epg": "EPG",
  "copy_m3u": "M3U",
-  "copied":     "\u2713 copiado",
+  "copied": "✓ copiado",
  "program_info": "Info del programa",
  "watch_now": "Ver ahora",
  "imdb_search": "Buscar en IMDb",
@@ -24,7 +45,11 @@
  "personal_epg_optional": "opcional",
  "cancel": "Cancelar",
  "apply": "Aplicar",
-  "setup_already_done": "Configuraci\u00f3n ya realizada. Usa tu clave de administrador para volver al setup.",
-  "shift_back": "\u25c4 1h",
-  "shift_fwd":  "1h \u25ba"
+  "setup_already_done": "Configuración ya realizada. Usa tu clave de administrador para volver al setup.",
+  "shift_back": "◄ 1h",
+  "shift_fwd": "1h ►",
+  "fav_add": "Agregar a favoritos",
+  "fav_remove": "Quitar de favoritos",
+  "update_available": "&#8593; Actualizacion disponible:",
+  "update_title": "Haz clic para descargar la ultima version"
 }
@@ -1,17 +1,38 @@
 {
-  "days":   ["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"],
-  "months": ["Jan", "F\u00e9v", "Mar", "Avr", "Mai", "Jun", "Jul", "Ao\u00fb", "Sep", "Oct", "Nov", "D\u00e9c"],
+  "days": [
+    "Dim",
+    "Lun",
+    "Mar",
+    "Mer",
+    "Jeu",
+    "Ven",
+    "Sam"
+  ],
+  "months": [
+    "Jan",
+    "Fév",
+    "Mar",
+    "Avr",
+    "Mai",
+    "Jun",
+    "Jul",
+    "Aoû",
+    "Sep",
+    "Oct",
+    "Nov",
+    "Déc"
+  ],
  "now": "Maintenant",
-  "channels":   "Cha\u00eenes",
+  "channels": "Chaînes",
  "live": "LIVE",
  "loading": "Chargement du guide...",
  "epg_error": "Impossible de charger l'EPG",
-  "epg_error_sub": "V\u00e9rifiez l'URL de votre flux XMLTV.",
+  "epg_error_sub": "Vérifiez l'URL de votre flux XMLTV.",
  "load": "Charger",
-  "search_placeholder": "Rechercher une cha\u00eene ou un programme...",
+  "search_placeholder": "Rechercher une chaîne ou un programme...",
  "copy_epg": "EPG",
  "copy_m3u": "M3U",
-  "copied":     "\u2713 copi\u00e9",
+  "copied": "✓ copié",
  "program_info": "Infos programme",
  "watch_now": "Regarder",
  "imdb_search": "Rechercher sur IMDb",
@@ -24,7 +45,11 @@
  "personal_epg_optional": "optionnel",
  "cancel": "Annuler",
  "apply": "Appliquer",
-  "setup_already_done": "Configuration d\u00e9j\u00e0 effectu\u00e9e. Utilisez votre cl\u00e9 admin pour acc\u00e9der \u00e0 nouveau au setup.",
-  "shift_back": "\u25c4 1h",
-  "shift_fwd":  "1h \u25ba"
+  "setup_already_done": "Configuration déjà effectuée. Utilisez votre clé admin pour accéder à nouveau au setup.",
+  "shift_back": "◄ 1h",
+  "shift_fwd": "1h ►",
+  "fav_add": "Ajouter aux favoris",
+  "fav_remove": "Retirer des favoris",
+  "update_available": "&#8593; Mise a jour disponible :",
+  "update_title": "Cliquez pour telecharger la derniere version"
 }
@@ -0,0 +1,24 @@
+{
+  "name": "GridTV",
+  "short_name": "GridTV",
+  "description": "Self-hosted IPTV TV guide",
+  "start_url": "/",
+  "display": "standalone",
+  "background_color": "#0a0b0d",
+  "theme_color": "#0a0b0d",
+  "orientation": "any",
+  "icons": [
+    {
+      "src": "assets/icon-192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "assets/icon-512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "any maskable"
+    }
+  ]
+}
@@ -1,81 +1,216 @@
 <?php
 /**
- * GridTV — proxy.php (Apache + cURL)
+ * GridTV — proxy.php
+ *
+ * HTTP->HTTPS proxy restricted to hosts explicitly configured in config.json.
+ * Private and LAN IPs are allowed only when the administrator configured them.
+ * Redirects are followed manually and the host is revalidated at every hop.
 */

-$url = $_GET['url'] ?? '';
-if (empty($url) || !preg_match('#^https?://#i', $url)) {
-    http_response_code(400); die('Invalid URL');
+// ── Allowlist: authorized hosts extracted from config.json ────────────────────
+$config_path = __DIR__ . '/config.json';
+$allowed_hosts = [];
+
+if (file_exists($config_path)) {
+    $config = json_decode(file_get_contents($config_path), true) ?? [];
+    foreach ($config['epg_sources'] ?? [] as $src) {
+        foreach (['epg_url', 'm3u_url'] as $key) {
+            if (!empty($src[$key])) {
+                $host = strtolower(parse_url($src[$key], PHP_URL_HOST) ?? '');
+                if ($host !== '') $allowed_hosts[] = $host;
+            }
+        }
+    }
 }

-$base   = preg_replace('#[^/]*(\?.*)?$#', '', $url);
-$origin = parse_url($url, PHP_URL_SCHEME) . '://' . parse_url($url, PHP_URL_HOST);
-$port   = parse_url($url, PHP_URL_PORT);
-if ($port) $origin .= ':' . $port;
+// ── Helpers ────────────────────────────────────────────────────────────────────
+
+function is_allowed_url(string $url, array $allowed_hosts): bool {
+    if (!preg_match('#^https?://#i', $url)) return false;
+    $host = strtolower(parse_url($url, PHP_URL_HOST) ?? '');
+    return $host !== '' && in_array($host, $allowed_hosts, true);
+}
+
+function normalize_path(string $path): string {
+    $segments = explode('/', $path);
+    $normalized = [];
+
+    foreach ($segments as $segment) {
+        if ($segment === '' || $segment === '.') {
+            continue;
+        }
+        if ($segment === '..') {
+            array_pop($normalized);
+            continue;
+        }
+        $normalized[] = $segment;
+    }
+
+    return '/' . implode('/', $normalized);
+}
+
+function resolve_url(string $base, string $location): string {
+    if (preg_match('#^https?://#i', $location)) return $location;
+
+    $parts = parse_url($base);
+    $origin = $parts['scheme'] . '://' . $parts['host'];
+    if (!empty($parts['port'])) $origin .= ':' . $parts['port'];
+
+    if (strpos($location, '//') === 0) {
+        return $parts['scheme'] . ':' . $location;
+    }
+
+    if ($location === '') {
+        return $base;
+    }
+
+    if ($location[0] === '#') {
+        $without_fragment = preg_replace('/#.*$/', '', $base);
+        return $without_fragment . $location;
+    }
+
+    if ($location[0] === '?') {
+        $path = $parts['path'] ?? '/';
+        return $origin . $path . $location;
+    }
+
+    $location_parts = parse_url($location);
+    $path = $location_parts['path'] ?? '';
+    $query = isset($location_parts['query']) ? '?' . $location_parts['query'] : '';
+    $fragment = isset($location_parts['fragment']) ? '#' . $location_parts['fragment'] : '';
+
+    if ($path !== '' && $path[0] === '/') {
+        return $origin . normalize_path($path) . $query . $fragment;
+    }
+
+    $base_dir = dirname($parts['path'] ?? '/');
+    if ($base_dir === '\\' || $base_dir === '.') {
+        $base_dir = '/';
+    }
+    $combined = rtrim($base_dir, '/') . '/' . $path;
+
+    return $origin . normalize_path($combined) . $query . $fragment;
+}
+
+/**
+ * Fetch with manual redirect handling so every Location header is checked
+ * against the allowlist before following it.
+ */
+function fetch_with_checked_redirects(string $url, array $allowed_hosts, bool $head_only = false): array {
+    $max_redirects = 5;
+
+    for ($i = 0; $i <= $max_redirects; $i++) {
+        if (!is_allowed_url($url, $allowed_hosts)) {
+            http_response_code(403); die('Host not allowed after redirect');
+        }
+
+        $ua = $_SERVER['HTTP_USER_AGENT'] ?? 'Mozilla/5.0';
+        $ch = curl_init($url);
+        curl_setopt_array($ch, [
+            CURLOPT_FOLLOWLOCATION => false,
+            CURLOPT_HEADER         => true,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_NOBODY         => $head_only,
+            CURLOPT_TIMEOUT        => 30,
+            CURLOPT_USERAGENT      => $ua,
+            CURLOPT_HTTPHEADER     => ['Accept: */*'],
+        ]);
+
+        $response   = curl_exec($ch);
+        $code       = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+        curl_close($ch);
+
+        if ($response === false) {
+            http_response_code(502); die('Upstream error');
+        }
+
+        $raw_headers = substr($response, 0, $header_size);
+        $body        = substr($response, $header_size);
+
+        // Follow redirects manually so each hop is rechecked against the allowlist.
+        if ($code >= 300 && $code < 400) {
+            if (!preg_match('/^Location:\s*(.+)$/mi', $raw_headers, $m)) {
+                http_response_code(502); die('Invalid redirect');
+            }
+            $url = resolve_url($url, trim($m[1]));
+            continue;
+        }
+
+        return [$code, $raw_headers, $body, $url];
+    }
+
+    http_response_code(508); die('Too many redirects');
+}
+
+// ── Validate the initial URL ───────────────────────────────────────────────────
+$url = $_GET['url'] ?? '';
+
+if (!is_allowed_url($url, $allowed_hosts)) {
+    http_response_code(empty($allowed_hosts) ? 503 : 403);
+    die(empty($allowed_hosts) ? 'No sources configured' : 'Host not allowed');
+}
+
+// ── Detect the resource type ───────────────────────────────────────────────────
 $path       = parse_url($url, PHP_URL_PATH) ?? '';
 $is_segment = preg_match('#\.(ts|aac|mp4|m4s|fmp4)(\?|$)#i', $path);

 header('Access-Control-Allow-Origin: *');
 header('Cache-Control: no-cache');

-$ua = $_SERVER['HTTP_USER_AGENT'] ?? 'Mozilla/5.0';
-
+// ── Binary segment: stream chunk by chunk ──────────────────────────────────────
 if ($is_segment) {
-    // Segment binaire — stream via cURL chunk par chunk
    header('Content-Type: video/MP2T');
    header('X-Content-Type-Options: nosniff');

    if (ob_get_level()) ob_end_clean();

-    $ch = curl_init($url);
+    // Resolve redirects with HEAD first so we do not download the segment twice.
+    // Some HLS/CDN servers reject HEAD on media objects even when GET works.
+    [$code, , , $final_url] = fetch_with_checked_redirects($url, $allowed_hosts, true);
+    if ($code === 403 || $code === 405) {
+        [, , , $final_url] = fetch_with_checked_redirects($url, $allowed_hosts, false);
+        $code = 200;
+    }
+
+    if ($code >= 400) { http_response_code($code); die(); }
+
+    // Stream the validated final URL.
+    $ua = $_SERVER['HTTP_USER_AGENT'] ?? 'Mozilla/5.0';
+    $ch = curl_init($final_url);
    curl_setopt_array($ch, [
-        CURLOPT_FOLLOWLOCATION => true,
+        CURLOPT_FOLLOWLOCATION => false,
        CURLOPT_TIMEOUT        => 30,
        CURLOPT_USERAGENT      => $ua,
        CURLOPT_HTTPHEADER     => ['Accept: */*'],
        CURLOPT_RETURNTRANSFER => false,
        CURLOPT_WRITEFUNCTION  => function($ch, $data) {
-            echo $data;
-            flush();
-            return strlen($data);
+            echo $data; flush(); return strlen($data);
        },
        CURLOPT_HEADERFUNCTION => function($ch, $header) {
            $h = trim($header);
-            if (preg_match('/^Content-Type:/i', $h)) {
-                header($h);
-            }
+            if (preg_match('/^Content-Type:/i', $h)) header($h);
            return strlen($header);
        },
    ]);
-
    $ok   = curl_exec($ch);
    $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-    if (!$ok || $code >= 400) {
-        http_response_code($code ?: 502);
-    }
+    if (!$ok || $code >= 400) http_response_code($code ?: 502);
    curl_close($ch);

+// ── m3u8 playlist: fetch and rewrite URLs ──────────────────────────────────────
 } else {
-    // Playlist .m3u8 — fetch + réécriture URLs
-    $ch = curl_init($url);
-    curl_setopt_array($ch, [
-        CURLOPT_FOLLOWLOCATION => true,
-        CURLOPT_TIMEOUT        => 15,
-        CURLOPT_USERAGENT      => $ua,
-        CURLOPT_HTTPHEADER     => ['Accept: */*'],
-        CURLOPT_RETURNTRANSFER => true,
-    ]);
-    $body = curl_exec($ch);
-    $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-    curl_close($ch);
+    [$code, , $body, $final_url] = fetch_with_checked_redirects($url, $allowed_hosts, false);

-    if ($body === false || $code >= 400) {
-        http_response_code($code ?: 502);
-        die("Upstream error $code");
-    }
+    if ($code >= 400) { http_response_code($code); die("Upstream error $code"); }

    header('Content-Type: application/vnd.apple.mpegurl');

+    $final_parts = parse_url($final_url);
+    $origin      = $final_parts['scheme'] . '://' . $final_parts['host'];
+    if (!empty($final_parts['port'])) $origin .= ':' . $final_parts['port'];
+    $base = preg_replace('#[^/]*(\?.*)?$#', '', $final_url);
+
    $proxy_base = (isset($_SERVER['HTTPS']) ? 'https' : 'http')
                . '://' . $_SERVER['HTTP_HOST']
                . strtok($_SERVER['REQUEST_URI'], '?')
@@ -85,7 +220,7 @@ if ($is_segment) {
    foreach (explode("\n", $body) as $line) {
        $line = rtrim($line);
        if ($line === '' || $line[0] === '#') {
-            $line = preg_replace_callback('/URI="([^"]+)"/', function($m) use ($base, $proxy_base) {
+            $line = preg_replace_callback('/URI="([^"]+)"/', function($m) use ($base, $origin, $proxy_base) {
                $seg = strpos($m[1], 'http') === 0 ? $m[1]
                     : ($m[1][0] === '/' ? $origin . $m[1] : $base . $m[1]);
                return 'URI="' . $proxy_base . urlencode($seg) . '"';
@@ -1,10 +1,10 @@
 <?php
-// ── Migration automatique ancien format → nouveau ─────────────────────────────
 $config_path = __DIR__ . '/config.json';

+// Automatically migrate the legacy config format.
 if (file_exists($config_path)) {
    $existing = json_decode(file_get_contents($config_path), true);
-    // Vieille instance : epg_url à la racine, pas de epg_sources
+    if (is_array($existing)) {
        if (isset($existing['epg_url']) && !isset($existing['epg_sources'])) {
            $existing['epg_sources'] = [[
                'name'    => 'Main',
@@ -15,18 +15,55 @@ if (file_exists($config_path)) {
            unset($existing['epg_url'], $existing['m3u_url']);
            file_put_contents($config_path, json_encode($existing, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
        }
-    http_response_code(403);
-    die('Configuration déjà effectuée. Modifiez config.json via SSH pour changer les paramètres.');
+        // Bootstrap an admin key for older configs that do not have one yet.
+        if (empty($existing['admin_key'])) {
+            $existing['admin_key'] = bin2hex(random_bytes(16));
+            file_put_contents($config_path, json_encode($existing, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        }
+    }
 }

-$error   = '';
-$success = false;
+$is_first_setup = !file_exists($config_path);
+$existing       = [];
+$corrupt_config = false;
+if (!$is_first_setup) {
+    $existing = json_decode(file_get_contents($config_path), true);
+    if (!is_array($existing)) {
+        $existing       = [];
+        $corrupt_config = true;
+        $is_first_setup = true;
+    }
+}
+$admin_key      = $existing['admin_key'] ?? null;

-if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+$mode    = 'setup';
+$error   = '';
+$new_key = '';
+
+if (!$is_first_setup) {
+    if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['admin_key_input'])) {
+        if (trim($_POST['admin_key_input']) === $admin_key) {
+            $mode = 'setup';
+        } else {
+            $mode  = 'lock';
+            $error = 'Invalid admin key.';
+        }
+    } elseif ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['group_name'])) {
+        if (trim($_POST['admin_key_hidden'] ?? '') !== $admin_key) {
+            $mode  = 'lock';
+            $error = 'Invalid admin key.';
+        } else {
+            $mode = 'setup';
+        }
+    } else {
+        $mode = 'lock';
+    }
+}
+
+if ($mode === 'setup' && $_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['group_name'])) {
    $group_name         = trim($_POST['group_name'] ?? '');
    $allow_personal_epg = isset($_POST['allow_personal_epg']);

-    // Récupérer les sources EPG dynamiques
    $names    = $_POST['source_name']    ?? [];
    $epg_urls = $_POST['source_epg_url'] ?? [];
    $m3u_urls = $_POST['source_m3u_url'] ?? [];
@@ -37,13 +74,13 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
        $m3u_url = trim($m3u_urls[$i] ?? '');
        if (empty($epg_url)) continue;
        if (!filter_var($epg_url, FILTER_VALIDATE_URL)) {
-            $error = "URL EPG invalide pour la source « $name »."; break;
+            $error = "Invalid EPG URL for source \"$name\"."; break;
        }
        if (!empty($m3u_url) && !filter_var($m3u_url, FILTER_VALIDATE_URL)) {
-            $error = "URL M3U invalide pour la source « $name »."; break;
+            $error = "Invalid M3U URL for source \"$name\"."; break;
        }
        $epg_sources[] = [
-            'name'    => trim($name) ?: "Source " . ($i + 1),
+            'name'    => trim($name) ?: 'Source ' . ($i + 1),
            'epg_url' => $epg_url,
            'm3u_url' => $m3u_url,
        ];
@@ -51,303 +88,224 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {

    if (empty($error)) {
        if (empty($group_name)) {
-            $error = 'Le nom du groupe est obligatoire.';
+            $error = 'Group name is required.';
        } elseif (empty($epg_sources)) {
-            $error = 'Au moins une source EPG est obligatoire.';
+            $error = 'At least one EPG source is required.';
        } else {
+            $new_key = $is_first_setup ? strtoupper(bin2hex(random_bytes(8))) : $admin_key;
            $config  = [
                'group_name'         => $group_name,
                'epg_sources'        => $epg_sources,
                'allow_personal_epg' => $allow_personal_epg,
+                'admin_key'          => $new_key,
            ];
-            $written = file_put_contents(
-                $config_path,
-                json_encode($config, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
-            );
+            $written = file_put_contents($config_path, json_encode($config, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
            if ($written === false) {
-                $error = 'Impossible d\'écrire config.json. Vérifiez les permissions (chmod 775 .).';
+                $error = 'Cannot write config.json. Check permissions (chmod 775 .).';
            } else {
-                $success = true;
+                $mode = 'success';
            }
        }
    }
 }
+
+$prefill_group   = $_POST['group_name'] ?? $existing['group_name']     ?? '';
+$prefill_sources = $existing['epg_sources']                            ?? [];
+$prefill_epg     = !empty($existing['allow_personal_epg']);
+$submitted_key   = trim($_POST['admin_key_input'] ?? $_POST['admin_key_hidden'] ?? '');
 ?>
 <!DOCTYPE html>
-<html lang="fr">
+<html lang="en">
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>GridTV — Configuration</title>
-<link href="https://fonts.googleapis.com/css2?family=Share+Tech+Mono&family=Barlow+Condensed:wght@300;400;600;700&display=swap" rel="stylesheet">
+<title>GridTV — Setup</title>
+<link rel="stylesheet" href="/assets/fonts/fonts.css">
 <style>
  :root {
-    --bg: #0a0b0d; --surface: #111318; --surface2: #181b22;
-    --border: #232733; --border-bright: #2e3444;
-    --accent: #e8c842; --accent2: #4a9eff;
-    --text: #c8cdd8; --text-dim: #5a6070; --text-bright: #eef0f5;
-    --error: #ff4444; --success: #44cc77;
-  }
-  * { box-sizing: border-box; margin: 0; padding: 0; }
-  html, body {
-    min-height: 100%; background: var(--bg); color: var(--text);
-    font-family: 'Barlow Condensed', sans-serif;
-    display: flex; align-items: flex-start; justify-content: center;
-  }
-  .setup-card {
-    width: 100%; max-width: 580px;
-    background: var(--surface); border: 1px solid var(--border-bright);
-    padding: 40px 40px 36px; margin: 40px 16px;
-  }
-  .setup-logo {
-    font-family: 'Share Tech Mono', monospace; font-size: 22px;
-    color: var(--accent); letter-spacing: 0.1em; text-transform: uppercase; margin-bottom: 6px;
-  }
-  .setup-logo span { color: var(--text-dim); margin: 0 6px; }
-  .setup-subtitle {
-    font-size: 13px; color: var(--text-dim); letter-spacing: 0.05em;
-    margin-bottom: 32px; line-height: 1.5;
-  }
-  .form-group { margin-bottom: 22px; }
-  .section-title {
-    font-family: 'Share Tech Mono', monospace; font-size: 11px;
-    letter-spacing: 0.12em; text-transform: uppercase;
-    color: var(--accent); margin: 32px 0 16px;
-    padding-bottom: 8px; border-bottom: 1px solid var(--border);
-  }
-  label {
-    display: block; font-size: 11px; letter-spacing: 0.12em;
-    text-transform: uppercase; color: var(--text-dim);
-    margin-bottom: 7px; font-family: 'Share Tech Mono', monospace;
-  }
-  label .required { color: var(--accent); margin-left: 3px; }
-  label .optional { color: var(--text-dim); font-size: 10px; text-transform: none; letter-spacing: 0; margin-left: 4px; opacity: 0.6; }
-  input[type="text"], input[type="url"] {
-    width: 100%; background: var(--surface2); border: 1px solid var(--border-bright);
-    color: var(--text-bright); font-family: 'Share Tech Mono', monospace;
-    font-size: 13px; padding: 10px 12px; outline: none; transition: border-color 0.15s;
-  }
-  input[type="text"]:focus, input[type="url"]:focus { border-color: var(--accent); }
-  input::placeholder { color: var(--text-dim); opacity: 0.5; }
-  .hint { font-size: 11px; color: var(--text-dim); margin-top: 5px; line-height: 1.4; }
-
-  /* Sources EPG */
-  .sources-list { display: flex; flex-direction: column; gap: 16px; }
-  .source-block {
-    background: var(--surface2); border: 1px solid var(--border);
-    padding: 16px; position: relative;
-  }
-  .source-block .source-num {
-    font-family: 'Share Tech Mono', monospace; font-size: 10px;
-    color: var(--accent); letter-spacing: 0.1em; margin-bottom: 12px;
-  }
-  .source-fields { display: grid; gap: 10px; }
-  .source-remove {
-    position: absolute; top: 10px; right: 10px;
-    background: none; border: none; color: var(--text-dim);
-    font-size: 16px; cursor: pointer; line-height: 1; padding: 2px 5px;
-  }
-  .source-remove:hover { color: var(--error); }
-  .btn-add-source {
-    width: 100%; background: none; border: 1px dashed var(--border-bright);
-    color: var(--accent2); font-family: 'Barlow Condensed', sans-serif;
-    font-size: 13px; font-weight: 600; letter-spacing: 0.1em;
-    text-transform: uppercase; padding: 10px; cursor: pointer;
-    margin-top: 8px; transition: border-color 0.15s, color 0.15s;
-  }
-  .btn-add-source:hover { border-color: var(--accent2); color: var(--text-bright); }
-
-  /* Toggle personal EPG */
-  .toggle-row {
-    display: flex; align-items: center; justify-content: space-between;
-    background: var(--surface2); border: 1px solid var(--border);
-    padding: 14px 16px; margin-bottom: 22px;
-  }
-  .toggle-label { font-size: 13px; color: var(--text); line-height: 1.4; }
-  .toggle-label small { display: block; font-size: 11px; color: var(--text-dim); margin-top: 2px; }
-  .toggle {
-    position: relative; width: 40px; height: 22px; flex-shrink: 0; margin-left: 16px;
-  }
-  .toggle input { opacity: 0; width: 0; height: 0; }
-  .toggle-slider {
-    position: absolute; inset: 0; background: var(--border-bright);
-    cursor: pointer; transition: background 0.2s; border-radius: 22px;
-  }
-  .toggle-slider:before {
-    content: ''; position: absolute; width: 16px; height: 16px;
-    left: 3px; top: 3px; background: var(--text-dim);
-    transition: transform 0.2s, background 0.2s; border-radius: 50%;
-  }
-  .toggle input:checked + .toggle-slider { background: var(--accent); }
-  .toggle input:checked + .toggle-slider:before { transform: translateX(18px); background: #000; }
-
-  .btn-submit {
-    width: 100%; background: var(--accent); color: #000; border: none;
-    font-family: 'Barlow Condensed', sans-serif; font-size: 15px; font-weight: 700;
-    letter-spacing: 0.12em; text-transform: uppercase; padding: 13px;
-    cursor: pointer; margin-top: 8px; transition: opacity 0.15s;
-  }
-  .btn-submit:hover { opacity: 0.85; }
-  .alert {
-    padding: 12px 14px; font-size: 13px; margin-bottom: 24px;
-    line-height: 1.5; border-left: 3px solid;
-  }
-  .alert-error  { background: rgba(255,68,68,0.08);  border-color: var(--error);   color: var(--error);   }
-  .alert-success{ background: rgba(68,204,119,0.08); border-color: var(--success); color: var(--success); }
-  .success-actions { text-align: center; margin-top: 28px; }
-  .btn-go {
-    display: inline-block; background: var(--accent); color: #000;
-    font-family: 'Barlow Condensed', sans-serif; font-size: 16px; font-weight: 700;
-    letter-spacing: 0.12em; text-transform: uppercase; padding: 13px 40px;
-    text-decoration: none; transition: opacity 0.15s;
-  }
-  .btn-go:hover { opacity: 0.85; }
-  .setup-note {
-    margin-top: 28px; padding-top: 20px; border-top: 1px solid var(--border);
-    font-size: 11px; color: var(--text-dim); line-height: 1.6;
-  }
-  .setup-note code {
-    font-family: 'Share Tech Mono', monospace; background: var(--surface2);
-    padding: 1px 5px; border: 1px solid var(--border); color: var(--accent2); font-size: 11px;
+    --bg:#0a0b0d;--surface:#111318;--surface2:#181b22;
+    --border:#232733;--border-bright:#2e3444;
+    --accent:#e8c842;--accent2:#4a9eff;
+    --text:#c8cdd8;--text-dim:#5a6070;--text-bright:#eef0f5;
+    --error:#ff4444;--success:#44cc77;
  }
+  *{box-sizing:border-box;margin:0;padding:0;}
+  html,body{min-height:100%;background:var(--bg);color:var(--text);font-family:'Barlow Condensed',sans-serif;display:flex;align-items:flex-start;justify-content:center;}
+  .setup-card{width:100%;max-width:580px;background:var(--surface);border:1px solid var(--border-bright);padding:40px 40px 36px;margin:40px 16px;}
+  .setup-logo{font-family:'Share Tech Mono',monospace;font-size:22px;color:var(--accent);letter-spacing:.1em;text-transform:uppercase;margin-bottom:6px;}
+  .setup-logo span{color:var(--text-dim);margin:0 6px;}
+  .setup-subtitle{font-size:13px;color:var(--text-dim);letter-spacing:.05em;margin-bottom:32px;line-height:1.5;}
+  .form-group{margin-bottom:22px;}
+  .section-title{font-family:'Share Tech Mono',monospace;font-size:11px;letter-spacing:.12em;text-transform:uppercase;color:var(--accent);margin:32px 0 16px;padding-bottom:8px;border-bottom:1px solid var(--border);}
+  label{display:block;font-size:11px;letter-spacing:.12em;text-transform:uppercase;color:var(--text-dim);margin-bottom:7px;font-family:'Share Tech Mono',monospace;}
+  label .required{color:var(--accent);margin-left:3px;}
+  label .optional{color:var(--text-dim);font-size:10px;text-transform:none;letter-spacing:0;margin-left:4px;opacity:.6;}
+  input[type=text],input[type=url],input[type=password]{width:100%;background:var(--surface2);border:1px solid var(--border-bright);color:var(--text-bright);font-family:'Share Tech Mono',monospace;font-size:13px;padding:10px 12px;outline:none;transition:border-color .15s;}
+  input:focus{border-color:var(--accent);}
+  input::placeholder{color:var(--text-dim);opacity:.5;}
+  .hint{font-size:11px;color:var(--text-dim);margin-top:5px;line-height:1.4;}
+  .sources-list{display:flex;flex-direction:column;gap:16px;}
+  .source-block{background:var(--surface2);border:1px solid var(--border);padding:16px;position:relative;}
+  .source-block .source-num{font-family:'Share Tech Mono',monospace;font-size:10px;color:var(--accent);letter-spacing:.1em;margin-bottom:12px;}
+  .source-fields{display:grid;gap:10px;}
+  .source-remove{position:absolute;top:10px;right:10px;background:none;border:none;color:var(--text-dim);font-size:16px;cursor:pointer;line-height:1;padding:2px 5px;}
+  .source-remove:hover{color:var(--error);}
+  .btn-add-source{width:100%;background:none;border:1px dashed var(--border-bright);color:var(--accent2);font-family:'Barlow Condensed',sans-serif;font-size:13px;font-weight:600;letter-spacing:.1em;text-transform:uppercase;padding:10px;cursor:pointer;margin-top:8px;transition:border-color .15s,color .15s;}
+  .btn-add-source:hover{border-color:var(--accent2);color:var(--text-bright);}
+  .toggle-row{display:flex;align-items:center;justify-content:space-between;background:var(--surface2);border:1px solid var(--border);padding:14px 16px;margin-bottom:22px;}
+  .toggle-label{font-size:13px;color:var(--text);line-height:1.4;}
+  .toggle-label small{display:block;font-size:11px;color:var(--text-dim);margin-top:2px;}
+  .toggle{position:relative;width:40px;height:22px;flex-shrink:0;margin-left:16px;}
+  .toggle input{opacity:0;width:0;height:0;}
+  .toggle-slider{position:absolute;inset:0;background:var(--border-bright);cursor:pointer;transition:background .2s;border-radius:22px;}
+  .toggle-slider:before{content:'';position:absolute;width:16px;height:16px;left:3px;top:3px;background:var(--text-dim);transition:transform .2s,background .2s;border-radius:50%;}
+  .toggle input:checked+.toggle-slider{background:var(--accent);}
+  .toggle input:checked+.toggle-slider:before{transform:translateX(18px);background:#000;}
+  .btn-submit{width:100%;background:var(--accent);color:#000;border:none;font-family:'Barlow Condensed',sans-serif;font-size:15px;font-weight:700;letter-spacing:.12em;text-transform:uppercase;padding:13px;cursor:pointer;margin-top:8px;transition:opacity .15s;}
+  .btn-submit:hover{opacity:.85;}
+  .alert{padding:12px 14px;font-size:13px;margin-bottom:24px;line-height:1.5;border-left:3px solid;}
+  .alert-error{background:rgba(255,68,68,.08);border-color:var(--error);color:var(--error);}
+  .alert-success{background:rgba(68,204,119,.08);border-color:var(--success);color:var(--success);}
+  .success-actions{text-align:center;margin-top:28px;}
+  .btn-go{display:inline-block;background:var(--accent);color:#000;font-family:'Barlow Condensed',sans-serif;font-size:16px;font-weight:700;letter-spacing:.12em;text-transform:uppercase;padding:13px 40px;text-decoration:none;transition:opacity .15s;}
+  .btn-go:hover{opacity:.85;}
+  .key-box{background:var(--surface2);border:1px solid var(--accent);padding:18px 20px;margin:24px 0;text-align:center;}
+  .key-label{font-family:'Share Tech Mono',monospace;font-size:10px;letter-spacing:.12em;text-transform:uppercase;color:var(--text-dim);margin-bottom:10px;}
+  .key-value{font-family:'Share Tech Mono',monospace;font-size:22px;color:var(--accent);letter-spacing:.15em;word-break:break-all;}
+  .key-warning{font-size:11px;color:var(--text-dim);margin-top:10px;line-height:1.5;}
+  .key-warning strong{color:var(--error);}
+  .lock-screen{text-align:center;padding:10px 0 20px;}
+  .lock-icon{font-size:36px;margin-bottom:16px;}
+  .lock-title{font-family:'Share Tech Mono',monospace;font-size:13px;letter-spacing:.1em;color:var(--text);margin-bottom:8px;}
+  .lock-sub{font-size:12px;color:var(--text-dim);margin-bottom:24px;line-height:1.5;}
+  .lock-form{display:flex;gap:8px;}
+  .lock-form input{flex:1;}
+  .setup-note{margin-top:28px;padding-top:20px;border-top:1px solid var(--border);font-size:11px;color:var(--text-dim);line-height:1.6;}
+  .setup-note code{font-family:'Share Tech Mono',monospace;background:var(--surface2);padding:1px 5px;border:1px solid var(--border);color:var(--accent2);font-size:11px;}
 </style>
 </head>
 <body>
 <div class="setup-card">
-
  <div class="setup-logo">Grid<span>/</span>TV</div>
-  <div class="setup-subtitle">
-    Bienvenue sur GridTV — votre guide TV IPTV.<br>
-    Configurez votre instance en remplissant les champs ci-dessous.
+
+  <?php if ($mode === 'lock'): ?>
+    <div class="setup-subtitle">Enter your admin key to access the configuration.</div>
+    <?php if ($error): ?><div class="alert alert-error"><?= htmlspecialchars($error) ?></div><?php endif; ?>
+    <div class="lock-screen">
+      <div class="lock-icon">&#128274;</div>
+      <div class="lock-title">Configuration locked</div>
+      <div class="lock-sub">GridTV is already configured.<br>Enter your admin key to edit the settings.</div>
+      <form method="POST" action="setup.php">
+        <div class="lock-form">
+          <input type="password" name="admin_key_input" placeholder="Your admin key" autofocus autocomplete="off">
+          <button type="submit" class="btn-submit" style="width:auto;padding:10px 20px;">Unlock</button>
+        </div>
+      </form>
    </div>

-  <?php if ($error): ?>
-    <div class="alert alert-error"><?= htmlspecialchars($error) ?></div>
-  <?php endif; ?>
-
-  <?php if ($success): ?>
-    <div class="alert alert-success">
-      ✓ Configuration enregistrée dans <code>config.json</code>.<br>
-      Cette page ne sera plus accessible. Pour modifier la config, éditez <code>config.json</code> via SSH.
-    </div>
-    <div class="success-actions">
-      <a href="index.php" class="btn-go">Ouvrir GridTV →</a>
+  <?php elseif ($mode === 'success'): ?>
+    <div class="setup-subtitle">Configuration saved successfully.</div>
+    <div class="alert alert-success">&#10003; Settings saved to <code>config.json</code>.</div>
+    <?php if ($is_first_setup): ?>
+    <div class="key-box">
+      <div class="key-label">Your admin key</div>
+      <div class="key-value"><?= htmlspecialchars($new_key) ?></div>
+      <div class="key-warning"><strong>Save this key now.</strong> It will not be shown again.<br>You will need it to access this setup page in the future.</div>
    </div>
    <?php else: ?>
+    <div class="alert alert-success" style="margin-top:0">Your admin key is unchanged.</div>
+    <?php endif; ?>
+    <div class="success-actions"><a href="index.php" class="btn-go">Open GridTV &rarr;</a></div>
+
+  <?php else: ?>
+    <div class="setup-subtitle">
+      <?= $is_first_setup ? 'Welcome to GridTV. Fill in the fields below to get started.' : 'Edit your GridTV configuration.' ?>
+    </div>
+    <?php if ($error): ?><div class="alert alert-error"><?= htmlspecialchars($error) ?></div><?php endif; ?>

    <form method="POST" action="setup.php">
+      <?php if (!$is_first_setup): ?>
+        <input type="hidden" name="admin_key_hidden" value="<?= htmlspecialchars($submitted_key ?: $admin_key) ?>">
+      <?php endif; ?>

      <div class="form-group">
-      <label>Nom du groupe TV <span class="required">*</span></label>
-      <input type="text" name="group_name"
-             value="<?= htmlspecialchars($_POST['group_name'] ?? '') ?>"
-             placeholder="Ex: JohnnyBeGood, MaTV, FamilleTV..."
-             required>
-      <div class="hint">S'affiche en haut à gauche dans la topbar.</div>
+        <label>TV Group Name <span class="required">*</span></label>
+        <input type="text" name="group_name" value="<?= htmlspecialchars($prefill_group) ?>" placeholder="e.g. JohnnyBeGood, MyTV, FamilyTV..." required>
+        <div class="hint">Displayed top-left in the topbar.</div>
      </div>

-    <div class="section-title">Sources EPG</div>
-
+      <div class="section-title">EPG Sources</div>
      <div class="sources-list" id="sourcesList">
-      <div class="source-block" data-index="0">
-        <div class="source-num">SOURCE 1</div>
-        <button type="button" class="source-remove" onclick="removeSource(this)" style="display:none">✕</button>
+        <?php
+        $sources_to_show = !empty($prefill_sources) ? $prefill_sources : [['name'=>'Main','epg_url'=>'','m3u_url'=>'']];
+        foreach ($sources_to_show as $i => $src): ?>
+        <div class="source-block" data-index="<?= $i ?>">
+          <div class="source-num">SOURCE <?= $i + 1 ?></div>
+          <button type="button" class="source-remove" onclick="removeSource(this)"<?= count($sources_to_show) === 1 ? ' style="display:none"' : '' ?>>&#10005;</button>
          <div class="source-fields">
            <div>
-            <label>Nom de la source</label>
-            <input type="text" name="source_name[]" value="Main" placeholder="Ex: Main, Sports, Films...">
+              <label>Source name</label>
+              <input type="text" name="source_name[]" value="<?= htmlspecialchars($src['name'] ?? '') ?>" placeholder="e.g. Main, Sports, Movies...">
            </div>
            <div>
-            <label>URL EPG (XMLTV) <span class="required">*</span></label>
-            <input type="url" name="source_epg_url[]" placeholder="http://votre-serveur/api/xmltv.xml" required>
+              <label>EPG URL (XMLTV) <span class="required">*</span></label>
+              <input type="url" name="source_epg_url[]" value="<?= htmlspecialchars($src['epg_url'] ?? '') ?>" placeholder="http://your-server/api/xmltv.xml">
            </div>
            <div>
-            <label>URL M3U <span class="optional">(optionnel)</span></label>
-            <input type="url" name="source_m3u_url[]" placeholder="http://votre-serveur/api/channels.m3u">
-            <div class="hint">Utilisé par le lecteur intégré pour matcher les chaînes.</div>
+              <label>M3U URL <span class="optional">(optional)</span></label>
+              <input type="url" name="source_m3u_url[]" value="<?= htmlspecialchars($src['m3u_url'] ?? '') ?>" placeholder="http://your-server/api/channels.m3u">
+              <div class="hint">Used by the built-in player to match channels to streams.</div>
            </div>
          </div>
        </div>
+        <?php endforeach; ?>
      </div>
-
-    <button type="button" class="btn-add-source" onclick="addSource()">+ Ajouter une source EPG</button>
+      <button type="button" class="btn-add-source" onclick="addSource()">+ Add EPG source</button>

      <div class="section-title">Options</div>
-
      <div class="toggle-row">
        <div class="toggle-label">
-        Autoriser les EPG personnels
-        <small>Les visiteurs peuvent utiliser votre instance avec leur propre EPG/M3U.</small>
+          Allow personal EPG
+          <small>Visitors can use your instance with their own EPG/M3U URLs.</small>
        </div>
        <label class="toggle">
-        <input type="checkbox" name="allow_personal_epg" id="allowPersonalEpg">
+          <input type="checkbox" name="allow_personal_epg" id="allowPersonalEpg"<?= $prefill_epg ? ' checked' : '' ?>>
          <span class="toggle-slider"></span>
        </label>
      </div>

-    <button type="submit" class="btn-submit">Enregistrer la configuration</button>
-
+      <button type="submit" class="btn-submit">Save configuration</button>
    </form>

  <?php endif; ?>

  <div class="setup-note">
-    <strong>Note :</strong> La configuration est stockée dans <code>config.json</code> sur le serveur.
-    Ce fichier est exclu du dépôt Git (<code>.gitignore</code>).
-    Pour modifier les paramètres ultérieurement, éditez ce fichier directement via SSH.
+    <strong>Note:</strong> Configuration is stored in <code>config.json</code> on the server.
+    This file is excluded from the Git repository (<code>.gitignore</code>).
  </div>
-
 </div>

 <script>
-let sourceCount = 1;
-
+let sourceCount = document.querySelectorAll('.source-block').length;
 function addSource() {
  sourceCount++;
  const list = document.getElementById('sourcesList');
  const div  = document.createElement('div');
  div.className = 'source-block';
-  div.dataset.index = sourceCount - 1;
  div.innerHTML = `
    <div class="source-num">SOURCE ${sourceCount}</div>
-    <button type="button" class="source-remove" onclick="removeSource(this)">✕</button>
+    <button type="button" class="source-remove" onclick="removeSource(this)">&#10005;</button>
    <div class="source-fields">
-      <div>
-        <label>Nom de la source</label>
-        <input type="text" name="source_name[]" placeholder="Ex: Sports, Films...">
-      </div>
-      <div>
-        <label>URL EPG (XMLTV) <span class="required">*</span></label>
-        <input type="url" name="source_epg_url[]" placeholder="http://votre-serveur/api/xmltv.xml">
-      </div>
-      <div>
-        <label>URL M3U <span class="optional">(optionnel)</span></label>
-        <input type="url" name="source_m3u_url[]" placeholder="http://votre-serveur/api/channels.m3u">
-        <div class="hint">Utilisé par le lecteur intégré pour matcher les chaînes.</div>
-      </div>
+      <div><label>Source name</label><input type="text" name="source_name[]" placeholder="e.g. Sports, Movies..."></div>
+      <div><label>EPG URL (XMLTV) <span class="required">*</span></label><input type="url" name="source_epg_url[]" placeholder="http://your-server/api/xmltv.xml"></div>
+      <div><label>M3U URL <span class="optional">(optional)</span></label><input type="url" name="source_m3u_url[]" placeholder="http://your-server/api/channels.m3u"><div class="hint">Used by the built-in player to match channels to streams.</div></div>
    </div>`;
  list.appendChild(div);
  updateRemoveButtons();
 }
-
-function removeSource(btn) {
-  btn.closest('.source-block').remove();
-  renumberSources();
-  updateRemoveButtons();
-}
-
-function renumberSources() {
-  document.querySelectorAll('.source-block').forEach((block, i) => {
-    block.querySelector('.source-num').textContent = `SOURCE ${i + 1}`;
-  });
-}
-
-function updateRemoveButtons() {
-  const blocks = document.querySelectorAll('.source-block');
-  blocks.forEach(block => {
-    block.querySelector('.source-remove').style.display = blocks.length > 1 ? '' : 'none';
-  });
-}
+function removeSource(btn) { btn.closest('.source-block').remove(); renumberSources(); updateRemoveButtons(); }
+function renumberSources() { document.querySelectorAll('.source-block').forEach((b,i) => b.querySelector('.source-num').textContent = `SOURCE ${i+1}`); }
+function updateRemoveButtons() { const b = document.querySelectorAll('.source-block'); b.forEach(bl => bl.querySelector('.source-remove').style.display = b.length > 1 ? '' : 'none'); }
 </script>
 </body>
 </html>
@@ -8,8 +8,12 @@ if (!file_exists($config_path)) {
 }

 $config = json_decode(file_get_contents($config_path), true);
+if (!is_array($config)) {
+    http_response_code(500);
+    die('<h2>GridTV — Configuration error</h2><p><code>config.json</code> is invalid or corrupted.<br>Please delete it and re-run <a href="setup.php">setup</a>, or fix it manually via SSH.</p>');
+}

-// ── Migration automatique ancien format → nouveau ─────────────────────────────
+// ── Automatically migrate the legacy config format to the current one ─────────
 if (isset($config['epg_url']) && !isset($config['epg_sources'])) {
    $config['epg_sources'] = [[
        'name'    => 'Main',
@@ -26,21 +30,28 @@ $group_name         = htmlspecialchars($config['group_name'] ?? 'GridTV');
 $epg_sources        = $config['epg_sources'] ?? [];
 $allow_personal_epg = !empty($config['allow_personal_epg']);

-// Première source par défaut (pour compatibilité avec le reste du code)
+// Default to the first configured source to keep the rest of the app compatible.
 $first_source = $epg_sources[0] ?? [];
 $epg_url      = htmlspecialchars($first_source['epg_url'] ?? '');
 $m3u_url      = htmlspecialchars($first_source['m3u_url'] ?? '');

 // ── Locale detection ─────────────────────────────────────────────────────────
-$supported_locales = ['en', 'fr', 'es'];
+// Auto-discover available locales from the locales/ directory.
+$locale_files    = glob(__DIR__ . '/../locales/*.json') ?: [];
+$supported_locales = array_map(fn($f) => basename($f, '.json'), $locale_files);
 $locale = 'en';
 $accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? 'en';
 foreach (explode(',', $accept) as $lang) {
    $code = strtolower(substr(trim($lang), 0, 2));
-    if (in_array($code, $supported_locales)) { $locale = $code; break; }
+    if (in_array($code, $supported_locales, true)) { $locale = $code; break; }
 }
 $locale_path = __DIR__ . "/../locales/{$locale}.json";
 $L = json_decode(file_get_contents($locale_path), true);
+if (!is_array($L)) {
+    // Fallback to English if the locale file is missing or corrupted.
+    $fallback_path = __DIR__ . '/../locales/en.json';
+    $L = is_file($fallback_path) ? (json_decode(file_get_contents($fallback_path), true) ?? []) : [];
+}
 // ─────────────────────────────────────────────────────────────────────────────
 ?>
 <!DOCTYPE html>
@@ -0,0 +1,36 @@
+/* Base variables overridden by the active theme file */
+  :root {
+    color-scheme: dark;
+    --bg: #0a0b0d;
+    --surface: #111318;
+    --surface2: #181b22;
+    --border: #232733;
+    --border-bright: #2e3444;
+    --accent: #e8c842;
+    --accent2: #4a9eff;
+    --accent-live: #ff4444;
+    --text: #c8cdd8;
+    --text-dim: #5a6070;
+    --text-bright: #eef0f5;
+    --prog-bg: #141820;
+    --prog-border: #1e2a3a;
+    --prog-live-bg: #0d2040;
+    --prog-live-border: #4a9eff;
+    --font-ui: 'Barlow Condensed', sans-serif;
+    --font-mono: 'Share Tech Mono', monospace;
+    --channel-w: 160px;
+    --row-h: 80px;
+    --header-h: 52px;
+  }
+
+  html, body { height: 100%; }
+
+  body {
+    background: var(--bg);
+    color: var(--text);
+    font-family: var(--font-ui);
+    font-size: 14px;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+  }
@@ -0,0 +1,16 @@
+/* ── FAVORITES ───────────────────────────────────────────────────────────── */
+  .fav-btn {
+    background: none; border: none; color: var(--text-muted);
+    cursor: pointer; font-size: 14px; line-height: 1;
+    margin-left: auto; padding: 2px 4px; flex-shrink: 0;
+    transition: color .15s, transform .15s;
+    opacity: 0;
+  }
+  .channel-cell:hover .fav-btn { opacity: 1; }
+  .fav-btn.is-fav { color: var(--accent); opacity: 1; }
+  .fav-btn:hover { transform: scale(1.2); }
+
+  .fav-separator {
+    height: 2px; background: var(--accent);
+    opacity: .3; margin: 0;
+  }
@@ -0,0 +1,215 @@
+/* ═══════════════════════════════════════════
+     GRID VIEW (desktop / tablet)
+  ═══════════════════════════════════════════ */
+  .grid-wrapper {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    position: relative;
+    min-height: 0;
+  }
+
+  .channels-col {
+    width: var(--channel-w);
+    flex-shrink: 0;
+    background: var(--surface);
+    border-right: 1px solid var(--border-bright);
+    z-index: 10;
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+  }
+
+  .channels-col-header {
+    height: var(--header-h);
+    border-bottom: 1px solid var(--border-bright);
+    display: flex;
+    align-items: center;
+    padding: 0 12px;
+    flex-shrink: 0;
+  }
+  .channels-col-header span {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 9px;
+    color: var(--text-dim);
+    letter-spacing: 0.15em;
+    text-transform: uppercase;
+  }
+
+  .channels-list {
+    overflow-y: auto;
+    flex: 1;
+    scrollbar-width: none;
+  }
+  .channels-list::-webkit-scrollbar { display: none; }
+
+  .channel-cell {
+    height: var(--row-h);
+    border-bottom: 1px solid var(--border);
+    display: flex;
+    align-items: center;
+    padding: 0 12px;
+    gap: 8px;
+    flex-shrink: 0;
+  }
+
+  .channel-logo {
+    width: 32px; height: 32px;
+    border-radius: 4px;
+    object-fit: contain;
+    background: var(--surface2);
+    flex-shrink: 0;
+  }
+  .channel-logo-placeholder {
+    width: 32px; height: 32px;
+    border-radius: 4px;
+    background: var(--surface2);
+    border: 1px solid var(--border);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 9px;
+    color: var(--text-dim);
+    flex-shrink: 0;
+  }
+
+  .channel-name {
+    font-size: 12px;
+    font-weight: 600;
+    color: var(--text-bright);
+    letter-spacing: 0.04em;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    text-transform: uppercase;
+  }
+
+  .timeline-area {
+    flex: 1;
+    overflow: auto;
+    position: relative;
+    min-height: 0;
+    scrollbar-width: thin;
+    scrollbar-color: var(--border-bright) transparent;
+  }
+  .timeline-area::-webkit-scrollbar { height: 4px; width: 4px; }
+  .timeline-area::-webkit-scrollbar-track { background: transparent; }
+  .timeline-area::-webkit-scrollbar-thumb { background: var(--border-bright); border-radius: 2px; }
+
+  /* Single container so the ruler and programs scroll together */
+  .timeline-inner {
+    position: relative;
+    display: block;
+    min-width: 100%;
+  }
+
+  .time-ruler {
+    height: var(--header-h);
+    background: var(--surface);
+    border-bottom: 1px solid var(--border-bright);
+    position: sticky;
+    top: 0;
+    z-index: 20;
+  }
+  .time-ruler-inner {
+    position: relative;
+    height: 100%;
+  }
+  .time-tick {
+    position: absolute;
+    bottom: 0;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  .time-tick-label {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 10px;
+    color: var(--text-dim);
+    letter-spacing: 0.08em;
+    padding: 0 6px 6px;
+    white-space: nowrap;
+  }
+  .time-tick-label.hour { color: var(--text); font-size: 12px; }
+  .time-tick-line { width: 1px; height: 8px; background: var(--border-bright); }
+  .time-tick-line.hour { height: 14px; }
+
+  .now-line {
+    position: absolute;
+    top: 0;
+    width: 2px;
+    height: 100%;
+    background: var(--accent-live);
+    z-index: 50;
+    pointer-events: none;
+  }
+  .now-line::before {
+    content: '';
+    position: absolute;
+    top: 0; left: -4px;
+    width: 10px; height: 10px;
+    background: var(--accent-live);
+    border-radius: 50%;
+  }
+
+  .programs-inner {
+    position: relative;
+    background-image: repeating-linear-gradient(
+      to bottom,
+      transparent 0px, transparent 79px,
+      var(--border) 79px, var(--border) 80px
+    );
+  }
+
+  .program-row {
+    height: var(--row-h);
+    border-bottom: 1px solid var(--border);
+    position: absolute;
+    left: 0; right: 0;
+  }
+
+  .program-block {
+    position: absolute;
+    top: 5px; bottom: 5px;
+    background: var(--surface2);
+    border: 1px solid var(--border);
+    border-radius: 3px;
+    padding: 0 8px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    overflow: hidden;
+    cursor: default;
+    transition: background 0.12s, border-color 0.12s;
+    min-width: 2px;
+  }
+  .program-block:hover { background: var(--surface); border-color: var(--accent2); z-index: 5; }
+  .program-block.is-live { border-color: var(--accent2); background: #0d1a2e; }
+  .program-block.is-live::after {
+    content: '';
+    position: absolute;
+    bottom: 0; left: 0;
+    height: 2px;
+    background: var(--accent2);
+    width: var(--progress, 0%);
+    transition: width 1s linear;
+  }
+  .program-block.is-past { opacity: 0.35; }
+
+  .program-title {
+    font-size: 12px;
+    font-weight: 600;
+    color: var(--text-bright);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    letter-spacing: 0.02em;
+  }
+  .program-time {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 9px;
+    color: var(--text-dim);
+    letter-spacing: 0.06em;
+    white-space: nowrap;
+  }
@@ -0,0 +1,210 @@
+/* ═══════════════════════════════════════════
+     MOBILE LIST VIEW
+  ═══════════════════════════════════════════ */
+  .mobile-view {
+    display: none;
+    flex: 1;
+    overflow-y: auto;
+    min-height: 0;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  .mobile-channel {
+    border-bottom: 2px solid var(--border-bright);
+  }
+
+  .mobile-channel-header {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 10px 14px;
+    background: var(--surface);
+    position: sticky;
+    top: 0;
+    z-index: 10;
+    border-bottom: 1px solid var(--border);
+  }
+
+  .mobile-programs {
+    padding: 6px 10px;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+  }
+
+  .mobile-program {
+    display: flex;
+    align-items: stretch;
+    border-radius: 4px;
+    overflow: hidden;
+    border: 1px solid var(--border);
+    background: var(--surface2);
+    position: relative;
+  }
+  .mobile-program.is-live { border-color: var(--accent2); background: #0d1a2e; }
+  .mobile-program.is-past { opacity: 0.4; }
+
+  .mobile-program-progress {
+    position: absolute;
+    bottom: 0; left: 0;
+    height: 2px;
+    background: var(--accent2);
+  }
+
+  .mobile-program-time {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 10px;
+    color: var(--text-dim);
+    padding: 8px 10px;
+    background: var(--surface);
+    border-right: 1px solid var(--border);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: flex-start;
+    min-width: 72px;
+    flex-shrink: 0;
+    gap: 2px;
+  }
+  .mobile-program.is-live .mobile-program-time { color: var(--accent2); }
+
+  .mobile-program-info {
+    padding: 8px 10px;
+    flex: 1;
+    min-width: 0;
+  }
+  .mobile-program-title {
+    font-size: 13px;
+    font-weight: 600;
+    color: var(--text-bright);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .mobile-program-dur {
+    font-size: 10px;
+    color: var(--text-dim);
+    margin-top: 2px;
+    font-family: 'Share Tech Mono', monospace;
+  }
+
+  .mobile-live-badge {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 9px;
+    color: var(--accent-live);
+    background: rgba(255,68,68,0.12);
+    border: 1px solid var(--accent-live);
+    border-radius: 2px;
+    padding: 2px 5px;
+    letter-spacing: 0.1em;
+    align-self: center;
+    margin-right: 8px;
+    flex-shrink: 0;
+  }
+
+  /* TOOLTIP */
+  .tooltip {
+    position: fixed;
+    background: var(--surface);
+    border: 1px solid var(--accent2);
+    border-radius: 4px;
+    padding: 10px 14px;
+    z-index: 999;
+    pointer-events: none;
+    max-width: 300px;
+    opacity: 0;
+    transition: opacity 0.15s;
+  }
+  .tooltip.visible { opacity: 1; }
+  .tooltip-title { font-size: 14px; font-weight: 700; color: var(--text-bright); margin-bottom: 4px; }
+  .tooltip-time { font-family: 'Share Tech Mono', monospace; font-size: 10px; color: var(--accent2); margin-bottom: 6px; }
+  .tooltip-desc { font-size: 12px; color: var(--text); line-height: 1.4; max-height: 80px; overflow: hidden; }
+
+  /* LOADING */
+  .loading {
+    position: fixed; inset: 0;
+    background: var(--bg);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+    gap: 20px;
+  }
+  .loading-text {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 12px;
+    color: var(--text-dim);
+    letter-spacing: 0.2em;
+    text-transform: uppercase;
+  }
+  .loading-bar {
+    width: 200px; height: 2px;
+    background: var(--border);
+    position: relative;
+    overflow: hidden;
+  }
+  .loading-bar::after {
+    content: '';
+    position: absolute;
+    top: 0; left: -60%;
+    width: 60%; height: 100%;
+    background: var(--accent);
+    animation: loading-anim 1.2s ease-in-out infinite;
+  }
+  @keyframes loading-anim { to { left: 110%; } }
+
+  .error-msg {
+    position: fixed; inset: 0;
+    background: var(--bg);
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+    gap: 16px;
+    display: none;
+    padding: 20px;
+  }
+  .err-title { font-family: 'Share Tech Mono', monospace; font-size: 14px; color: var(--accent-live); letter-spacing: 0.1em; }
+  .err-sub { font-size: 13px; color: var(--text-dim); text-align: center; max-width: 400px; line-height: 1.5; }
+  .epg-input-bar { display: flex; gap: 8px; margin-top: 8px; flex-wrap: wrap; justify-content: center; }
+  .epg-input {
+    background: var(--surface2);
+    border: 1px solid var(--border-bright);
+    color: var(--text-bright);
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 12px;
+    padding: 8px 12px;
+    width: 320px;
+    outline: none;
+  }
+  .epg-input:focus { border-color: var(--accent); }
+  .epg-btn {
+    background: var(--accent);
+    border: none; color: #000;
+    font-family: 'Barlow Condensed', sans-serif;
+    font-weight: 700; font-size: 13px;
+    letter-spacing: 0.1em;
+    text-transform: uppercase;
+    padding: 8px 18px;
+    cursor: pointer;
+  }
+
+@media (max-width: 600px) {
+    html, body { height: 100%; overflow: hidden; }
+    body { overflow: hidden; }
+
+    .topbar {
+      height: auto;
+      flex-wrap: wrap;
+      padding: 8px 12px;
+      gap: 8px;
+    }
+    .logo { font-size: 11px; }
+    .clock { font-size: 14px; }
+
+    .grid-wrapper { display: none; }
+    .mobile-view { display: block; }
+    .tooltip { display: none !important; }
+    #navBtns { display: none !important; }
+  }
@@ -0,0 +1,40 @@
+/* ── MODAL PERSONAL EPG ─────────────────────────────────────────────────── */
+  .modal-overlay {
+    position: fixed; inset: 0; background: rgba(0,0,0,0.7);
+    z-index: 3000; display: none; align-items: center; justify-content: center;
+  }
+  .modal-overlay.visible { display: flex; }
+  .modal-card {
+    background: var(--surface); border: 1px solid var(--border-bright);
+    padding: 28px; width: 100%; max-width: 420px; margin: 16px;
+  }
+  .modal-title {
+    font-family: var(--font-mono); font-size: 13px; color: var(--accent);
+    letter-spacing: 0.1em; text-transform: uppercase; margin-bottom: 6px;
+  }
+  .modal-subtitle { font-size: 12px; color: var(--text-dim); margin-bottom: 20px; line-height: 1.5; }
+  .modal-field { margin-bottom: 14px; }
+  .modal-field label {
+    display: block; font-family: var(--font-mono); font-size: 10px;
+    letter-spacing: 0.1em; text-transform: uppercase; color: var(--text-dim); margin-bottom: 6px;
+  }
+  .modal-field input {
+    width: 100%; background: var(--surface2); border: 1px solid var(--border-bright);
+    color: var(--text-bright); font-family: var(--font-mono); font-size: 12px;
+    padding: 9px 10px; outline: none; transition: border-color 0.15s;
+  }
+  .modal-field input:focus { border-color: var(--accent); }
+  .modal-field input::placeholder { color: var(--text-dim); opacity: 0.4; }
+  .modal-actions { display: flex; gap: 10px; margin-top: 20px; justify-content: flex-end; }
+  .modal-btn-cancel {
+    background: none; border: 1px solid var(--border-bright); color: var(--text-dim);
+    font-family: var(--font-mono); font-size: 11px; letter-spacing: 0.08em;
+    text-transform: uppercase; padding: 8px 16px; cursor: pointer; transition: border-color 0.15s;
+  }
+  .modal-btn-cancel:hover { border-color: var(--text-dim); color: var(--text); }
+  .modal-btn-apply {
+    background: var(--accent); border: none; color: #000;
+    font-family: var(--font-mono); font-size: 11px; letter-spacing: 0.08em;
+    text-transform: uppercase; padding: 8px 20px; cursor: pointer; transition: opacity 0.15s;
+  }
+  .modal-btn-apply:hover { opacity: 0.85; }
@@ -0,0 +1,78 @@
+/* ═══════════════════════════════════════════
+     PLAYER PiP
+  ═══════════════════════════════════════════ */
+  .pip {
+    position: fixed;
+    bottom: 24px;
+    right: 24px;
+    width: 380px;
+    background: #000;
+    border: 1px solid var(--border-bright);
+    box-shadow: 0 8px 32px rgba(0,0,0,0.8);
+    z-index: 2000;
+    display: none;
+    flex-direction: column;
+  }
+  .pip.visible { display: flex; }
+  .pip-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 6px 10px;
+    background: var(--surface);
+    border-bottom: 1px solid var(--border);
+    gap: 8px;
+    flex-shrink: 0;
+  }
+  .pip-channel {
+    font-family: var(--font-mono);
+    font-size: 11px;
+    color: var(--accent);
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex: 1;
+  }
+  .pip-program {
+    font-size: 11px;
+    color: var(--text-dim);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex: 2;
+    text-align: center;
+  }
+  .pip-close {
+    background: none;
+    border: none;
+    color: var(--text-dim);
+    font-size: 18px;
+    cursor: pointer;
+    padding: 0 4px;
+    line-height: 1;
+    flex-shrink: 0;
+    transition: color 0.15s;
+  }
+  .pip-close:hover { color: var(--accent-live); }
+  .pip video {
+    width: 100%;
+    aspect-ratio: 16/9;
+    display: block;
+    background: #000;
+  }
+  .pip-error {
+    padding: 20px;
+    text-align: center;
+    font-family: var(--font-mono);
+    font-size: 11px;
+    color: var(--accent-live);
+    letter-spacing: 0.06em;
+  }
+  .channel-cell { cursor: pointer; }
+  .channel-cell:hover { background: var(--surface2); }
+  .program-block.is-live { cursor: pointer; }
+  @media (max-width: 600px) {
+    .pip { width: calc(100vw - 16px); bottom: 8px; right: 8px; left: 8px; }
+  }
@@ -0,0 +1,63 @@
+/* ── PROGRAM MODAL ───────────────────────────────────────────────────────── */
+  .program-card {
+    max-width: 520px; padding: 28px; position: relative;
+  }
+  .pm-close {
+    position: absolute; top: 14px; right: 14px;
+    background: none; border: none; color: var(--text-muted);
+    cursor: pointer; font-size: 18px; line-height: 1;
+    transition: color .2s;
+  }
+  .pm-close:hover { color: var(--accent); }
+  .pm-channel {
+    font-size: 11px; letter-spacing: .1em; text-transform: uppercase;
+    color: var(--accent); margin-bottom: 6px;
+  }
+  .pm-title {
+    font-size: 20px; font-weight: 700; color: var(--text);
+    margin-bottom: 8px; line-height: 1.2;
+  }
+  .pm-subtitle {
+    font-size: 13px; color: var(--text); margin-bottom: 10px;
+    font-style: italic;
+  }
+  .pm-time {
+    font-size: 12px; color: var(--accent); margin-bottom: 10px;
+  }
+  .pm-meta {
+    font-size: 12px; color: var(--text-muted); margin-bottom: 10px;
+  }
+  .pm-genres {
+    font-size: 12px; color: var(--text); margin-bottom: 12px;
+    font-weight: 600;
+  }
+  .pm-desc {
+    font-size: 13px; color: var(--text-muted); line-height: 1.6;
+    margin-bottom: 20px; max-height: 140px; overflow-y: auto;
+  }
+  .pm-actions {
+    display: flex; gap: 10px; flex-wrap: wrap;
+  }
+  .pm-btn {
+    border-radius: 4px; cursor: pointer; font-family: inherit;
+    font-size: 13px; font-weight: 600; padding: 8px 16px;
+    text-decoration: none; transition: opacity .2s;
+    display: inline-flex; align-items: center; gap: 6px;
+    border: none;
+  }
+  .pm-btn:hover { opacity: .8; }
+  .pm-watch  { background: var(--accent); color: var(--bg); }
+  .pm-imdb   { background: #f5c518; color: #000; }
+  .pm-cancel { background: var(--bg); color: var(--text-muted); border: 1px solid var(--border); }
+
+  /* Midnight date marker in the timebar */
+  .time-tick-label.midnight {
+    color: var(--accent); font-weight: 700; font-size: 11px;
+    white-space: nowrap;
+  }
+  .time-tick-line.midnight {
+    background: var(--accent); opacity: .4; width: 2px;
+  }
+
+
+  /* ── FAVORITES ───────────────────────────────────────────────────────────── */
@@ -0,0 +1,39 @@
+/* ── SEARCH ───────────────────────────────────────────────────────────────── */
+  .search-btn {
+    background: none; border: 1px solid var(--border); border-radius: 4px;
+    color: var(--text-muted); cursor: pointer; font-size: 14px;
+    padding: 4px 8px; transition: color .2s, border-color .2s;
+  }
+  .search-btn:hover { color: var(--accent); border-color: var(--accent); }
+
+  .search-bar {
+    display: none; align-items: center; gap: 8px;
+    background: var(--bg-card); border-bottom: 1px solid var(--border);
+    padding: 8px 16px;
+  }
+  .search-bar.visible { display: flex; }
+
+  .search-input {
+    flex: 1; background: var(--bg); border: 1px solid var(--border);
+    border-radius: 4px; color: var(--text); font-family: inherit;
+    font-size: 14px; outline: none; padding: 6px 12px;
+    transition: border-color .2s;
+  }
+  .search-input:focus { border-color: var(--accent); }
+  .search-input::placeholder { color: var(--text-muted); }
+
+  .search-clear {
+    background: none; border: none; color: var(--text-muted);
+    cursor: pointer; font-size: 16px; padding: 4px 8px;
+    transition: color .2s;
+  }
+  .search-clear:hover { color: var(--accent); }
+
+  /* Highlight programs that match the current query */
+  .program-block.search-match {
+    border: 1px solid var(--accent);
+    box-shadow: 0 0 6px var(--accent);
+  }
+  .mobile-program.search-match {
+    border-left: 3px solid var(--accent);
+  }
@@ -0,0 +1,224 @@
+/* ═══════════════════════════════════════════
+     TOP BAR
+  ═══════════════════════════════════════════ */
+  .topbar {
+    height: 50px;
+    background: var(--surface);
+    border-bottom: 1px solid var(--border);
+    display: flex;
+    align-items: center;
+    padding: 0 16px;
+    gap: 12px;
+    flex-shrink: 0;
+    position: relative;
+    z-index: 100;
+  }
+
+  .logo {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 13px;
+    color: var(--accent);
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+    white-space: nowrap;
+  }
+  .logo span { color: var(--text-dim); margin: 0 5px; }
+  .logo-sub { display: inline; }
+
+  .live-dot {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    font-size: 11px;
+    font-family: 'Share Tech Mono', monospace;
+    color: var(--accent-live);
+    letter-spacing: 0.1em;
+    margin-left: auto;
+    flex-shrink: 0;
+  }
+  .live-dot::before {
+    content: '';
+    width: 7px; height: 7px;
+    background: var(--accent-live);
+    border-radius: 50%;
+    animation: pulse 1.4s ease-in-out infinite;
+  }
+  @keyframes pulse {
+    0%,100% { opacity:1; transform:scale(1); }
+    50% { opacity:0.3; transform:scale(0.7); }
+  }
+
+  .clock {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 20px;
+    color: var(--text-bright);
+    letter-spacing: 0.05em;
+    flex-shrink: 0;
+  }
+
+  .date-label {
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 10px;
+    color: var(--text-dim);
+    letter-spacing: 0.1em;
+    text-transform: uppercase;
+    white-space: nowrap;
+  }
+
+  .nav-btns {
+    display: flex;
+    gap: 4px;
+    flex-shrink: 0;
+  }
+  .nav-btn {
+    background: var(--surface2);
+    border: 1px solid var(--border);
+    color: var(--text);
+    font-family: 'Barlow Condensed', sans-serif;
+    font-size: 12px;
+    letter-spacing: 0.06em;
+    padding: 4px 10px;
+    cursor: pointer;
+    text-transform: uppercase;
+    transition: all 0.15s;
+    white-space: nowrap;
+  }
+  .nav-btn:hover, .nav-btn.active {
+    background: var(--accent);
+    color: #000;
+    border-color: var(--accent);
+  }
+
+  .copy-btns {
+    display: flex;
+    gap: 4px;
+    flex-shrink: 0;
+  }
+  .copy-btn {
+    background: transparent;
+    border: 1px solid var(--border-bright);
+    color: var(--text-dim);
+    font-family: 'Share Tech Mono', monospace;
+    font-size: 10px;
+    letter-spacing: 0.1em;
+    padding: 4px 9px;
+    cursor: pointer;
+    text-transform: uppercase;
+    transition: all 0.15s;
+    white-space: nowrap;
+    position: relative;
+  }
+  .copy-btn:hover {
+    border-color: var(--accent2);
+    color: var(--accent2);
+  }
+  .copy-btn.copied {
+    border-color: var(--accent);
+    color: var(--accent);
+  }
+
+/* ═══════════════════════════════════════════
+     RESPONSIVE
+  ═══════════════════════════════════════════ */
+  @media (max-width: 900px) {
+    :root { --channel-w: 110px; }
+    .logo-sub { display: none; }
+    .date-label { display: none; }
+    .clock { font-size: 16px; }
+  }
+
+/* ═══════════════════════════════════════════
+     THEME SELECTOR
+  ═══════════════════════════════════════════ */
+  .theme-select {
+    background: transparent;
+    border: 1px solid var(--border-bright);
+    color: var(--text-dim);
+    font-family: var(--font-mono);
+    font-size: 10px;
+    letter-spacing: 0.08em;
+    padding: 4px 8px;
+    cursor: pointer;
+    text-transform: uppercase;
+    transition: all 0.15s;
+    flex-shrink: 0;
+    -webkit-appearance: none;
+    appearance: none;
+  }
+  .theme-select:hover { border-color: var(--accent2); color: var(--accent2); }
+  .theme-select option { background: #111; color: #eee; font-family: sans-serif; }
+
+      body { overflow: hidden; }
+
+    .topbar {
+      height: auto;
+      flex-wrap: wrap;
+      padding: 8px 12px;
+      gap: 8px;
+    }
+    .logo { font-size: 11px; }
+    .clock { font-size: 14px; }
+
+    .grid-wrapper { display: none; }
+    .mobile-view { display: block; }
+    .tooltip { display: none !important; }
+    #navBtns { display: none !important; }
+  }
+
+/* ── SOURCE SELECTOR ─────────────────────────────────────────────────────── */
+  .source-select {
+    background-color: var(--surface2) !important;
+    border: 1px solid var(--border-bright);
+    color: var(--text) !important;
+    font-family: var(--font-mono);
+    font-size: 11px;
+    padding: 5px 8px;
+    cursor: pointer;
+    letter-spacing: 0.06em;
+    height: 28px;
+    outline: none;
+    transition: border-color 0.15s, color 0.15s;
+    max-width: 130px;
+    -webkit-appearance: none;
+    appearance: none;
+  }
+  .source-select:hover { border-color: var(--accent2); color: var(--accent2) !important; }
+  .source-select option { background: #111 !important; color: #eee !important; font-family: sans-serif; }
+
+  /* ── SOURCE DROPDOWN ─────────────────────────────────────────────────────── */
+  .source-dropdown {
+    position: relative;
+    flex-shrink: 0;
+  }
+  .source-dropdown-btn {
+    display: flex; align-items: center; gap: 6px;
+    background: var(--surface2); border: 1px solid var(--border-bright);
+    color: var(--text); font-family: var(--font-mono); font-size: 11px;
+    letter-spacing: 0.06em; padding: 5px 10px; height: 28px;
+    cursor: pointer; white-space: nowrap;
+    transition: border-color 0.15s, color 0.15s;
+  }
+  .source-dropdown-btn:hover { border-color: var(--accent2); color: var(--accent2); }
+  .source-dropdown-arrow { font-size: 8px; opacity: 0.6; }
+
+  .source-dropdown-menu {
+    display: none; position: absolute; top: calc(100% + 4px); left: 0;
+    background: var(--surface); border: 1px solid var(--border-bright);
+    min-width: 160px; z-index: 1000;
+    flex-direction: column;
+    box-shadow: 0 8px 24px rgba(0,0,0,0.6);
+  }
+  .source-dropdown-menu.open { display: flex; }
+
+  .source-dropdown-item {
+    background: none; border: none; color: var(--text);
+    font-family: var(--font-mono); font-size: 11px;
+    letter-spacing: 0.06em; padding: 10px 14px;
+    text-align: left; cursor: pointer; white-space: nowrap;
+    transition: background 0.1s, color 0.1s;
+    border-bottom: 1px solid var(--border);
+  }
+  .source-dropdown-item:last-child { border-bottom: none; }
+  .source-dropdown-item:hover { background: var(--surface2); color: var(--accent2); }
+  .source-dropdown-item.active { color: var(--accent); }
+  .source-dropdown-personal { color: var(--accent2); }
@@ -0,0 +1,13 @@
+/* ── UPDATE BADGE ────────────────────────────────────────────────────────── */
+  .update-badge {
+    background: var(--accent); color: #000;
+    font-size: 11px; font-weight: 700; letter-spacing: 0.06em;
+    padding: 4px 10px; text-decoration: none; white-space: nowrap;
+    animation: pulse-badge 2s ease-in-out infinite;
+    border-radius: 2px; margin-left: 4px;
+  }
+  .update-badge:hover { opacity: .85; }
+  @keyframes pulse-badge {
+    0%, 100% { opacity: 1; }
+    50%       { opacity: .65; }
+  }
@@ -2,16 +2,16 @@ const EPG_SOURCES = <?= json_encode(array_values($epg_sources)) ?>;
 const L = <?= json_encode($L) ?>;
 const ALLOW_PERSONAL_EPG = <?= $allow_personal_epg ? 'true' : 'false' ?>;

-// Source active (index)
+// Index of the currently selected source.
 let activeSourceIndex = 0;

 const DEFAULT_EPG_URL = EPG_SOURCES[0]?.epg_url ?? '';
 const DEFAULT_M3U_URL = EPG_SOURCES[0]?.m3u_url ?? '';
 const PX_PER_MIN = 5;
 const GRID_HOURS = 72;
-const CORS_PROXY = 'https://corsproxy.io/?';
+const CORS_PROXY = '/proxy.php?url=';

-// Ancre : 2h avant maintenant, arrondi au quart d'heure inférieur
+// Anchor the grid 2 hours before "now", rounded down to the previous quarter-hour.
 const _d = new Date();
 _d.setMinutes(Math.floor(_d.getMinutes()/15)*15, 0, 0);
 const GRID_START = new Date(_d.getTime() - 2*3600000);
@@ -10,10 +10,7 @@ function makePlaceholder(name) {
  return el;
 }

-function renderChannels() {
-  const list = document.getElementById('channelsList');
-  list.innerHTML = '';
-  channels.forEach(ch => {
+function makeChannelCell(ch) {
  const cell = document.createElement('div');
  cell.className = 'channel-cell';
  if (ch.icon) {
@@ -25,9 +22,23 @@ function renderChannels() {
  const name = document.createElement('div');
  name.className = 'channel-name'; name.textContent = ch.name; name.title = ch.name;
  cell.appendChild(name);
+  cell.appendChild(makeFavBtn(ch.id));
  cell.addEventListener('click', () => openPip(ch.name, getNowPlaying(ch.id)));
-    list.appendChild(cell);
-  });
+  return cell;
+}
+
+function renderChannels() {
+  const list = document.getElementById('channelsList');
+  list.innerHTML = '';
+  const { favs, rest } = sortedChannels(channels);
+
+  if (favs.length) {
+    favs.forEach(ch => list.appendChild(makeChannelCell(ch)));
+    const sep = document.createElement('div');
+    sep.className = 'fav-separator';
+    list.appendChild(sep);
+  }
+  rest.forEach(ch => list.appendChild(makeChannelCell(ch)));
 }

 function renderRuler() {
@@ -62,7 +73,7 @@ function renderPrograms() {
  inner.style.width = TOTAL_WIDTH_PX+'px';
  inner.style.height = totalH+'px';

-  // Remettre la now-line (détruite par innerHTML='')
+  // Recreate the now-line because it was removed by innerHTML = ''.
  const nowLine = document.createElement('div');
  nowLine.className = 'now-line'; nowLine.id = 'nowLine';
  nowLine.style.height = totalH + 'px';
@@ -70,7 +81,9 @@ function renderPrograms() {

  const now = new Date();

-  channels.forEach((ch, i) => {
+  const { favs: _f, rest: _r } = sortedChannels(channels);
+  const orderedChannels = [..._f, ..._r];
+  orderedChannels.forEach((ch, i) => {
    const row = document.createElement('div');
    row.className = 'program-row';
    row.style.cssText = `top:${i*ROW_H}px;position:absolute;left:0;right:0;`;
@@ -128,4 +141,3 @@ function shiftView(mins) {
  area.scrollLeft = Math.max(0, area.scrollLeft + mins * PX_PER_MIN);
  document.querySelectorAll('.nav-btn').forEach(b => b.classList.remove('active'));
 }
-
@@ -0,0 +1,35 @@
+// ── FAVORITES ─────────────────────────────────────────────────────────────────
+let favorites = new Set(JSON.parse(localStorage.getItem('gridtv-favorites') || '[]'));
+
+function saveFavorites() {
+  localStorage.setItem('gridtv-favorites', JSON.stringify([...favorites]));
+}
+
+function toggleFavorite(chId, btn) {
+  if (favorites.has(chId)) {
+    favorites.delete(chId);
+    btn.classList.remove('is-fav');
+    btn.title = L.fav_add;
+  } else {
+    favorites.add(chId);
+    btn.classList.add('is-fav');
+    btn.title = L.fav_remove;
+  }
+  saveFavorites();
+  renderAll();
+}
+
+function makeFavBtn(chId) {
+  const btn = document.createElement('button');
+  btn.className = 'fav-btn' + (favorites.has(chId) ? ' is-fav' : '');
+  btn.title = favorites.has(chId) ? L.fav_remove : L.fav_add;
+  btn.textContent = '★';
+  btn.addEventListener('click', e => { e.stopPropagation(); toggleFavorite(chId, btn); });
+  return btn;
+}
+
+function sortedChannels(list) {
+  const favs = list.filter(ch => favorites.has(ch.id));
+  const rest  = list.filter(ch => !favorites.has(ch.id));
+  return { favs, rest };
+}
@@ -13,8 +13,7 @@ window.addEventListener('load', () => {
    if (epg) {
      currentEpgUrl = epg;
      currentM3uUrl = m3u;
-      const sel = document.getElementById('sourceSelect');
-      if (sel) sel.value = 'personal';
+      updateSourceDropdownLabel('✏ Personal EPG');
      loadEPG(epg);
      if (m3u) loadM3U(m3u);
      return;
@@ -26,8 +25,7 @@ window.addEventListener('load', () => {
      activeSourceIndex = idx;
      currentEpgUrl = src.epg_url;
      currentM3uUrl = src.m3u_url ?? '';
-      const sel = document.getElementById('sourceSelect');
-      if (sel) sel.value = idx;
+      if (src) updateSourceDropdownLabel(src.name);
    }
  }
  loadEPG(currentEpgUrl);
@@ -1,8 +1,8 @@
 // ── M3U PARSER ────────────────────────────────────────────────────────────────
 function slugify(str) {
  return str.toLowerCase()
-    .replace(/^\d+\s*/, '')       // virer le numéro de chaîne en début
-    .replace(/[^a-z0-9]/g, '');   // garder que alphanum
+    .replace(/^\d+\s*/, '')       // Strip any leading channel number.
+    .replace(/[^a-z0-9]/g, '');   // Keep only alphanumeric characters.
 }

 async function loadM3U(url) {
@@ -25,7 +25,7 @@ function parseM3U(text) {
  for (let i = 0; i < lines.length; i++) {
    const line = lines[i].trim();
    if (line.startsWith('#EXTINF')) {
-      // Extraire le nom : dernière partie après la virgule
+      // Extract the display name from the last comma-separated segment.
      const comma = line.lastIndexOf(',');
      currentName = comma !== -1 ? line.slice(comma + 1).trim() : null;
    } else if (line && !line.startsWith('#') && currentName) {
@@ -42,16 +42,15 @@ function getStreamUrl(channelName) {
  if (m3uStreams[slug]) {
    url = m3uStreams[slug];
  } else {
-    // Fallback : chercher une clé qui contient le slug ou l'inverse
+    // Fallback: try a partial match in either direction.
    for (const [key, u] of Object.entries(m3uStreams)) {
      if (key.includes(slug) || slug.includes(key)) { url = u; break; }
    }
  }
  if (!url) return null;
-  // Passer par proxy.php pour éviter le mixed content HTTP/HTTPS
+  // Route plain HTTP streams through proxy.php to avoid mixed-content issues.
  if (url.startsWith('http://')) {
    return 'proxy.php?url=' + encodeURIComponent(url);
  }
  return url;
 }
-
@@ -6,7 +6,9 @@ function renderMobile() {
  const winStart = new Date(now.getTime() - 30*60000);
  const winEnd   = new Date(now.getTime() + 4*3600000);

-  channels.forEach(ch => {
+  const { favs: _f, rest: _r } = sortedChannels(channels);
+  const orderedChannels = [..._f, ..._r];
+  orderedChannels.forEach(ch => {
    const progs = (programs[ch.id]||[]).filter(p => p.stop>winStart && p.start<winEnd);
    if (!progs.length) return;

@@ -37,12 +39,12 @@ function renderMobile() {
      }

      const timeCol = document.createElement('div'); timeCol.className='mobile-program-time';
-      timeCol.innerHTML = `<span>${fmtTime(p.start)}</span><span>${fmtTime(p.stop)}</span>`;
+      timeCol.innerHTML = `<span>${esc(fmtTime(p.start))}</span><span>${esc(fmtTime(p.stop))}</span>`;
      item.appendChild(timeCol);

      const info = document.createElement('div'); info.className='mobile-program-info';
      const ep = fmtEpisode(p.season, p.episode);
-      info.innerHTML = `<div class="mobile-program-title">${p.title}</div><div class="mobile-program-dur">${ep ? ep + ' · ' : ''}${dur} min</div>`;
+      info.innerHTML = `<div class="mobile-program-title">${esc(p.title)}</div><div class="mobile-program-dur">${ep ? esc(ep) + ' · ' : ''}${dur} min</div>`;
      item.appendChild(info);

      if (isLive) {
@@ -12,7 +12,7 @@ function openPip(channelName, programTitle) {
  err.style.display = 'none';
  pip.classList.add('visible');

-  // Détruire l'instance HLS précédente
+  // Tear down the previous HLS instance before opening another stream.
  if (hlsInstance) { hlsInstance.destroy(); hlsInstance = null; }
  video.src = '';

@@ -39,7 +39,7 @@ function openPip(channelName, programTitle) {
      }
    });
  } else if (video.canPlayType('application/vnd.apple.mpegurl')) {
-    // Safari natif HLS
+    // Safari can play HLS natively without hls.js.
    video.src = url;
    video.addEventListener('loadedmetadata', () => video.play().catch(() => {}));
  } else {
@@ -55,4 +55,3 @@ function closePip() {
  if (hlsInstance) { hlsInstance.destroy(); hlsInstance = null; }
  video.pause(); video.src = '';
 }
-
@@ -4,16 +4,24 @@ function openProgramModal(ch, p) {
  const isLive = p.start <= now && p.stop > now;
  const dur = Math.round((p.stop - p.start) / 60000);
  const ep  = fmtEpisode(p.season, p.episode);
+  const genres = formatCategories(p.categories);
+  const meta = [p.airDate, p.rating].filter(Boolean).join('  ·  ');

  document.getElementById('pm-title').textContent    = p.title;
  document.getElementById('pm-channel').textContent  = ch.name;
+  document.getElementById('pm-subtitle').textContent = p.subtitle || '';
+  document.getElementById('pm-subtitle').style.display = p.subtitle ? 'block' : 'none';
  document.getElementById('pm-time').textContent     =
    `${fmtTime(p.start)} — ${fmtTime(p.stop)}  ·  ${dur} ${L.duration_min}` +
    (ep ? `  ·  ${ep}` : '');
+  document.getElementById('pm-meta').textContent     = meta;
+  document.getElementById('pm-meta').style.display   = meta ? 'block' : 'none';
+  document.getElementById('pm-genres').textContent   = genres;
+  document.getElementById('pm-genres').style.display = genres ? 'block' : 'none';
  document.getElementById('pm-desc').textContent     = p.desc || '';
  document.getElementById('pm-desc').style.display   = p.desc ? 'block' : 'none';

-  // Bouton Watch now — seulement si live ET M3U fourni pour la source active
+  // Only show "Watch now" when the program is live and the active source has M3U data.
  const watchBtn = document.getElementById('pm-watch');
  if (isLive && currentM3uUrl) {
    watchBtn.style.display = 'inline-flex';
@@ -22,7 +30,7 @@ function openProgramModal(ch, p) {
    watchBtn.style.display = 'none';
  }

-  // Bouton IMDb
+  // IMDb search shortcut.
  document.getElementById('pm-imdb').href =
    `https://www.imdb.com/find/?q=${encodeURIComponent(p.title)}&s=tt`;

@@ -33,13 +41,13 @@ function closeProgramModal() {
  document.getElementById('programModal').classList.remove('visible');
 }

-// Fermer sur clic overlay
+// Close when the overlay itself is clicked.
 document.addEventListener('click', e => {
  const modal = document.getElementById('programModal');
  if (e.target === modal) closeProgramModal();
 });

-// Fermer sur Escape
+// Close on Escape.
 document.addEventListener('keydown', e => {
  if (e.key === 'Escape') closeProgramModal();
 });
@@ -31,7 +31,7 @@ function onSearchInput(val) {

 function applySearch(q) {
  if (!q) {
-    // Remettre toutes les chaines
+    // Restore the full channel list when the query is cleared.
    renderAll();
    return;
  }
@@ -40,15 +40,16 @@ function applySearch(q) {
  today.setHours(0,0,0,0);
  const tomorrow = new Date(today.getTime() + 24*3600000);

-  // Filtrer les chaines : nom OU programme aujourd'hui correspond
+  // Keep channels whose name matches or that have a matching program today.
  const filtered = channels.filter(ch => {
-    // Match sur le nom de la chaine
+    // Match against the channel name.
    if (ch.name.toLowerCase().includes(q)) return true;
-    // Match sur les programmes d'aujourd'hui (titre + desc)
+    // Match against today's programs (title + description).
    return (programs[ch.id]||[]).some(p => {
      if (p.stop < today || p.start > tomorrow) return false;
      if (p.title.toLowerCase().includes(q)) return true;
      if (p.desc && p.desc.toLowerCase().includes(q)) return true;
+      if ((p.categories || []).some(cat => cat.toLowerCase().includes(q))) return true;
      return false;
    });
  });
@@ -72,7 +73,7 @@ function renderFiltered(filteredChannels, q) {
  inner.style.width = TOTAL_WIDTH_PX + 'px';
  inner.style.height = (filteredChannels.length * ROW_H) + 'px';

-  // Remettre la now-line
+  // Recreate the now-line after clearing the container.
  const nowLine = document.createElement('div');
  nowLine.className = 'now-line'; nowLine.id = 'nowLine';
  nowLine.style.height = (filteredChannels.length * ROW_H) + 'px';
@@ -81,7 +82,7 @@ function renderFiltered(filteredChannels, q) {
  const now = new Date();

  filteredChannels.forEach((ch, i) => {
-    // Colonne chaîne
+    // Channel column.
    const cell = document.createElement('div');
    cell.className = 'channel-cell';
    if (ch.icon) {
@@ -96,7 +97,7 @@ function renderFiltered(filteredChannels, q) {
    cell.addEventListener('click', () => openPip(ch.name, getNowPlaying(ch.id)));
    list.appendChild(cell);

-    // Programmes
+    // Programs row.
    const row = document.createElement('div');
    row.className = 'program-row';
    row.style.cssText = `top:${i*ROW_H}px;position:absolute;left:0;right:0;`;
@@ -109,8 +110,11 @@ function renderFiltered(filteredChannels, q) {
      const block = document.createElement('div');
      block.className = 'program-block';

-      // Highlight si le programme matche la recherche
-      const matchesProg = p.title.toLowerCase().includes(q) || (p.desc && p.desc.toLowerCase().includes(q));
+      // Highlight programs that match the current search query.
+      const matchesProg =
+        p.title.toLowerCase().includes(q) ||
+        (p.desc && p.desc.toLowerCase().includes(q)) ||
+        (p.categories || []).some(cat => cat.toLowerCase().includes(q));
      if (matchesProg) block.classList.add('search-match');

      if (p.stop < now) block.classList.add('is-past');
@@ -168,7 +172,10 @@ function renderMobileFiltered(filteredChannels, q) {
      const isLive = p.start <= now && p.stop > now;
      const isPast = p.stop < now;
      const dur = Math.round((p.stop - p.start) / 60000);
-      const matchesProg = p.title.toLowerCase().includes(q) || (p.desc && p.desc.toLowerCase().includes(q));
+      const matchesProg =
+        p.title.toLowerCase().includes(q) ||
+        (p.desc && p.desc.toLowerCase().includes(q)) ||
+        (p.categories || []).some(cat => cat.toLowerCase().includes(q));
      const item = document.createElement('div');
      item.className = 'mobile-program' + (isLive ? ' is-live' : '') + (isPast ? ' is-past' : '') + (matchesProg ? ' search-match' : '');

@@ -179,12 +186,12 @@ function renderMobileFiltered(filteredChannels, q) {
      }

      const timeCol = document.createElement('div'); timeCol.className = 'mobile-program-time';
-      timeCol.innerHTML = `<span>${fmtTime(p.start)}</span><span>${fmtTime(p.stop)}</span>`;
+      timeCol.innerHTML = `<span>${esc(fmtTime(p.start))}</span><span>${esc(fmtTime(p.stop))}</span>`;
      item.appendChild(timeCol);

      const info = document.createElement('div'); info.className = 'mobile-program-info';
      const ep = fmtEpisode(p.season, p.episode);
-      info.innerHTML = `<div class="mobile-program-title">${p.title}</div><div class="mobile-program-dur">${ep ? ep + ' · ' : ''}${dur} min</div>`;
+      info.innerHTML = `<div class="mobile-program-title">${esc(p.title)}</div><div class="mobile-program-dur">${ep ? esc(ep) + ' · ' : ''}${dur} min</div>`;
      item.appendChild(info);

      if (isLive) {
@@ -21,7 +21,7 @@ function switchSource(value) {
 }

 function updateCopyButtons() {
-  // Rien à faire visuellement, copyUrl() lit currentEpgUrl/currentM3uUrl
+  // No visual update is needed here because copyUrl() reads the current URLs directly.
 }

 function openPersonalEpgModal() {
@@ -35,7 +35,7 @@ function openPersonalEpgModal() {

 function closePersonalEpgModal(applied) {
  document.getElementById('personalEpgModal').classList.remove('visible');
-  // Si annulé (pas applied), remettre le select sur la source précédente
+  // If the modal was cancelled, restore the previously selected source.
  if (!applied) {
    const sel = document.getElementById('sourceSelect');
    if (sel) sel.value = localStorage.getItem('gridtv-active-source') === 'personal' ? 'personal' : activeSourceIndex;
@@ -49,6 +49,7 @@ function applyPersonalEpg() {
  localStorage.setItem('gridtv-personal-epg', epg);
  localStorage.setItem('gridtv-personal-m3u', m3u);
  localStorage.setItem('gridtv-active-source', 'personal');
+  updateSourceDropdownLabel('✏ Personal EPG');
  currentEpgUrl = epg;
  currentM3uUrl = m3u;
  const sel = document.getElementById('sourceSelect');
@@ -58,3 +59,24 @@ function applyPersonalEpg() {
  if (m3u) loadM3U(m3u);
 }

+function toggleSourceDropdown() {
+  document.getElementById('sourceDropdownMenu')?.classList.toggle('open');
+}
+
+function closeSourceDropdown() {
+  document.getElementById('sourceDropdownMenu')?.classList.remove('open');
+}
+
+// Close the dropdown when clicking outside of it.
+document.addEventListener('click', e => {
+  if (!e.target.closest('.source-dropdown')) closeSourceDropdown();
+});
+
+function updateSourceDropdownLabel(label) {
+  const el = document.getElementById('sourceDropdownLabel');
+  if (el) el.textContent = label;
+  // Update the active item styling in the dropdown.
+  document.querySelectorAll('.source-dropdown-item').forEach((btn, i) => {
+    btn.classList.toggle('active', i === activeSourceIndex);
+  });
+}
@@ -1,4 +1,4 @@
-// ── THÈMES ────────────────────────────────────────────────────────────────────
+// ── THEMES ────────────────────────────────────────────────────────────────────
 function setTheme(theme) {
  document.getElementById('themeStylesheet').href = 'themes/' + theme + '.css';
  localStorage.setItem('gridtv-theme', theme);
@@ -17,4 +17,3 @@ function startLiveUpdates() {
  setInterval(() => { if (channels.length) renderAll(); }, 60000);
  setInterval(() => loadEPG(DEFAULT_EPG_URL), 30*60*1000);
 }
-
@@ -8,8 +8,13 @@ function getNowPlaying(chId) {
 // ── TOOLTIP ───────────────────────────────────────────────────────────────────
 function showTooltip(e, p) {
  const ep = fmtEpisode(p.season, p.episode);
-  document.getElementById('tt-title').textContent = p.title + (ep ? '  ' + ep : '');
-  document.getElementById('tt-time').textContent = `${fmtTime(p.start)} — ${fmtTime(p.stop)} · ${Math.round((p.stop-p.start)/60000)} min`;
+  const genres = formatCategories(p.categories);
+  const title = p.title + (p.subtitle ? ` - ${p.subtitle}` : '') + (ep ? '  ' + ep : '');
+  const meta = [p.airDate, p.rating, genres].filter(Boolean).join(' · ');
+  document.getElementById('tt-title').textContent = title;
+  document.getElementById('tt-time').textContent =
+    `${fmtTime(p.start)} — ${fmtTime(p.stop)} · ${Math.round((p.stop-p.start)/60000)} min` +
+    (meta ? ` · ${meta}` : '');
  document.getElementById('tt-desc').textContent = p.desc || '—';
  document.getElementById('tooltip').classList.add('visible');
  moveTooltip(e);
@@ -23,5 +28,3 @@ function moveTooltip(e) {
 function hideTooltip() { document.getElementById('tooltip').classList.remove('visible'); }


-
-
@@ -0,0 +1,38 @@
+// ── UPDATE CHECKER ────────────────────────────────────────────────────────────
+(async function checkForUpdate() {
+  try {
+    const [localRes, remoteRes] = await Promise.all([
+      fetch('version.json'),
+      fetch('https://api.github.com/repos/Johnnybegood90/GridTV/releases/latest')
+    ]);
+    if (!localRes.ok || !remoteRes.ok) return;
+
+    const local  = (await localRes.json()).version  ?? '0.0.0';
+    const remote = (await remoteRes.json()).tag_name ?? '0.0.0';
+
+    const clean = v => v.replace(/^v/, '');
+    const toNum = v => v.split('.').map(Number);
+
+    const [lMaj, lMin, lPat] = toNum(clean(local));
+    const [rMaj, rMin, rPat] = toNum(clean(remote));
+
+    const hasUpdate =
+      rMaj > lMaj ||
+      (rMaj === lMaj && rMin > lMin) ||
+      (rMaj === lMaj && rMin === lMin && rPat > lPat);
+
+    if (!hasUpdate) return;
+
+    const badge = document.createElement('a');
+    badge.className  = 'update-badge';
+    badge.href       = `https://github.com/Johnnybegood90/GridTV/releases/latest`;
+    badge.target     = '_blank';
+    badge.rel        = 'noopener';
+    badge.innerHTML = `${L.update_available} ${clean(remote)}`;
+    badge.title      = L.update_title;
+
+    document.querySelector('.topbar')?.appendChild(badge);
+  } catch (_) {
+    // Silencieux — pas de connexion ou rate limit GitHub
+  }
+})();
@@ -1,8 +1,15 @@

+// Escape EPG-provided strings before injecting them into HTML.
+function esc(str) {
+  const d = document.createElement('div');
+  d.textContent = str || '';
+  return d.innerHTML;
+}
+
 let channels = [];
 let programs = {};
-let m3uStreams = {}; // slug normalisé → url stream
-let scrollListenerAdded = false; // sync scroll vertical chaînes
+let m3uStreams = {}; // Normalized slug -> stream URL.
+let scrollListenerAdded = false; // Keeps the channel column vertically synced with the timeline.

 function pad(n) { return String(n).padStart(2,'0'); }

@@ -28,6 +35,8 @@ function parseXMLTVDate(str) {
  if (!str) return null;
  const m = str.match(/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s*([+-]\d{4})?/);
  if (!m) return null;
+  // XMLTV timestamps use a compact timezone suffix like +0200, so we rebuild
+  // the UTC instant manually before letting Date convert it to local time.
  const offset = m[7] ? parseInt(m[7]) : 0;
  const offsetMs = (Math.floor(Math.abs(offset)/100)*60 + (Math.abs(offset)%100)) * 60000 * (offset<0?-1:1);
  return new Date(Date.UTC(+m[1],+m[2]-1,+m[3],+m[4],+m[5],+m[6]) - offsetMs);
@@ -71,7 +80,7 @@ function loadFromInput() {
 }

 function parseEpisode(p) {
-  // Format xmltv_ns : "S.E.part" (0-indexed) ex: "0.2.0/1" = S01E03
+  // xmltv_ns format: "S.E.part" (0-indexed), e.g. "0.2.0/1" -> S01E03
  const ns = p.querySelector('episode-num[system="xmltv_ns"]')?.textContent;
  if (ns) {
    const parts = ns.split('.');
@@ -80,7 +89,7 @@ function parseEpisode(p) {
    const e = ePart !== '' ? parseInt(ePart) + 1 : null;
    if (s !== null || e !== null) return { season: s, episode: e };
  }
-  // Format onscreen : "S01E03" ou "s1e3"
+  // onscreen format: "S01E03" or "s1e3"
  const os = p.querySelector('episode-num[system="onscreen"]')?.textContent;
  if (os) {
    const m = os.match(/[Ss](\d+)[Ee](\d+)/);
@@ -97,6 +106,34 @@ function fmtEpisode(season, episode) {
  return null;
 }

+function parseCategories(p) {
+  const seen = new Set();
+  const categories = [];
+  p.querySelectorAll('category').forEach(cat => {
+    const value = (cat.textContent || '').trim();
+    const key = value.toLowerCase();
+    if (!value || seen.has(key)) return;
+    seen.add(key);
+    categories.push(value);
+  });
+  return categories;
+}
+
+function formatCategories(categories) {
+  return Array.isArray(categories) && categories.length ? categories.join(' · ') : '';
+}
+
+function parseAirDate(value) {
+  if (!value) return null;
+  const match = String(value).trim().match(/^(\d{4})/);
+  return match ? match[1] : null;
+}
+
+function parseRatingValue(p) {
+  const rating = p.querySelector('rating > value')?.textContent || '';
+  return rating.trim() || null;
+}
+
 function parseAndRender(doc) {
  channels = []; programs = {};
  doc.querySelectorAll('channel').forEach(ch => {
@@ -115,9 +152,13 @@ function parseAndRender(doc) {
    const start = parseXMLTVDate(p.getAttribute('start'));
    const stop  = parseXMLTVDate(p.getAttribute('stop'));
    const title = p.querySelector('title')?.textContent || '';
+    const subtitle = p.querySelector('sub-title')?.textContent || '';
    const desc  = p.querySelector('desc')?.textContent  || '';
+    const categories = parseCategories(p);
+    const airDate = parseAirDate(p.querySelector('date')?.textContent || '');
+    const rating = parseRatingValue(p);
    const epInfo = parseEpisode(p);
-    if (start && stop) programs[chId].push({ start, stop, title, desc, ...epInfo });
+    if (start && stop) programs[chId].push({ start, stop, title, subtitle, desc, categories, airDate, rating, ...epInfo });
  });
  Object.keys(programs).forEach(id => programs[id].sort((a,b) => a.start - b.start));

@@ -129,4 +170,3 @@ function renderAll() {
  if (isMobile()) { renderMobile(); }
  else { renderGrid(); setTimeout(centerNow, 150); }
 }
-
@@ -1,13 +1,21 @@
-<script src="https://cdnjs.cloudflare.com/ajax/libs/hls.js/1.4.12/hls.min.js"></script>
+<script src="/assets/vendor/hls.min.js"></script>
 <script>
 <?php
 $js_dir = __DIR__ . '/../js/';
 include $js_dir . 'config.js';
-$js_modules = ['utils', 'epg', 'mobile', 'tooltip', 'sources', 'm3u', 'player', 'themes', 'search', 'program', 'live'];
+$js_modules = ['utils', 'favorites', 'epg', 'mobile', 'tooltip', 'sources', 'm3u', 'player', 'themes', 'search', 'program', 'updater', 'live'];
 foreach ($js_modules as $mod) {
    echo file_get_contents($js_dir . $mod . '.js');
 }
 ?>
 </script>
+
+<script>
+if ('serviceWorker' in navigator) {
+  window.addEventListener('load', () => {
+    navigator.serviceWorker.register('/sw.js').catch(() => {});
+  });
+}
+</script>
 </body>
 </html>
@@ -1,857 +1,27 @@
 <!DOCTYPE html>
-<html lang="fr">
+<html lang="<?= $locale ?>">
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>GridTV — <?= $group_name ?></title>
-<link href="https://fonts.googleapis.com/css2?family=Share+Tech+Mono&family=Barlow+Condensed:wght@300;400;600;700&display=swap" rel="stylesheet">
-<style>
-  /* Variables de base — surchargées par le fichier thème */
-  :root {
-    --bg: #0a0b0d;
-    --surface: #111318;
-    --surface2: #181b22;
-    --border: #232733;
-    --border-bright: #2e3444;
-    --accent: #e8c842;
-    --accent2: #4a9eff;
-    --accent-live: #ff4444;
-    --text: #c8cdd8;
-    --text-dim: #5a6070;
-    --text-bright: #eef0f5;
-    --prog-bg: #141820;
-    --prog-border: #1e2a3a;
-    --prog-live-bg: #0d2040;
-    --prog-live-border: #4a9eff;
-    --font-ui: 'Barlow Condensed', sans-serif;
-    --font-mono: 'Share Tech Mono', monospace;
-    --channel-w: 160px;
-    --row-h: 80px;
-    --header-h: 52px;
-  }
-
-  html, body { height: 100%; }
-
-  body {
-    background: var(--bg);
-    color: var(--text);
-    font-family: var(--font-ui);
-    font-size: 14px;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-  }
-
-  /* ═══════════════════════════════════════════
-     TOP BAR
-  ═══════════════════════════════════════════ */
-  .topbar {
-    height: 50px;
-    background: var(--surface);
-    border-bottom: 1px solid var(--border);
-    display: flex;
-    align-items: center;
-    padding: 0 16px;
-    gap: 12px;
-    flex-shrink: 0;
-    position: relative;
-    z-index: 100;
-  }
-
-  .logo {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 13px;
-    color: var(--accent);
-    letter-spacing: 0.08em;
-    text-transform: uppercase;
-    white-space: nowrap;
-  }
-  .logo span { color: var(--text-dim); margin: 0 5px; }
-  .logo-sub { display: inline; }
-
-  .live-dot {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    font-size: 11px;
-    font-family: 'Share Tech Mono', monospace;
-    color: var(--accent-live);
-    letter-spacing: 0.1em;
-    margin-left: auto;
-    flex-shrink: 0;
-  }
-  .live-dot::before {
-    content: '';
-    width: 7px; height: 7px;
-    background: var(--accent-live);
-    border-radius: 50%;
-    animation: pulse 1.4s ease-in-out infinite;
-  }
-  @keyframes pulse {
-    0%,100% { opacity:1; transform:scale(1); }
-    50% { opacity:0.3; transform:scale(0.7); }
-  }
-
-  .clock {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 20px;
-    color: var(--text-bright);
-    letter-spacing: 0.05em;
-    flex-shrink: 0;
-  }
-
-  .date-label {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 10px;
-    color: var(--text-dim);
-    letter-spacing: 0.1em;
-    text-transform: uppercase;
-    white-space: nowrap;
-  }
-
-  .nav-btns {
-    display: flex;
-    gap: 4px;
-    flex-shrink: 0;
-  }
-  .nav-btn {
-    background: var(--surface2);
-    border: 1px solid var(--border);
-    color: var(--text);
-    font-family: 'Barlow Condensed', sans-serif;
-    font-size: 12px;
-    letter-spacing: 0.06em;
-    padding: 4px 10px;
-    cursor: pointer;
-    text-transform: uppercase;
-    transition: all 0.15s;
-    white-space: nowrap;
-  }
-  .nav-btn:hover, .nav-btn.active {
-    background: var(--accent);
-    color: #000;
-    border-color: var(--accent);
-  }
-
-  .copy-btns {
-    display: flex;
-    gap: 4px;
-    flex-shrink: 0;
-  }
-  .copy-btn {
-    background: transparent;
-    border: 1px solid var(--border-bright);
-    color: var(--text-dim);
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 10px;
-    letter-spacing: 0.1em;
-    padding: 4px 9px;
-    cursor: pointer;
-    text-transform: uppercase;
-    transition: all 0.15s;
-    white-space: nowrap;
-    position: relative;
-  }
-  .copy-btn:hover {
-    border-color: var(--accent2);
-    color: var(--accent2);
-  }
-  .copy-btn.copied {
-    border-color: var(--accent);
-    color: var(--accent);
-  }
-
-  /* ═══════════════════════════════════════════
-     GRID VIEW (desktop / tablet)
-  ═══════════════════════════════════════════ */
-  .grid-wrapper {
-    flex: 1;
-    display: flex;
-    overflow: hidden;
-    position: relative;
-    min-height: 0;
-  }
-
-  .channels-col {
-    width: var(--channel-w);
-    flex-shrink: 0;
-    background: var(--surface);
-    border-right: 1px solid var(--border-bright);
-    z-index: 10;
-    display: flex;
-    flex-direction: column;
-    min-height: 0;
-  }
-
-  .channels-col-header {
-    height: var(--header-h);
-    border-bottom: 1px solid var(--border-bright);
-    display: flex;
-    align-items: center;
-    padding: 0 12px;
-    flex-shrink: 0;
-  }
-  .channels-col-header span {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 9px;
-    color: var(--text-dim);
-    letter-spacing: 0.15em;
-    text-transform: uppercase;
-  }
-
-  .channels-list {
-    overflow-y: auto;
-    flex: 1;
-    scrollbar-width: none;
-  }
-  .channels-list::-webkit-scrollbar { display: none; }
-
-  .channel-cell {
-    height: var(--row-h);
-    border-bottom: 1px solid var(--border);
-    display: flex;
-    align-items: center;
-    padding: 0 12px;
-    gap: 8px;
-    flex-shrink: 0;
-  }
-
-  .channel-logo {
-    width: 32px; height: 32px;
-    border-radius: 4px;
-    object-fit: contain;
-    background: var(--surface2);
-    flex-shrink: 0;
-  }
-  .channel-logo-placeholder {
-    width: 32px; height: 32px;
-    border-radius: 4px;
-    background: var(--surface2);
-    border: 1px solid var(--border);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 9px;
-    color: var(--text-dim);
-    flex-shrink: 0;
-  }
-
-  .channel-name {
-    font-size: 12px;
-    font-weight: 600;
-    color: var(--text-bright);
-    letter-spacing: 0.04em;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    text-transform: uppercase;
-  }
-
-  .timeline-area {
-    flex: 1;
-    overflow: auto;
-    position: relative;
-    min-height: 0;
-    scrollbar-width: thin;
-    scrollbar-color: var(--border-bright) transparent;
-  }
-  .timeline-area::-webkit-scrollbar { height: 4px; width: 4px; }
-  .timeline-area::-webkit-scrollbar-track { background: transparent; }
-  .timeline-area::-webkit-scrollbar-thumb { background: var(--border-bright); border-radius: 2px; }
-
-  /* Conteneur unique — ruler + programmes scrollent ensemble */
-  .timeline-inner {
-    position: relative;
-    display: block;
-    min-width: 100%;
-  }
-
-  .time-ruler {
-    height: var(--header-h);
-    background: var(--surface);
-    border-bottom: 1px solid var(--border-bright);
-    position: sticky;
-    top: 0;
-    z-index: 20;
-  }
-  .time-ruler-inner {
-    position: relative;
-    height: 100%;
-  }
-  .time-tick {
-    position: absolute;
-    bottom: 0;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-  }
-  .time-tick-label {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 10px;
-    color: var(--text-dim);
-    letter-spacing: 0.08em;
-    padding: 0 6px 6px;
-    white-space: nowrap;
-  }
-  .time-tick-label.hour { color: var(--text); font-size: 12px; }
-  .time-tick-line { width: 1px; height: 8px; background: var(--border-bright); }
-  .time-tick-line.hour { height: 14px; }
-
-  .now-line {
-    position: absolute;
-    top: 0;
-    width: 2px;
-    height: 100%;
-    background: var(--accent-live);
-    z-index: 50;
-    pointer-events: none;
-  }
-  .now-line::before {
-    content: '';
-    position: absolute;
-    top: 0; left: -4px;
-    width: 10px; height: 10px;
-    background: var(--accent-live);
-    border-radius: 50%;
-  }
-
-  .programs-inner {
-    position: relative;
-    background-image: repeating-linear-gradient(
-      to bottom,
-      transparent 0px, transparent 79px,
-      var(--border) 79px, var(--border) 80px
-    );
-  }
-
-  .program-row {
-    height: var(--row-h);
-    border-bottom: 1px solid var(--border);
-    position: absolute;
-    left: 0; right: 0;
-  }
-
-  .program-block {
-    position: absolute;
-    top: 5px; bottom: 5px;
-    background: var(--surface2);
-    border: 1px solid var(--border);
-    border-radius: 3px;
-    padding: 0 8px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    overflow: hidden;
-    cursor: default;
-    transition: background 0.12s, border-color 0.12s;
-    min-width: 2px;
-  }
-  .program-block:hover { background: var(--surface); border-color: var(--accent2); z-index: 5; }
-  .program-block.is-live { border-color: var(--accent2); background: #0d1a2e; }
-  .program-block.is-live::after {
-    content: '';
-    position: absolute;
-    bottom: 0; left: 0;
-    height: 2px;
-    background: var(--accent2);
-    width: var(--progress, 0%);
-    transition: width 1s linear;
-  }
-  .program-block.is-past { opacity: 0.35; }
-
-  .program-title {
-    font-size: 12px;
-    font-weight: 600;
-    color: var(--text-bright);
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    letter-spacing: 0.02em;
-  }
-  .program-time {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 9px;
-    color: var(--text-dim);
-    letter-spacing: 0.06em;
-    white-space: nowrap;
-  }
-
-  /* ═══════════════════════════════════════════
-     MOBILE LIST VIEW
-  ═══════════════════════════════════════════ */
-  .mobile-view {
-    display: none;
-    flex: 1;
-    overflow-y: auto;
-    min-height: 0;
-    -webkit-overflow-scrolling: touch;
-  }
-
-  .mobile-channel {
-    border-bottom: 2px solid var(--border-bright);
-  }
-
-  .mobile-channel-header {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    padding: 10px 14px;
-    background: var(--surface);
-    position: sticky;
-    top: 0;
-    z-index: 10;
-    border-bottom: 1px solid var(--border);
-  }
-
-  .mobile-programs {
-    padding: 6px 10px;
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-  }
-
-  .mobile-program {
-    display: flex;
-    align-items: stretch;
-    border-radius: 4px;
-    overflow: hidden;
-    border: 1px solid var(--border);
-    background: var(--surface2);
-    position: relative;
-  }
-  .mobile-program.is-live { border-color: var(--accent2); background: #0d1a2e; }
-  .mobile-program.is-past { opacity: 0.4; }
-
-  .mobile-program-progress {
-    position: absolute;
-    bottom: 0; left: 0;
-    height: 2px;
-    background: var(--accent2);
-  }
-
-  .mobile-program-time {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 10px;
-    color: var(--text-dim);
-    padding: 8px 10px;
-    background: var(--surface);
-    border-right: 1px solid var(--border);
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: flex-start;
-    min-width: 72px;
-    flex-shrink: 0;
-    gap: 2px;
-  }
-  .mobile-program.is-live .mobile-program-time { color: var(--accent2); }
-
-  .mobile-program-info {
-    padding: 8px 10px;
-    flex: 1;
-    min-width: 0;
-  }
-  .mobile-program-title {
-    font-size: 13px;
-    font-weight: 600;
-    color: var(--text-bright);
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  .mobile-program-dur {
-    font-size: 10px;
-    color: var(--text-dim);
-    margin-top: 2px;
-    font-family: 'Share Tech Mono', monospace;
-  }
-
-  .mobile-live-badge {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 9px;
-    color: var(--accent-live);
-    background: rgba(255,68,68,0.12);
-    border: 1px solid var(--accent-live);
-    border-radius: 2px;
-    padding: 2px 5px;
-    letter-spacing: 0.1em;
-    align-self: center;
-    margin-right: 8px;
-    flex-shrink: 0;
-  }
-
-  /* TOOLTIP */
-  .tooltip {
-    position: fixed;
-    background: var(--surface);
-    border: 1px solid var(--accent2);
-    border-radius: 4px;
-    padding: 10px 14px;
-    z-index: 999;
-    pointer-events: none;
-    max-width: 300px;
-    opacity: 0;
-    transition: opacity 0.15s;
-  }
-  .tooltip.visible { opacity: 1; }
-  .tooltip-title { font-size: 14px; font-weight: 700; color: var(--text-bright); margin-bottom: 4px; }
-  .tooltip-time { font-family: 'Share Tech Mono', monospace; font-size: 10px; color: var(--accent2); margin-bottom: 6px; }
-  .tooltip-desc { font-size: 12px; color: var(--text); line-height: 1.4; max-height: 80px; overflow: hidden; }
-
-  /* LOADING */
-  .loading {
-    position: fixed; inset: 0;
-    background: var(--bg);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    z-index: 1000;
-    gap: 20px;
-  }
-  .loading-text {
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 12px;
-    color: var(--text-dim);
-    letter-spacing: 0.2em;
-    text-transform: uppercase;
-  }
-  .loading-bar {
-    width: 200px; height: 2px;
-    background: var(--border);
-    position: relative;
-    overflow: hidden;
-  }
-  .loading-bar::after {
-    content: '';
-    position: absolute;
-    top: 0; left: -60%;
-    width: 60%; height: 100%;
-    background: var(--accent);
-    animation: loading-anim 1.2s ease-in-out infinite;
-  }
-  @keyframes loading-anim { to { left: 110%; } }
-
-  .error-msg {
-    position: fixed; inset: 0;
-    background: var(--bg);
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    z-index: 1000;
-    gap: 16px;
-    display: none;
-    padding: 20px;
-  }
-  .err-title { font-family: 'Share Tech Mono', monospace; font-size: 14px; color: var(--accent-live); letter-spacing: 0.1em; }
-  .err-sub { font-size: 13px; color: var(--text-dim); text-align: center; max-width: 400px; line-height: 1.5; }
-  .epg-input-bar { display: flex; gap: 8px; margin-top: 8px; flex-wrap: wrap; justify-content: center; }
-  .epg-input {
-    background: var(--surface2);
-    border: 1px solid var(--border-bright);
-    color: var(--text-bright);
-    font-family: 'Share Tech Mono', monospace;
-    font-size: 12px;
-    padding: 8px 12px;
-    width: 320px;
-    outline: none;
-  }
-  .epg-input:focus { border-color: var(--accent); }
-  .epg-btn {
-    background: var(--accent);
-    border: none; color: #000;
-    font-family: 'Barlow Condensed', sans-serif;
-    font-weight: 700; font-size: 13px;
-    letter-spacing: 0.1em;
-    text-transform: uppercase;
-    padding: 8px 18px;
-    cursor: pointer;
-  }
-
-  /* ═══════════════════════════════════════════
-     RESPONSIVE
-  ═══════════════════════════════════════════ */
-  @media (max-width: 900px) {
-    :root { --channel-w: 110px; }
-    .logo-sub { display: none; }
-    .date-label { display: none; }
-    .clock { font-size: 16px; }
-  }
-
-  /* ═══════════════════════════════════════════
-     SÉLECTEUR DE THÈME
-  ═══════════════════════════════════════════ */
-  .theme-select {
-    background: transparent;
-    border: 1px solid var(--border-bright);
-    color: var(--text-dim);
-    font-family: var(--font-mono);
-    font-size: 10px;
-    letter-spacing: 0.08em;
-    padding: 4px 8px;
-    cursor: pointer;
-    text-transform: uppercase;
-    transition: all 0.15s;
-    flex-shrink: 0;
-    -webkit-appearance: none;
-    appearance: none;
-  }
-  .theme-select:hover { border-color: var(--accent2); color: var(--accent2); }
-  .theme-select option { background: #111; color: #eee; font-family: sans-serif; }
-
-  @media (max-width: 600px) {
-    html, body { height: 100%; overflow: hidden; }
-    body { overflow: hidden; }
-
-    .topbar {
-      height: auto;
-      flex-wrap: wrap;
-      padding: 8px 12px;
-      gap: 8px;
-    }
-    .logo { font-size: 11px; }
-    .clock { font-size: 14px; }
-
-    .grid-wrapper { display: none; }
-    .mobile-view { display: block; }
-    .tooltip { display: none !important; }
-    #navBtns { display: none !important; }
-  }
-
-
-
-  /* ── MODAL PERSONAL EPG ─────────────────────────────────────────────────── */
-  .modal-overlay {
-    position: fixed; inset: 0; background: rgba(0,0,0,0.7);
-    z-index: 3000; display: none; align-items: center; justify-content: center;
-  }
-  .modal-overlay.visible { display: flex; }
-  .modal-card {
-    background: var(--surface); border: 1px solid var(--border-bright);
-    padding: 28px; width: 100%; max-width: 420px; margin: 16px;
-  }
-  .modal-title {
-    font-family: var(--font-mono); font-size: 13px; color: var(--accent);
-    letter-spacing: 0.1em; text-transform: uppercase; margin-bottom: 6px;
-  }
-  .modal-subtitle { font-size: 12px; color: var(--text-dim); margin-bottom: 20px; line-height: 1.5; }
-  .modal-field { margin-bottom: 14px; }
-  .modal-field label {
-    display: block; font-family: var(--font-mono); font-size: 10px;
-    letter-spacing: 0.1em; text-transform: uppercase; color: var(--text-dim); margin-bottom: 6px;
-  }
-  .modal-field input {
-    width: 100%; background: var(--surface2); border: 1px solid var(--border-bright);
-    color: var(--text-bright); font-family: var(--font-mono); font-size: 12px;
-    padding: 9px 10px; outline: none; transition: border-color 0.15s;
-  }
-  .modal-field input:focus { border-color: var(--accent); }
-  .modal-field input::placeholder { color: var(--text-dim); opacity: 0.4; }
-  .modal-actions { display: flex; gap: 10px; margin-top: 20px; justify-content: flex-end; }
-  .modal-btn-cancel {
-    background: none; border: 1px solid var(--border-bright); color: var(--text-dim);
-    font-family: var(--font-mono); font-size: 11px; letter-spacing: 0.08em;
-    text-transform: uppercase; padding: 8px 16px; cursor: pointer; transition: border-color 0.15s;
-  }
-  .modal-btn-cancel:hover { border-color: var(--text-dim); color: var(--text); }
-  .modal-btn-apply {
-    background: var(--accent); border: none; color: #000;
-    font-family: var(--font-mono); font-size: 11px; letter-spacing: 0.08em;
-    text-transform: uppercase; padding: 8px 20px; cursor: pointer; transition: opacity 0.15s;
-  }
-  .modal-btn-apply:hover { opacity: 0.85; }
-
-  /* ── SOURCE SELECTOR ─────────────────────────────────────────────────────── */
-  .source-select {
-    background: var(--surface2);
-    border: 1px solid var(--border-bright);
-    color: var(--text);
-    font-family: var(--font-mono);
-    font-size: 11px;
-    padding: 5px 8px;
-    cursor: pointer;
-    letter-spacing: 0.06em;
-    height: 28px;
-    outline: none;
-    transition: border-color 0.15s, color 0.15s;
-    max-width: 130px;
-  }
-  .source-select:hover { border-color: var(--accent2); color: var(--accent2); }
-  .source-select option { background: #111; color: #eee; font-family: sans-serif; }
-
-  /* ═══════════════════════════════════════════
-     PLAYER PiP
-  ═══════════════════════════════════════════ */
-  .pip {
-    position: fixed;
-    bottom: 24px;
-    right: 24px;
-    width: 380px;
-    background: #000;
-    border: 1px solid var(--border-bright);
-    box-shadow: 0 8px 32px rgba(0,0,0,0.8);
-    z-index: 2000;
-    display: none;
-    flex-direction: column;
-  }
-  .pip.visible { display: flex; }
-  .pip-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 6px 10px;
-    background: var(--surface);
-    border-bottom: 1px solid var(--border);
-    gap: 8px;
-    flex-shrink: 0;
-  }
-  .pip-channel {
-    font-family: var(--font-mono);
-    font-size: 11px;
-    color: var(--accent);
-    letter-spacing: 0.08em;
-    text-transform: uppercase;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    flex: 1;
-  }
-  .pip-program {
-    font-size: 11px;
-    color: var(--text-dim);
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    flex: 2;
-    text-align: center;
-  }
-  .pip-close {
-    background: none;
-    border: none;
-    color: var(--text-dim);
-    font-size: 18px;
-    cursor: pointer;
-    padding: 0 4px;
-    line-height: 1;
-    flex-shrink: 0;
-    transition: color 0.15s;
-  }
-  .pip-close:hover { color: var(--accent-live); }
-  .pip video {
-    width: 100%;
-    aspect-ratio: 16/9;
-    display: block;
-    background: #000;
-  }
-  .pip-error {
-    padding: 20px;
-    text-align: center;
-    font-family: var(--font-mono);
-    font-size: 11px;
-    color: var(--accent-live);
-    letter-spacing: 0.06em;
-  }
-  .channel-cell { cursor: pointer; }
-  .channel-cell:hover { background: var(--surface2); }
-  .program-block.is-live { cursor: pointer; }
-  @media (max-width: 600px) {
-    .pip { width: calc(100vw - 16px); bottom: 8px; right: 8px; left: 8px; }
-  }
-
-
-  /* ── SEARCH ───────────────────────────────────────────────────────────────── */
-  .search-btn {
-    background: none; border: 1px solid var(--border); border-radius: 4px;
-    color: var(--text-muted); cursor: pointer; font-size: 14px;
-    padding: 4px 8px; transition: color .2s, border-color .2s;
-  }
-  .search-btn:hover { color: var(--accent); border-color: var(--accent); }
-
-  .search-bar {
-    display: none; align-items: center; gap: 8px;
-    background: var(--bg-card); border-bottom: 1px solid var(--border);
-    padding: 8px 16px;
-  }
-  .search-bar.visible { display: flex; }
-
-  .search-input {
-    flex: 1; background: var(--bg); border: 1px solid var(--border);
-    border-radius: 4px; color: var(--text); font-family: inherit;
-    font-size: 14px; outline: none; padding: 6px 12px;
-    transition: border-color .2s;
-  }
-  .search-input:focus { border-color: var(--accent); }
-  .search-input::placeholder { color: var(--text-muted); }
-
-  .search-clear {
-    background: none; border: none; color: var(--text-muted);
-    cursor: pointer; font-size: 16px; padding: 4px 8px;
-    transition: color .2s;
-  }
-  .search-clear:hover { color: var(--accent); }
-
-  /* Highlight programmes qui matchent */
-  .program-block.search-match {
-    border: 1px solid var(--accent);
-    box-shadow: 0 0 6px var(--accent);
-  }
-  .mobile-program.search-match {
-    border-left: 3px solid var(--accent);
-  }
-
-
-  /* ── PROGRAM MODAL ───────────────────────────────────────────────────────── */
-  .program-card {
-    max-width: 520px; padding: 28px; position: relative;
-  }
-  .pm-close {
-    position: absolute; top: 14px; right: 14px;
-    background: none; border: none; color: var(--text-muted);
-    cursor: pointer; font-size: 18px; line-height: 1;
-    transition: color .2s;
-  }
-  .pm-close:hover { color: var(--accent); }
-  .pm-channel {
-    font-size: 11px; letter-spacing: .1em; text-transform: uppercase;
-    color: var(--accent); margin-bottom: 6px;
-  }
-  .pm-title {
-    font-size: 20px; font-weight: 700; color: var(--text);
-    margin-bottom: 8px; line-height: 1.2;
-  }
-  .pm-time {
-    font-size: 12px; color: var(--accent); margin-bottom: 14px;
-  }
-  .pm-desc {
-    font-size: 13px; color: var(--text-muted); line-height: 1.6;
-    margin-bottom: 20px; max-height: 140px; overflow-y: auto;
-  }
-  .pm-actions {
-    display: flex; gap: 10px; flex-wrap: wrap;
-  }
-  .pm-btn {
-    border-radius: 4px; cursor: pointer; font-family: inherit;
-    font-size: 13px; font-weight: 600; padding: 8px 16px;
-    text-decoration: none; transition: opacity .2s;
-    display: inline-flex; align-items: center; gap: 6px;
-    border: none;
-  }
-  .pm-btn:hover { opacity: .8; }
-  .pm-watch  { background: var(--accent); color: var(--bg); }
-  .pm-imdb   { background: #f5c518; color: #000; }
-  .pm-cancel { background: var(--bg); color: var(--text-muted); border: 1px solid var(--border); }
-
-  /* Date midnight dans la timebar */
-  .time-tick-label.midnight {
-    color: var(--accent); font-weight: 700; font-size: 11px;
-    white-space: nowrap;
-  }
-  .time-tick-line.midnight {
-    background: var(--accent); opacity: .4; width: 2px;
-  }
-
-</style>
+<link rel="manifest" href="/manifest.json">
+<link rel="icon" href="/assets/favicon.png" type="image/png">
+<link rel="apple-touch-icon" href="/assets/apple-touch-icon.png">
+<meta name="theme-color" content="#0a0b0d">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+<meta name="apple-mobile-web-app-title" content="GridTV">
+<link rel="stylesheet" href="/assets/fonts/fonts.css">
+<?php
+$css_dir = __DIR__ . '/../css/';
+$css_files = ['base', 'topbar', 'grid', 'mobile', 'player', 'modals', 'search', 'program', 'favorites', 'updater'];
+echo "<style>\n";
+foreach ($css_files as $file) {
+    echo file_get_contents($css_dir . $file . '.css') . "\n";
+}
+echo "</style>\n";
+?>
 <link id="themeStylesheet" rel="stylesheet" href="themes/default.css">
 </head>

@@ -4,7 +4,10 @@
    <button class="pm-close" onclick="closeProgramModal()">&#10005;</button>
    <div class="pm-channel" id="pm-channel"></div>
    <div class="pm-title" id="pm-title"></div>
+    <div class="pm-subtitle" id="pm-subtitle"></div>
    <div class="pm-time" id="pm-time"></div>
+    <div class="pm-meta" id="pm-meta"></div>
+    <div class="pm-genres" id="pm-genres"></div>
    <div class="pm-desc" id="pm-desc"></div>
    <div class="pm-actions">
      <button class="pm-btn pm-watch" id="pm-watch">&#9654; <?= htmlspecialchars($L["watch_now"]) ?></button>
@@ -14,20 +14,30 @@
 <?php endif; ?>
  </div>
 <?php if (count($epg_sources) > 1 || $allow_personal_epg): ?>
-  <select class="source-select" id="sourceSelect" onchange="switchSource(this.value)" title="Source EPG">
+  <div class="source-dropdown" id="sourceDropdown">
+    <button class="source-dropdown-btn" onclick="toggleSourceDropdown()" id="sourceDropdownBtn">
+      <span id="sourceDropdownLabel"><?= htmlspecialchars($epg_sources[0]['name'] ?? 'EPG') ?></span>
+      <span class="source-dropdown-arrow">&#9660;</span>
+    </button>
+    <div class="source-dropdown-menu" id="sourceDropdownMenu">
 <?php foreach ($epg_sources as $i => $src): ?>
-    <option value="<?= $i ?>"><?= htmlspecialchars($src['name']) ?></option>
+      <button class="source-dropdown-item<?= $i === 0 ? ' active' : '' ?>" onclick="switchSource(<?= $i ?>); closeSourceDropdown()">
+        <?= htmlspecialchars($src['name']) ?>
+      </button>
 <?php endforeach; ?>
 <?php if ($allow_personal_epg): ?>
-    <option value="personal">✏ Personal EPG</option>
+      <button class="source-dropdown-item source-dropdown-personal" onclick="switchSource('personal'); closeSourceDropdown()">
+        &#9998; Personal EPG
+      </button>
 <?php endif; ?>
-  </select>
+    </div>
+  </div>
 <?php endif; ?>
  <select class="theme-select" id="themeSelect" onchange="setTheme(this.value)" title="Thème">
 <?php
 $theme_dir = __DIR__ . '/../../themes';
 $theme_files = glob($theme_dir . '/*.css');
-// default en premier, puis le reste par ordre alphabétique
+// Put the default theme first, then sort the rest alphabetically.
 usort($theme_files, function($a, $b) {
    $a_base = basename($a, '.css');
    $b_base = basename($b, '.css');
@@ -38,7 +48,7 @@ usort($theme_files, function($a, $b) {
 foreach ($theme_files as $file) {
    $slug = basename($file, '.css');
    $css  = file_get_contents($file);
-    // Lire @name et @emoji dans le premier bloc commentaire
+    // Read @name and @emoji from the first comment block.
    preg_match('/@name\s+(.+)/u',  $css, $m_name);
    preg_match('/@emoji\s+(\S+)/u', $css, $m_emoji);
    $name  = isset($m_name[1])  ? trim($m_name[1])  : ucfirst($slug);
@@ -54,4 +64,3 @@ foreach ($theme_files as $file) {
  <input class="search-input" id="searchInput" type="text" placeholder="<?= htmlspecialchars($L["search_placeholder"]) ?>" oninput="onSearchInput(this.value)" />
  <button class="search-clear" onclick="clearSearch()">&#10005;</button>
 </div>
-
@@ -0,0 +1,77 @@
+const CACHE_NAME = 'gridtv-v2';
+
+// Static assets cached during installation.
+const STATIC_ASSETS = [
+  '/',
+  '/index.php',
+  '/manifest.json',
+  '/assets/fonts/fonts.css',
+  '/assets/icon-192.png',
+  '/assets/icon-512.png',
+  '/assets/vendor/hls.min.js'
+];
+
+// Install: cache the static assets.
+self.addEventListener('install', e => {
+  e.waitUntil(
+    caches.open(CACHE_NAME)
+      .then(cache => cache.addAll(STATIC_ASSETS))
+      .then(() => self.skipWaiting())
+  );
+});
+
+// Activate: remove outdated caches.
+self.addEventListener('activate', e => {
+  e.waitUntil(
+    caches.keys().then(keys =>
+      Promise.all(keys.filter(k => k !== CACHE_NAME).map(k => caches.delete(k)))
+    ).then(() => self.clients.claim())
+  );
+});
+
+// Fetch: choose a caching strategy based on resource type.
+self.addEventListener('fetch', e => {
+  const url = new URL(e.request.url);
+
+  // EPG/M3U feeds, the GitHub API, and version.json stay network-only.
+  if (
+    url.pathname.includes('xmltv') ||
+    url.pathname.includes('.m3u') ||
+    url.hostname === 'api.github.com' ||
+    url.pathname.includes('proxy.php') ||
+    url.pathname.endsWith('version.json')
+  ) {
+    return;
+  }
+
+  // Static assets use a cache-first strategy.
+  if (
+    e.request.destination === 'style' ||
+    e.request.destination === 'script' ||
+    e.request.destination === 'font' ||
+    e.request.destination === 'image' ||
+    url.pathname.endsWith('.json') ||
+    url.pathname.endsWith('.css') ||
+    url.pathname.endsWith('.js')
+  ) {
+    e.respondWith(
+      caches.match(e.request).then(cached => cached || fetch(e.request).then(res => {
+        const clone = res.clone();
+        caches.open(CACHE_NAME).then(cache => cache.put(e.request, clone));
+        return res;
+      }))
+    );
+    return;
+  }
+
+  // PHP pages use network-first with cache fallback.
+  e.respondWith(
+    fetch(e.request)
+      .then(res => {
+        const clone = res.clone();
+        caches.open(CACHE_NAME).then(cache => cache.put(e.request, clone));
+        return res;
+      })
+      .catch(() => caches.match(e.request))
+  );
+});
@@ -3,8 +3,6 @@
 * Néons rose/cyan sur noir absolu. Blade Runner.
 */

-@import url('https://fonts.googleapis.com/css2?family=Rajdhani:wght@400;600;700&display=swap');
-
 :root {
  --bg: #000008;
  --surface: #080010;
@@ -3,8 +3,6 @@
 * Salle de régie sombre, la base.
 */

-@import url('https://fonts.googleapis.com/css2?family=Share+Tech+Mono&family=Barlow+Condensed:wght@300;400;600;700&display=swap');
-
 :root {
  --bg: #0a0b0d;
  --surface: #111318;
@@ -3,8 +3,6 @@
 * Papier jauni, encre rouge et bleue, machine à écrire.
 */

-@import url('https://fonts.googleapis.com/css2?family=Special+Elite&display=swap');
-
 :root {
  --bg: #f2e8c8;
  --surface: #ede0b0;
@@ -3,8 +3,6 @@
 * Brun chaud, cuivre, laiton. Très 1880.
 */

-@import url('https://fonts.googleapis.com/css2?family=IM+Fell+English:ital@0;1&display=swap');
-
 :root {
  --bg: #160e04;
  --surface: #201408;
@@ -0,0 +1,3 @@
+{
+  "version": "1.5.0"
+}
Author	SHA1	Message	Date
Johnnybegood90	3f83055198	version.json update	2026-03-14 13:40:47 +01:00
Johnnybegood90	c46ca14f4c	version.json update	2026-03-14 13:40:31 +01:00
Johnnybegood90	ea7407f1d8	Added support for new tags in XMLTV	2026-03-14 13:38:52 +01:00
Johnnybegood90	674c13ae26	Feat: Added support for new tags in XMLTV	2026-03-14 13:36:12 +01:00
Johnnybegood90	96601b76b6	Fix HLS proxy fallback and avoid overwriting invalid config	2026-03-14 13:16:29 +01:00
Johnnybegood90	fc608ee0e0	Fix HLS proxy fallback and avoid overwriting invalid config	2026-03-14 13:16:09 +01:00
Johnnybegood90	45cf0975b0	Merge remote-tracking branch 'origin/beta' Auto-discover locales and harden JSON config loading - discover available locale files dynamically instead of relying on a hardcoded language list - make config JSON decoding more defensive to avoid null-state failures on invalid or empty data - improve startup resilience when configuration files are missing or malformed	2026-03-14 13:09:25 +01:00
Johnnybegood90	90679e9221	Auto-discover locales and harden JSON config loading - discover available locale files dynamically instead of relying on a hardcoded language list - make config JSON decoding more defensive to avoid null-state failures on invalid or empty data - improve startup resilience when configuration files are missing or malformed	2026-03-14 13:08:33 +01:00
Johnnybegood90	7f500ff9ee	Merge remote-tracking branch 'origin/beta' Improve proxy redirect handling and avoid double-fetching media segments - validate redirect chains more robustly, including scheme-relative, query-only, fragment, and normalized relative paths - resolve media segment redirects with HEAD before streaming to avoid downloading the same segment twice - keep strict host allowlisting in place while making HLS/CDN redirect handling more reliable	2026-03-14 12:20:28 +01:00
Johnnybegood90	bc5c9e296a	Improve proxy redirect handling and avoid double-fetching media segments - validate redirect chains more robustly, including scheme-relative, query-only, fragment, and normalized relative paths - resolve media segment redirects with HEAD before streaming to avoid downloading the same segment twice - keep strict host allowlisting in place while making HLS/CDN redirect handling more reliable	2026-03-14 12:20:02 +01:00
Johnnybegood90	985a417ccb	security: replace corsproxy.io with local proxy fallback, Fix: Update avail. cache.	2026-03-14 12:10:20 +01:00
Johnnybegood90	27ef739845	Fix: Update avail. was cached and making mistake..	2026-03-14 12:08:06 +01:00
Johnnybegood90	77f02361ab	security: replace corsproxy.io with local proxy fallback.	2026-03-14 12:03:42 +01:00
Johnnybegood90	6f379fd18e	Adjusting comments into files.	2026-03-14 04:24:06 +01:00
Johnnybegood90	8dabd2d190	Adjusting comments into files.	2026-03-14 04:23:44 +01:00
Johnnybegood90	1402d9b5fc	Adjusting README.md	2026-03-14 03:51:48 +01:00
Johnnybegood90	062954a780	Adjusting README.md	2026-03-14 03:51:30 +01:00
Johnnybegood90	ad56bd85cc	Add deploy workflow	2026-03-14 03:42:43 +01:00
Johnnybegood90	1959734b56	Add deploy workflow	2026-03-14 03:42:20 +01:00
Johnnybegood90	3d0b4796b2	Update version	2026-03-14 03:13:28 +01:00
Johnnybegood90	de1f5a336c	Version update.	2026-03-14 03:13:11 +01:00
Johnnybegood90	4f0e1f55ba	Merge remote-tracking branch 'origin/beta' Harden Docker packaging and bundle frontend assets locally - replace fragile Docker file bind mount with persistent /data storage - add container entrypoint to link config.json from persistent storage - tighten Docker image permissions and add a basic healthcheck - add .dockerignore to keep git metadata and runtime files out of the image - bundle hls.js locally instead of loading it from a CDN - download and serve UI/theme fonts locally instead of Google Fonts - update service worker cache entries for local assets - refresh README to reflect local bundled assets and cleaner deployment docs	2026-03-14 03:11:11 +01:00
Johnnybegood90	8ba8c3013e	Harden Docker packaging and bundle frontend assets locally - replace fragile Docker file bind mount with persistent /data storage - add container entrypoint to link config.json from persistent storage - tighten Docker image permissions and add a basic healthcheck - add .dockerignore to keep git metadata and runtime files out of the image - bundle hls.js locally instead of loading it from a CDN - download and serve UI/theme fonts locally instead of Google Fonts - update service worker cache entries for local assets - refresh README to reflect local bundled assets and cleaner deployment docs	2026-03-14 03:10:21 +01:00
Johnnybegood90	9609f096ef	Updating Docker Compose & README.md	2026-03-14 02:58:05 +01:00
Johnnybegood90	8c81c05bca	Updating Docker Compose & README.md	2026-03-14 02:57:13 +01:00
Johnnybegood90	ff998d379d	security: harden proxy.php with config whitelist, fix XSS via EPG innerHTML	2026-03-14 02:44:48 +01:00
Johnnybegood90	62732ab2c6	security: harden proxy.php with config whitelist, fix XSS via EPG innerHTML	2026-03-14 02:43:11 +01:00
Johnnybegood90	25dabc97b2	security: harden proxy.php with config whitelist, fix XSS via EPG innerHTML	2026-03-14 02:31:25 +01:00
Johnnybegood90	e81cd8b64d	security: harden proxy.php with config whitelist, fix XSS via EPG innerHTML	2026-03-14 02:29:09 +01:00
Johnnybegood90	30d8a24927	security: harden proxy.php with config whitelist, fix XSS via EPG innerHTML	2026-03-14 02:26:36 +01:00
Johnnybegood90	d6532d3501	Improvment: Replacing change EPG menu.	2026-03-14 01:22:16 +01:00
Johnnybegood90	17db9f56f7	Fix version.json	2026-03-14 01:22:05 +01:00
Johnnybegood90	874214aa41	Improvment: Replacing change EPG menu.	2026-03-14 01:18:38 +01:00
Johnnybegood90	de0e1adf44	Improvment: Replacing change EPG menu.	2026-03-14 01:18:02 +01:00
Johnnybegood90	42d161beff	Update topbar CSS	2026-03-14 01:10:58 +01:00
Johnnybegood90	30c0de2a2d	Fix: CSS Topbar.	2026-03-14 01:09:33 +01:00
Johnnybegood90	77f0c2523b	Fix: CSS Topbar.	2026-03-14 01:06:32 +01:00
Johnnybegood90	73bdde5093	Fix: CSS Topbar.	2026-03-14 01:03:44 +01:00
Johnnybegood90	0c2bce40fb	Update assets.	2026-03-14 00:30:04 +01:00
Johnnybegood90	005fca9a05	Adjusting assets.	2026-03-14 00:28:52 +01:00
Johnnybegood90	f82bc65472	Fix: CSS Topbar.	2026-03-14 00:11:34 +01:00
Johnnybegood90	d57855c385	Hotfix desktop CSS	2026-03-14 00:08:29 +01:00
Johnnybegood90	ca25d5000b	Hotfix css desktop	2026-03-14 00:07:10 +01:00
Johnnybegood90	f935a82e91	Hotfix mobile CSS	2026-03-14 00:01:17 +01:00
Johnnybegood90	96c9835a27	Hotfix css mobile	2026-03-14 00:00:05 +01:00
Johnnybegood90	b312e8cc26	Updating favicon.	2026-03-13 23:51:49 +01:00
Johnnybegood90	79a077a85f	Adding PWA support.	2026-03-13 23:46:14 +01:00
Johnnybegood90	8e3dc664ed	Remove Sublime workspace file	2026-03-13 23:27:25 +01:00
Johnnybegood90	2172202d25	update .gitignore	2026-03-13 23:24:54 +01:00
Johnnybegood90	804bb96e07	Update .gitignore.	2026-03-13 23:23:20 +01:00
Johnnybegood90	d7541c0fa4	update .gitignore	2026-03-13 23:23:05 +01:00
Johnnybegood90	7f23ba92ad	Update README.md.	2026-03-13 23:12:20 +01:00
Johnnybegood90	9e4614d8df	Update README.md	2026-03-13 23:12:00 +01:00
Johnnybegood90	5fd4eb8a5c	Split the CSS from head.php into separate files.	2026-03-13 23:06:43 +01:00
Johnnybegood90	8ca85e778e	Split the CSS from head.php into separate files.	2026-03-13 23:04:55 +01:00
Johnnybegood90	181e477a0e	Split the CSS from head.php into separate files.	2026-03-13 22:56:40 +01:00
Johnnybegood90	da501bccc7	removing useless config.example.json	2026-03-13 22:05:28 +01:00
Johnnybegood90	8a465dc6da	removing useless config.example.json	2026-03-13 22:05:06 +01:00
Johnnybegood90	2d4d8c031e	Feat: Update available checker.	2026-03-13 21:49:02 +01:00
Johnnybegood90	8b032f56de	Update available fix.	2026-03-13 21:47:49 +01:00
Johnnybegood90	44f4eeaafe	Update available tag.	2026-03-13 21:39:34 +01:00
Johnnybegood90	aac2b4404f	Feat: Possibility added to reconfigure via setup.php. A key is created into the config file.	2026-03-13 21:30:00 +01:00
Johnnybegood90	8460771d20	Fix: setup.php now add a key in existing setup post update.	2026-03-13 21:28:18 +01:00
Johnnybegood90	76dbd18ca7	Feat: Reconfigure in setup.php	2026-03-13 21:24:51 +01:00
Johnnybegood90	e924c945d6	Feat: Favorite channels in Localstorage.	2026-03-13 20:47:47 +01:00
Johnnybegood90	7b42539bc8	Feat: Fav channel in localstorage	2026-03-13 20:46:01 +01:00
Johnnybegood90	d7617bfeaa	Update screenshots.	2026-03-12 15:57:24 +01:00
Johnnybegood90	23e0f29990	Update screenshots.	2026-03-12 15:57:00 +01:00