16 changed files with 143 additions and 261 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@ -36,29 +36,6 @@ jobs:
        working-directory: build-${{ github.run_id }}
        run: dotnet restore Jellyfin.Plugin.SRFPlay.sln

-      - name: Compute build version
-        id: version
-        run: |
-          # For PRs, stamp a distinct version so a side-loaded build is
-          # identifiable in Jellyfin: 1.0.<YYYYMMDD>-pr<N>.<run_number>.
-          # For plain master pushes, keep a date-based dev version.
-          DATE=$(date -u +"%Y%m%d")
-          if [ -n "${{ github.event.pull_request.number }}" ]; then
-            VERSION="1.0.${DATE}.${{ github.run_number }}"
-            LABEL="pr${{ github.event.pull_request.number }}"
-          else
-            VERSION="1.0.${DATE}.${{ github.run_number }}"
-            LABEL="master"
-          fi
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "label=${LABEL}" >> $GITHUB_OUTPUT
-          echo "Build version: ${VERSION} (${LABEL})"
-
-      - name: Set build version
-        working-directory: build-${{ github.run_id }}
-        run: |
-          sed -i "s/^version:.*/version: \"${{ steps.version.outputs.version }}\"/" build.yaml
-
      - name: Build solution
        working-directory: build-${{ github.run_id }}
        run: dotnet build Jellyfin.Plugin.SRFPlay.sln --configuration Release --no-restore --no-self-contained /m:1
@ -82,7 +59,7 @@ jobs:
      - name: Upload build artifact
        uses: actions/upload-artifact@v3
        with:
-          name: srfplay-${{ steps.version.outputs.label }}-${{ steps.version.outputs.version }}
+          name: jellyfin-srfplay-plugin
          path: build-${{ github.run_id }}/${{ steps.jprm.outputs.artifact }}
          retention-days: 30
          if-no-files-found: error
--- a/.gitea/workflows/latest.yaml
+++ b/.gitea/workflows/latest.yaml
@ -1,4 +1,4 @@
-name: 'Nightly Build'
+name: 'Latest Release'

 on:
  push:
@ -7,10 +7,9 @@ on:
    paths-ignore:
      - '**/*.md'
      - 'manifest.json'
-      - 'manifest-nightly.json'

 jobs:
-  nightly-build:
+  latest-release:
    runs-on: linux/amd64
    container:
      image: gitea.tourolle.paris/dtourolle/srfplay-builder:latest
@ -21,24 +20,6 @@ jobs:
        with:
          path: build-${{ github.run_id }}

-      - name: Compute nightly version
-        id: version
-        run: |
-          # Date-based nightly version: 1.0.<YYYYMMDD>.<run_number>
-          # The run_number suffix keeps multiple builds on the same day
-          # monotonically increasing so Jellyfin always offers the newest.
-          DATE=$(date -u +"%Y%m%d")
-          VERSION="1.0.${DATE}.${{ github.run_number }}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "Nightly version: ${VERSION}"
-
-      - name: Set build version
-        working-directory: build-${{ github.run_id }}
-        run: |
-          VERSION="${{ steps.version.outputs.version }}"
-          sed -i "s/^version:.*/version: \"${VERSION}\"/" build.yaml
-          cat build.yaml
-
      - name: Restore dependencies
        working-directory: build-${{ github.run_id }}
        run: dotnet restore Jellyfin.Plugin.SRFPlay.sln
@ -71,7 +52,7 @@ jobs:
          echo "checksum=${CHECKSUM}" >> $GITHUB_OUTPUT
          echo "Checksum: ${CHECKSUM}"

-      - name: Delete existing nightly release
+      - name: Delete existing latest release
        working-directory: build-${{ github.run_id }}
        env:
          GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -90,7 +71,7 @@ jobs:
              -H "Authorization: token ${GITEA_TOKEN}" \
              "${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/tags/${TAG}" | jq -r '.id')

-            echo "Deleting existing nightly release (ID: ${RELEASE_ID})..."
+            echo "Deleting existing latest release (ID: ${RELEASE_ID})..."
            curl -s -X DELETE \
              -H "Authorization: token ${GITEA_TOKEN}" \
              "${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}"
@ -100,7 +81,7 @@ jobs:
            -H "Authorization: token ${GITEA_TOKEN}" \
            "${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/tags/${TAG}" || true

-      - name: Create nightly release
+      - name: Create latest release
        working-directory: build-${{ github.run_id }}
        env:
          GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -108,14 +89,12 @@ jobs:
          REPO_OWNER="${{ github.repository_owner }}"
          REPO_NAME="${{ github.event.repository.name }}"
          GITEA_URL="${{ github.server_url }}"
-          VERSION="${{ steps.version.outputs.version }}"
-          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)

          RESPONSE=$(curl -s -w "\n%{http_code}" -X POST \
            -H "Authorization: token ${GITEA_TOKEN}" \
            -H "Content-Type: application/json" \
            "${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases" \
-            -d "$(jq -n --arg tag "latest" --arg name "Nightly Build ${VERSION}" --arg body "SRFPlay Jellyfin Plugin nightly build ${VERSION} from master (${SHORT_SHA})." '{tag_name: $tag, name: $name, body: $body, target_commitish: "master", draft: false, prerelease: true}')")
+            -d "$(jq -n --arg tag "latest" --arg name "Latest Build" --arg body "SRFPlay Jellyfin Plugin latest build from master." '{tag_name: $tag, name: $name, body: $body, target_commitish: "master", draft: false, prerelease: true}')")

          HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
          BODY=$(echo "$RESPONSE" | sed '$d')
@ -145,9 +124,9 @@ jobs:
            --data-binary "@build.yaml" \
            "${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/releases/${RELEASE_ID}/assets?name=build.yaml"

-          echo "Nightly release updated successfully!"
+          echo "Latest release updated successfully!"

-      - name: Update manifest-nightly.json
+      - name: Update manifest.json
        working-directory: build-${{ github.run_id }}
        env:
          GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -155,7 +134,6 @@ jobs:
          REPO_OWNER="${{ github.repository_owner }}"
          REPO_NAME="${{ github.event.repository.name }}"
          GITEA_URL="${{ github.server_url }}"
-          VERSION="${{ steps.version.outputs.version }}"
          CHECKSUM="${{ steps.checksum.outputs.checksum }}"
          ARTIFACT_NAME="${{ steps.jprm.outputs.artifact_name }}"
          TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
@ -167,10 +145,13 @@ jobs:
          git fetch origin master
          git checkout master

+          # Remove existing "latest" entry if present, then prepend new one
+          jq --arg url "$DOWNLOAD_URL" 'if .[0].versions[0].changelog == "Latest Build" then .[0].versions = .[0].versions[1:] else . end' manifest.json > manifest.tmp && mv manifest.tmp manifest.json
+
          NEW_VERSION=$(cat <<EOF
          {
-            "version": "${VERSION}",
-            "changelog": "Nightly build ${VERSION} (${SHORT_SHA})",
+            "version": "0.0.0.0",
+            "changelog": "Latest Build",
            "targetAbi": "10.9.0.0",
            "sourceUrl": "${DOWNLOAD_URL}",
            "checksum": "${CHECKSUM}",
@ -179,13 +160,9 @@ jobs:
          EOF
          )

-          # Prepend the new build and keep only the most recent 5 nightlies.
-          jq --argjson newver "${NEW_VERSION}" \
-            '.[0].versions = ([$newver] + .[0].versions)[0:5]' \
-            manifest-nightly.json > manifest.tmp && mv manifest.tmp manifest-nightly.json
-
-          git add manifest-nightly.json
-          git commit -m "Nightly: ${VERSION} (${SHORT_SHA})" || echo "No changes to commit"
+          jq --argjson newver "${NEW_VERSION}" '.[0].versions = [$newver] + .[0].versions' manifest.json > manifest.tmp && mv manifest.tmp manifest.json
+          git add manifest.json
+          git commit -m "Update manifest.json for latest build (${SHORT_SHA})" || echo "No changes to commit"
          git push origin master

      - name: Cleanup
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,17 +0,0 @@
-<Project>
-  <!--
-    The Jellyfin meta build workflow rewrites Directory.Build.props, stamping Version,
-    AssemblyVersion and FileVersion all to a date-based value (e.g. 1.0.20260627.182).
-    The build segment (20260627) exceeds the 16-bit limit (0-65535) that AssemblyVersion
-    and FileVersion require, which fails the compile (CS7034/CS7035).
-
-    Directory.Build.targets is imported AFTER the project (and after Directory.Build.props),
-    and the workflow does not touch it, so we force valid assembly/file versions here. The
-    package/plugin manifest Version stays as injected; only the .NET assembly identity is
-    normalised, which is fine because Jellyfin identifies plugins by GUID + manifest version.
-  -->
-  <PropertyGroup>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
-  </PropertyGroup>
-</Project>
--- a/Jellyfin.Plugin.SRFPlay/Api/SRFApiClient.cs
+++ b/Jellyfin.Plugin.SRFPlay/Api/SRFApiClient.cs
@ -20,6 +20,7 @@ namespace Jellyfin.Plugin.SRFPlay.Api;
 /// </summary>
 public class SRFApiClient : IDisposable
 {
+    private static readonly System.Text.CompositeFormat PlayV3UrlFormat = System.Text.CompositeFormat.Parse(ApiEndpoints.PlayV3BaseUrlTemplate);
    private readonly HttpClient _httpClient;
    private readonly HttpClient _playV3HttpClient;
    private readonly ILogger _logger;
@ -57,21 +58,6 @@ public class SRFApiClient : IDisposable
        };
    }

-    /// <summary>
-    /// Builds the Play v3 API base URL for a business unit. The host is normally
-    /// www.&lt;unit&gt;.ch, but SWI's site lives at www.swissinfo.ch (www.swi.ch is an
-    /// unrelated welding institute), while the API path segment stays the unit code.
-    /// </summary>
-    /// <param name="businessUnit">The lowercase business unit (e.g. "srf", "swi").</param>
-    /// <returns>The Play v3 production base URL ending in a slash.</returns>
-    private static string BuildPlayV3BaseUrl(string businessUnit)
-    {
-        var host = string.Equals(businessUnit, "swi", StringComparison.OrdinalIgnoreCase)
-            ? "www.swissinfo.ch"
-            : $"www.{businessUnit}.ch";
-        return $"https://{host}/play/v3/api/{businessUnit}/production/";
-    }
-
    /// <summary>
    /// Reads HTTP response content as UTF-8 string.
    /// </summary>
@ -329,7 +315,7 @@ public class SRFApiClient : IDisposable
    {
        try
        {
-            var baseUrl = BuildPlayV3BaseUrl(businessUnit);
+            var baseUrl = string.Format(CultureInfo.InvariantCulture, PlayV3UrlFormat, businessUnit);
            var url = $"{baseUrl}{endpoint}";
            _logger.LogInformation("Fetching all {Endpoint} for business unit: {BusinessUnit} from URL: {Url}", endpoint, businessUnit, url);

@ -366,7 +352,7 @@ public class SRFApiClient : IDisposable
    {
        try
        {
-            var baseUrl = BuildPlayV3BaseUrl(businessUnit);
+            var baseUrl = string.Format(CultureInfo.InvariantCulture, PlayV3UrlFormat, businessUnit);
            var url = $"{baseUrl}videos-by-show-id?showId={showId}";
            _logger.LogDebug("Fetching videos for show {ShowId} from business unit: {BusinessUnit}", showId, businessUnit);

@ -406,7 +392,7 @@ public class SRFApiClient : IDisposable
    {
        try
        {
-            var baseUrl = BuildPlayV3BaseUrl(businessUnit);
+            var baseUrl = string.Format(CultureInfo.InvariantCulture, PlayV3UrlFormat, businessUnit);
            var url = $"{baseUrl}livestreams?eventType={eventType.ToUpperInvariant()}";
            _logger.LogInformation("Fetching scheduled livestreams for eventType={EventType} from business unit: {BusinessUnit}", eventType, businessUnit);

--- a/Jellyfin.Plugin.SRFPlay/Channels/SrgChannelBase.cs
+++ b/Jellyfin.Plugin.SRFPlay/Channels/SrgChannelBase.cs
@ -175,8 +175,21 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
        }
    }

+    private bool IsUnitEnabled()
+    {
+        var config = Plugin.Instance?.Configuration;
+        return config == null || config.ResolveEnabledUnits().Contains(Unit);
+    }
+
    private async Task<List<ChannelItemInfo>> GetFolderItemsAsync(string? folderId, CancellationToken cancellationToken)
    {
+        // If this unit is not enabled in configuration, show nothing (empty tile).
+        if (!IsUnitEnabled())
+        {
+            _logger.LogDebug("Business unit {Unit} is not enabled - returning no items", Unit);
+            return new List<ChannelItemInfo>();
+        }
+
        // Root level - show folder list
        if (string.IsNullOrEmpty(folderId))
        {
--- a/Jellyfin.Plugin.SRFPlay/Configuration/PluginConfiguration.cs
+++ b/Jellyfin.Plugin.SRFPlay/Configuration/PluginConfiguration.cs
@ -66,6 +66,7 @@ public class PluginConfiguration : BasePluginConfiguration
    {
        // Set default options
        BusinessUnit = BusinessUnit.SRF;
+        EnabledBusinessUnits = new System.Collections.Generic.List<BusinessUnit> { BusinessUnit.SRF };
        QualityPreference = QualityPreference.Auto;
        ContentRefreshIntervalHours = 6;
        ExpirationCheckIntervalHours = 24;
@ -75,15 +76,23 @@ public class PluginConfiguration : BasePluginConfiguration
        EnableCategoryFolders = true;
        EnabledTopics = new System.Collections.Generic.List<string>();
        GenerateTitleCards = true;
-        LiveStartSegmentsBack = 3;
    }

    /// <summary>
-    /// Gets or sets the legacy single business unit. Retained only for backwards compatibility
-    /// with older configs; every unit now has its own always-on channel.
+    /// Gets or sets the legacy single business unit. Retained for backwards compatibility and
+    /// migration into <see cref="EnabledBusinessUnits"/>; new code should use the list instead.
    /// </summary>
    public BusinessUnit BusinessUnit { get; set; }

+    /// <summary>
+    /// Gets or sets the list of business units to expose as channels. One channel tile is shown
+    /// per enabled unit, so polylingual households can browse e.g. SRF (German) and RTS (French)
+    /// at the same time.
+    /// </summary>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "Required for configuration serialization")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1002:Do not expose generic lists", Justification = "Configuration DTO")]
+    public System.Collections.Generic.List<BusinessUnit> EnabledBusinessUnits { get; set; }
+
    /// <summary>
    /// Gets or sets the preferred video quality.
    /// </summary>
@ -165,12 +174,18 @@ public class PluginConfiguration : BasePluginConfiguration
    public string RecordingOutputPath { get; set; } = string.Empty;

    /// <summary>
-    /// Gets or sets how many segments back from the live edge livestream playback should start.
-    /// Injected as <c>#EXT-X-START:TIME-OFFSET=-(N * targetDuration)</c> into the live media
-    /// playlist. This keeps the start point out of the volatile live edge, which on Android TV
-    /// (ExoPlayer) otherwise causes stalling/jumping until a manual skip. RFC 8216 requires the
-    /// offset to stay at least 3 target durations from the edge, so values below 3 are clamped.
-    /// Set to 0 to disable injection entirely.
+    /// Resolves the effective set of enabled business units, migrating from the legacy single
+    /// <see cref="BusinessUnit"/> value when the list has not been populated yet.
    /// </summary>
-    public int LiveStartSegmentsBack { get; set; }
+    /// <returns>The business units that should have channels.</returns>
+    public System.Collections.Generic.IReadOnlyList<BusinessUnit> ResolveEnabledUnits()
+    {
+        if (EnabledBusinessUnits != null && EnabledBusinessUnits.Count > 0)
+        {
+            return EnabledBusinessUnits;
+        }
+
+        // Legacy installs only had a single BusinessUnit; honour it so they keep working.
+        return new System.Collections.Generic.List<BusinessUnit> { BusinessUnit };
+    }
 }
--- a/Jellyfin.Plugin.SRFPlay/Configuration/configPage.html
+++ b/Jellyfin.Plugin.SRFPlay/Configuration/configPage.html
@ -3,8 +3,28 @@
            <div class="content-primary">
                <form id="SRFPlayConfigForm">
                    <div class="checkboxContainer checkboxContainer-withDescription">
-                        <h3>Channels</h3>
-                        <div class="fieldDescription">Every Swiss broadcaster has its own channel tile: SRF (German), RTS (French), RSI (Italian), RTR (Romansh) and SWI (swissinfo.ch). They are always available — pin the ones you use from the Jellyfin home screen.</div>
+                        <h3>Channels (Business Units)</h3>
+                        <div class="fieldDescription" style="margin-bottom: 0.5em;">Enable a channel tile for each Swiss broadcaster you want. A separate tile appears per enabled unit, so polylingual households can browse e.g. SRF (German) and RTS (French) at the same time.</div>
+                        <label class="emby-checkbox-label">
+                            <input id="buSRF" type="checkbox" is="emby-checkbox" data-bu="SRF" />
+                            <span>SRF — Schweizer Radio und Fernsehen (German)</span>
+                        </label>
+                        <label class="emby-checkbox-label">
+                            <input id="buRTS" type="checkbox" is="emby-checkbox" data-bu="RTS" />
+                            <span>RTS — Radio Télévision Suisse (French)</span>
+                        </label>
+                        <label class="emby-checkbox-label">
+                            <input id="buRSI" type="checkbox" is="emby-checkbox" data-bu="RSI" />
+                            <span>RSI — Radiotelevisione svizzera (Italian)</span>
+                        </label>
+                        <label class="emby-checkbox-label">
+                            <input id="buRTR" type="checkbox" is="emby-checkbox" data-bu="RTR" />
+                            <span>RTR — Radiotelevisiun Svizra Rumantscha (Romansh)</span>
+                        </label>
+                        <label class="emby-checkbox-label">
+                            <input id="buSWI" type="checkbox" is="emby-checkbox" data-bu="SWI" />
+                            <span>SWI — swissinfo.ch (International)</span>
+                        </label>
                    </div>
                    <div class="selectContainer">
                        <label class="selectLabel" for="QualityPreference">Quality Preference</label>
@ -82,11 +102,6 @@
                        <input id="RecordingOutputPath" name="RecordingOutputPath" type="text" is="emby-input" placeholder="e.g., /media/recordings/srf" />
                        <div class="fieldDescription">Directory where sport livestream recordings will be saved (requires ffmpeg)</div>
                    </div>
-                    <div class="inputContainer">
-                        <label class="inputLabel inputLabelUnfocused" for="LiveStartSegmentsBack">Live Start Offset (segments)</label>
-                        <input id="LiveStartSegmentsBack" name="LiveStartSegmentsBack" type="number" is="emby-input" min="0" max="20" />
-                        <div class="fieldDescription">How many segments back from the live edge livestreams start playing. Fixes jumpy/stalling playback at the start on Android TV. Minimum 3 (RFC requirement); 0 disables it. Default 3.</div>
-                    </div>
                    <br />
                    <h2>Network Settings</h2>
                    <div class="inputContainer">
@ -140,6 +155,12 @@
                .addEventListener('pageshow', function() {
                    Dashboard.showLoadingMsg();
                    ApiClient.getPluginConfiguration(SRFPlayConfig.pluginUniqueId).then(function (config) {
+                        var enabled = (config.EnabledBusinessUnits && config.EnabledBusinessUnits.length)
+                            ? config.EnabledBusinessUnits
+                            : [config.BusinessUnit]; // migrate legacy single value
+                        ['SRF','RTS','RSI','RTR','SWI'].forEach(function(bu) {
+                            document.querySelector('#bu' + bu).checked = enabled.indexOf(bu) !== -1;
+                        });
                        document.querySelector('#QualityPreference').value = config.QualityPreference;
                        document.querySelector('#ContentRefreshIntervalHours').value = config.ContentRefreshIntervalHours;
                        document.querySelector('#ExpirationCheckIntervalHours').value = config.ExpirationCheckIntervalHours;
@ -153,7 +174,6 @@
                        document.querySelector('#ProxyPassword').value = config.ProxyPassword || '';
                        document.querySelector('#PublicServerUrl').value = config.PublicServerUrl || '';
                        document.querySelector('#RecordingOutputPath').value = config.RecordingOutputPath || '';
-                        document.querySelector('#LiveStartSegmentsBack').value = config.LiveStartSegmentsBack != null ? config.LiveStartSegmentsBack : 3;
                        Dashboard.hideLoadingMsg();

                        // Load recordings UI
@ -166,6 +186,11 @@
                .addEventListener('submit', function(e) {
                Dashboard.showLoadingMsg();
                ApiClient.getPluginConfiguration(SRFPlayConfig.pluginUniqueId).then(function (config) {
+                    config.EnabledBusinessUnits = ['SRF','RTS','RSI','RTR','SWI'].filter(function(bu) {
+                        return document.querySelector('#bu' + bu).checked;
+                    });
+                    // Keep legacy field in sync with the first enabled unit for backwards compat.
+                    config.BusinessUnit = config.EnabledBusinessUnits[0] || 'SRF';
                    config.QualityPreference = document.querySelector('#QualityPreference').value;
                    config.ContentRefreshIntervalHours = parseInt(document.querySelector('#ContentRefreshIntervalHours').value);
                    config.ExpirationCheckIntervalHours = parseInt(document.querySelector('#ExpirationCheckIntervalHours').value);
@ -179,7 +204,6 @@
                    config.ProxyPassword = document.querySelector('#ProxyPassword').value;
                    config.PublicServerUrl = document.querySelector('#PublicServerUrl').value;
                    config.RecordingOutputPath = document.querySelector('#RecordingOutputPath').value;
-                    config.LiveStartSegmentsBack = parseInt(document.querySelector('#LiveStartSegmentsBack').value) || 0;
                    ApiClient.updatePluginConfiguration(SRFPlayConfig.pluginUniqueId, config).then(function (result) {
                        Dashboard.processPluginConfigurationUpdateResult(result);
                    });
--- a/Jellyfin.Plugin.SRFPlay/Controllers/StreamProxyController.cs
+++ b/Jellyfin.Plugin.SRFPlay/Controllers/StreamProxyController.cs
@ -225,8 +225,7 @@ public class StreamProxyController : ControllerBase
                queryParams = string.Empty;
            }

-            var isLiveStream = _proxyService.GetStreamMetadata(actualItemId)?.IsLiveStream ?? false;
-            var rewrittenContent = _proxyService.RewriteVariantManifestUrls(manifestContent, baseProxyUrl, queryParams, isLiveStream);
+            var rewrittenContent = _proxyService.RewriteVariantManifestUrls(manifestContent, baseProxyUrl, queryParams);

            // Set cache headers based on stream type (live vs VOD)
            // Variant manifests use stricter no-cache for live streams
--- a/Jellyfin.Plugin.SRFPlay/ScheduledTasks/ContentRefreshTask.cs
+++ b/Jellyfin.Plugin.SRFPlay/ScheduledTasks/ContentRefreshTask.cs
@ -64,8 +64,8 @@ public class ContentRefreshTask : IScheduledTask
                return;
            }

-            // Refresh content for every business unit (one channel per unit).
-            var units = System.Enum.GetValues<Configuration.BusinessUnit>();
+            // Refresh content for every enabled business unit (one channel per unit).
+            var units = config.ResolveEnabledUnits();
            foreach (var unit in units)
            {
                var businessUnit = unit.ToLowerString();
--- a/Jellyfin.Plugin.SRFPlay/Services/Interfaces/IStreamProxyService.cs
+++ b/Jellyfin.Plugin.SRFPlay/Services/Interfaces/IStreamProxyService.cs
@ -71,9 +71,8 @@ public interface IStreamProxyService
    /// <param name="manifestContent">The variant manifest content.</param>
    /// <param name="baseProxyUrl">The base proxy URL (without query params).</param>
    /// <param name="queryParams">Query parameters to append to rewritten URLs (e.g., "?token=abc").</param>
-    /// <param name="isLiveStream">Whether this is a livestream; if so an EXT-X-START offset is injected.</param>
    /// <returns>The rewritten manifest content.</returns>
-    string RewriteVariantManifestUrls(string manifestContent, string baseProxyUrl, string queryParams, bool isLiveStream = false);
+    string RewriteVariantManifestUrls(string manifestContent, string baseProxyUrl, string queryParams);

    /// <summary>
    /// Cleans up old and expired stream mappings.
--- a/Jellyfin.Plugin.SRFPlay/Services/RecordingService.cs
+++ b/Jellyfin.Plugin.SRFPlay/Services/RecordingService.cs
@ -147,12 +147,13 @@ public class RecordingService : IRecordingService, IDisposable
    /// <inheritdoc />
    public async Task<IReadOnlyList<PlayV3TvProgram>> GetUpcomingScheduleAsync(CancellationToken cancellationToken)
    {
-        var units = System.Enum.GetValues<Configuration.BusinessUnit>();
+        var config = Plugin.Instance?.Configuration;
+        var units = config?.ResolveEnabledUnits() ?? new[] { Configuration.BusinessUnit.SRF };

        using var apiClient = _apiClientFactory.CreateClient();

-        // Aggregate sport livestreams across every business unit so the recordings
-        // page shows events from all languages.
+        // Aggregate sport livestreams across every enabled business unit so the recordings
+        // page shows events from all enabled languages.
        var all = new List<PlayV3TvProgram>();
        foreach (var unit in units)
        {
--- a/Jellyfin.Plugin.SRFPlay/Services/StreamProxyService.cs
+++ b/Jellyfin.Plugin.SRFPlay/Services/StreamProxyService.cs
@ -900,15 +900,9 @@ public class StreamProxyService : IStreamProxyService
    /// <param name="manifestContent">The variant manifest content.</param>
    /// <param name="baseProxyUrl">The base proxy URL (without query params).</param>
    /// <param name="queryParams">Query parameters to append to rewritten URLs (e.g., "?token=abc").</param>
-    /// <param name="isLiveStream">Whether this is a livestream; if so an EXT-X-START offset is injected.</param>
    /// <returns>The rewritten manifest content.</returns>
-    public string RewriteVariantManifestUrls(string manifestContent, string baseProxyUrl, string queryParams, bool isLiveStream = false)
+    public string RewriteVariantManifestUrls(string manifestContent, string baseProxyUrl, string queryParams)
    {
-        if (isLiveStream)
-        {
-            manifestContent = InjectLiveStartOffset(manifestContent);
-        }
-
        string RewriteUrl(string url)
        {
            if (url.Contains("://", StringComparison.Ordinal))
@ -959,82 +953,6 @@ public class StreamProxyService : IStreamProxyService
        return result.ToString();
    }

-    /// <summary>
-    /// Injects an <c>#EXT-X-START:TIME-OFFSET</c> tag into a live media playlist so that players
-    /// (notably ExoPlayer on Android TV) begin a few segments back from the volatile live edge
-    /// instead of at the edge itself, which otherwise causes stalling/jumping until a manual skip.
-    /// The offset is sized relative to the playlist's own <c>EXT-X-TARGETDURATION</c> to stay
-    /// RFC 8216 compliant (≥ 3 target durations from the edge for live playlists).
-    /// </summary>
-    /// <param name="manifestContent">The media playlist content.</param>
-    /// <returns>The playlist with the tag injected, or unchanged if it is not applicable.</returns>
-    private string InjectLiveStartOffset(string manifestContent)
-    {
-        var segmentsBack = Plugin.Instance?.Configuration?.LiveStartSegmentsBack ?? 3;
-        if (segmentsBack <= 0)
-        {
-            return manifestContent; // Disabled by config.
-        }
-
-        // Only a media playlist (has segments, no variant list) should carry EXT-X-START.
-        // A master/multivariant playlist or a VOD playlist (#EXT-X-ENDLIST) is left untouched.
-        if (!manifestContent.Contains("#EXTINF", StringComparison.Ordinal)
-            || manifestContent.Contains("#EXT-X-STREAM-INF", StringComparison.Ordinal)
-            || manifestContent.Contains("#EXT-X-ENDLIST", StringComparison.Ordinal))
-        {
-            return manifestContent;
-        }
-
-        // Don't add a second tag if the source already specified a start point.
-        if (manifestContent.Contains("#EXT-X-START", StringComparison.Ordinal))
-        {
-            _logger.LogDebug("Live playlist already contains #EXT-X-START; leaving as-is");
-            return manifestContent;
-        }
-
-        var targetDurationMatch = Regex.Match(manifestContent, @"#EXT-X-TARGETDURATION:(\d+(?:\.\d+)?)");
-        if (!targetDurationMatch.Success
-            || !double.TryParse(
-                targetDurationMatch.Groups[1].Value,
-                System.Globalization.NumberStyles.Float,
-                System.Globalization.CultureInfo.InvariantCulture,
-                out var targetDuration)
-            || targetDuration <= 0)
-        {
-            _logger.LogDebug("Could not read EXT-X-TARGETDURATION; skipping EXT-X-START injection");
-            return manifestContent;
-        }
-
-        // RFC 8216: TIME-OFFSET SHOULD NOT be within 3 target durations of the live edge.
-        var clampedSegments = Math.Max(3, segmentsBack);
-        var offsetSeconds = clampedSegments * targetDuration;
-        var startTag = string.Format(
-            System.Globalization.CultureInfo.InvariantCulture,
-            "#EXT-X-START:TIME-OFFSET=-{0:0.###},PRECISE=YES",
-            offsetSeconds);
-
-        _logger.LogInformation(
-            "Injecting {StartTag} into live playlist (targetDuration={TargetDuration}s, segmentsBack={SegmentsBack})",
-            startTag,
-            targetDuration,
-            clampedSegments);
-
-        // Insert after the #EXTM3U header so it sits with the other top-level tags.
-        var headerIndex = manifestContent.IndexOf("#EXTM3U", StringComparison.Ordinal);
-        if (headerIndex < 0)
-        {
-            return startTag + "\n" + manifestContent;
-        }
-
-        var lineEnd = manifestContent.IndexOf('\n', headerIndex);
-        if (lineEnd < 0)
-        {
-            return manifestContent + "\n" + startTag;
-        }
-
-        return manifestContent[..(lineEnd + 1)] + startTag + "\n" + manifestContent[(lineEnd + 1)..];
-    }
-
    /// <summary>
    /// Cleans up old and expired stream mappings.
    /// </summary>
--- a/README.md
+++ b/README.md
@ -270,12 +270,7 @@ The plugin includes:

 ### Contributing

-Contributions welcome! This project is hosted on a self-hosted [Gitea](https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay) instance.
-
-**You don't need a separate account** — you can sign in with your existing GitHub account. On the [sign-in page](https://gitea.tourolle.paris/user/login), choose **"Sign in with GitHub"** to register and log in via GitHub OAuth. Once signed in, you can:
-
- **Raise issues** — report bugs or request features on the [issue tracker](https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/issues)
- **Contribute code** — fork the repository, push a branch, and open a pull request
+Contributions welcome!

 ## License

--- a/build.yaml
+++ b/build.yaml
@ -1,6 +1,6 @@
 ---
 name: "SRFPlay"
-guid: "a4b12f86-8c3d-4e9a-b7f2-1d5e6c8a9b4f"
+guid: "eb5d7894-8eef-4b36-aa6f-5d124e828ce1"
 version: "1.0.0.0"
 targetAbi: "10.9.0.0"
 framework: "net8.0"
--- a/manifest-nightly.json
+++ b/manifest-nightly.json
@ -1,29 +0,0 @@
-[
-  {
-    "guid": "a4b12f86-8c3d-4e9a-b7f2-1d5e6c8a9b4f",
-    "name": "SRF Play (Nightly)",
-    "description": "NIGHTLY/UNSTABLE builds of the SRF Play plugin for Jellyfin. Built automatically from the master branch on every push. Expect bugs. For stable releases use the regular SRF Play repository instead.",
-    "overview": "Nightly builds of SRF Play for Jellyfin",
-    "owner": "dtourolle",
-    "category": "Live TV",
-    "imageUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/raw/branch/master/assests/main%20logo.png",
-    "versions": [
-      {
-        "version": "1.0.20260627.189",
-        "changelog": "Nightly build 1.0.20260627.189 (7c81ef9)",
-        "targetAbi": "10.9.0.0",
-        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260627.189.zip",
-        "checksum": "553ac3f806bce24e5aae3b2c8d17395b",
-        "timestamp": "2026-06-27T13:46:17Z"
-      },
-      {
-        "version": "1.0.20260627.185",
-        "changelog": "Nightly build 1.0.20260627.185 (1101385)",
-        "targetAbi": "10.9.0.0",
-        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.20260627.185.zip",
-        "checksum": "577af725ca202bec555bf51905b75913",
-        "timestamp": "2026-06-27T09:30:57Z"
-      }
-    ]
-  }
-]
--- a/manifest.json
+++ b/manifest.json
@ -8,22 +8,6 @@
    "category": "Live TV",
    "imageUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/raw/branch/master/assests/main%20logo.png",
    "versions": [
-      {
-        "version": "1.1.0",
-        "changelog": "Release 1.1.0",
-        "targetAbi": "10.9.0.0",
-        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/v1.1.0/srfplay_1.1.0.0.zip",
-        "checksum": "2094b00b29f79e7625fcd3ebf046674f",
-        "timestamp": "2026-06-27T09:33:04Z"
-      },
-      {
-        "version": "0.0.0.0",
-        "changelog": "Latest Build",
-        "targetAbi": "10.9.0.0",
-        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
-        "checksum": "2ed3281990b56fbfb5f75a1ee82a2f55",
-        "timestamp": "2026-06-27T09:01:57Z"
-      },
      {
        "version": "1.0.32",
        "changelog": "Release 1.0.32",
@ -32,6 +16,14 @@
        "checksum": "82f53848f2e2b15a35ea731ee69ee402",
        "timestamp": "2026-06-27T07:16:38Z"
      },
+      {
+        "version": "0.0.0.0",
+        "changelog": "Latest Build",
+        "targetAbi": "10.9.0.0",
+        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
+        "checksum": "a3848128ff37d68f97493c33538a4d25",
+        "timestamp": "2026-06-27T07:15:26Z"
+      },
      {
        "version": "1.0.31",
        "changelog": "Release 1.0.31",
@ -40,6 +32,14 @@
        "checksum": "4e499de15687e6e328ddca41c6192485",
        "timestamp": "2026-06-27T06:54:01Z"
      },
+      {
+        "version": "0.0.0.0",
+        "changelog": "Latest Build",
+        "targetAbi": "10.9.0.0",
+        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
+        "checksum": "1a8b8b018ff6bcdb8da4783b74253fc4",
+        "timestamp": "2026-06-27T06:52:52Z"
+      },
      {
        "version": "1.0.30",
        "changelog": "Release 1.0.30",
@ -48,6 +48,14 @@
        "checksum": "06731df9ba3d2dab53885c9c8ac95fa6",
        "timestamp": "2026-05-03T16:44:57Z"
      },
+      {
+        "version": "0.0.0.0",
+        "changelog": "Latest Build",
+        "targetAbi": "10.9.0.0",
+        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
+        "checksum": "834e9f57206eee47ec9607ef6f65d17b",
+        "timestamp": "2026-05-03T16:39:53Z"
+      },
      {
        "version": "1.0.29",
        "changelog": "Release 1.0.29",
@ -56,6 +64,14 @@
        "checksum": "fb745388e64299497262d9ad370d8823",
        "timestamp": "2026-05-03T16:07:24Z"
      },
+      {
+        "version": "0.0.0.0",
+        "changelog": "Latest Build",
+        "targetAbi": "10.9.0.0",
+        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
+        "checksum": "7471a63c69deb5b9a31343bb6c49075f",
+        "timestamp": "2026-05-03T16:05:37Z"
+      },
      {
        "version": "1.0.27",
        "changelog": "Release 1.0.27",
@ -64,6 +80,14 @@
        "checksum": "1e15e35452f7b82bf74d8c3560c15949",
        "timestamp": "2026-03-07T16:40:17Z"
      },
+      {
+        "version": "0.0.0.0",
+        "changelog": "Latest Build",
+        "targetAbi": "10.9.0.0",
+        "sourceUrl": "https://gitea.tourolle.paris/dtourolle/jellyfin-srfPlay/releases/download/latest/srfplay_1.0.0.0.zip",
+        "checksum": "c7e868d23293adcc21d72e735094d9d6",
+        "timestamp": "2026-03-07T16:28:38Z"
+      },
      {
        "version": "1.0.25",
        "changelog": "Release 1.0.25",