diff --git a/.github/ISSUE_TEMPLATE/------channel-request.yml b/.github/ISSUE_TEMPLATE/------channel-request.yml
index 7e383a4748..0452b452d1 100644
--- a/.github/ISSUE_TEMPLATE/------channel-request.yml
+++ b/.github/ISSUE_TEMPLATE/------channel-request.yml
@@ -1,5 +1,6 @@
-name: \U0001F4FA Channel Request
+name: 📺 Channel Request
 description: Request to add a channel into the playlist
+title: "Add: "
 labels: [ "channel request" ]
 
 body:
diff --git a/.github/ISSUE_TEMPLATE/-----broken-stream.yml b/.github/ISSUE_TEMPLATE/-----broken-stream.yml
new file mode 100644
index 0000000000..a532733d85
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/-----broken-stream.yml
@@ -0,0 +1,76 @@
+name: 🛠 Broken Stream
+description: Report a broken stream
+title: "Replace: "
+labels: [ "broken stream" ]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+         Please fill out the issue template as much as you can so we could efficiently process your request
+         **IMPORTANT**: An issue may contain a request for only one channel, otherwise it will be closed
+         
+         Channels present in this repository come from variety of sources, some may have overbalanced load at times, temporal issues or just be far away from your location to play smoothly.
+         Please wait for a few hours at least before filling this form.
+         
+  - type: checkboxes
+    id: preliminary
+    attributes:
+     label: I have verified that
+     options:
+      - label: I use the GitHub playlist link and not a downloaded/cached version of the file
+        required: true
+      - label: My TV player has updated this playlist after 0:00 GMT and is set to update it daily
+        required: true
+      - label: I am aware that the channel source may have temporal outages. It is broken/absent from the playlist for couple of hours or days 
+        required: true
+        
+  - type: input
+    id: name
+    attributes:
+      label: Channel Name
+      description: Full name of the channel. Please use the exact name, as in how it appears in the playlist.
+      placeholder: 'Fox Life Russia'
+    validations:
+      required: true
+
+  - type: dropdown
+    id: reason
+    attributes:
+      label: What happened to the stream?
+      options:
+        - It is now offline (disappeared from the playlist)
+        - It is stuck at a single frame/the same segment
+        - I see visual artifacts
+        - It is buffering to unplayable point
+    validations:
+      required: true
+      
+  - type: input
+    id: playlist
+    attributes:
+      label: Playlist
+      description: What playlist was used to get the channel from?
+      placeholder: 'ex. https://iptv-org.github.io/iptv/countries/au.m3u'
+    validations:
+      required: true
+      
+  - type: input
+    id: link
+    attributes:
+      label: Broken Link
+      description: Please specify the broken link from a playlist if you can
+      placeholder: 'ex. https://lnc-kdfw-fox-aws.tubi.video/index.m3u8'
+      
+  - type: input
+    id: alt
+    attributes:
+      label: Possible Replacement
+      description: If you know an alternate non-protected source or the way to fix current stream please let us know 
+      placeholder: 'ex. https://lnc-kdfw-fox-aws.tubi.video/index.m3u8'
+      
+  - type: input
+    id: notes
+    attributes:
+      label: Notes
+      placeholder: 'Anything else we should know?'
diff --git a/.github/ISSUE_TEMPLATE/-----bug-report.md b/.github/ISSUE_TEMPLATE/-----bug-report.md
deleted file mode 100644
index cb7b32fcd0..0000000000
--- a/.github/ISSUE_TEMPLATE/-----bug-report.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: '🐞 Bug Report'
-about: Report an error in this repository
-title: 'Fix: xxx'
-labels: bug
-assignees: ''
----
-
-<!-- Please describe the error in as much detail as possible so that we can fix it quickly -->
diff --git a/.github/ISSUE_TEMPLATE/----broken-stream.md b/.github/ISSUE_TEMPLATE/----broken-stream.md
deleted file mode 100644
index 3f4b0cff09..0000000000
--- a/.github/ISSUE_TEMPLATE/----broken-stream.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: '🛠 Broken Stream'
-about: Report a broken stream
-title: ''
-labels: broken stream
-assignees: ''
----
-
-<!-- Please fill out the information in this issue template so that we can
-efficiently process your request -->
-
-<!-- IMPORTANT: An issue may contain a request for only one channel, otherwise it will be closed -->
-
-**_Channel Name:_** xxx
-**_Country:_** xxx
-**_Broken Link (from playlist):_** xxx
-**_Possible Replacement (optional):_** xxx
-**_Notes (optional):_** xxx
diff --git a/.github/ISSUE_TEMPLATE/----bug-report.yml b/.github/ISSUE_TEMPLATE/----bug-report.yml
new file mode 100644
index 0000000000..accafd41fe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/----bug-report.yml
@@ -0,0 +1,22 @@
+name: 🐞 Bug Report
+description: Report an error in this repository
+title: "Fix: "
+labels: [ "bug" ]
+assignees:
+  - freearhey
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+       This form is **ONLY** intended for auto-update, channel sorting and other automation scripts related issues.
+       If you're experiencing problems viewing a channel, **this is not the right form**. Please fill a [Broken stream](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=broken+stream&template=-----broken-stream.yml&title=Fix%3A+) form instead.
+
+       Please describe the error in as much detail as possible so that we can fix it quickly.
+
+  - type: textarea
+    id: bug
+    attributes:
+      label: Describe your issue
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/--remove-channel.md b/.github/ISSUE_TEMPLATE/--remove-channel.md
deleted file mode 100644
index 6cc3a0a2b8..0000000000
--- a/.github/ISSUE_TEMPLATE/--remove-channel.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: "\U0001F6A8 Remove Channel"
-about: Request to remove a channel
-title: 'Remove: xxx'
-labels: DMCA
-assignees: ''
----
-
-<!-- Please fill out the information in this issue template so that we can
-efficiently process your request -->
-
-**_Channel Name:_** xxx
-**_DMCA Notice (link):_** xxx
diff --git a/.github/ISSUE_TEMPLATE/--remove-channel.yml b/.github/ISSUE_TEMPLATE/--remove-channel.yml
new file mode 100644
index 0000000000..3495957012
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/--remove-channel.yml
@@ -0,0 +1,34 @@
+name: 🚨 Remove Channel
+description: Request to remove a channel
+title: "Remove: "
+labels: [ "DMCA" ]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+       Please fill out the issue template as much as you can so we could efficiently process your request
+
+  - type: input
+    id: name
+    attributes:
+      label: Channel Names
+      description: Full name of every channel to be removed
+      placeholder: 'Fox Life Russia'
+    validations:
+      required: true
+     
+  - type: input
+    id: link
+    attributes:
+      label:  DMCA Notice
+      description: A link to your published complaint form that must be filled here https://github.com/contact/dmca
+      placeholder: 'https://github.com/github/dmca/blob/3ce1c9402c6b7e46dcbbea6ff866d6a44e75c72a/2021/03/2021-03-26-sky-italia.md'
+    validations:
+      required: true
+         
+  - type: input
+    id: notes
+    attributes:
+      label: Notes
+      placeholder: 'Anything else we should know?'
diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index dec1f3be64..49a504d1bf 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -4,279 +4,120 @@ on:
   schedule:
     - cron: '0 0,12 * * *'
 jobs:
-  create-branch:
+  setup:
     runs-on: ubuntu-latest
-    outputs:
-      branch_name: ${{ steps.set-branch-name.outputs.branch_name }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.ref }}
-      - name: Set Branch Name
-        id: set-branch-name
-        run: echo "::set-output name=branch_name::$(date +'bot/auto-update-%Y%m%d%H%M00')"
-      - name: Create Branch
-        uses: peterjgrainger/action-create-branch@v2.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          branch: ${{ steps.set-branch-name.outputs.branch_name }}
-  create-matrix:
-    runs-on: ubuntu-latest
-    needs: create-branch
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Setup Node
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        if: ${{ !env.ACT }}
         with:
           node-version: '14'
           cache: 'npm'
-      - name: Install Dependencies
-        run: npm install
-      - name: Create Matrix
-        id: set-matrix
-        run: node scripts/create-matrix.js
-  format:
+      - run: npm install
+      - run: node scripts/commands/create-database.js
+      - run: node scripts/commands/create-matrix.js
+        id: create-matrix
+      - uses: actions/upload-artifact@v2
+        with:
+          name: database
+          path: scripts/channels.db
+    outputs:
+      matrix: ${{ steps.create-matrix.outputs.matrix }}
+  load:
     runs-on: ubuntu-latest
-    needs: [create-matrix, create-branch]
+    needs: setup
     continue-on-error: true
     strategy:
       fail-fast: false
-      matrix: ${{fromJSON(needs.create-matrix.outputs.matrix)}}
+      matrix: ${{ fromJson(needs.setup.outputs.matrix) }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+      - uses: actions/download-artifact@v2
         with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Setup FFmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v1
-      - name: Setup Node
-        uses: actions/setup-node@v2
+          name: database
+          path: scripts
+      - uses: FedericoCarboni/setup-ffmpeg@v1
+      - uses: actions/setup-node@v2
+        if: ${{ !env.ACT }}
         with:
           node-version: '14'
-          cache: 'npm'
-      - name: Install Dependencies
-        run: npm install
-      - name: Format Playlists
-        run: node scripts/format.js --country=${{ matrix.country }} --debug
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+      - run: npm install
+      - run: node scripts/commands/check-streams.js --cluster-id=${{ matrix.cluster_id }}
+      - uses: actions/upload-artifact@v2
         with:
-          name: channels
-          path: channels/${{ matrix.country }}.m3u
-  commit-changes:
+          name: logs
+          path: scripts/logs
+  update:
     runs-on: ubuntu-latest
-    needs: [format, create-branch]
+    needs: load
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+      - run: echo "::set-output name=branch_name::$(date +'bot/auto-update-%s')"
+        id: create-branch-name
+      - run: git config user.name 'iptv-bot[bot]'
+      - run: git config user.email '84861620+iptv-bot[bot]@users.noreply.github.com'
+      - run: git checkout -b ${{ steps.create-branch-name.outputs.branch_name }}
+      - run: curl -L -o scripts/data/codes.json https://iptv-org.github.io/epg/codes.json
+      - uses: actions/download-artifact@v2
         with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
+          name: database
+          path: scripts
+      - uses: actions/download-artifact@v2
         with:
-          name: channels
-          path: channels
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Format playlists'
-          commit_user_name: iptv-bot
-          commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com
-          commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>'
-          branch: ${{ needs.create-branch.outputs.branch_name }}
-          file_pattern: channels/*
-  remove-duplicates:
-    runs-on: ubuntu-latest
-    needs: [commit-changes, create-branch]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Setup Node
-        uses: actions/setup-node@v2
+          name: logs
+          path: scripts/logs
+      - uses: actions/setup-node@v2
+        if: ${{ !env.ACT }}
         with:
           node-version: '14'
-          cache: 'npm'
-      - name: Install Dependencies
-        run: npm install
-      - name: Remove Duplicates
-        run: node scripts/remove-duplicates.js
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
+      - run: npm install
+      - run: node scripts/commands/update-database.js
+      - uses: actions/upload-artifact@v2
         with:
-          commit_message: '[Bot] Remove duplicates'
-          commit_user_name: iptv-bot
-          commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com
-          commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>'
-          branch: ${{ needs.create-branch.outputs.branch_name }}
-          file_pattern: channels/*
-  sort:
-    runs-on: ubuntu-latest
-    needs: [remove-duplicates, create-branch]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+          name: database
+          path: scripts/channels.db
+      - run: node scripts/commands/update-playlists.js
+      - run: git add channels/*
+      - run: git commit -m "[Bot] Update playlists"
+      - run: node scripts/commands/generate-playlists.js
+      - uses: actions/upload-artifact@v2
         with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'npm'
-      - name: Install Dependencies
-        run: npm install
-      - name: Sort Channels
-        run: node scripts/sort.js
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Sort channels'
-          commit_user_name: iptv-bot
-          commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com
-          commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>'
-          branch: ${{ needs.create-branch.outputs.branch_name }}
-          file_pattern: channels/*
-  filter:
-    runs-on: ubuntu-latest
-    needs: [sort, create-branch]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'npm'
-      - name: Install Dependencies
-        run: npm install
-      - name: Filter Playlists
-        run: node scripts/filter.js
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Filter channels'
-          commit_user_name: iptv-bot
-          commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com
-          commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>'
-          branch: ${{ needs.create-branch.outputs.branch_name }}
-          file_pattern: channels/*
-  generate:
-    runs-on: ubuntu-latest
-    needs: [filter, create-branch]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'npm'
-      - name: Install Dependencies
-        run: npm install
-      - name: Generate Playlists
-        run: node scripts/generate.js
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: gh-pages
-          path: .gh-pages/
-  deploy:
-    runs-on: ubuntu-latest
-    needs: [generate, create-branch]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: gh-pages
-          path: .gh-pages
-      - name: Generate Token
-        uses: tibdex/github-app-token@v1
-        id: generate-token
+          name: logs
+          path: scripts/logs
+      - run: node scripts/commands/update-readme.js
+      - run: git add README.md
+      - run: git commit -m "[Bot] Update README.md"
+      - run: git push -u origin ${{ steps.create-branch-name.outputs.branch_name }}
+      - uses: tibdex/github-app-token@v1
+        if: ${{ !env.ACT }}
+        id: create-app-token
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
-      - name: Deploy to GitHub Pages
-        if: ${{ github.ref == 'refs/heads/master' }}
-        uses: JamesIves/github-pages-deploy-action@4.1.1
+      - uses: repo-sync/pull-request@v2
+        if: ${{ !env.ACT }}
+        id: pull-request
         with:
-          branch: gh-pages
-          folder: .gh-pages
-          token: ${{ steps.generate-token.outputs.token }}
-          git-config-name: iptv-bot
-          git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com
-          commit-message: '[Bot] Deploy to GitHub Pages'
-  update-readme:
-    runs-on: ubuntu-latest
-    needs: [generate, create-branch]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'npm'
-      - name: Install Dependencies
-        run: npm install
-      - name: Update README.md
-        run: node scripts/update-readme.js
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Update README.md'
-          commit_user_name: iptv-bot
-          commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com
-          commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>'
-          branch: ${{ needs.create-branch.outputs.branch_name }}
-          file_pattern: README.md
-  pull-request:
-    if: ${{ github.ref == 'refs/heads/master' }}
-    needs: [update-readme, create-branch]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ needs.create-branch.outputs.branch_name }}
-      - name: Generate Token
-        uses: tibdex/github-app-token@v1
-        id: generate-token
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-      - name: Create Pull Request
-        id: pr
-        uses: repo-sync/pull-request@v2
-        with:
-          source_branch: ${{ needs.create-branch.outputs.branch_name }}
+          github_token: ${{ steps.create-app-token.outputs.token }}
+          source_branch: ${{ steps.create-branch-name.outputs.branch_name }}
           destination_branch: 'master'
-          pr_title: '[Bot] Update playlists'
+          pr_title: '[Bot] Daily update'
           pr_body: |
             This pull request is created by [auto-update][1] workflow.
 
             [1]: https://github.com/iptv-org/iptv/actions/runs/${{ github.run_id }}
-          github_token: ${{ steps.generate-token.outputs.token }}
-      - name: Merge Pull Request
-        uses: juliangruber/merge-pull-request-action@v1
+      - uses: juliangruber/merge-pull-request-action@v1
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           github-token: ${{ secrets.PAT }}
-          number: ${{ steps.pr.outputs.pr_number }}
+          number: ${{ steps.pull-request.outputs.pr_number }}
           method: squash
+      - uses: JamesIves/github-pages-deploy-action@4.1.1
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          branch: gh-pages
+          folder: .gh-pages
+          token: ${{ steps.create-app-token.outputs.token }}
+          git-config-name: iptv-bot[bot]
+          git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com
+          commit-message: '[Bot] Generate playlists'
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index a557daedf1..6792edc057 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -4,12 +4,15 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, edited]
 jobs:
-  lint:
+  check:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Dependencies
-        run: npm install
-      - name: Check Playlists
-        run: npm run lint
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        if: ${{ !env.ACT }}
+        with:
+          node-version: '14'
+          cache: 'npm'
+      - run: npm install
+      - run: npm run lint
+      - run: npm run validate
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index a030d6bc67..ff86dc62ad 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -2,65 +2,38 @@ name: cleanup
 on:
   workflow_dispatch:
 jobs:
-  create-branch:
+  cleanup:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.ref }}
-      - name: Create Branch
-        uses: peterjgrainger/action-create-branch@v2.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          branch: 'bot/cleanup'
-  remove-broken-links:
-    runs-on: ubuntu-latest
-    needs: create-branch
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/cleanup
-      - name: Install Dependencies
-        run: npm install
-      - name: Remove Broken Links
-        run: node scripts/remove-broken-links.js
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[Bot] Remove broken links'
-          commit_user_name: iptv-bot
-          commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com
-          commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>'
-          branch: bot/cleanup
-          file_pattern: channels/*
-  pull-request:
-    if: ${{ github.ref == 'refs/heads/master' }}
-    runs-on: ubuntu-latest
-    needs: remove-broken-links
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: bot/cleanup
-      - name: Generate Token
-        uses: tibdex/github-app-token@v1
-        id: generate-token
+      - uses: actions/checkout@v2
+      - run: echo "::set-output name=branch_name::$(date +'bot/cleanup-%s')"
+        id: create-branch-name
+      - run: |
+          git config user.name 'iptv-bot[bot]'
+          git config user.email '84861620+iptv-bot[bot]@users.noreply.github.com'
+      - run: git checkout -b ${{ steps.create-branch-name.outputs.branch_name }}
+      - run: npm install
+      - run: node scripts/commands/create-database.js
+      - run: node scripts/commands/cleanup-database.js
+      - run: node scripts/commands/update-playlists.js
+      - run: |
+          git add channels/*
+          git commit -m "[Bot] Update playlists"
+      - uses: tibdex/github-app-token@v1
+        if: ${{ !env.ACT }}
+        id: create-app-token
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
-      - name: Create Pull Request
-        id: pr
-        uses: repo-sync/pull-request@v2
+      - uses: repo-sync/pull-request@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        id: pull-request
         with:
-          source_branch: 'bot/cleanup'
+          github_token: ${{ steps.create-app-token.outputs.token }}
+          source_branch: ${{ steps.create-branch-name.outputs.branch_name }}
           destination_branch: 'master'
-          pr_title: '[Bot] Cleaning playlists'
+          pr_title: '[Bot] Remove broken links'
           pr_body: |
             This pull request is created by [cleanup][1] workflow.
 
             [1]: https://github.com/iptv-org/iptv/actions/runs/${{ github.run_id }}
-          pr_draft: true
-          github_token: ${{ steps.generate-token.outputs.token }}
diff --git a/.gitignore b/.gitignore
index b512c09d47..91905e1feb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
-node_modules
\ No newline at end of file
+node_modules
+database
+.artifacts
+.secrets
+.actrc
+.DS_Store
\ No newline at end of file
diff --git a/.readme/.gitignore b/.readme/.gitignore
index 778ddef3ca..a2ac441348 100644
--- a/.readme/.gitignore
+++ b/.readme/.gitignore
@@ -1,3 +1,4 @@
 _categories.md
 _countries.md
-_languages.md
\ No newline at end of file
+_languages.md
+_regions.md
\ No newline at end of file
diff --git a/.readme/supported-region-codes.md b/.readme/supported-regions.md
similarity index 92%
rename from .readme/supported-region-codes.md
rename to .readme/supported-regions.md
index a575740c6d..0b0a9656c6 100644
--- a/.readme/supported-region-codes.md
+++ b/.readme/supported-regions.md
@@ -1,4 +1,4 @@
-## Supported Region Codes
+## Supported Regions
 
 | Code                                                                     | Description                        |
 | ------------------------------------------------------------------------ | ---------------------------------- |
@@ -10,11 +10,11 @@
 | [CARIB](https://en.wikipedia.org/wiki/Caribbean)                         | Caribbean                          |
 | [CAS](https://en.wikipedia.org/wiki/Central_Asia)                        | Central Asia                       |
 | [CIS](https://en.wikipedia.org/wiki/Commonwealth_of_Independent_States)  | Commonwealth of Independent States |
-| [EMEA](https://en.wikipedia.org/wiki/Europe,_the_Middle_East_and_Africa) | Europe, Middle East and Africa     |
+| [EMEA](https://en.wikipedia.org/wiki/Europe,_the_Middle_East_and_Africa) | Europe, the Middle East and Africa |
 | [EUR](https://en.wikipedia.org/wiki/Europe)                              | Europe                             |
 | [HISPAM](https://en.wikipedia.org/wiki/Hispanic_America)                 | Hispanic America                   |
 | [LATAM](https://en.wikipedia.org/wiki/Latin_America)                     | Latin America                      |
-| [MAGHRIB](https://en.wikipedia.org/wiki/Maghreb)                         | Maghrib                            |
+| [MAGHREB](https://en.wikipedia.org/wiki/Maghreb)                         | Maghreb                            |
 | [MENA](https://en.wikipedia.org/wiki/MENA)                               | Middle East and North Africa       |
 | [MIDEAST](https://en.wikipedia.org/wiki/Middle_East)                     | Middle East                        |
 | [NORAM](https://en.wikipedia.org/wiki/North_America)                     | North America                      |
diff --git a/.readme/supported-statuses.md b/.readme/supported-statuses.md
new file mode 100644
index 0000000000..ec5f076065
--- /dev/null
+++ b/.readme/supported-statuses.md
@@ -0,0 +1,8 @@
+## Supported Statuses
+
+| Label       | Description                                       |
+| ----------- | ------------------------------------------------- |
+| Geo-blocked | Channel is only available in selected countries.  |
+| Not 24/7    | Broadcast is not available 24 hours a day.        |
+| Timeout     | Server does not respond for more than 60 seconds. |
+| Offline     | The broadcast does not work for any other reason. |
diff --git a/.readme/template.md b/.readme/template.md
index 43dce5682d..ba3185499e 100644
--- a/.readme/template.md
+++ b/.readme/template.md
@@ -14,9 +14,10 @@ To watch IPTV you just need to paste this link `https://iptv-org.github.io/iptv/
 
 Also you can instead use one of these playlists:
 
-- `https://iptv-org.github.io/iptv/index.country.m3u` (grouped by country)
 - `https://iptv-org.github.io/iptv/index.category.m3u` (grouped by category)
 - `https://iptv-org.github.io/iptv/index.language.m3u` (grouped by language)
+- `https://iptv-org.github.io/iptv/index.country.m3u` (grouped by country)
+- `https://iptv-org.github.io/iptv/index.region.m3u` (grouped by region)
 - `https://iptv-org.github.io/iptv/index.nsfw.m3u` (includes adult channels)
 
 Or select one of the playlists from the list below.
@@ -43,6 +44,17 @@ Or select one of the playlists from the list below.
 
 </details>
 
+### Playlists by region
+
+<details>
+<summary>Expand</summary>
+<br>
+
+<!-- prettier-ignore -->
+#include "./.readme/_regions.md"
+
+</details>
+
 ### Playlists by country
 
 <details>
@@ -77,11 +89,10 @@ If successful, you should get the following response:
     "name": "CNN",
     "logo": "https://i.imgur.com/ilZJT5s.png",
     "url": "http://ott-cdn.ucom.am/s27/index.m3u8",
-    "category": "News",
-    "languages": [
+    "categories": [
       {
-        "code": "eng",
-        "name": "English"
+        "name": "News",
+        "slug": "news"
       }
     ],
     "countries": [
@@ -94,6 +105,12 @@ If successful, you should get the following response:
         "name": "Canada"
       }
     ],
+    "languages": [
+      {
+        "code": "eng",
+        "name": "English"
+      }
+    ],
     "tvg": {
       "id": "cnn.us",
       "name": "CNN",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d835b3e83..6a330d4eaa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,15 +11,15 @@ Before submitting your contribution, please make sure to take a moment and read
 
 ### Request a Channel
 
-To request a channel, create an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=channel+request&template=------channel-request.md&title=Add%3A+xxx) and complete all details requested. (**IMPORTANT:** the issue should contain a request for only one channel, otherwise it will be closed immediately). Understand that our community of volunteers will try to help you, but if a public link cannot be found, there is little we can do.
+To request a channel, create an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=channel+request&template=------channel-request.yml&title=Add%3A+) and complete all details requested. Understand that our community of volunteers will try to help you, but if a public link cannot be found, there is little we can do. (**IMPORTANT:** the issue should contain a request for only one channel, otherwise it will be closed immediately)
 
 ### Report a Broken Stream
 
-To report a broadcast that is not working, create an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=broken+stream&template=----broken-stream.md&title=Fix%3A+xxx) with a description of the channel (**IMPORTANT:** an issue should contain a report for only one channel, otherwise it will be closed immediately).
+To report a broadcast that is not working, create an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=broken+stream&template=-----broken-stream.yml&title=Replace%3A+) with a description of the channel. (**IMPORTANT:** an issue should contain a report for only one channel, otherwise it will be closed immediately)
 
 ### Request Channel Removal
 
-Publish your DMCA notice somewhere and send us a link to it through this [form](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=DMCA&template=--remove-channel.md&title=Remove%3A+xxx).
+Publish your DMCA notice somewhere and send us a link to it through this [form](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=DMCA&template=--remove-channel.yml&title=Remove%3A+).
 
 ## Pull Request Guidelines
 
@@ -29,12 +29,13 @@ If you would like to replace a broken stream or add a new one, please do the fol
 
 - make sure that the link you want to add works by using a program like [VLC media player](https://www.videolan.org/vlc/index.html)
 - check if the channel is working outside your country by using a VPN or use a service like [streamtest.in](https://streamtest.in/)
-- if the broadcast is not available outside of a certain country, add the label `[Geo-blocked]` to the end of the channel name
 - find out from which country the channel is being broadcasted. This information can usually be found on [lyngsat.com](https://www.lyngsat.com/search.html) or [wikipedia.org](https://www.wikipedia.org/). If you are unable to determine which country the channel belongs to, add the channel onto the `channels/unsorted.m3u` playlist
 - find the corresponding [ISO_3166-2 code](https://en.wikipedia.org/wiki/ISO_3166-2) for the country
 - open the `/channels` folder and find the file that has the same code in its name and open it
 - if broken, find the broken link in this file and replace it with working one
 - if new, at the very end of this file add a link to the channel with a description
+- if the broadcast is not available outside of a certain country, add the label `[Geo-blocked]` to the end of the channel name and list these countries in the `tvg-country` attribute
+- if the broadcast is not available 24 hours a day, add the label `[Not 24/7]`
 - commit all changes and send a pull request
 
 ### Add a Category to a Channel
@@ -77,7 +78,7 @@ If a channel is broadcasted in several countries at once, you can specify them a
 http://example.com/cnn.m3u8
 ```
 
-If a channel is broadcast for an entire region, you can use one of the [supported region code](https://github.com/iptv-org/iptv/blob/master/.readme/supported-region-codes.md) to avoid listing all countries. In this case the channel will be added to the playlists of all countries from that region.
+If a channel is broadcast for an entire region, you can use one of the [supported region code](https://github.com/iptv-org/iptv/blob/master/.readme/supported-regions.md) to avoid listing all countries. In this case the channel will be added to the playlists of all countries from that region.
 
 In case the channel is broadcast worldwide you can use the code `INT`:
 
@@ -117,31 +118,31 @@ For a channel to be approved, its description must follow this template:
 STREAM_URL
 ```
 
-| Attribute           | Description                                                                                                                                                                                                                                                                                                                                                                                   |
-| ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `EPG_ID`            | Channel ID that is used to load EPG. Must match `id` from the EPG file. (optional)                                                                                                                                                                                                                                                                                                            |
-| `COUNTRY`           | The code of the country in which the channel is broadcast. The code of the country must conform to the standard [ISO_3166-2](https://en.wikipedia.org/wiki/ISO_3166-2). If the channel is broadcast in several countries you can list them separated by a semicolon. You can also use one of these [region codes](#supported-region-codes). (optional)                                        |
-| `LANGUAGE`          | Channel language. The name of the language must conform to the standard [ISO 639-3](https://iso639-3.sil.org/code_tables/639/data?title=&field_iso639_cd_st_mmbrshp_639_1_tid=94671&name_3=&field_iso639_element_scope_tid=All&field_iso639_language_type_tid=51&items_per_page=500). If the channel is broadcast in several languages you can list them separated by a semicolon. (optional) |
-| `LOGO_URL`          | The logo of the channel that will be displayed if the player supports it. Supports files in png, jpeg and gif format. (optional)                                                                                                                                                                                                                                                              |
-| `CATEGORY`          | The category to which the channel belongs. The list of currently supported categories can be found [here](https://github.com/iptv-org/iptv#playlists-by-category). (optional)                                                                                                                                                                                                                 |
-| `FULL_NAME`         | Full name of the channel. It is recommended to use the name listed on [lyngsat](https://www.lyngsat.com/search.html) or [wikipedia](https://www.wikipedia.org/) if possible. May contain any characters except round and square brackets.                                                                                                                                                     |
-| `STREAM_TIME_SHIFT` | Must be specified if the channel is broadcast with a shift in time relative to the main stream. Should only contain a number and a sign. (optional)                                                                                                                                                                                                                                           |
-| `ALTERNATIVE_NAME`  | Can be used to specify a short name or name in another language. May contain any characters except round and square brackets. (optional)                                                                                                                                                                                                                                                      |
-| `STREAM_RESOLUTION` | The maximum height of the frame with a "p" at the end. In case of VLC Player this information can be found in `Window > Media Information... > Codec Details`. (optional)                                                                                                                                                                                                                     |
-| `STREAM_STATUS`     | Specified if the broadcast for some reason is interrupted or does not work in a particular application. May contain any characters except round and square brackets. (optional)                                                                                                                                                                                                               |
-| `STREAM_URL`        | Channel broadcast URL.                                                                                                                                                                                                                                                                                                                                                                        |
+| Attribute           | Description                                                                                                                                                                                                                                                                                                                                                                                              |
+| ------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `EPG_ID`            | Channel ID that is used to load EPG. The same ID is used in [iptv-org/epg](https://iptv-org.github.io/epg/index.html) to search for the corresponding program. (optional)                                                                                                                                                                                                                                |
+| `COUNTRY`           | The code of the country in which the channel is broadcast. The code of the country must conform to the standard [ISO_3166-2](https://en.wikipedia.org/wiki/ISO_3166-2). If the channel is broadcast in several countries you can list them separated by a semicolon. You can also use one of these [region codes](https://github.com/iptv-org/iptv/blob/master/.readme/supported-regions.md). (optional) |
+| `LANGUAGE`          | Channel language. The name of the language must conform to the standard [ISO 639-3](https://iso639-3.sil.org/code_tables/639/data?title=&field_iso639_cd_st_mmbrshp_639_1_tid=94671&name_3=&field_iso639_element_scope_tid=All&field_iso639_language_type_tid=51&items_per_page=500). If the channel is broadcast in several languages you can list them separated by a semicolon. (optional)            |
+| `LOGO_URL`          | The logo of the channel that will be displayed if the player supports it. Supports files in png, jpeg and gif format. (optional)                                                                                                                                                                                                                                                                         |
+| `CATEGORY`          | The category to which the channel belongs. The list of currently supported categories can be found [here](https://github.com/iptv-org/iptv/blob/master/.readme/supported-categories.md). (optional)                                                                                                                                                                                                      |
+| `FULL_NAME`         | Full name of the channel. It is recommended to use the name listed on [lyngsat](https://www.lyngsat.com/search.html) or [wikipedia](https://www.wikipedia.org/) if possible. May contain any characters except round and square brackets.                                                                                                                                                                |
+| `STREAM_TIME_SHIFT` | Must be specified if the channel is broadcast with a shift in time relative to the main stream. Should only contain a number and a sign. (optional)                                                                                                                                                                                                                                                      |
+| `ALTERNATIVE_NAME`  | Can be used to specify a short name or name in another language. May contain any characters except round and square brackets. (optional)                                                                                                                                                                                                                                                                 |
+| `STREAM_RESOLUTION` | The maximum height of the frame with a "p" at the end. In case of VLC Player this information can be found in `Window > Media Information... > Codec Details`. (optional)                                                                                                                                                                                                                                |
+| `STREAM_STATUS`     | Specified if the broadcast for some reason is interrupted or does not work in a particular application. The list of currently supported statuses can be found [here](https://github.com/iptv-org/iptv/blob/master/.readme/supported-statuses.md). (optional)                                                                                                                                             |
+| `STREAM_URL`        | Channel broadcast URL.                                                                                                                                                                                                                                                                                                                                                                                   |
 
 Example:
 
 ```xml
-#EXTINF:-1 tvg-id="example.ua" tvg-country="UA" tvg-language="Ukrainian;Russian" tvg-logo="https://i.imgur.com/bu12f89.png" group-title="Kids",Example TV +3 (Пример ТВ) (720p) [not 24/7]
+#EXTINF:-1 tvg-id="ExampleTVPlus3.ua" tvg-country="UA" tvg-language="Ukrainian;Russian" tvg-logo="https://i.imgur.com/bu12f89.png" group-title="Kids",Example TV +3 (Пример ТВ) (720p) [not 24/7]
 https://example.com/playlist.m3u8
 ```
 
 Also, if necessary, you can specify custom HTTP User-Agent or Referrer via the `#EXTVLCOPT` tag:
 
 ```xml
-#EXTINF:-1 tvg-id="exampletv.us" tvg-country="US" tvg-language="English" tvg-logo="http://example.com/channel-logo.png" group-title="News",Example TV
+#EXTINF:-1 tvg-id="ExampleTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://example.com/channel-logo.png" group-title="News",Example TV
 #EXTVLCOPT:http-referrer=http://example.com/
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64)
 http://example.com/stream.m3u8
@@ -152,29 +153,22 @@ http://example.com/stream.m3u8
 - `.github/`
   - `ISSUE_TEMPLATE/`: issue templates for this repository.
   - `workflows/`
-    - `auto-update.yml`: GitHub workflow that automatically updates all playlists every day.
-    - `check.yml`: GitHub workflow that automatically checks every pull request for syntax errors.
-    - `cleanup.yml`: GitHub workflow that automatically removes broken links every week.
+    - `auto-update.yml`: GitHub workflow that launches daily playlist updates (at 0:00 and 12:00 UTC).
+    - `check.yml`: GitHub workflow that checks every pull request for syntax errors.
+    - `cleanup.yml`: GitHub workflow that removes broken links by request.
+    - `validate.yml`: GitHub workflow that compares channel names with the blocklist each time a pull request is made.
   - `CODE_OF_CONDUCT.md`: rules you shouldn't break if you don't want to get banned.
 - `.readme/`
   - `config.json`: config for the `markdown-include` package, which is used to compile everything into one `README.md` file.
   - `preview.png`: image displayed in the `README.md`.
   - `supported-categories.md`: list of supported categories.
-  - `supported-region-codes.md`: list of supported region codes.
+  - `supported-statuses.md`: list of supported statuses.
+  - `supported-regions.md`: list of supported regions.
   - `template.md`: template for `README.md`.
 - `channels/`: contains all channels broken down by the country from which they are broadcast.
   - ...
   - `unsorted.m3u`: playlist with channels not yet sorted.
-- `scripts/`
-  - `data/`: data used in scripts.
-  - `helpers/`: helper scripts.
-  - `create-matrix.js`: used within GitHub workflow to create matrix of files to process.
-  - `filter.js`: used within GitHub workflow to remove blacklisted channels from playlists.
-  - `format.js`: used within GitHub workflow to format channel descriptions.
-  - `generate.js`: used within GitHub workflow to generate all additional playlists.
-  - `remove-broken-links.js`: used in GitHub workflow to remove broken links from the playlist.
-  - `remove-duplicates.js`: used in GitHub workflow to remove duplicates from the playlist.
-  - `sort.js`: used within GitHub workflow to sort channels by name.
-  - `update-readme.js`: used within GitHub workflow to update the `README.md` file.
+- `scripts/`: contains all the scripts used in GitHub workflows.
+- `tests/`: contains tests to check the scripts in the folder above.
 - `CONTRIBUTING.md`: file you are currently reading.
 - `README.md`: project description generated from the contents of the `.readme/` folder.
diff --git a/README.md b/README.md
index 48cbe1803b..287402c3fa 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,10 @@ To watch IPTV you just need to paste this link `https://iptv-org.github.io/iptv/
 
 Also you can instead use one of these playlists:
 
-- `https://iptv-org.github.io/iptv/index.country.m3u` (grouped by country)
 - `https://iptv-org.github.io/iptv/index.category.m3u` (grouped by category)
 - `https://iptv-org.github.io/iptv/index.language.m3u` (grouped by language)
+- `https://iptv-org.github.io/iptv/index.country.m3u` (grouped by country)
+- `https://iptv-org.github.io/iptv/index.region.m3u` (grouped by region)
 - `https://iptv-org.github.io/iptv/index.nsfw.m3u` (includes adult channels)
 
 Or select one of the playlists from the list below.
@@ -29,41 +30,41 @@ Or select one of the playlists from the list below.
 
 <!-- prettier-ignore -->
 <table>
-	<thead>
-		<tr><th align="left">Category</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
-	</thead>
-	<tbody>
-		<tr><td align="left">Auto</td><td align="right">15</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/auto.m3u</code></td></tr>
-		<tr><td align="left">Animation</td><td align="right">30</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/animation.m3u</code></td></tr>
-		<tr><td align="left">Business</td><td align="right">42</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/business.m3u</code></td></tr>
-		<tr><td align="left">Classic</td><td align="right">64</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/classic.m3u</code></td></tr>
-		<tr><td align="left">Comedy</td><td align="right">54</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/comedy.m3u</code></td></tr>
-		<tr><td align="left">Cooking</td><td align="right">35</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/cooking.m3u</code></td></tr>
-		<tr><td align="left">Culture</td><td align="right">16</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/culture.m3u</code></td></tr>
-		<tr><td align="left">Documentary</td><td align="right">46</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/documentary.m3u</code></td></tr>
-		<tr><td align="left">Education</td><td align="right">25</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/education.m3u</code></td></tr>
-		<tr><td align="left">Entertainment</td><td align="right">209</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/entertainment.m3u</code></td></tr>
-		<tr><td align="left">Family</td><td align="right">31</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/family.m3u</code></td></tr>
-		<tr><td align="left">General</td><td align="right">365</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/general.m3u</code></td></tr>
-		<tr><td align="left">Kids</td><td align="right">185</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/kids.m3u</code></td></tr>
-		<tr><td align="left">Legislative</td><td align="right">64</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/legislative.m3u</code></td></tr>
-		<tr><td align="left">Lifestyle</td><td align="right">82</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/lifestyle.m3u</code></td></tr>
-		<tr><td align="left">Local</td><td align="right">808</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/local.m3u</code></td></tr>
-		<tr><td align="left">Movies</td><td align="right">263</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/movies.m3u</code></td></tr>
-		<tr><td align="left">Music</td><td align="right">397</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr>
-		<tr><td align="left">News</td><td align="right">431</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr>
-		<tr><td align="left">Outdoor</td><td align="right">31</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/outdoor.m3u</code></td></tr>
-		<tr><td align="left">Relax</td><td align="right">19</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/relax.m3u</code></td></tr>
-		<tr><td align="left">Religious</td><td align="right">305</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/religious.m3u</code></td></tr>
-		<tr><td align="left">Series</td><td align="right">219</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/series.m3u</code></td></tr>
-		<tr><td align="left">Science</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/science.m3u</code></td></tr>
-		<tr><td align="left">Shop</td><td align="right">51</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/shop.m3u</code></td></tr>
-		<tr><td align="left">Sports</td><td align="right">212</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/sports.m3u</code></td></tr>
-		<tr><td align="left">Travel</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/travel.m3u</code></td></tr>
-		<tr><td align="left">Weather</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/weather.m3u</code></td></tr>
-		<tr><td align="left">XXX</td><td align="right">40</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/xxx.m3u</code></td></tr>
-		<tr><td align="left">Other</td><td align="right">3743</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/other.m3u</code></td></tr>
-	</tbody>
+  <thead>
+    <tr><th align="left">Category</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
+  </thead>
+  <tbody>
+    <tr><td align="left">Animation</td><td align="right">26</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/animation.m3u</code></td></tr>
+    <tr><td align="left">Auto</td><td align="right">15</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/auto.m3u</code></td></tr>
+    <tr><td align="left">Business</td><td align="right">37</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/business.m3u</code></td></tr>
+    <tr><td align="left">Classic</td><td align="right">59</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/classic.m3u</code></td></tr>
+    <tr><td align="left">Comedy</td><td align="right">53</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/comedy.m3u</code></td></tr>
+    <tr><td align="left">Cooking</td><td align="right">33</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/cooking.m3u</code></td></tr>
+    <tr><td align="left">Culture</td><td align="right">16</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/culture.m3u</code></td></tr>
+    <tr><td align="left">Documentary</td><td align="right">45</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/documentary.m3u</code></td></tr>
+    <tr><td align="left">Education</td><td align="right">22</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/education.m3u</code></td></tr>
+    <tr><td align="left">Entertainment</td><td align="right">203</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/entertainment.m3u</code></td></tr>
+    <tr><td align="left">Family</td><td align="right">32</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/family.m3u</code></td></tr>
+    <tr><td align="left">General</td><td align="right">360</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/general.m3u</code></td></tr>
+    <tr><td align="left">Kids</td><td align="right">162</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/kids.m3u</code></td></tr>
+    <tr><td align="left">Legislative</td><td align="right">63</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/legislative.m3u</code></td></tr>
+    <tr><td align="left">Lifestyle</td><td align="right">79</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/lifestyle.m3u</code></td></tr>
+    <tr><td align="left">Local</td><td align="right">792</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/local.m3u</code></td></tr>
+    <tr><td align="left">Movies</td><td align="right">246</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/movies.m3u</code></td></tr>
+    <tr><td align="left">Music</td><td align="right">346</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr>
+    <tr><td align="left">News</td><td align="right">414</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr>
+    <tr><td align="left">Outdoor</td><td align="right">31</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/outdoor.m3u</code></td></tr>
+    <tr><td align="left">Relax</td><td align="right">18</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/relax.m3u</code></td></tr>
+    <tr><td align="left">Religious</td><td align="right">291</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/religious.m3u</code></td></tr>
+    <tr><td align="left">Science</td><td align="right">11</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/science.m3u</code></td></tr>
+    <tr><td align="left">Series</td><td align="right">196</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/series.m3u</code></td></tr>
+    <tr><td align="left">Shop</td><td align="right">46</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/shop.m3u</code></td></tr>
+    <tr><td align="left">Sports</td><td align="right">191</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/sports.m3u</code></td></tr>
+    <tr><td align="left">Travel</td><td align="right">18</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/travel.m3u</code></td></tr>
+    <tr><td align="left">Weather</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/weather.m3u</code></td></tr>
+    <tr><td align="left">XXX</td><td align="right">40</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/xxx.m3u</code></td></tr>
+    <tr><td align="left">Other</td><td align="right">3634</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/other.m3u</code></td></tr>
+  </tbody>
 </table>
 
 </details>
@@ -76,107 +77,146 @@ Or select one of the playlists from the list below.
 
 <!-- prettier-ignore -->
 <table>
-	<thead>
-		<tr><th align="left">Language</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
-	</thead>
-	<tbody>
-		<tr><td align="left">Akan</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aka.m3u</code></td></tr>
-		<tr><td align="left">Albanian</td><td align="right">48</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/sqi.m3u</code></td></tr>
-		<tr><td align="left">Amharic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/amh.m3u</code></td></tr>
-		<tr><td align="left">Arabic</td><td align="right">406</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ara.m3u</code></td></tr>
-		<tr><td align="left">Armenian</td><td align="right">28</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hye.m3u</code></td></tr>
-		<tr><td align="left">Assyrian Neo-Aramaic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aii.m3u</code></td></tr>
-		<tr><td align="left">Azerbaijani</td><td align="right">26</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aze.m3u</code></td></tr>
-		<tr><td align="left">Bashkir</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bak.m3u</code></td></tr>
-		<tr><td align="left">Belarusian</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bel.m3u</code></td></tr>
-		<tr><td align="left">Bengali</td><td align="right">40</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ben.m3u</code></td></tr>
-		<tr><td align="left">Bhojpuri</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bho.m3u</code></td></tr>
-		<tr><td align="left">Bosnian</td><td align="right">11</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bos.m3u</code></td></tr>
-		<tr><td align="left">Bulgarian</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bul.m3u</code></td></tr>
-		<tr><td align="left">Burmese</td><td align="right">0</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mya.m3u</code></td></tr>
-		<tr><td align="left">Catalan</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/cat.m3u</code></td></tr>
-		<tr><td align="left">Chinese</td><td align="right">808</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/zho.m3u</code></td></tr>
-		<tr><td align="left">Croatian</td><td align="right">12</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hrv.m3u</code></td></tr>
-		<tr><td align="left">Czech</td><td align="right">22</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ces.m3u</code></td></tr>
-		<tr><td align="left">Danish</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/dan.m3u</code></td></tr>
-		<tr><td align="left">Dhivehi</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/div.m3u</code></td></tr>
-		<tr><td align="left">Dutch</td><td align="right">104</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nld.m3u</code></td></tr>
-		<tr><td align="left">English</td><td align="right">2161</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/eng.m3u</code></td></tr>
-		<tr><td align="left">Estonian</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/est.m3u</code></td></tr>
-		<tr><td align="left">Faroese</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fao.m3u</code></td></tr>
-		<tr><td align="left">Finnish</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fin.m3u</code></td></tr>
-		<tr><td align="left">French</td><td align="right">228</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fra.m3u</code></td></tr>
-		<tr><td align="left">Galician</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/glg.m3u</code></td></tr>
-		<tr><td align="left">Georgian</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kat.m3u</code></td></tr>
-		<tr><td align="left">German</td><td align="right">232</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/deu.m3u</code></td></tr>
-		<tr><td align="left">Greek</td><td align="right">106</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ell.m3u</code></td></tr>
-		<tr><td align="left">Greenlandic</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kal.m3u</code></td></tr>
-		<tr><td align="left">Hebrew</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/heb.m3u</code></td></tr>
-		<tr><td align="left">Hindi</td><td align="right">178</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hin.m3u</code></td></tr>
-		<tr><td align="left">Hungarian</td><td align="right">30</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hun.m3u</code></td></tr>
-		<tr><td align="left">Icelandic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/isl.m3u</code></td></tr>
-		<tr><td align="left">Indonesian</td><td align="right">70</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ind.m3u</code></td></tr>
-		<tr><td align="left">Inuktitut</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/iku.m3u</code></td></tr>
-		<tr><td align="left">Italian</td><td align="right">212</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ita.m3u</code></td></tr>
-		<tr><td align="left">Japanese</td><td align="right">51</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/jpn.m3u</code></td></tr>
-		<tr><td align="left">Javanese</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/jav.m3u</code></td></tr>
-		<tr><td align="left">Kannada</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kan.m3u</code></td></tr>
-		<tr><td align="left">Kazakh</td><td align="right">16</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kaz.m3u</code></td></tr>
-		<tr><td align="left">Khmer</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/khm.m3u</code></td></tr>
-		<tr><td align="left">Kinyarwanda</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kin.m3u</code></td></tr>
-		<tr><td align="left">Korean</td><td align="right">60</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kor.m3u</code></td></tr>
-		<tr><td align="left">Kurdish</td><td align="right">26</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kur.m3u</code></td></tr>
-		<tr><td align="left">Kyrgyz</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kir.m3u</code></td></tr>
-		<tr><td align="left">Lao</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/lao.m3u</code></td></tr>
-		<tr><td align="left">Latvian</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/lav.m3u</code></td></tr>
-		<tr><td align="left">Lithuanian</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/lit.m3u</code></td></tr>
-		<tr><td align="left">Luxembourgish</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ltz.m3u</code></td></tr>
-		<tr><td align="left">Macedonian</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mkd.m3u</code></td></tr>
-		<tr><td align="left">Malay</td><td align="right">21</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/msa.m3u</code></td></tr>
-		<tr><td align="left">Malayalam</td><td align="right">54</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mal.m3u</code></td></tr>
-		<tr><td align="left">Maltese</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mlt.m3u</code></td></tr>
-		<tr><td align="left">Mandarin Chinese</td><td align="right">52</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/cmn.m3u</code></td></tr>
-		<tr><td align="left">Mandinka</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mnk.m3u</code></td></tr>
-		<tr><td align="left">Maori</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mri.m3u</code></td></tr>
-		<tr><td align="left">Marathi</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mar.m3u</code></td></tr>
-		<tr><td align="left">Min Nan Chinese</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nan.m3u</code></td></tr>
-		<tr><td align="left">Mongolian</td><td align="right">0</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mon.m3u</code></td></tr>
-		<tr><td align="left">Montenegrin</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/cnr.m3u</code></td></tr>
-		<tr><td align="left">Nepali</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nep.m3u</code></td></tr>
-		<tr><td align="left">Norwegian</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nor.m3u</code></td></tr>
-		<tr><td align="left">Norwegian Bokmål</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nob.m3u</code></td></tr>
-		<tr><td align="left">Papiamento</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/pap.m3u</code></td></tr>
-		<tr><td align="left">Pashto</td><td align="right">23</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/pus.m3u</code></td></tr>
-		<tr><td align="left">Persian</td><td align="right">174</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fas.m3u</code></td></tr>
-		<tr><td align="left">Polish</td><td align="right">38</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/pol.m3u</code></td></tr>
-		<tr><td align="left">Portuguese</td><td align="right">231</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/por.m3u</code></td></tr>
-		<tr><td align="left">Punjabi</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/pan.m3u</code></td></tr>
-		<tr><td align="left">Romanian</td><td align="right">55</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ron.m3u</code></td></tr>
-		<tr><td align="left">Russian</td><td align="right">362</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/rus.m3u</code></td></tr>
-		<tr><td align="left">Serbian</td><td align="right">30</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/srp.m3u</code></td></tr>
-		<tr><td align="left">Sinhala</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/sin.m3u</code></td></tr>
-		<tr><td align="left">Slovak</td><td align="right">24</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/slk.m3u</code></td></tr>
-		<tr><td align="left">Slovenian</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/slv.m3u</code></td></tr>
-		<tr><td align="left">Somali</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/som.m3u</code></td></tr>
-		<tr><td align="left">Spanish</td><td align="right">1061</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/spa.m3u</code></td></tr>
-		<tr><td align="left">Sundanese</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/sun.m3u</code></td></tr>
-		<tr><td align="left">Swahili</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/swa.m3u</code></td></tr>
-		<tr><td align="left">Swedish</td><td align="right">13</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/swe.m3u</code></td></tr>
-		<tr><td align="left">Tagalog</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tgl.m3u</code></td></tr>
-		<tr><td align="left">Tamil</td><td align="right">43</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tam.m3u</code></td></tr>
-		<tr><td align="left">Telugu</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tel.m3u</code></td></tr>
-		<tr><td align="left">Thai</td><td align="right">48</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tha.m3u</code></td></tr>
-		<tr><td align="left">Turkish</td><td align="right">165</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tur.m3u</code></td></tr>
-		<tr><td align="left">Turkmen</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tuk.m3u</code></td></tr>
-		<tr><td align="left">Ukrainian</td><td align="right">89</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ukr.m3u</code></td></tr>
-		<tr><td align="left">Urdu</td><td align="right">21</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/urd.m3u</code></td></tr>
-		<tr><td align="left">Uzbek</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/uzb.m3u</code></td></tr>
-		<tr><td align="left">Vietnamese</td><td align="right">99</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/vie.m3u</code></td></tr>
-		<tr><td align="left">Western Frisian</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fry.m3u</code></td></tr>
-		<tr><td align="left">Wolof</td><td align="right">15</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/wol.m3u</code></td></tr>
-		<tr><td align="left">Yue Chinese</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/yue.m3u</code></td></tr>
-		<tr><td align="left">Undefined</td><td align="right">218</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
-	</tbody>
+  <thead>
+    <tr><th align="left">Language</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
+  </thead>
+  <tbody>
+    <tr><td align="left">Akan</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aka.m3u</code></td></tr>
+    <tr><td align="left">Albanian</td><td align="right">120</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/sqi.m3u</code></td></tr>
+    <tr><td align="left">Amharic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/amh.m3u</code></td></tr>
+    <tr><td align="left">Arabic</td><td align="right">384</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ara.m3u</code></td></tr>
+    <tr><td align="left">Armenian</td><td align="right">26</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hye.m3u</code></td></tr>
+    <tr><td align="left">Assyrian Neo-Aramaic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aii.m3u</code></td></tr>
+    <tr><td align="left">Azerbaijani</td><td align="right">25</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aze.m3u</code></td></tr>
+    <tr><td align="left">Bashkir</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bak.m3u</code></td></tr>
+    <tr><td align="left">Belarusian</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bel.m3u</code></td></tr>
+    <tr><td align="left">Bengali</td><td align="right">39</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ben.m3u</code></td></tr>
+    <tr><td align="left">Bhojpuri</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bho.m3u</code></td></tr>
+    <tr><td align="left">Bosnian</td><td align="right">12</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bos.m3u</code></td></tr>
+    <tr><td align="left">Bulgarian</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/bul.m3u</code></td></tr>
+    <tr><td align="left">Burmese</td><td align="right">0</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mya.m3u</code></td></tr>
+    <tr><td align="left">Catalan</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/cat.m3u</code></td></tr>
+    <tr><td align="left">Chinese</td><td align="right">778</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/zho.m3u</code></td></tr>
+    <tr><td align="left">Croatian</td><td align="right">12</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hrv.m3u</code></td></tr>
+    <tr><td align="left">Czech</td><td align="right">19</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ces.m3u</code></td></tr>
+    <tr><td align="left">Danish</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/dan.m3u</code></td></tr>
+    <tr><td align="left">Dhivehi</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/div.m3u</code></td></tr>
+    <tr><td align="left">Dutch</td><td align="right">103</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nld.m3u</code></td></tr>
+    <tr><td align="left">English</td><td align="right">2089</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/eng.m3u</code></td></tr>
+    <tr><td align="left">Estonian</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/est.m3u</code></td></tr>
+    <tr><td align="left">Faroese</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fao.m3u</code></td></tr>
+    <tr><td align="left">Finnish</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fin.m3u</code></td></tr>
+    <tr><td align="left">French</td><td align="right">216</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fra.m3u</code></td></tr>
+    <tr><td align="left">Galician</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/glg.m3u</code></td></tr>
+    <tr><td align="left">Georgian</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kat.m3u</code></td></tr>
+    <tr><td align="left">German</td><td align="right">223</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/deu.m3u</code></td></tr>
+    <tr><td align="left">Greek</td><td align="right">101</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ell.m3u</code></td></tr>
+    <tr><td align="left">Greenlandic</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kal.m3u</code></td></tr>
+    <tr><td align="left">Hebrew</td><td align="right">16</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/heb.m3u</code></td></tr>
+    <tr><td align="left">Hindi</td><td align="right">181</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hin.m3u</code></td></tr>
+    <tr><td align="left">Hungarian</td><td align="right">30</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hun.m3u</code></td></tr>
+    <tr><td align="left">Icelandic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/isl.m3u</code></td></tr>
+    <tr><td align="left">Indonesian</td><td align="right">73</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ind.m3u</code></td></tr>
+    <tr><td align="left">Inuktitut</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/iku.m3u</code></td></tr>
+    <tr><td align="left">Italian</td><td align="right">195</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ita.m3u</code></td></tr>
+    <tr><td align="left">Japanese</td><td align="right">50</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/jpn.m3u</code></td></tr>
+    <tr><td align="left">Javanese</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/jav.m3u</code></td></tr>
+    <tr><td align="left">Kannada</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kan.m3u</code></td></tr>
+    <tr><td align="left">Kazakh</td><td align="right">15</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kaz.m3u</code></td></tr>
+    <tr><td align="left">Khmer</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/khm.m3u</code></td></tr>
+    <tr><td align="left">Kinyarwanda</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kin.m3u</code></td></tr>
+    <tr><td align="left">Korean</td><td align="right">54</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kor.m3u</code></td></tr>
+    <tr><td align="left">Kurdish</td><td align="right">25</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kur.m3u</code></td></tr>
+    <tr><td align="left">Kyrgyz</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kir.m3u</code></td></tr>
+    <tr><td align="left">Lao</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/lao.m3u</code></td></tr>
+    <tr><td align="left">Latvian</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/lav.m3u</code></td></tr>
+    <tr><td align="left">Lithuanian</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/lit.m3u</code></td></tr>
+    <tr><td align="left">Luxembourgish</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ltz.m3u</code></td></tr>
+    <tr><td align="left">Macedonian</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mkd.m3u</code></td></tr>
+    <tr><td align="left">Malay</td><td align="right">20</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/msa.m3u</code></td></tr>
+    <tr><td align="left">Malayalam</td><td align="right">54</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mal.m3u</code></td></tr>
+    <tr><td align="left">Maltese</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mlt.m3u</code></td></tr>
+    <tr><td align="left">Mandarin Chinese</td><td align="right">54</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/cmn.m3u</code></td></tr>
+    <tr><td align="left">Mandinka</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mnk.m3u</code></td></tr>
+    <tr><td align="left">Maori</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mri.m3u</code></td></tr>
+    <tr><td align="left">Marathi</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mar.m3u</code></td></tr>
+    <tr><td align="left">Min Nan Chinese</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nan.m3u</code></td></tr>
+    <tr><td align="left">Mongolian</td><td align="right">0</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/mon.m3u</code></td></tr>
+    <tr><td align="left">Montenegrin</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/cnr.m3u</code></td></tr>
+    <tr><td align="left">Nepali</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nep.m3u</code></td></tr>
+    <tr><td align="left">Norwegian</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nor.m3u</code></td></tr>
+    <tr><td align="left">Norwegian Bokmål</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nob.m3u</code></td></tr>
+    <tr><td align="left">Panjabi</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/pan.m3u</code></td></tr>
+    <tr><td align="left">Papiamento</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/pap.m3u</code></td></tr>
+    <tr><td align="left">Pashto</td><td align="right">22</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/pus.m3u</code></td></tr>
+    <tr><td align="left">Persian</td><td align="right">167</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fas.m3u</code></td></tr>
+    <tr><td align="left">Polish</td><td align="right">34</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/pol.m3u</code></td></tr>
+    <tr><td align="left">Portuguese</td><td align="right">226</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/por.m3u</code></td></tr>
+    <tr><td align="left">Romanian</td><td align="right">57</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ron.m3u</code></td></tr>
+    <tr><td align="left">Russian</td><td align="right">349</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/rus.m3u</code></td></tr>
+    <tr><td align="left">Serbian</td><td align="right">27</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/srp.m3u</code></td></tr>
+    <tr><td align="left">Sinhala</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/sin.m3u</code></td></tr>
+    <tr><td align="left">Slovak</td><td align="right">20</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/slk.m3u</code></td></tr>
+    <tr><td align="left">Slovenian</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/slv.m3u</code></td></tr>
+    <tr><td align="left">Somali</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/som.m3u</code></td></tr>
+    <tr><td align="left">Spanish</td><td align="right">1005</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/spa.m3u</code></td></tr>
+    <tr><td align="left">Sundanese</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/sun.m3u</code></td></tr>
+    <tr><td align="left">Swahili</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/swa.m3u</code></td></tr>
+    <tr><td align="left">Swedish</td><td align="right">11</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/swe.m3u</code></td></tr>
+    <tr><td align="left">Tagalog</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tgl.m3u</code></td></tr>
+    <tr><td align="left">Tamil</td><td align="right">43</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tam.m3u</code></td></tr>
+    <tr><td align="left">Telugu</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tel.m3u</code></td></tr>
+    <tr><td align="left">Thai</td><td align="right">46</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tha.m3u</code></td></tr>
+    <tr><td align="left">Turkish</td><td align="right">159</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tur.m3u</code></td></tr>
+    <tr><td align="left">Turkmen</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tuk.m3u</code></td></tr>
+    <tr><td align="left">Ukrainian</td><td align="right">90</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ukr.m3u</code></td></tr>
+    <tr><td align="left">Urdu</td><td align="right">21</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/urd.m3u</code></td></tr>
+    <tr><td align="left">Uzbek</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/uzb.m3u</code></td></tr>
+    <tr><td align="left">Vietnamese</td><td align="right">71</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/vie.m3u</code></td></tr>
+    <tr><td align="left">Western Frisian</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fry.m3u</code></td></tr>
+    <tr><td align="left">Wolof</td><td align="right">15</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/wol.m3u</code></td></tr>
+    <tr><td align="left">Yue Chinese</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/yue.m3u</code></td></tr>
+    <tr><td align="left">Undefined</td><td align="right">210</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
+  </tbody>
+</table>
+
+</details>
+
+### Playlists by region
+
+<details>
+<summary>Expand</summary>
+<br>
+
+<!-- prettier-ignore -->
+<table>
+  <thead>
+    <tr><th align="left">Region</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
+  </thead>
+  <tbody>
+    <tr><td align="left">Africa</td><td align="right">200</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/afr.m3u</code></td></tr>
+    <tr><td align="left">Americas</td><td align="right">2816</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/amer.m3u</code></td></tr>
+    <tr><td align="left">Arab world</td><td align="right">382</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/arab.m3u</code></td></tr>
+    <tr><td align="left">Asia</td><td align="right">2519</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/asia.m3u</code></td></tr>
+    <tr><td align="left">Asia-Pacific</td><td align="right">1560</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/apac.m3u</code></td></tr>
+    <tr><td align="left">Caribbean</td><td align="right">131</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/carib.m3u</code></td></tr>
+    <tr><td align="left">Central Asia</td><td align="right">37</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/cas.m3u</code></td></tr>
+    <tr><td align="left">Commonwealth of Independent States</td><td align="right">409</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/cis.m3u</code></td></tr>
+    <tr><td align="left">Europe</td><td align="right">2236</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/eur.m3u</code></td></tr>
+    <tr><td align="left">Europe, the Middle East and Africa</td><td align="right">2850</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/emea.m3u</code></td></tr>
+    <tr><td align="left">Hispanic America</td><td align="right">664</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/hispam.m3u</code></td></tr>
+    <tr><td align="left">Latin America</td><td align="right">869</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/latam.m3u</code></td></tr>
+    <tr><td align="left">Maghreb</td><td align="right">93</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/maghreb.m3u</code></td></tr>
+    <tr><td align="left">Middle East</td><td align="right">690</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/mideast.m3u</code></td></tr>
+    <tr><td align="left">Middle East and North Africa</td><td align="right">548</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/mena.m3u</code></td></tr>
+    <tr><td align="left">Nordics</td><td align="right">44</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/nord.m3u</code></td></tr>
+    <tr><td align="left">North America</td><td align="right">2215</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/noram.m3u</code></td></tr>
+    <tr><td align="left">Oceania</td><td align="right">77</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/oce.m3u</code></td></tr>
+    <tr><td align="left">South Asia</td><td align="right">381</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/sas.m3u</code></td></tr>
+    <tr><td align="left">Sub-Saharan Africa</td><td align="right">114</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/ssa.m3u</code></td></tr>
+    <tr><td align="left">West Africa</td><td align="right">71</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/wafr.m3u</code></td></tr>
+    <tr><td align="left">Undefined</td><td align="right">272</td><td align="left"><code>https://iptv-org.github.io/iptv/regions/undefined.m3u</code></td></tr>
+  </tbody>
 </table>
 
 </details>
@@ -189,227 +229,227 @@ Or select one of the playlists from the list below.
 
 <!-- prettier-ignore -->
 <table>
-	<thead>
-		<tr><th align="left">Country</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
-	</thead>
-	<tbody>
-		<tr><td align="left">🇦🇫&nbsp;Afghanistan</td><td align="right">28</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/af.m3u</code></td></tr>
-		<tr><td align="left">🇦🇱&nbsp;Albania</td><td align="right">50</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/al.m3u</code></td></tr>
-		<tr><td align="left">🇩🇿&nbsp;Algeria</td><td align="right">66</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/dz.m3u</code></td></tr>
-		<tr><td align="left">🇦🇸&nbsp;American Samoa</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/as.m3u</code></td></tr>
-		<tr><td align="left">🇦🇩&nbsp;Andorra</td><td align="right">11</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ad.m3u</code></td></tr>
-		<tr><td align="left">🇦🇴&nbsp;Angola</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ao.m3u</code></td></tr>
-		<tr><td align="left">🇦🇬&nbsp;Antigua & Barbuda</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ag.m3u</code></td></tr>
-		<tr><td align="left">🇦🇷&nbsp;Argentina</td><td align="right">102</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ar.m3u</code></td></tr>
-		<tr><td align="left">🇦🇲&nbsp;Armenia</td><td align="right">37</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/am.m3u</code></td></tr>
-		<tr><td align="left">🇦🇼&nbsp;Aruba</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/aw.m3u</code></td></tr>
-		<tr><td align="left">🇦🇺&nbsp;Australia</td><td align="right">71</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/au.m3u</code></td></tr>
-		<tr><td align="left">🇦🇹&nbsp;Austria</td><td align="right">29</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/at.m3u</code></td></tr>
-		<tr><td align="left">🇦🇿&nbsp;Azerbaijan</td><td align="right">36</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/az.m3u</code></td></tr>
-		<tr><td align="left">🇧🇸&nbsp;Bahamas</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bs.m3u</code></td></tr>
-		<tr><td align="left">🇧🇭&nbsp;Bahrain</td><td align="right">49</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bh.m3u</code></td></tr>
-		<tr><td align="left">🇧🇩&nbsp;Bangladesh</td><td align="right">38</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bd.m3u</code></td></tr>
-		<tr><td align="left">🇧🇧&nbsp;Barbados</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bb.m3u</code></td></tr>
-		<tr><td align="left">🇧🇾&nbsp;Belarus</td><td align="right">29</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/by.m3u</code></td></tr>
-		<tr><td align="left">🇧🇪&nbsp;Belgium</td><td align="right">31</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/be.m3u</code></td></tr>
-		<tr><td align="left">🇧🇯&nbsp;Benin</td><td align="right">5</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bj.m3u</code></td></tr>
-		<tr><td align="left">🇧🇹&nbsp;Bhutan</td><td align="right">10</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bt.m3u</code></td></tr>
-		<tr><td align="left">🇧🇴&nbsp;Bolivia</td><td align="right">56</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bo.m3u</code></td></tr>
-		<tr><td align="left">🇧🇦&nbsp;Bosnia</td><td align="right">17</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ba.m3u</code></td></tr>
-		<tr><td align="left">🇧🇼&nbsp;Botswana</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bw.m3u</code></td></tr>
-		<tr><td align="left">🇧🇷&nbsp;Brazil</td><td align="right">192</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/br.m3u</code></td></tr>
-		<tr><td align="left">🇧🇳&nbsp;Brunei</td><td align="right">7</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bn.m3u</code></td></tr>
-		<tr><td align="left">🇧🇬&nbsp;Bulgaria</td><td align="right">16</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bg.m3u</code></td></tr>
-		<tr><td align="left">🇧🇫&nbsp;Burkina Faso</td><td align="right">5</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bf.m3u</code></td></tr>
-		<tr><td align="left">🇧🇮&nbsp;Burundi</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/bi.m3u</code></td></tr>
-		<tr><td align="left">🇰🇭&nbsp;Cambodia</td><td align="right">14</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kh.m3u</code></td></tr>
-		<tr><td align="left">🇨🇲&nbsp;Cameroon</td><td align="right">5</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cm.m3u</code></td></tr>
-		<tr><td align="left">🇨🇦&nbsp;Canada</td><td align="right">141</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ca.m3u</code></td></tr>
-		<tr><td align="left">🇨🇻&nbsp;Cape Verde</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cv.m3u</code></td></tr>
-		<tr><td align="left">🇨🇫&nbsp;Central African Republic</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cf.m3u</code></td></tr>
-		<tr><td align="left">🇹🇩&nbsp;Chad</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/td.m3u</code></td></tr>
-		<tr><td align="left">🇨🇱&nbsp;Chile</td><td align="right">105</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cl.m3u</code></td></tr>
-		<tr><td align="left">🇨🇳&nbsp;China</td><td align="right">730</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cn.m3u</code></td></tr>
-		<tr><td align="left">🇨🇴&nbsp;Colombia</td><td align="right">77</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/co.m3u</code></td></tr>
-		<tr><td align="left">🇰🇲&nbsp;Comoros</td><td align="right">40</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/km.m3u</code></td></tr>
-		<tr><td align="left">🇨🇬&nbsp;Congo - Brazzaville</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cg.m3u</code></td></tr>
-		<tr><td align="left">🇨🇩&nbsp;Congo - Kinshasa</td><td align="right">4</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cd.m3u</code></td></tr>
-		<tr><td align="left">🇨🇰&nbsp;Cook Islands</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ck.m3u</code></td></tr>
-		<tr><td align="left">🇨🇷&nbsp;Costa Rica</td><td align="right">70</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cr.m3u</code></td></tr>
-		<tr><td align="left">🇨🇮&nbsp;Côte d’Ivoire</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ci.m3u</code></td></tr>
-		<tr><td align="left">🇭🇷&nbsp;Croatia</td><td align="right">19</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/hr.m3u</code></td></tr>
-		<tr><td align="left">🇨🇺&nbsp;Cuba</td><td align="right">40</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cu.m3u</code></td></tr>
-		<tr><td align="left">🇨🇼&nbsp;Curaçao</td><td align="right">5</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cw.m3u</code></td></tr>
-		<tr><td align="left">🇨🇾&nbsp;Cyprus</td><td align="right">26</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cy.m3u</code></td></tr>
-		<tr><td align="left">🇨🇿&nbsp;Czechia</td><td align="right">29</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/cz.m3u</code></td></tr>
-		<tr><td align="left">🇩🇰&nbsp;Denmark</td><td align="right">13</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/dk.m3u</code></td></tr>
-		<tr><td align="left">🇩🇯&nbsp;Djibouti</td><td align="right">42</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/dj.m3u</code></td></tr>
-		<tr><td align="left">🇩🇴&nbsp;Dominican Republic</td><td align="right">100</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/do.m3u</code></td></tr>
-		<tr><td align="left">🇪🇨&nbsp;Ecuador</td><td align="right">63</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ec.m3u</code></td></tr>
-		<tr><td align="left">🇪🇬&nbsp;Egypt</td><td align="right">82</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/eg.m3u</code></td></tr>
-		<tr><td align="left">🇸🇻&nbsp;El Salvador</td><td align="right">51</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sv.m3u</code></td></tr>
-		<tr><td align="left">🇬🇶&nbsp;Equatorial Guinea</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gq.m3u</code></td></tr>
-		<tr><td align="left">🇪🇷&nbsp;Eritrea</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/er.m3u</code></td></tr>
-		<tr><td align="left">🇪🇪&nbsp;Estonia</td><td align="right">12</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ee.m3u</code></td></tr>
-		<tr><td align="left">🇸🇿&nbsp;Eswatini</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sz.m3u</code></td></tr>
-		<tr><td align="left">🇪🇹&nbsp;Ethiopia</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/et.m3u</code></td></tr>
-		<tr><td align="left">🇫🇴&nbsp;Faroe Islands</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fo.m3u</code></td></tr>
-		<tr><td align="left">🇫🇯&nbsp;Fiji</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fj.m3u</code></td></tr>
-		<tr><td align="left">🇫🇮&nbsp;Finland</td><td align="right">13</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fi.m3u</code></td></tr>
-		<tr><td align="left">🇫🇷&nbsp;France</td><td align="right">158</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fr.m3u</code></td></tr>
-		<tr><td align="left">🇵🇫&nbsp;French Polynesia</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pf.m3u</code></td></tr>
-		<tr><td align="left">🇹🇫&nbsp;French Southern Territories</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tf.m3u</code></td></tr>
-		<tr><td align="left">🇬🇦&nbsp;Gabon</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ga.m3u</code></td></tr>
-		<tr><td align="left">🇬🇲&nbsp;Gambia</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gm.m3u</code></td></tr>
-		<tr><td align="left">🇬🇪&nbsp;Georgia</td><td align="right">20</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ge.m3u</code></td></tr>
-		<tr><td align="left">🇩🇪&nbsp;Germany</td><td align="right">193</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/de.m3u</code></td></tr>
-		<tr><td align="left">🇬🇭&nbsp;Ghana</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gh.m3u</code></td></tr>
-		<tr><td align="left">🇬🇷&nbsp;Greece</td><td align="right">98</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gr.m3u</code></td></tr>
-		<tr><td align="left">🇬🇱&nbsp;Greenland</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gl.m3u</code></td></tr>
-		<tr><td align="left">🇬🇵&nbsp;Guadeloupe</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gp.m3u</code></td></tr>
-		<tr><td align="left">🇬🇺&nbsp;Guam</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gu.m3u</code></td></tr>
-		<tr><td align="left">🇬🇹&nbsp;Guatemala</td><td align="right">44</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gt.m3u</code></td></tr>
-		<tr><td align="left">🇬🇳&nbsp;Guinea</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gn.m3u</code></td></tr>
-		<tr><td align="left">🇬🇼&nbsp;Guinea-Bissau</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gw.m3u</code></td></tr>
-		<tr><td align="left">🇭🇹&nbsp;Haiti</td><td align="right">14</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ht.m3u</code></td></tr>
-		<tr><td align="left">🇭🇳&nbsp;Honduras</td><td align="right">57</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/hn.m3u</code></td></tr>
-		<tr><td align="left">🇭🇰&nbsp;Hong Kong</td><td align="right">13</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/hk.m3u</code></td></tr>
-		<tr><td align="left">🇭🇺&nbsp;Hungary</td><td align="right">35</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/hu.m3u</code></td></tr>
-		<tr><td align="left">🇮🇸&nbsp;Iceland</td><td align="right">7</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/is.m3u</code></td></tr>
-		<tr><td align="left">🇮🇳&nbsp;India</td><td align="right">316</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/in.m3u</code></td></tr>
-		<tr><td align="left">🇮🇩&nbsp;Indonesia</td><td align="right">78</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/id.m3u</code></td></tr>
-		<tr><td align="left">🌍&nbsp;International</td><td align="right">36</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/int.m3u</code></td></tr>
-		<tr><td align="left">🇮🇷&nbsp;Iran</td><td align="right">185</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ir.m3u</code></td></tr>
-		<tr><td align="left">🇮🇶&nbsp;Iraq</td><td align="right">96</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/iq.m3u</code></td></tr>
-		<tr><td align="left">🇮🇪&nbsp;Ireland</td><td align="right">16</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ie.m3u</code></td></tr>
-		<tr><td align="left">🇮🇱&nbsp;Israel</td><td align="right">24</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/il.m3u</code></td></tr>
-		<tr><td align="left">🇮🇹&nbsp;Italy</td><td align="right">218</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/it.m3u</code></td></tr>
-		<tr><td align="left">🇯🇲&nbsp;Jamaica</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/jm.m3u</code></td></tr>
-		<tr><td align="left">🇯🇵&nbsp;Japan</td><td align="right">59</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/jp.m3u</code></td></tr>
-		<tr><td align="left">🇯🇴&nbsp;Jordan</td><td align="right">66</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/jo.m3u</code></td></tr>
-		<tr><td align="left">🇰🇿&nbsp;Kazakhstan</td><td align="right">26</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kz.m3u</code></td></tr>
-		<tr><td align="left">🇰🇪&nbsp;Kenya</td><td align="right">14</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ke.m3u</code></td></tr>
-		<tr><td align="left">🇰🇮&nbsp;Kiribati</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ki.m3u</code></td></tr>
-		<tr><td align="left">🇽🇰&nbsp;Kosovo</td><td align="right">4</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/xk.m3u</code></td></tr>
-		<tr><td align="left">🇰🇼&nbsp;Kuwait</td><td align="right">66</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kw.m3u</code></td></tr>
-		<tr><td align="left">🇰🇬&nbsp;Kyrgyzstan</td><td align="right">7</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kg.m3u</code></td></tr>
-		<tr><td align="left">🇱🇦&nbsp;Laos</td><td align="right">37</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/la.m3u</code></td></tr>
-		<tr><td align="left">🇱🇻&nbsp;Latvia</td><td align="right">10</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/lv.m3u</code></td></tr>
-		<tr><td align="left">🇱🇧&nbsp;Lebanon</td><td align="right">69</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/lb.m3u</code></td></tr>
-		<tr><td align="left">🇱🇸&nbsp;Lesotho</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ls.m3u</code></td></tr>
-		<tr><td align="left">🇱🇷&nbsp;Liberia</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/lr.m3u</code></td></tr>
-		<tr><td align="left">🇱🇾&nbsp;Libya</td><td align="right">50</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ly.m3u</code></td></tr>
-		<tr><td align="left">🇱🇮&nbsp;Liechtenstein</td><td align="right">8</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/li.m3u</code></td></tr>
-		<tr><td align="left">🇱🇹&nbsp;Lithuania</td><td align="right">10</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/lt.m3u</code></td></tr>
-		<tr><td align="left">🇱🇺&nbsp;Luxembourg</td><td align="right">16</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/lu.m3u</code></td></tr>
-		<tr><td align="left">🇲🇴&nbsp;Macao</td><td align="right">11</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mo.m3u</code></td></tr>
-		<tr><td align="left">🇲🇬&nbsp;Madagascar</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mg.m3u</code></td></tr>
-		<tr><td align="left">🇲🇼&nbsp;Malawi</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mw.m3u</code></td></tr>
-		<tr><td align="left">🇲🇾&nbsp;Malaysia</td><td align="right">29</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/my.m3u</code></td></tr>
-		<tr><td align="left">🇲🇻&nbsp;Maldives</td><td align="right">11</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mv.m3u</code></td></tr>
-		<tr><td align="left">🇲🇱&nbsp;Mali</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ml.m3u</code></td></tr>
-		<tr><td align="left">🇲🇹&nbsp;Malta</td><td align="right">9</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mt.m3u</code></td></tr>
-		<tr><td align="left">🇲🇭&nbsp;Marshall Islands</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mh.m3u</code></td></tr>
-		<tr><td align="left">🇲🇶&nbsp;Martinique</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mq.m3u</code></td></tr>
-		<tr><td align="left">🇲🇷&nbsp;Mauritania</td><td align="right">40</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mr.m3u</code></td></tr>
-		<tr><td align="left">🇲🇺&nbsp;Mauritius</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mu.m3u</code></td></tr>
-		<tr><td align="left">🇾🇹&nbsp;Mayotte</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/yt.m3u</code></td></tr>
-		<tr><td align="left">🇲🇽&nbsp;Mexico</td><td align="right">120</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mx.m3u</code></td></tr>
-		<tr><td align="left">🇫🇲&nbsp;Micronesia</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fm.m3u</code></td></tr>
-		<tr><td align="left">🇲🇩&nbsp;Moldova</td><td align="right">17</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/md.m3u</code></td></tr>
-		<tr><td align="left">🇲🇨&nbsp;Monaco</td><td align="right">9</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mc.m3u</code></td></tr>
-		<tr><td align="left">🇲🇳&nbsp;Mongolia</td><td align="right">6</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mn.m3u</code></td></tr>
-		<tr><td align="left">🇲🇪&nbsp;Montenegro</td><td align="right">12</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/me.m3u</code></td></tr>
-		<tr><td align="left">🇲🇦&nbsp;Morocco</td><td align="right">57</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ma.m3u</code></td></tr>
-		<tr><td align="left">🇲🇿&nbsp;Mozambique</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mz.m3u</code></td></tr>
-		<tr><td align="left">🇲🇲&nbsp;Myanmar</td><td align="right">6</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mm.m3u</code></td></tr>
-		<tr><td align="left">🇳🇦&nbsp;Namibia</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/na.m3u</code></td></tr>
-		<tr><td align="left">🇳🇷&nbsp;Nauru</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/nr.m3u</code></td></tr>
-		<tr><td align="left">🇳🇵&nbsp;Nepal</td><td align="right">11</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/np.m3u</code></td></tr>
-		<tr><td align="left">🇳🇱&nbsp;Netherlands</td><td align="right">98</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/nl.m3u</code></td></tr>
-		<tr><td align="left">🇳🇨&nbsp;New Caledonia</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/nc.m3u</code></td></tr>
-		<tr><td align="left">🇳🇿&nbsp;New Zealand</td><td align="right">20</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/nz.m3u</code></td></tr>
-		<tr><td align="left">🇳🇮&nbsp;Nicaragua</td><td align="right">47</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ni.m3u</code></td></tr>
-		<tr><td align="left">🇳🇪&nbsp;Niger</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ne.m3u</code></td></tr>
-		<tr><td align="left">🇳🇬&nbsp;Nigeria</td><td align="right">7</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ng.m3u</code></td></tr>
-		<tr><td align="left">🇳🇺&nbsp;Niue</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/nu.m3u</code></td></tr>
-		<tr><td align="left">🇳🇫&nbsp;Norfolk Island</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/nf.m3u</code></td></tr>
-		<tr><td align="left">🇰🇵&nbsp;North Korea</td><td align="right">7</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kp.m3u</code></td></tr>
-		<tr><td align="left">🇲🇰&nbsp;North Macedonia</td><td align="right">9</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mk.m3u</code></td></tr>
-		<tr><td align="left">🇲🇵&nbsp;Northern Mariana Islands</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/mp.m3u</code></td></tr>
-		<tr><td align="left">🇳🇴&nbsp;Norway</td><td align="right">18</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/no.m3u</code></td></tr>
-		<tr><td align="left">🇴🇲&nbsp;Oman</td><td align="right">51</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/om.m3u</code></td></tr>
-		<tr><td align="left">🇵🇰&nbsp;Pakistan</td><td align="right">31</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pk.m3u</code></td></tr>
-		<tr><td align="left">🇵🇼&nbsp;Palau</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pw.m3u</code></td></tr>
-		<tr><td align="left">🇵🇸&nbsp;Palestine</td><td align="right">68</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ps.m3u</code></td></tr>
-		<tr><td align="left">🇵🇦&nbsp;Panama</td><td align="right">48</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pa.m3u</code></td></tr>
-		<tr><td align="left">🇵🇬&nbsp;Papua New Guinea</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pg.m3u</code></td></tr>
-		<tr><td align="left">🇵🇾&nbsp;Paraguay</td><td align="right">47</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/py.m3u</code></td></tr>
-		<tr><td align="left">🇵🇪&nbsp;Peru</td><td align="right">240</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pe.m3u</code></td></tr>
-		<tr><td align="left">🇵🇭&nbsp;Philippines</td><td align="right">21</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ph.m3u</code></td></tr>
-		<tr><td align="left">🇵🇳&nbsp;Pitcairn Islands</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pn.m3u</code></td></tr>
-		<tr><td align="left">🇵🇱&nbsp;Poland</td><td align="right">44</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pl.m3u</code></td></tr>
-		<tr><td align="left">🇵🇹&nbsp;Portugal</td><td align="right">46</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pt.m3u</code></td></tr>
-		<tr><td align="left">🇵🇷&nbsp;Puerto Rico</td><td align="right">46</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pr.m3u</code></td></tr>
-		<tr><td align="left">🇶🇦&nbsp;Qatar</td><td align="right">52</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/qa.m3u</code></td></tr>
-		<tr><td align="left">🇷🇪&nbsp;Réunion</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/re.m3u</code></td></tr>
-		<tr><td align="left">🇷🇴&nbsp;Romania</td><td align="right">52</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ro.m3u</code></td></tr>
-		<tr><td align="left">🇷🇺&nbsp;Russia</td><td align="right">324</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ru.m3u</code></td></tr>
-		<tr><td align="left">🇷🇼&nbsp;Rwanda</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/rw.m3u</code></td></tr>
-		<tr><td align="left">🇼🇸&nbsp;Samoa</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ws.m3u</code></td></tr>
-		<tr><td align="left">🇸🇲&nbsp;San Marino</td><td align="right">8</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sm.m3u</code></td></tr>
-		<tr><td align="left">🇸🇹&nbsp;São Tomé & Príncipe</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/st.m3u</code></td></tr>
-		<tr><td align="left">🇸🇦&nbsp;Saudi Arabia</td><td align="right">83</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sa.m3u</code></td></tr>
-		<tr><td align="left">🇸🇳&nbsp;Senegal</td><td align="right">15</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sn.m3u</code></td></tr>
-		<tr><td align="left">🇷🇸&nbsp;Serbia</td><td align="right">31</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/rs.m3u</code></td></tr>
-		<tr><td align="left">🇸🇨&nbsp;Seychelles</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sc.m3u</code></td></tr>
-		<tr><td align="left">🇸🇱&nbsp;Sierra Leone</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sl.m3u</code></td></tr>
-		<tr><td align="left">🇸🇬&nbsp;Singapore</td><td align="right">12</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sg.m3u</code></td></tr>
-		<tr><td align="left">🇸🇰&nbsp;Slovakia</td><td align="right">36</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sk.m3u</code></td></tr>
-		<tr><td align="left">🇸🇮&nbsp;Slovenia</td><td align="right">17</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/si.m3u</code></td></tr>
-		<tr><td align="left">🇸🇧&nbsp;Solomon Islands</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sb.m3u</code></td></tr>
-		<tr><td align="left">🇸🇴&nbsp;Somalia</td><td align="right">45</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/so.m3u</code></td></tr>
-		<tr><td align="left">🇿🇦&nbsp;South Africa</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/za.m3u</code></td></tr>
-		<tr><td align="left">🇰🇷&nbsp;South Korea</td><td align="right">63</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kr.m3u</code></td></tr>
-		<tr><td align="left">🇸🇸&nbsp;South Sudan</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ss.m3u</code></td></tr>
-		<tr><td align="left">🇪🇸&nbsp;Spain</td><td align="right">229</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/es.m3u</code></td></tr>
-		<tr><td align="left">🇱🇰&nbsp;Sri Lanka</td><td align="right">18</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/lk.m3u</code></td></tr>
-		<tr><td align="left">🇸🇭&nbsp;St. Helena</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sh.m3u</code></td></tr>
-		<tr><td align="left">🇸🇩&nbsp;Sudan</td><td align="right">44</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sd.m3u</code></td></tr>
-		<tr><td align="left">🇸🇪&nbsp;Sweden</td><td align="right">19</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/se.m3u</code></td></tr>
-		<tr><td align="left">🇨🇭&nbsp;Switzerland</td><td align="right">99</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ch.m3u</code></td></tr>
-		<tr><td align="left">🇸🇾&nbsp;Syria</td><td align="right">66</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sy.m3u</code></td></tr>
-		<tr><td align="left">🇹🇼&nbsp;Taiwan</td><td align="right">76</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tw.m3u</code></td></tr>
-		<tr><td align="left">🇹🇯&nbsp;Tajikistan</td><td align="right">5</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tj.m3u</code></td></tr>
-		<tr><td align="left">🇹🇿&nbsp;Tanzania</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tz.m3u</code></td></tr>
-		<tr><td align="left">🇹🇭&nbsp;Thailand</td><td align="right">61</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/th.m3u</code></td></tr>
-		<tr><td align="left">🇹🇱&nbsp;Timor-Leste</td><td align="right">6</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tl.m3u</code></td></tr>
-		<tr><td align="left">🇹🇬&nbsp;Togo</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tg.m3u</code></td></tr>
-		<tr><td align="left">🇹🇰&nbsp;Tokelau</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tk.m3u</code></td></tr>
-		<tr><td align="left">🇹🇴&nbsp;Tonga</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/to.m3u</code></td></tr>
-		<tr><td align="left">🇹🇹&nbsp;Trinidad & Tobago</td><td align="right">0</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tt.m3u</code></td></tr>
-		<tr><td align="left">🇹🇳&nbsp;Tunisia</td><td align="right">50</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tn.m3u</code></td></tr>
-		<tr><td align="left">🇹🇷&nbsp;Turkey</td><td align="right">174</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tr.m3u</code></td></tr>
-		<tr><td align="left">🇹🇲&nbsp;Turkmenistan</td><td align="right">11</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tm.m3u</code></td></tr>
-		<tr><td align="left">🇹🇻&nbsp;Tuvalu</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tv.m3u</code></td></tr>
-		<tr><td align="left">🇺🇬&nbsp;Uganda</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ug.m3u</code></td></tr>
-		<tr><td align="left">🇺🇦&nbsp;Ukraine</td><td align="right">96</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ua.m3u</code></td></tr>
-		<tr><td align="left">🇦🇪&nbsp;United Arab Emirates</td><td align="right">88</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ae.m3u</code></td></tr>
-		<tr><td align="left">🇬🇧&nbsp;United Kingdom</td><td align="right">191</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/uk.m3u</code></td></tr>
-		<tr><td align="left">🇺🇸&nbsp;United States</td><td align="right">1865</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/us.m3u</code></td></tr>
-		<tr><td align="left">🇺🇾&nbsp;Uruguay</td><td align="right">44</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/uy.m3u</code></td></tr>
-		<tr><td align="left">🇺🇿&nbsp;Uzbekistan</td><td align="right">5</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/uz.m3u</code></td></tr>
-		<tr><td align="left">🇻🇺&nbsp;Vanuatu</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/vu.m3u</code></td></tr>
-		<tr><td align="left">🇻🇦&nbsp;Vatican City</td><td align="right">7</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/va.m3u</code></td></tr>
-		<tr><td align="left">🇻🇪&nbsp;Venezuela</td><td align="right">54</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ve.m3u</code></td></tr>
-		<tr><td align="left">🇻🇳&nbsp;Vietnam</td><td align="right">72</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/vn.m3u</code></td></tr>
-		<tr><td align="left">🇼🇫&nbsp;Wallis & Futuna</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/wf.m3u</code></td></tr>
-		<tr><td align="left">🇪🇭&nbsp;Western Sahara</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/eh.m3u</code></td></tr>
-		<tr><td align="left">🇾🇪&nbsp;Yemen</td><td align="right">53</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ye.m3u</code></td></tr>
-		<tr><td align="left">🇿🇲&nbsp;Zambia</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/zm.m3u</code></td></tr>
-		<tr><td align="left">🇿🇼&nbsp;Zimbabwe</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/zw.m3u</code></td></tr>
-		<tr><td align="left">Undefined</td><td align="right">209</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/undefined.m3u</code></td></tr>
-	</tbody>
+  <thead>
+    <tr><th align="left">Country</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
+  </thead>
+  <tbody>
+    <tr><td align="left">🇦🇫 Afghanistan</td><td align="right">26</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/af.m3u</code></td></tr>
+    <tr><td align="left">🇦🇱 Albania</td><td align="right">121</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/al.m3u</code></td></tr>
+    <tr><td align="left">🇩🇿 Algeria</td><td align="right">62</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/dz.m3u</code></td></tr>
+    <tr><td align="left">🇦🇸 American Samoa</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/as.m3u</code></td></tr>
+    <tr><td align="left">🇦🇩 Andorra</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ad.m3u</code></td></tr>
+    <tr><td align="left">🇦🇴 Angola</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ao.m3u</code></td></tr>
+    <tr><td align="left">🇦🇬 Antigua and Barbuda</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ag.m3u</code></td></tr>
+    <tr><td align="left">🇦🇷 Argentina</td><td align="right">101</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ar.m3u</code></td></tr>
+    <tr><td align="left">🇦🇲 Armenia</td><td align="right">33</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/am.m3u</code></td></tr>
+    <tr><td align="left">🇦🇼 Aruba</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/aw.m3u</code></td></tr>
+    <tr><td align="left">🇦🇺 Australia</td><td align="right">64</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/au.m3u</code></td></tr>
+    <tr><td align="left">🇦🇹 Austria</td><td align="right">31</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/at.m3u</code></td></tr>
+    <tr><td align="left">🇦🇿 Azerbaijan</td><td align="right">33</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/az.m3u</code></td></tr>
+    <tr><td align="left">🇧🇸 Bahamas</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bs.m3u</code></td></tr>
+    <tr><td align="left">🇧🇭 Bahrain</td><td align="right">45</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bh.m3u</code></td></tr>
+    <tr><td align="left">🇧🇩 Bangladesh</td><td align="right">37</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bd.m3u</code></td></tr>
+    <tr><td align="left">🇧🇧 Barbados</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bb.m3u</code></td></tr>
+    <tr><td align="left">🇧🇾 Belarus</td><td align="right">29</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/by.m3u</code></td></tr>
+    <tr><td align="left">🇧🇪 Belgium</td><td align="right">29</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/be.m3u</code></td></tr>
+    <tr><td align="left">🇧🇯 Benin</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bj.m3u</code></td></tr>
+    <tr><td align="left">🇧🇹 Bhutan</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bt.m3u</code></td></tr>
+    <tr><td align="left">🇧🇴 Bolivia</td><td align="right">52</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bo.m3u</code></td></tr>
+    <tr><td align="left">🇧🇦 Bosnia and Herzegovina</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ba.m3u</code></td></tr>
+    <tr><td align="left">🇧🇼 Botswana</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bw.m3u</code></td></tr>
+    <tr><td align="left">🇧🇷 Brazil</td><td align="right">190</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/br.m3u</code></td></tr>
+    <tr><td align="left">🇧🇳 Brunei</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bn.m3u</code></td></tr>
+    <tr><td align="left">🇧🇬 Bulgaria</td><td align="right">14</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bg.m3u</code></td></tr>
+    <tr><td align="left">🇧🇫 Burkina Faso</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bf.m3u</code></td></tr>
+    <tr><td align="left">🇧🇮 Burundi</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/bi.m3u</code></td></tr>
+    <tr><td align="left">🇰🇭 Cambodia</td><td align="right">13</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/kh.m3u</code></td></tr>
+    <tr><td align="left">🇨🇲 Cameroon</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cm.m3u</code></td></tr>
+    <tr><td align="left">🇨🇦 Canada</td><td align="right">129</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ca.m3u</code></td></tr>
+    <tr><td align="left">🇨🇻 Cape Verde</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cv.m3u</code></td></tr>
+    <tr><td align="left">🇨🇫 Central African Republic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cf.m3u</code></td></tr>
+    <tr><td align="left">🇹🇩 Chad</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/td.m3u</code></td></tr>
+    <tr><td align="left">🇨🇱 Chile</td><td align="right">97</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cl.m3u</code></td></tr>
+    <tr><td align="left">🇨🇳 China</td><td align="right">699</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cn.m3u</code></td></tr>
+    <tr><td align="left">🇨🇴 Colombia</td><td align="right">73</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/co.m3u</code></td></tr>
+    <tr><td align="left">🇰🇲 Comoros</td><td align="right">37</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/km.m3u</code></td></tr>
+    <tr><td align="left">🇨🇰 Cook Islands</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ck.m3u</code></td></tr>
+    <tr><td align="left">🇨🇷 Costa Rica</td><td align="right">63</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cr.m3u</code></td></tr>
+    <tr><td align="left">🇭🇷 Croatia</td><td align="right">18</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/hr.m3u</code></td></tr>
+    <tr><td align="left">🇨🇺 Cuba</td><td align="right">36</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cu.m3u</code></td></tr>
+    <tr><td align="left">🇨🇼 Curacao</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cw.m3u</code></td></tr>
+    <tr><td align="left">🇨🇾 Cyprus</td><td align="right">24</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cy.m3u</code></td></tr>
+    <tr><td align="left">🇨🇿 Czech Republic</td><td align="right">25</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cz.m3u</code></td></tr>
+    <tr><td align="left">🇨🇩 Democratic Republic of the Congo</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cd.m3u</code></td></tr>
+    <tr><td align="left">🇩🇰 Denmark</td><td align="right">12</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/dk.m3u</code></td></tr>
+    <tr><td align="left">🇩🇯 Djibouti</td><td align="right">39</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/dj.m3u</code></td></tr>
+    <tr><td align="left">🇩🇴 Dominican Republic</td><td align="right">94</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/do.m3u</code></td></tr>
+    <tr><td align="left">🇹🇱 East Timor</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tl.m3u</code></td></tr>
+    <tr><td align="left">🇪🇨 Ecuador</td><td align="right">59</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ec.m3u</code></td></tr>
+    <tr><td align="left">🇪🇬 Egypt</td><td align="right">71</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/eg.m3u</code></td></tr>
+    <tr><td align="left">🇸🇻 El Salvador</td><td align="right">46</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sv.m3u</code></td></tr>
+    <tr><td align="left">🇬🇶 Equatorial Guinea</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gq.m3u</code></td></tr>
+    <tr><td align="left">🇪🇷 Eritrea</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/er.m3u</code></td></tr>
+    <tr><td align="left">🇪🇪 Estonia</td><td align="right">11</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ee.m3u</code></td></tr>
+    <tr><td align="left">🇪🇹 Ethiopia</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/et.m3u</code></td></tr>
+    <tr><td align="left">🇫🇴 Faroe Islands</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/fo.m3u</code></td></tr>
+    <tr><td align="left">🇫🇯 Fiji</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/fj.m3u</code></td></tr>
+    <tr><td align="left">🇫🇮 Finland</td><td align="right">12</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/fi.m3u</code></td></tr>
+    <tr><td align="left">🇫🇷 France</td><td align="right">153</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/fr.m3u</code></td></tr>
+    <tr><td align="left">🇵🇫 French Polynesia</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pf.m3u</code></td></tr>
+    <tr><td align="left">🇹🇫 French Southern Territories</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tf.m3u</code></td></tr>
+    <tr><td align="left">🇬🇦 Gabon</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ga.m3u</code></td></tr>
+    <tr><td align="left">🇬🇲 Gambia</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gm.m3u</code></td></tr>
+    <tr><td align="left">🇬🇪 Georgia</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ge.m3u</code></td></tr>
+    <tr><td align="left">🇩🇪 Germany</td><td align="right">183</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/de.m3u</code></td></tr>
+    <tr><td align="left">🇬🇭 Ghana</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gh.m3u</code></td></tr>
+    <tr><td align="left">🇬🇷 Greece</td><td align="right">94</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gr.m3u</code></td></tr>
+    <tr><td align="left">🇬🇱 Greenland</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gl.m3u</code></td></tr>
+    <tr><td align="left">🇬🇵 Guadeloupe</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gp.m3u</code></td></tr>
+    <tr><td align="left">🇬🇺 Guam</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gu.m3u</code></td></tr>
+    <tr><td align="left">🇬🇹 Guatemala</td><td align="right">40</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gt.m3u</code></td></tr>
+    <tr><td align="left">🇬🇳 Guinea</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gn.m3u</code></td></tr>
+    <tr><td align="left">🇬🇼 Guinea-Bissau</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/gw.m3u</code></td></tr>
+    <tr><td align="left">🇭🇹 Haiti</td><td align="right">14</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ht.m3u</code></td></tr>
+    <tr><td align="left">🇭🇳 Honduras</td><td align="right">54</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/hn.m3u</code></td></tr>
+    <tr><td align="left">🇭🇰 Hong Kong</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/hk.m3u</code></td></tr>
+    <tr><td align="left">🇭🇺 Hungary</td><td align="right">34</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/hu.m3u</code></td></tr>
+    <tr><td align="left">🇮🇸 Iceland</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/is.m3u</code></td></tr>
+    <tr><td align="left">🇮🇳 India</td><td align="right">311</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/in.m3u</code></td></tr>
+    <tr><td align="left">🇮🇩 Indonesia</td><td align="right">79</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/id.m3u</code></td></tr>
+    <tr><td align="left">🇮🇷 Iran</td><td align="right">177</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ir.m3u</code></td></tr>
+    <tr><td align="left">🇮🇶 Iraq</td><td align="right">92</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/iq.m3u</code></td></tr>
+    <tr><td align="left">🇮🇪 Ireland</td><td align="right">15</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ie.m3u</code></td></tr>
+    <tr><td align="left">🇮🇱 Israel</td><td align="right">22</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/il.m3u</code></td></tr>
+    <tr><td align="left">🇮🇹 Italy</td><td align="right">200</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/it.m3u</code></td></tr>
+    <tr><td align="left">🇨🇮 Ivory Coast</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ci.m3u</code></td></tr>
+    <tr><td align="left">🇯🇲 Jamaica</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/jm.m3u</code></td></tr>
+    <tr><td align="left">🇯🇵 Japan</td><td align="right">56</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/jp.m3u</code></td></tr>
+    <tr><td align="left">🇯🇴 Jordan</td><td align="right">62</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/jo.m3u</code></td></tr>
+    <tr><td align="left">🇰🇿 Kazakhstan</td><td align="right">25</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/kz.m3u</code></td></tr>
+    <tr><td align="left">🇰🇪 Kenya</td><td align="right">14</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ke.m3u</code></td></tr>
+    <tr><td align="left">🇰🇮 Kiribati</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ki.m3u</code></td></tr>
+    <tr><td align="left">🇽🇰 Kosovo</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/xk.m3u</code></td></tr>
+    <tr><td align="left">🇰🇼 Kuwait</td><td align="right">62</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/kw.m3u</code></td></tr>
+    <tr><td align="left">🇰🇬 Kyrgyzstan</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/kg.m3u</code></td></tr>
+    <tr><td align="left">🇱🇦 Laos</td><td align="right">36</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/la.m3u</code></td></tr>
+    <tr><td align="left">🇱🇻 Latvia</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/lv.m3u</code></td></tr>
+    <tr><td align="left">🇱🇧 Lebanon</td><td align="right">66</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/lb.m3u</code></td></tr>
+    <tr><td align="left">🇱🇸 Lesotho</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ls.m3u</code></td></tr>
+    <tr><td align="left">🇱🇷 Liberia</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/lr.m3u</code></td></tr>
+    <tr><td align="left">🇱🇾 Libya</td><td align="right">47</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ly.m3u</code></td></tr>
+    <tr><td align="left">🇱🇮 Liechtenstein</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/li.m3u</code></td></tr>
+    <tr><td align="left">🇱🇹 Lithuania</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/lt.m3u</code></td></tr>
+    <tr><td align="left">🇱🇺 Luxembourg</td><td align="right">14</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/lu.m3u</code></td></tr>
+    <tr><td align="left">🇲🇴 Macao</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mo.m3u</code></td></tr>
+    <tr><td align="left">🇲🇬 Madagascar</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mg.m3u</code></td></tr>
+    <tr><td align="left">🇲🇼 Malawi</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mw.m3u</code></td></tr>
+    <tr><td align="left">🇲🇾 Malaysia</td><td align="right">27</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/my.m3u</code></td></tr>
+    <tr><td align="left">🇲🇻 Maldives</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mv.m3u</code></td></tr>
+    <tr><td align="left">🇲🇱 Mali</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ml.m3u</code></td></tr>
+    <tr><td align="left">🇲🇹 Malta</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mt.m3u</code></td></tr>
+    <tr><td align="left">🇲🇭 Marshall Islands</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mh.m3u</code></td></tr>
+    <tr><td align="left">🇲🇶 Martinique</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mq.m3u</code></td></tr>
+    <tr><td align="left">🇲🇷 Mauritania</td><td align="right">37</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mr.m3u</code></td></tr>
+    <tr><td align="left">🇲🇺 Mauritius</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mu.m3u</code></td></tr>
+    <tr><td align="left">🇾🇹 Mayotte</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/yt.m3u</code></td></tr>
+    <tr><td align="left">🇲🇽 Mexico</td><td align="right">111</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mx.m3u</code></td></tr>
+    <tr><td align="left">🇫🇲 Micronesia</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/fm.m3u</code></td></tr>
+    <tr><td align="left">🇲🇩 Moldova</td><td align="right">15</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/md.m3u</code></td></tr>
+    <tr><td align="left">🇲🇨 Monaco</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mc.m3u</code></td></tr>
+    <tr><td align="left">🇲🇳 Mongolia</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mn.m3u</code></td></tr>
+    <tr><td align="left">🇲🇪 Montenegro</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/me.m3u</code></td></tr>
+    <tr><td align="left">🇲🇦 Morocco</td><td align="right">54</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ma.m3u</code></td></tr>
+    <tr><td align="left">🇲🇿 Mozambique</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mz.m3u</code></td></tr>
+    <tr><td align="left">🇲🇲 Myanmar [Burma]</td><td align="right">5</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mm.m3u</code></td></tr>
+    <tr><td align="left">🇳🇦 Namibia</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/na.m3u</code></td></tr>
+    <tr><td align="left">🇳🇷 Nauru</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/nr.m3u</code></td></tr>
+    <tr><td align="left">🇳🇵 Nepal</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/np.m3u</code></td></tr>
+    <tr><td align="left">🇳🇱 Netherlands</td><td align="right">96</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/nl.m3u</code></td></tr>
+    <tr><td align="left">🇳🇨 New Caledonia</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/nc.m3u</code></td></tr>
+    <tr><td align="left">🇳🇿 New Zealand</td><td align="right">19</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/nz.m3u</code></td></tr>
+    <tr><td align="left">🇳🇮 Nicaragua</td><td align="right">43</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ni.m3u</code></td></tr>
+    <tr><td align="left">🇳🇪 Niger</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ne.m3u</code></td></tr>
+    <tr><td align="left">🇳🇬 Nigeria</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ng.m3u</code></td></tr>
+    <tr><td align="left">🇳🇺 Niue</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/nu.m3u</code></td></tr>
+    <tr><td align="left">🇳🇫 Norfolk Island</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/nf.m3u</code></td></tr>
+    <tr><td align="left">🇰🇵 North Korea</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/kp.m3u</code></td></tr>
+    <tr><td align="left">🇲🇰 North Macedonia</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mk.m3u</code></td></tr>
+    <tr><td align="left">🇲🇵 Northern Mariana Islands</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/mp.m3u</code></td></tr>
+    <tr><td align="left">🇳🇴 Norway</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/no.m3u</code></td></tr>
+    <tr><td align="left">🇴🇲 Oman</td><td align="right">47</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/om.m3u</code></td></tr>
+    <tr><td align="left">🇵🇰 Pakistan</td><td align="right">29</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pk.m3u</code></td></tr>
+    <tr><td align="left">🇵🇼 Palau</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pw.m3u</code></td></tr>
+    <tr><td align="left">🇵🇸 Palestine</td><td align="right">64</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ps.m3u</code></td></tr>
+    <tr><td align="left">🇵🇦 Panama</td><td align="right">44</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pa.m3u</code></td></tr>
+    <tr><td align="left">🇵🇬 Papua New Guinea</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pg.m3u</code></td></tr>
+    <tr><td align="left">🇵🇾 Paraguay</td><td align="right">44</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/py.m3u</code></td></tr>
+    <tr><td align="left">🇵🇪 Peru</td><td align="right">235</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pe.m3u</code></td></tr>
+    <tr><td align="left">🇵🇭 Philippines</td><td align="right">21</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ph.m3u</code></td></tr>
+    <tr><td align="left">🇵🇳 Pitcairn Islands</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pn.m3u</code></td></tr>
+    <tr><td align="left">🇵🇱 Poland</td><td align="right">39</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pl.m3u</code></td></tr>
+    <tr><td align="left">🇵🇹 Portugal</td><td align="right">42</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pt.m3u</code></td></tr>
+    <tr><td align="left">🇵🇷 Puerto Rico</td><td align="right">43</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/pr.m3u</code></td></tr>
+    <tr><td align="left">🇶🇦 Qatar</td><td align="right">49</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/qa.m3u</code></td></tr>
+    <tr><td align="left">🇨🇬 Republic of the Congo</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/cg.m3u</code></td></tr>
+    <tr><td align="left">🇷🇴 Romania</td><td align="right">53</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ro.m3u</code></td></tr>
+    <tr><td align="left">🇷🇺 Russia</td><td align="right">318</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ru.m3u</code></td></tr>
+    <tr><td align="left">🇷🇼 Rwanda</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/rw.m3u</code></td></tr>
+    <tr><td align="left">🇷🇪 Réunion</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/re.m3u</code></td></tr>
+    <tr><td align="left">🇸🇭 Saint Helena</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sh.m3u</code></td></tr>
+    <tr><td align="left">🇼🇸 Samoa</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ws.m3u</code></td></tr>
+    <tr><td align="left">🇸🇲 San Marino</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sm.m3u</code></td></tr>
+    <tr><td align="left">🇸🇦 Saudi Arabia</td><td align="right">76</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sa.m3u</code></td></tr>
+    <tr><td align="left">🇸🇳 Senegal</td><td align="right">15</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sn.m3u</code></td></tr>
+    <tr><td align="left">🇷🇸 Serbia</td><td align="right">28</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/rs.m3u</code></td></tr>
+    <tr><td align="left">🇸🇨 Seychelles</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sc.m3u</code></td></tr>
+    <tr><td align="left">🇸🇱 Sierra Leone</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sl.m3u</code></td></tr>
+    <tr><td align="left">🇸🇬 Singapore</td><td align="right">11</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sg.m3u</code></td></tr>
+    <tr><td align="left">🇸🇰 Slovakia</td><td align="right">30</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sk.m3u</code></td></tr>
+    <tr><td align="left">🇸🇮 Slovenia</td><td align="right">16</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/si.m3u</code></td></tr>
+    <tr><td align="left">🇸🇧 Solomon Islands</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sb.m3u</code></td></tr>
+    <tr><td align="left">🇸🇴 Somalia</td><td align="right">41</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/so.m3u</code></td></tr>
+    <tr><td align="left">🇿🇦 South Africa</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/za.m3u</code></td></tr>
+    <tr><td align="left">🇰🇷 South Korea</td><td align="right">56</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/kr.m3u</code></td></tr>
+    <tr><td align="left">🇸🇸 South Sudan</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ss.m3u</code></td></tr>
+    <tr><td align="left">🇪🇸 Spain</td><td align="right">197</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/es.m3u</code></td></tr>
+    <tr><td align="left">🇱🇰 Sri Lanka</td><td align="right">18</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/lk.m3u</code></td></tr>
+    <tr><td align="left">🇸🇩 Sudan</td><td align="right">40</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sd.m3u</code></td></tr>
+    <tr><td align="left">🇸🇿 Swaziland</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sz.m3u</code></td></tr>
+    <tr><td align="left">🇸🇪 Sweden</td><td align="right">16</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/se.m3u</code></td></tr>
+    <tr><td align="left">🇨🇭 Switzerland</td><td align="right">94</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ch.m3u</code></td></tr>
+    <tr><td align="left">🇸🇾 Syria</td><td align="right">61</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/sy.m3u</code></td></tr>
+    <tr><td align="left">🇸🇹 São Tomé and Príncipe</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/st.m3u</code></td></tr>
+    <tr><td align="left">🇹🇼 Taiwan</td><td align="right">78</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tw.m3u</code></td></tr>
+    <tr><td align="left">🇹🇯 Tajikistan</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tj.m3u</code></td></tr>
+    <tr><td align="left">🇹🇿 Tanzania</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tz.m3u</code></td></tr>
+    <tr><td align="left">🇹🇭 Thailand</td><td align="right">57</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/th.m3u</code></td></tr>
+    <tr><td align="left">🇹🇬 Togo</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tg.m3u</code></td></tr>
+    <tr><td align="left">🇹🇰 Tokelau</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tk.m3u</code></td></tr>
+    <tr><td align="left">🇹🇴 Tonga</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/to.m3u</code></td></tr>
+    <tr><td align="left">🇹🇹 Trinidad and Tobago</td><td align="right">0</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tt.m3u</code></td></tr>
+    <tr><td align="left">🇹🇳 Tunisia</td><td align="right">47</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tn.m3u</code></td></tr>
+    <tr><td align="left">🇹🇷 Turkey</td><td align="right">167</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tr.m3u</code></td></tr>
+    <tr><td align="left">🇹🇲 Turkmenistan</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tm.m3u</code></td></tr>
+    <tr><td align="left">🇹🇻 Tuvalu</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/tv.m3u</code></td></tr>
+    <tr><td align="left">🇺🇬 Uganda</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ug.m3u</code></td></tr>
+    <tr><td align="left">🇺🇦 Ukraine</td><td align="right">96</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ua.m3u</code></td></tr>
+    <tr><td align="left">🇦🇪 United Arab Emirates</td><td align="right">84</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ae.m3u</code></td></tr>
+    <tr><td align="left">🇬🇧 United Kingdom</td><td align="right">184</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/uk.m3u</code></td></tr>
+    <tr><td align="left">🇺🇸 United States</td><td align="right">1823</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/us.m3u</code></td></tr>
+    <tr><td align="left">🇺🇾 Uruguay</td><td align="right">38</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/uy.m3u</code></td></tr>
+    <tr><td align="left">🇺🇿 Uzbekistan</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/uz.m3u</code></td></tr>
+    <tr><td align="left">🇻🇺 Vanuatu</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/vu.m3u</code></td></tr>
+    <tr><td align="left">🇻🇦 Vatican City</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/va.m3u</code></td></tr>
+    <tr><td align="left">🇻🇪 Venezuela</td><td align="right">50</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ve.m3u</code></td></tr>
+    <tr><td align="left">🇻🇳 Vietnam</td><td align="right">71</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/vn.m3u</code></td></tr>
+    <tr><td align="left">🇼🇫 Wallis and Futuna</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/wf.m3u</code></td></tr>
+    <tr><td align="left">🇪🇭 Western Sahara</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/eh.m3u</code></td></tr>
+    <tr><td align="left">🇾🇪 Yemen</td><td align="right">49</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/ye.m3u</code></td></tr>
+    <tr><td align="left">🇿🇲 Zambia</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/zm.m3u</code></td></tr>
+    <tr><td align="left">🇿🇼 Zimbabwe</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/zw.m3u</code></td></tr>
+    <tr><td align="left">🌍 International</td><td align="right">33</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/int.m3u</code></td></tr>
+    <tr><td align="left">Undefined</td><td align="right">224</td><td align="left"><code>https://iptv-org.github.io/iptv/countries/undefined.m3u</code></td></tr>
+  </tbody>
 </table>
 
 </details>
@@ -437,11 +477,10 @@ If successful, you should get the following response:
     "name": "CNN",
     "logo": "https://i.imgur.com/ilZJT5s.png",
     "url": "http://ott-cdn.ucom.am/s27/index.m3u8",
-    "category": "News",
-    "languages": [
+    "categories": [
       {
-        "code": "eng",
-        "name": "English"
+        "name": "News",
+        "slug": "news"
       }
     ],
     "countries": [
@@ -454,6 +493,12 @@ If successful, you should get the following response:
         "name": "Canada"
       }
     ],
+    "languages": [
+      {
+        "code": "eng",
+        "name": "English"
+      }
+    ],
     "tvg": {
       "id": "cnn.us",
       "name": "CNN",
diff --git a/channels/ae.m3u b/channels/ae.m3u
index 562ee39b6a..7e22f44362 100644
--- a/channels/ae.m3u
+++ b/channels/ae.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="3eeshAlAanTV.ae" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://www.3eeshalaan.net/wp-content/themes/alaan-child-3eesh/assets/img/logo.png" group-title="General",3eesh Al Aan TV (720p)
+#EXTINF:-1 tvg-id="3eeshAlAanTV.ae" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://www.3eeshalaan.net/wp-content/themes/alaan-child-3eesh/assets/img/logo.png" group-title="General",3eesh Al Aan TV (720p) [Timeout]
 https://streaming.3eeshalaan.net/AAAFinalFeed/AlAanFeed_live.m3u8
 #EXTINF:-1 tvg-id="AbuDhabiAloula.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="" group-title="",Abu Dhabi Aloula (1080p)
 https://admdn2.cdn.mangomolo.com/adtv/smil:adtv.stream.smil/playlist.m3u8
@@ -37,7 +37,7 @@ https://cdn5.iqsat.net/iq/8c17d37e0f5c88b1e9c7e1f8f82bc980.sdp/playlist.m3u8
 https://svs.itworkscdn.net/kablatvlive/kabtv1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlWoustaTV.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.osn.com/logo/channel/cropped/WAD.png" group-title="General",Al Wousta TV (1080p)
 https://svs.itworkscdn.net/alwoustalive/alwoustatv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AlYaumTV.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://alyaumtv.net/wp-content/uploads/2019/04/alyaom-1-1_small2.png" group-title="News",Al Yaum TV (720p)
+#EXTINF:-1 tvg-id="AlYaumTV.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://alyaumtv.net/wp-content/uploads/2019/04/alyaom-1-1_small2.png" group-title="News",Al Yaum TV (360p)
 https://ikomg1.s.llnwi.net/alyaumtv/playlist.m3u8
 #EXTINF:-1 tvg-id="Asharq.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="" group-title="",Asharq (1080p) [Offline]
 https://bcsecurelivehls-i.akamaihd.net/hls/live/1021447/6203311941001/master.m3u8
@@ -51,7 +51,7 @@ https://citrusstv.akamaized.net/hls/live/687285/CTV/index.m3u8
 http://dminnvll.cdn.mangomolo.com/dubaione/smil:dubaione.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="DubaiOne.ae" tvg-country="ARAB" tvg-language="English;Arabic" tvg-logo="https://i.imgur.com/WjJ8MHC.png" group-title="General",Dubai One (1080p)
 https://ch.iptvmate.net/f5d063ba7b6f6a5acbb3dd649ecf38d8.m3u8
-#EXTINF:-1 tvg-id="DubaiRacing.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="http://admango.cdn.mangomolo.com/analytics/uploads/71/icons/live/dubai-racing-live.png" group-title="",Dubai Racing (1080p)
+#EXTINF:-1 tvg-id="DubaiRacing.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="http://admango.cdn.mangomolo.com/analytics/uploads/71/icons/live/dubai-racing-live.png" group-title="",Dubai Racing (720p)
 https://dmisvthvll.cdn.mangomolo.com/events/smil:events.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="DubaiRacing2.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="http://admango.cdn.mangomolo.com/analytics/uploads/71/icons/live/duabi-racing-2-live.png" group-title="",Dubai Racing 2 (1080p)
 https://dmithrvll.cdn.mangomolo.com/dubairacing/smil:dubairacing.smil/playlist.m3u8
@@ -65,15 +65,15 @@ https://dmitwlvvll.cdn.mangomolo.com/dubaisportshd/smil:dubaisportshd.smil/index
 https://dmitwlvvll.cdn.mangomolo.com/dubaisportshd5/smil:dubaisportshd5.smil/index.m3u8
 #EXTINF:-1 tvg-id="DubaiTV.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://i.imgur.com/dWueFIE.png" group-title="General",Dubai TV (1080p)
 https://dmisxthvll.cdn.mgmlcdn.com/dubaitvht/smil:dubaitv.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="DubaiZaman.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://i.imgur.com/F5U9qpf.png" group-title="Classic",Dubai Zaman (576p)
+#EXTINF:-1 tvg-id="DubaiZaman.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://i.imgur.com/F5U9qpf.png" group-title="Classic",Dubai Zaman (1080p)
 https://dmiffthvll.cdn.mangomolo.com/dubaizaman/smil:dubaizaman.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="EXPO2020.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="" group-title="",EXPO 2020
+#EXTINF:-1 tvg-id="EXPO2020.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="" group-title="",EXPO 2020 (1080p)
 https://shls-expotv-prod-dub.shahid.net/out/v1/d01b0b3888284878b8898017895a5922/index.m3u8
 #EXTINF:-1 tvg-id="HawasTV.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://i.imgur.com/rVYdkth.jpg" group-title="General",Hawas TV (480p)
 https://jmc-live.ercdn.net/hawastvhd/hawastvhd.m3u8
-#EXTINF:-1 tvg-id="KhyberMiddleEastTV.ae" tvg-country="AE" tvg-language="Pashto" tvg-logo="" group-title="",Khyber Middle East TV (414p) [Not 24/7]
+#EXTINF:-1 tvg-id="KhyberMiddleEastTV.ae" tvg-country="AE" tvg-language="Pashto" tvg-logo="" group-title="",Khyber Middle East TV (720p) [Not 24/7]
 https://dcunilive83-lh.akamaihd.net/i/dclive_1@16122/master.m3u8
-#EXTINF:-1 tvg-id="KhyberNewsTV.ae" tvg-country="AE" tvg-language="Pashto" tvg-logo="" group-title="News",Khyber News TV (414p) [Not 24/7]
+#EXTINF:-1 tvg-id="KhyberNewsTV.ae" tvg-country="AE" tvg-language="Pashto" tvg-logo="" group-title="News",Khyber News TV (404p) [Not 24/7]
 https://dcunilive38-lh.akamaihd.net/i/dclive_1@692677/master.m3u8
 #EXTINF:-1 tvg-id="MajidTV.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://i.imgur.com/9Bun2IX.png" group-title="Kids",Majid TV (1080p)
 https://admdn4.cdn.mangomolo.com/majid/smil:majid.stream.smil/playlist.m3u8
@@ -151,9 +151,9 @@ https://admdn2.cdn.mangomolo.com/nagtv/smil:nagtv.stream.smil/playlist.m3u8
 https://dmiffthvll.cdn.mangomolo.com/noordubaitv/smil:noordubaitv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="PeaceTVAlbanian.ae" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://github.com/fawazahmed0/tiger/raw/master/peace/albanian.jpg" group-title="Religious",Peace TV Albanian (360p)
 http://82.114.67.178:8081/hls/PeaceTV.m3u8
-#EXTINF:-1 tvg-id="PeaceTVBangla.ae" tvg-country="BD;IN" tvg-language="Bengali" tvg-logo="https://github.com/fawazahmed0/tiger/raw/master/peace/bangla.jpg" group-title="Religious",Peace TV Bangla (1080p)
+#EXTINF:-1 tvg-id="PeaceTVBangla.ae" tvg-country="BD;IN" tvg-language="Bengali" tvg-logo="https://github.com/fawazahmed0/tiger/raw/master/peace/bangla.jpg" group-title="Religious",Peace TV Bangla (720p)
 http://199.223.252.162:8032/bangla_adaptive/index.m3u8
-#EXTINF:-1 tvg-id="PeaceTVChinese.ae" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://github.com/fawazahmed0/tiger/raw/master/peace/chinese.jpg" group-title="Religious",Peace TV Chinese (1080p)
+#EXTINF:-1 tvg-id="PeaceTVChinese.ae" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://github.com/fawazahmed0/tiger/raw/master/peace/chinese.jpg" group-title="Religious",Peace TV Chinese (720p)
 http://199.223.252.162:8032/chinese_adaptive/index.m3u8
 #EXTINF:-1 tvg-id="PeaceTVEnglish.ae" tvg-country="INT" tvg-language="English" tvg-logo="https://github.com/fawazahmed0/tiger/raw/master/peace/english.jpg" group-title="Religious",Peace TV English (1080p)
 http://199.223.252.162:8032/english_adaptive/index.m3u8
@@ -173,7 +173,7 @@ https://svs.itworkscdn.net/smc1live/smc1.smil/playlist.m3u8
 http://51.210.199.1/hls/stream.m3u8
 #EXTINF:-1 tvg-id="Wanasah.ae" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/GmgibYW.jpg" group-title="Music",Wanasah (1080p)
 https://shls-wanasah-prod-dub.shahid.net/out/v1/c84ef3128e564b74a6a796e8b6287de6/index.m3u8
-#EXTINF:-1 tvg-id="WeyyakAction.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/207c8580-318d-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Action (720p)
+#EXTINF:-1 tvg-id="WeyyakAction.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/207c8580-318d-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Action (1080p)
 https://weyyak-live.akamaized.net/weyyak_action/index.m3u8
 #EXTINF:-1 tvg-id="WeyyakDrama.ae" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/d995517f-bc87-ea11-831d-02d662556796/poster-image" group-title="Movies",Weyyak Drama (720p)
 https://weyyak-live.akamaized.net/weyyak_drama/index.m3u8
diff --git a/channels/af.m3u b/channels/af.m3u
index 22ebcd7a32..379b0896be 100644
--- a/channels/af.m3u
+++ b/channels/af.m3u
@@ -5,9 +5,9 @@ http://iptv.arianaafgtv.com/ariana/playlist.m3u8
 https://d10rltuy0iweup.cloudfront.net/ATNNAT/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="ArianaTVUS.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV US (720p) [Not 24/7]
 https://d2g7v53450s2i2.cloudfront.net/ATNUS/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="ArianaTVUS.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV US (Delayed stream) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ArianaTVUS.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV US (Delayed stream) (480p) [Not 24/7]
 https://d2g7v53450s2i2.cloudfront.net/ATNUS/streamdelay/playlist.m3u8
-#EXTINF:-1 tvg-id="ATNNews.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/x8mlbJM.jpg" group-title="News",ATN News (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="ATNNews.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/x8mlbJM.jpg" group-title="News",ATN News (720p) [Not 24/7]
 https://d10rltuy0iweup.cloudfront.net/ATNNEWS/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="BaharTV.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="" group-title="",Bahar TV (720p) [Not 24/7]
 https://59d39900ebfb8.streamlock.net/bahartv/bahartv/playlist.m3u8
@@ -15,7 +15,7 @@ https://59d39900ebfb8.streamlock.net/bahartv/bahartv/playlist.m3u8
 http://51.210.199.56/hls/stream.m3u8
 #EXTINF:-1 tvg-id="HelalTV.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/mfTccwm.png" group-title="",Helal TV (720p) [Not 24/7]
 http://51.210.199.54/hls/stream.m3u8
-#EXTINF:-1 tvg-id="HewadTV.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/RkcUtMK.jpg" group-title="",Hewad TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="HewadTV.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/RkcUtMK.jpg" group-title="",Hewad TV (720p) [Not 24/7]
 http://51.210.199.58/hls/stream.m3u8
 #EXTINF:-1 tvg-id="ImanTV.af" tvg-country="AF" tvg-language="Pashto" tvg-logo="" group-title="",Iman TV (480p) [Not 24/7]
 https://59d39900ebfb8.streamlock.net/imantv/imantv/playlist.m3u8
diff --git a/channels/al.m3u b/channels/al.m3u
index 3afc30c12d..ff68be416f 100644
--- a/channels/al.m3u
+++ b/channels/al.m3u
@@ -1,147 +1,147 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="7HD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",7 HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="7HD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",7 HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8889/playlist.m3u8
-#EXTINF:-1 tvg-id="21Mix.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 Mix (1080p) [Offline]
+#EXTINF:-1 tvg-id="21Mix.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 Mix (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8756/playlist.m3u8
-#EXTINF:-1 tvg-id="21Plus.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 Plus (1080p) [Offline]
+#EXTINF:-1 tvg-id="21Plus.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 Plus (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8750/playlist.m3u8
-#EXTINF:-1 tvg-id="21PopulloreHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 Popullore HD (576p) [Offline]
+#EXTINF:-1 tvg-id="21PopulloreHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 Popullore HD (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8749/playlist.m3u8
-#EXTINF:-1 tvg-id="21RTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 RTV (720p) [Offline]
+#EXTINF:-1 tvg-id="21RTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 RTV (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8748/playlist.m3u8
-#EXTINF:-1 tvg-id="21TVMacedonia.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 TV Macedonia (576p) [Offline]
+#EXTINF:-1 tvg-id="21TVMacedonia.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",21 TV Macedonia (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8790/playlist.m3u8
-#EXTINF:-1 tvg-id="ATV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",A TV (720p) [Offline]
+#EXTINF:-1 tvg-id="ATV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",A TV (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8709/playlist.m3u8
-#EXTINF:-1 tvg-id="ABCNews.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://abcnews.al/wp-content/uploads/2020/11/cropped-abclogo.png" group-title="News",ABC News (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="ABCNews.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://abcnews.al/wp-content/uploads/2020/11/cropped-abclogo.png" group-title="News",ABC News (720p) [Not 24/7]
 https://tv2.abcnews.al/live/abcnews/playlist.m3u8
-#EXTINF:-1 tvg-id="AlbaniaFolk.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Albania Folk (576p) [Offline]
+#EXTINF:-1 tvg-id="AlbaniaFolk.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Albania Folk (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8759/playlist.m3u8
-#EXTINF:-1 tvg-id="AlbanianTVAmerica.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Albanian TV America (1080p) [Offline]
+#EXTINF:-1 tvg-id="AlbanianTVAmerica.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Albanian TV America (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8711/playlist.m3u8
-#EXTINF:-1 tvg-id="AlbMusikHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",AlbMusik HD (720p) [Offline]
+#EXTINF:-1 tvg-id="AlbMusikHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",AlbMusik HD (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8821/playlist.m3u8
-#EXTINF:-1 tvg-id="ALBUK.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",ALBUK (1080p) [Offline]
+#EXTINF:-1 tvg-id="ALBUK.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",ALBUK (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8794/playlist.m3u8
 #EXTINF:-1 tvg-id="AlbUKTV.uk" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/gRvEH4v.png" group-title="",AlbUK TV (1080p) [Not 24/7]
 http://albuk.dyndns.tv:1935/albuk/albuk.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="ALPO.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/00hiXCL.png" group-title="",ALPO (720p) [Not 24/7]
 https://5d00db0e0fcd5.streamlock.net/7236/7236/playlist.m3u8
-#EXTINF:-1 tvg-id="Alsat.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Alsat (1080p) [Offline]
+#EXTINF:-1 tvg-id="Alsat.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Alsat (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8713/playlist.m3u8
-#EXTINF:-1 tvg-id="ARTAHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",ARTA HD (720p) [Offline]
+#EXTINF:-1 tvg-id="ARTAHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",ARTA HD (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8745/playlist.m3u8
-#EXTINF:-1 tvg-id="BabyTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",BabyTV (576p) [Offline]
+#EXTINF:-1 tvg-id="BabyTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",BabyTV (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8747/playlist.m3u8
 #EXTINF:-1 tvg-id="BangBang.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/TD4J83Q.png" group-title="Kids",Bang Bang (576p)
 http://93.157.62.180/BangBang/index.m3u8
 #EXTINF:-1 tvg-id="BangBang.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/TD4J83Q.png" group-title="Kids",Bang Bang (576p) [Offline]
 http://us.bestvideostreaming.is/8737/playlist.m3u8
-#EXTINF:-1 tvg-id="BBFMusicTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",BBF Music TV (576p) [Offline]
+#EXTINF:-1 tvg-id="BBFMusicTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",BBF Music TV (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8795/playlist.m3u8
 #EXTINF:-1 tvg-id="Channel117.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Channel 117 (1080p) [Offline]
 https://shkoder.gjirafa.com/api/media/rgjirafa/t0110y/index.m3u8
-#EXTINF:-1 tvg-id="Cufo.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/cjVAXnZ.png" group-title="Kids",Cufo (576p) [Offline]
+#EXTINF:-1 tvg-id="Cufo.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/cjVAXnZ.png" group-title="Kids",Cufo (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8738/playlist.m3u8
 #EXTINF:-1 tvg-id="Cufo.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/cjVAXnZ.png" group-title="Kids",Çufo (576p)
 http://93.157.62.180/Cufo/index.m3u8
-#EXTINF:-1 tvg-id="DigitalbAktionHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Aktion HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbAktionHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Aktion HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8742/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbAutor.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Autor (576p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbAutor.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Autor (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8753/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbBigBrotherVIP1.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Big Brother VIP 1 (1080p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbBigBrotherVIP1.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Big Brother VIP 1 (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8803/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbBigBrotherVIP2.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Big Brother VIP 2 (1080p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbBigBrotherVIP2.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Big Brother VIP 2 (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8804/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbDrame.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Dramë (576p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbDrame.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Dramë (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8727/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbDYHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb DY HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbDYHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb DY HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8731/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbEurofilm.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Eurofilm (576p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbEurofilm.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Eurofilm (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8758/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbFamilyHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Family HD (720p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbFamilyHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Family HD (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8754/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8746/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbHistori.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Histori (576p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbHistori.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Histori (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8729/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbHitsHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Hits HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbHitsHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Hits HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8755/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbKomedi.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Komedi (576p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbKomedi.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Komedi (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8752/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbNatyra.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Natyra (576p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbNatyra.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Natyra (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8739/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbNjeHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Një HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbNjeHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Një HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8730/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbShkense.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Shkensë (576p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbShkense.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Shkensë (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8726/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbStinet.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Stinët (720p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbStinet.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Stinët (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8751/playlist.m3u8
-#EXTINF:-1 tvg-id="DigitalbThriller.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Thriller (576p) [Offline]
+#EXTINF:-1 tvg-id="DigitalbThriller.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Digitalb Thriller (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8757/playlist.m3u8
-#EXTINF:-1 tvg-id="Drame.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Drame (576p) [Offline]
+#EXTINF:-1 tvg-id="Drame.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Drame (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8883/playlist.m3u8
-#EXTINF:-1 tvg-id="dTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",dTV HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="dTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",dTV HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8793/playlist.m3u8
-#EXTINF:-1 tvg-id="ElrodiTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Elrodi TV (576p) [Offline]
+#EXTINF:-1 tvg-id="ElrodiTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Elrodi TV (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8718/playlist.m3u8
-#EXTINF:-1 tvg-id="FirstChannel.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",First Channel (1080p) [Offline]
+#EXTINF:-1 tvg-id="FirstChannel.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",First Channel (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8717/playlist.m3u8
 #EXTINF:-1 tvg-id="FrameTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Frame TV (720p) [Not 24/7]
 http://195.154.252.221:8000/play/a002/index.m3u8
-#EXTINF:-1 tvg-id="KHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",K HD (720p) [Offline]
+#EXTINF:-1 tvg-id="KHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",K HD (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8710/playlist.m3u8
-#EXTINF:-1 tvg-id="Kanali7.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://tv2go.t-2.net/static/media/img/channels/dark/ios/small/retina/145526.png" group-title="",Kanali 7 (576p) [Offline]
+#EXTINF:-1 tvg-id="Kanali7.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://tv2go.t-2.net/static/media/img/channels/dark/ios/small/retina/145526.png" group-title="",Kanali 7 (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8761/playlist.m3u8
-#EXTINF:-1 tvg-id="KLAN.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/pWoMc0r.png" group-title="",KLAN [Offline]
+#EXTINF:-1 tvg-id="KLAN.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/pWoMc0r.png" group-title="",KLAN [Timeout]
 http://79.106.73.244:4040/live/klanhdmob/playlist.m3u8
-#EXTINF:-1 tvg-id="KlanHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Klan HD (720p) [Offline]
+#EXTINF:-1 tvg-id="KlanHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Klan HD (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8704/playlist.m3u8
-#EXTINF:-1 tvg-id="KlanMakedonia.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Klan Makedonia (576p) [Offline]
+#EXTINF:-1 tvg-id="KlanMakedonia.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Klan Makedonia (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8789/playlist.m3u8
 #EXTINF:-1 tvg-id="KLANNews.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/NMtr8Z4.jpg" group-title="News",KLAN News [Offline]
 http://51.195.88.12:4050/live/klannewsmobpp3/playlist.m3u8
-#EXTINF:-1 tvg-id="KlanPlus.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Klan Plus (576p) [Offline]
+#EXTINF:-1 tvg-id="KlanPlus.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Klan Plus (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8720/playlist.m3u8
 #EXTINF:-1 tvg-id="KLANPlus.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/xg23eK4.jpg" group-title="News",KLAN Plus [Offline]
 http://51.195.88.12:4050/live/klanplusmobpp3/playlist.m3u8
-#EXTINF:-1 tvg-id="Komedi.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Komedi (576p) [Offline]
+#EXTINF:-1 tvg-id="Komedi.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Komedi (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8881/playlist.m3u8
-#EXTINF:-1 tvg-id="Kosova.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Kosova (1080p) [Offline]
+#EXTINF:-1 tvg-id="Kosova.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Kosova (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8706/playlist.m3u8
-#EXTINF:-1 tvg-id="KTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",KTV HD (720p) [Offline]
+#EXTINF:-1 tvg-id="KTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",KTV HD (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8705/playlist.m3u8
-#EXTINF:-1 tvg-id="Max.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Max (576p) [Offline]
+#EXTINF:-1 tvg-id="Max.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Max (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8882/playlist.m3u8
-#EXTINF:-1 tvg-id="MPT2.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",MPT 2 (576p) [Offline]
+#EXTINF:-1 tvg-id="MPT2.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",MPT 2 (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8728/playlist.m3u8
-#EXTINF:-1 tvg-id="Muse.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringMuse_logo.png" group-title="",Muse (576p) [Offline]
+#EXTINF:-1 tvg-id="Muse.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringMuse_logo.png" group-title="",Muse (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8778/playlist.m3u8
-#EXTINF:-1 tvg-id="News24.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/PWGMnzW.jpg" group-title="News",News 24 (576p)
+#EXTINF:-1 tvg-id="News24.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/PWGMnzW.jpg" group-title="News",News 24 (392p)
 http://tv.balkanweb.com/news24/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="News24AL.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",News24 AL (576p) [Offline]
+#EXTINF:-1 tvg-id="News24AL.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",News24 AL (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8724/playlist.m3u8
-#EXTINF:-1 tvg-id="Novela.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Novela (576p) [Offline]
+#EXTINF:-1 tvg-id="Novela.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Novela (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8884/playlist.m3u8
-#EXTINF:-1 tvg-id="Opoja.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Opoja (720p) [Offline]
+#EXTINF:-1 tvg-id="Opoja.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Opoja (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8723/playlist.m3u8
-#EXTINF:-1 tvg-id="Oranews.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Oranews (576p) [Offline]
+#EXTINF:-1 tvg-id="Oranews.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Oranews (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8715/playlist.m3u8
-#EXTINF:-1 tvg-id="PeaceTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Peace TV (720p)
+#EXTINF:-1 tvg-id="PeaceTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Peace TV (360p)
 http://93.157.62.180/PeaceTV/index.m3u8
 #EXTINF:-1 tvg-id="PeaceTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Peace TV (720p) [Offline]
 http://us.bestvideostreaming.is/8792/playlist.m3u8
-#EXTINF:-1 tvg-id="PendimiTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Pendimi TV HD (720p) [Offline]
+#EXTINF:-1 tvg-id="PendimiTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Pendimi TV HD (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8786/playlist.m3u8
-#EXTINF:-1 tvg-id="QSportNews.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Q Sport News (576p) [Offline]
+#EXTINF:-1 tvg-id="QSportNews.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Q Sport News (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8785/playlist.m3u8
 #EXTINF:-1 tvg-id="ReportTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Report TV HD (576p)
 http://93.157.62.180/ReportTV/index.m3u8
-#EXTINF:-1 tvg-id="ReportTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Report TV HD (576p) [Offline]
+#EXTINF:-1 tvg-id="ReportTVHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Report TV HD (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8707/playlist.m3u8
-#EXTINF:-1 tvg-id="RitaTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Rita TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="RitaTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Rita TV (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8890/playlist.m3u8
-#EXTINF:-1 tvg-id="RTK1HD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTK 1 HD (720p) [Offline]
+#EXTINF:-1 tvg-id="RTK1HD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTK 1 HD (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8702/playlist.m3u8
 #EXTINF:-1 tvg-id="RTSH1.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/IVttVXp.png" group-title="",RTSH 1 (406p)
 https://tvlive.rtsh.dev/live/rtsh_11mob1/playlist.m3u8
@@ -171,53 +171,53 @@ https://tvlive.rtsh.dev/live/rtsh_kuvendi_ott/playlist.m3u8
 https://tvlive.rtsh.dev/live/rtsh_muzike_mob/playlist.m3u8
 #EXTINF:-1 tvg-id="RTSHPlus.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/UiDzIUN.png" group-title="",RTSH Plus (480p) [Not 24/7]
 https://tvlive.rtsh.dev/live/rtsh_plus_ott/playlist.m3u8
-#EXTINF:-1 tvg-id="RTSHSatelit.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTSH Satelit (720p) [Offline]
+#EXTINF:-1 tvg-id="RTSHSatelit.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTSH Satelit (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8701/playlist.m3u8
 #EXTINF:-1 tvg-id="RTSHShkolle.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/e8KhDGp.png" group-title="",RTSH Shkollë (360p) [Not 24/7]
 https://tvlive.rtsh.dev/live/rtsh_shkolle_ott/playlist.m3u8
+#EXTINF:-1 tvg-id="RTSHShqip.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/IBpZiuO.png" group-title="",RTSH Shqip (576p) [Geo-blocked]
+http://us.bestvideostreaming.is/8721/playlist.m3u8
 #EXTINF:-1 tvg-id="RTSHShqip.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/IBpZiuO.png" group-title="",RTSH Shqip (406p) [Not 24/7]
 https://tvlive.rtsh.dev/live/rtsh_shqip_ott/playlist.m3u8
-#EXTINF:-1 tvg-id="RTSHShqip.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/IBpZiuO.png" group-title="",RTSH Shqip (576p) [Offline]
-http://us.bestvideostreaming.is/8721/playlist.m3u8
 #EXTINF:-1 tvg-id="RTSHSport.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/rCTH2iP.png" group-title="",RTSH Sport (406p) [Not 24/7]
 https://tvlive.rtsh.dev/live/rtsh_sport_ott11/playlist.m3u8
-#EXTINF:-1 tvg-id="RTVDukagjini.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTV Dukagjini (720p) [Offline]
+#EXTINF:-1 tvg-id="RTVDukagjini.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTV Dukagjini (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8788/playlist.m3u8
-#EXTINF:-1 tvg-id="RTVFontana.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTV Fontana (720p) [Offline]
+#EXTINF:-1 tvg-id="RTVFontana.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTV Fontana (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8852/playlist.m3u8
-#EXTINF:-1 tvg-id="RTVIlirida.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTV Ilirida (274p) [Not 24/7]
+#EXTINF:-1 tvg-id="RTVIlirida.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTV Ilirida (360p) [Not 24/7]
 https://5a1178b42cc03.streamlock.net/rtvilirida/rtvilirida/playlist.m3u8
-#EXTINF:-1 tvg-id="RTVislam.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTVislam (1080p) [Offline]
+#EXTINF:-1 tvg-id="RTVislam.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTVislam (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8714/playlist.m3u8
-#EXTINF:-1 tvg-id="Shenja.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Shenja (576p) [Offline]
+#EXTINF:-1 tvg-id="Shenja.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Shenja (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8850/playlist.m3u8
 #EXTINF:-1 tvg-id="SofiaHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Sofia HD (1080p)
 http://93.157.62.180/Sofia/index.m3u8
 #EXTINF:-1 tvg-id="SofiaHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Sofia HD (1080p) [Offline]
 http://us.bestvideostreaming.is/8820/playlist.m3u8
-#EXTINF:-1 tvg-id="StarHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Star HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="StarHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Star HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8781/playlist.m3u8
-#EXTINF:-1 tvg-id="SyriHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Syri HD (1080p)
+#EXTINF:-1 tvg-id="SyriHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Syri HD (720p)
 http://93.157.62.180/SyriTV/index.m3u8
 #EXTINF:-1 tvg-id="SyriHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Syri HD (1080p) [Offline]
 http://us.bestvideostreaming.is/8784/playlist.m3u8
 #EXTINF:-1 tvg-id="SyriTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="http://www.albepg.com/tvlogi/Syri%20Blue.png" group-title="",Syri TV (720p) [Not 24/7]
 http://live.syri.tv:6969/live/syriblue/hd/23.ts
-#EXTINF:-1 tvg-id="TipTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TipTV.png" group-title="",Tip TV (576p) [Offline]
+#EXTINF:-1 tvg-id="TipTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TipTV.png" group-title="",Tip TV (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8776/playlist.m3u8
-#EXTINF:-1 tvg-id="TopChannel.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/top-channel-logo.png" group-title="",Top Channel (720p) [Offline]
+#EXTINF:-1 tvg-id="TopChannel.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/top-channel-logo.png" group-title="",Top Channel (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8708/playlist.m3u8
-#EXTINF:-1 tvg-id="Tring3.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring 3 (576p) [Offline]
+#EXTINF:-1 tvg-id="Tring3.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring 3 (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8773/playlist.m3u8
-#EXTINF:-1 tvg-id="TringActionHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring Action HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="TringActionHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring Action HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8769/playlist.m3u8
-#EXTINF:-1 tvg-id="TringComedy.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringComedy.png" group-title="",Tring Comedy (576p) [Offline]
+#EXTINF:-1 tvg-id="TringComedy.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringComedy.png" group-title="",Tring Comedy (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8767/playlist.m3u8
-#EXTINF:-1 tvg-id="TringFantasy.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://prd-static-mkt.spectar.tv/rev-1636968170/image_transform.php/transform/1/instance_id/1/video_id/126" group-title="",Tring Fantasy (576p) [Offline]
+#EXTINF:-1 tvg-id="TringFantasy.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://prd-static-mkt.spectar.tv/rev-1636968170/image_transform.php/transform/1/instance_id/1/video_id/126" group-title="",Tring Fantasy (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8766/playlist.m3u8
-#EXTINF:-1 tvg-id="TringHistory.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringHistory.png" group-title="",Tring History (576p) [Offline]
+#EXTINF:-1 tvg-id="TringHistory.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringHistory.png" group-title="",Tring History (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8765/playlist.m3u8
-#EXTINF:-1 tvg-id="TringJollyHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring Jolly HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="TringJollyHD.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring Jolly HD (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8774/playlist.m3u8
 #EXTINF:-1 tvg-id="TringKids.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringKids_logo.png" group-title="",Tring Kids (576p)
 http://93.157.62.180/TringKids/index.m3u8
@@ -225,13 +225,13 @@ http://93.157.62.180/TringKids/index.m3u8
 http://us.bestvideostreaming.is/8777/playlist.m3u8
 #EXTINF:-1 tvg-id="TringLife.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring Life (576p)
 http://93.157.62.180/TringLife/index.m3u8
-#EXTINF:-1 tvg-id="TringLife.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring Life (576p) [Offline]
+#EXTINF:-1 tvg-id="TringLife.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring Life (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8768/playlist.m3u8
 #EXTINF:-1 tvg-id="TringPlanet.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringPlanet.png" group-title="",Tring Planet (576p)
 http://93.157.62.180/TringPlanet/index.m3u8
 #EXTINF:-1 tvg-id="TringPlanet.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringPlanet.png" group-title="",Tring Planet (576p) [Offline]
 http://us.bestvideostreaming.is/8764/playlist.m3u8
-#EXTINF:-1 tvg-id="TringShqip.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringShqip.png" group-title="",Tring Shqip (720p)
+#EXTINF:-1 tvg-id="TringShqip.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringShqip.png" group-title="",Tring Shqip (576p)
 http://93.157.62.180/TringShqip/index.m3u8
 #EXTINF:-1 tvg-id="TringShqip.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/TringShqip.png" group-title="",Tring Shqip (720p) [Offline]
 http://us.bestvideostreaming.is/8762/playlist.m3u8
@@ -245,29 +245,29 @@ http://93.157.62.180/TringTring/index.m3u8
 http://us.bestvideostreaming.is/8775/playlist.m3u8
 #EXTINF:-1 tvg-id="TringWorld.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring World (576p)
 http://93.157.62.180/TringWorld/index.m3u8
-#EXTINF:-1 tvg-id="TringWorld.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring World (576p) [Offline]
+#EXTINF:-1 tvg-id="TringWorld.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tring World (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8763/playlist.m3u8
-#EXTINF:-1 tvg-id="TurboTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Turbo TV (576p) [Offline]
+#EXTINF:-1 tvg-id="TurboTV.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Turbo TV (576p) [Geo-blocked]
 http://us.bestvideostreaming.is/8839/playlist.m3u8
 #EXTINF:-1 tvg-id="TV7Albania.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/k9WqPLZ.png" group-title="",TV 7 Albania (540p) [Not 24/7]
 http://media.az-mediaserver.com:1935/7064/7064/playlist.m3u8
 #EXTINF:-1 tvg-id="TVApollon.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",TV Apollon (480p)
 https://live.apollon.tv/Apollon-WEB/video.m3u8?token=tnt3u76re30d2
-#EXTINF:-1 tvg-id="TVDielli.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",TV Dielli (720p) [Offline]
+#EXTINF:-1 tvg-id="TVDielli.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",TV Dielli (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8818/playlist.m3u8
-#EXTINF:-1 tvg-id="TVKoha.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/AJ472ot.png" group-title="",TV Koha (720p)
+#EXTINF:-1 tvg-id="TVKoha.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/AJ472ot.png" group-title="",TV Koha (720p) [Offline]
 rtmp://live.tvkoha.tv:1935/live/koha/livestream
-#EXTINF:-1 tvg-id="TVLlapi.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",TV Llapi (720p) [Offline]
+#EXTINF:-1 tvg-id="TVLlapi.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",TV Llapi (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8823/playlist.m3u8
 #EXTINF:-1 tvg-id="TVOpoja.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/De7sZf6.jpg" group-title="",TV Opoja (720p) [Not 24/7]
 http://ip.opoja.tv:1935/tvopoja/tvopoja/playlist.m3u8
-#EXTINF:-1 tvg-id="TVPlisi.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",TV Plisi (720p) [Offline]
+#EXTINF:-1 tvg-id="TVPlisi.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",TV Plisi (720p) [Geo-blocked]
 http://us.bestvideostreaming.is/8735/playlist.m3u8
+#EXTINF:-1 tvg-id="USmile.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",U Smile (576p) [Geo-blocked]
+http://us.bestvideostreaming.is/8802/playlist.m3u8
 #EXTINF:-1 tvg-id="USmile.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",U Smile (576p) [Offline]
 http://us.bestvideostreaming.is/8772/playlist.m3u8
-#EXTINF:-1 tvg-id="USmile.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",U Smile (576p) [Offline]
-http://us.bestvideostreaming.is/8802/playlist.m3u8
-#EXTINF:-1 tvg-id="VPlus.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",V Plus (1080p) [Offline]
+#EXTINF:-1 tvg-id="VPlus.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",V Plus (1080p) [Geo-blocked]
 http://us.bestvideostreaming.is/8703/playlist.m3u8
-#EXTINF:-1 tvg-id="ZjarrTelevizion.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/UValLp1.png" group-title="",Zjarr Televizion (1080p)
+#EXTINF:-1 tvg-id="ZjarrTelevizion.al" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/UValLp1.png" group-title="",Zjarr Televizion (1080p) [Timeout]
 http://217.73.132.66:1935/live/Zjarr.stream/playlist.m3u8
diff --git a/channels/am.m3u b/channels/am.m3u
index 94ccdce262..3efe2b226e 100644
--- a/channels/am.m3u
+++ b/channels/am.m3u
@@ -32,7 +32,7 @@ http://ott-cdn.ucom.am/s53/index.m3u8
 #EXTINF:-1 tvg-id="ATVKhaghaliqTV.am" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/mrfm9uY.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Kids",ATV ԽաղԱլիք (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s74/index.m3u8
-#EXTINF:-1 tvg-id="ATVKinoman.am" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/lidNHkH.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Movies",ATV Կինոման (480p)
+#EXTINF:-1 tvg-id="ATVKinoman.am" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/lidNHkH.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Movies",ATV Կինոման (480p) [Timeout]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s94/index.m3u8
 #EXTINF:-1 tvg-id="ATVHayTV.am" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/KCkzU5R.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Music",ATV Հայ TV (480p)
@@ -65,7 +65,7 @@ http://ott-cdn.ucom.am/s2/index.m3u8
 http://ott-cdn.ucom.am/s12/index.m3u8
 #EXTINF:-1 tvg-id="NorHayastanTV.am" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/EmOsMTC.png" group-title="General",Նոր Հայաստան (720p) [Offline]
 https://cdn.onarmtv.com/str/7/output.m3u8
-#EXTINF:-1 tvg-id="ShantTV.am" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/EbqVba3.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Genral",Շանթ (1080p)
+#EXTINF:-1 tvg-id="ShantTV.am" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/EbqVba3.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",Շանթ (1080p) [Timeout]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s3/index.m3u8
 #EXTINF:-1 tvg-id="ShoghakatTV.am" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/e4VxCnn.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Religious",Շողակաթ (480p)
diff --git a/channels/ar.m3u b/channels/ar.m3u
index 9d59382438..bd1caa5fb7 100644
--- a/channels/ar.m3u
+++ b/channels/ar.m3u
@@ -7,7 +7,7 @@ http://www.coninfo.net:1935/tvcinco/live1/playlist.m3u8
 https://59c5c86e10038.streamlock.net/6605140/6605140/playlist.m3u8
 #EXTINF:-1 tvg-id="247CanaldeNoticias.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/6miysb8.png" group-title="News",24/7 Canal de Noticias (720p)
 https://panel.dattalive.com/6605140/6605140/playlist.m3u8
-#EXTINF:-1 tvg-id="A24.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/ar_america-24_m.png" user-agent="iPhone" group-title="News",A24
+#EXTINF:-1 tvg-id="A24.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/ar_america-24_m.png" user-agent="iPhone" group-title="News",A24 (540p)
 #EXTVLCOPT:http-referrer=https://vmf.edge-apps.net/
 #EXTVLCOPT:http-user-agent=iPhone
 https://g1.vxral-hor.transport.edge-access.net/a15/ngrp:a24-100056_all/a24-100056.m3u8
@@ -15,11 +15,11 @@ https://g1.vxral-hor.transport.edge-access.net/a15/ngrp:a24-100056_all/a24-10005
 #EXTVLCOPT:http-referrer=https://vmf.edge-apps.net/
 #EXTVLCOPT:http-user-agent=iPhone
 https://iptv-all.lanesh4d0w.repl.co/m3u8/america_hls.m3u8
-#EXTINF:-1 tvg-id="ArgentinisimaSatelital.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/Jo7p7yZ.png" group-title="",Argentinísima Satelital (576p)
+#EXTINF:-1 tvg-id="ArgentinisimaSatelital.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/Jo7p7yZ.png" group-title="",Argentinísima Satelital (720p)
 http://186.0.233.76:1935/Argentinisima/smil:argentinisima.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal2Jujuy.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",Canal 2 Jujuy (720p) [Not 24/7]
 http://api.new.livestream.com/accounts/679322/events/3782013/live.m3u8
-#EXTINF:-1 tvg-id="Canal3Pinamar.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",Canal 3 Pinamar (380p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal3Pinamar.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",Canal 3 Pinamar (360p) [Not 24/7]
 http://www.intelintec.com.ar:9090/hls/canal3pinamar.m3u8
 #EXTINF:-1 tvg-id="Canal3Rosario.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",Canal 3 Rosario (576p) [Geo-blocked]
 https://59d52c5a5ce5e.streamlock.net:4443/canal3rosario/ngrp:canal3rosario_all/playlist.m3u8
@@ -61,18 +61,18 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/canalccor
 https://panel.tuvideostreaming.com:19360/8002/8002.m3u8
 #EXTINF:-1 tvg-id="CanalProvincial.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="Local",Canal Provincial (San Miguel) (360p) [Not 24/7]
 http://www.trimi.com.ar/provincial/streaming/mystream.m3u8
-#EXTINF:-1 tvg-id="CANALTDC.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://directostv.teleame.com/wp-content/uploads/2018/02/TDC-TV-Santa-F%C3%A9-en-vivo-Online.png" group-title="",CANAL TDC (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CANALTDC.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://directostv.teleame.com/wp-content/uploads/2018/02/TDC-TV-Santa-F%C3%A9-en-vivo-Online.png" group-title="",CANAL TDC (1080p) [Not 24/7]
 https://5e7cdf2370883.streamlock.net/tdconline/tdconline/playlist.m3u8
 #EXTINF:-1 tvg-id="CANAL9MULTIVISION.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSg84RxHjkboUjpSwVwVYl7oviFLwGDJs-4UCKzP-JMCdIE4MOb&s" group-title="",CANAL.9 MULTIVISION (720p) [Not 24/7]
 https://panel.dattalive.com/8250/8250/playlist.m3u8
-#EXTINF:-1 tvg-id="canalLUZ.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://www.canalluz.org/assets/images/logo-2020-250x79.png" user-agent="Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36" group-title="Religious",canalLUZ (720p) [Offline]
+#EXTINF:-1 tvg-id="canalLUZ.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://www.canalluz.org/assets/images/logo-2020-250x79.png" user-agent="Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36" group-title="Religious",canalLUZ (1080p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36
 https://g1.mc-slo.transport.edge-access.net/a11/ngrp:canal_luz01-100009_all/Playlist.m3u8?sense=true
 #EXTINF:-1 tvg-id="CatacamaTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="Local",Catacama TV (1080p)
 https://5f700d5b2c46f.streamlock.net/catamarcatelevision/catamarcatelevision/playlist.m3u8
 #EXTINF:-1 tvg-id="ChacoTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/JbxMs5i.png" group-title="Local",Chaco TV (720p) [Not 24/7]
 https://5b7ecefab6325.streamlock.net/Streamtv/chacotv/playlist.m3u8
-#EXTINF:-1 tvg-id="ChacraTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/mZlUGBf.jpg" group-title="",Chacra TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ChacraTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/mZlUGBf.jpg" group-title="",Chacra TV (720p) [Not 24/7]
 https://s8.stweb.tv/chacra/live/playlist.m3u8
 #EXTINF:-1 tvg-id="CincoTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.pinimg.com/originals/2d/18/54/2d185451c3cc188c39add960b94c6844.png" group-title="",Cinco TV (480p) [Not 24/7]
 https://59537faa0729a.streamlock.net/cincotv/cincotv/playlist.m3u8
@@ -80,7 +80,7 @@ https://59537faa0729a.streamlock.net/cincotv/cincotv/playlist.m3u8
 https://5fb24b460df87.streamlock.net/live-cont.ar/cinear/playlist.m3u8
 #EXTINF:-1 tvg-id="CiudadTVResistencia.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/WxzqqFQ.jpg" group-title="Local",Ciudad TV Resistencia (Chaco) (720p) [Not 24/7]
 http://coninfo.net:1935/chacodxdtv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="CN3Pinamar.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",CN3 Pinamar (1080p) [Offline]
+#EXTINF:-1 tvg-id="CN3Pinamar.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",CN3 Pinamar (720p) [Not 24/7]
 https://wowza.telpin.com.ar:1935/canal3/canal3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="CPEtv.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/75UgF.png" group-title="",CPEtv (720p) [Offline]
 https://dcunilive28-lh.akamaihd.net/i/dclive_1@533583/master.m3u8
@@ -88,7 +88,7 @@ https://dcunilive28-lh.akamaihd.net/i/dclive_1@533583/master.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCSmh3DFxBwFurMttT60PQ1g/live
 #EXTINF:-1 tvg-id="DeporTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/ar_dxtv_m.png" group-title="Sports",DeporTV (1080p) [Not 24/7]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UCSmh3DFxBwFurMttT60PQ1g/live
-#EXTINF:-1 tvg-id="ElGarageTV.ar" tvg-country="HISPAM;ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/cd0hP5e.png" group-title="Auto",El Garage TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ElGarageTV.ar" tvg-country="HISPAM;ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/cd0hP5e.png" group-title="Auto",El Garage TV (324p) [Not 24/7]
 http://186.0.233.76:1935/Garage/smil:garage.smil/master.m3u8
 #EXTINF:-1 tvg-id="ElOnce.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",ElOnce (1080p) [Not 24/7]
 https://elonceovh.elonce.com/hls/live.m3u8
@@ -96,7 +96,7 @@ https://elonceovh.elonce.com/hls/live.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC1zLDoKL-eKmd_K7qkUZ-ow/live
 #EXTINF:-1 tvg-id="Encuentro.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/ar_encuentro_m.png" group-title="General",Encuentro (1080p) [Not 24/7]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UC1zLDoKL-eKmd_K7qkUZ-ow/live
-#EXTINF:-1 tvg-id="FenixTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/Op0zdh5.jpg" group-title="Local",Fenix TV (Ciudad de La Rioja) (720p)
+#EXTINF:-1 tvg-id="FenixTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/Op0zdh5.jpg" group-title="Local",Fenix TV (Ciudad de La Rioja) (360p)
 https://stmv1.questreaming.com/fenixlarioja/fenixlarioja/playlist.m3u8
 #EXTINF:-1 tvg-id="GenTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",GenTV (720p) [Not 24/7]
 https://videohd.live:19360/8010/8010.m3u8
@@ -105,7 +105,7 @@ https://srv1.zcast.com.br/lavozdetucuman/lavozdetucuman/playlist.m3u8
 #EXTINF:-1 tvg-id="LivePeruTVStreaming.ar" tvg-country="AR;PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/liveperutv/picture?width=320&height=320" group-title="General",Live Perú TV Streaming (720p) [Not 24/7]
 http://209.126.108.55/app/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="MagicKids.ar" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="" group-title="",Magic Kids (240p) [Not 24/7]
-https://live.admefy.com/live/240/clean_peach_ef224.m3u8
+https://live.admefy.com/live/default/rival_maroon_4fb1e.m3u8
 #EXTINF:-1 tvg-id="MediosRioja.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",Medios Rioja (864p) [Not 24/7]
 http://streamyes.alsolnet.com/mediosrioja/live/playlist.m3u8
 #EXTINF:-1 tvg-id="MultivisionFederal.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/sZ1yE4e.png" group-title="",Multivisión Federal (720p) [Not 24/7]
@@ -138,15 +138,15 @@ http://telefewhitehls-lh.akamaihd.net/i/whitelist_hls@302302/master.m3u8
 https://videostream.shockmedia.com.ar:1936/telejunin/telejunin/playlist.m3u8
 #EXTINF:-1 tvg-id="Telemax.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",Telemax (720p)
 http://live-edge01.telecentro.net.ar/live/smil:tlx.smil/master.m3u8
-#EXTINF:-1 tvg-id="TelenordCorrientes.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/byxXHzq.png" group-title="Local",Telenord Corrientes (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TelenordCorrientes.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/byxXHzq.png" group-title="Local",Telenord Corrientes (1080p) [Not 24/7]
 http://www.coninfo.net:1935/previsoratv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="TelesolTLS.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://telesol.tv/wp-content/uploads/2020/06/LOGO-FINAL-TELESOL-2020.png" group-title="",Telesol (TLS) (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="TelesolTLS.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://telesol.tv/wp-content/uploads/2020/06/LOGO-FINAL-TELESOL-2020.png" group-title="",Telesol (TLS) (432p) [Not 24/7]
 https://cnnsanjuan.com:9999/live/telesol/playlist.m3u8
 #EXTINF:-1 tvg-id="TelpinCanal2.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/B2lKSvo.png" group-title="",Telpin Canal 2 (720p)
 https://wowza.telpin.com.ar:1935/telpintv/smil:ttv.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TelpinTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",Telpin TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="TelpinTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",Telpin TV (1080p) [Not 24/7]
 https://wowza.telpin.com.ar:1935/telpintv/ttv.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TierraMiaTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://forounivers.com/uploads/monthly_2018_09/small.Logo_TierramiaTV.png.52a0b19eb1a7425c43898d0766558d1a.png" group-title="",Tierra Mía TV (480p)
+#EXTINF:-1 tvg-id="TierraMiaTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://forounivers.com/uploads/monthly_2018_09/small.Logo_TierramiaTV.png.52a0b19eb1a7425c43898d0766558d1a.png" group-title="",Tierra Mía TV (720p)
 http://live-edge01.telecentro.net.ar/live/smil:trm.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Toonizaki.ar" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/toonizaki/picture?width=300&height=300" group-title="Animation",Toonizaki (720p) [Not 24/7]
 https://live.admefy.com/live/default/great_salmon_9bd9d.m3u8
@@ -156,5 +156,7 @@ http://streamspub.manasat.com:1935/tvar/tvmanaar2/playlist.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/user/TVPublicaArgentina/live
 #EXTINF:-1 tvg-id="TVUniversidad.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/960549144657002496/9Rdtd6Ke_400x400.jpg" group-title="Education",TVU Universidad Nacional de La Plata (720p) [Not 24/7]
 https://stratus.stream.cespi.unlp.edu.ar/hls/tvunlp.m3u8
+#EXTINF:-1 tvg-id="VTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/vertvgs/picture?width=320&height=320" group-title="",VerTV (VTV) (720p)
+https://5f700d5b2c46f.streamlock.net/vertv/vertv/playlist.m3u8
 #EXTINF:-1 tvg-id="Vorterix.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/vorterix/picture?width=320&height=320" group-title="Entertainment",Vorterix (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCvCTWHCbBC0b9UIeLeNs8ug/live
diff --git a/channels/at.m3u b/channels/at.m3u
index e1c572f3f7..d8cea70de6 100644
--- a/channels/at.m3u
+++ b/channels/at.m3u
@@ -7,7 +7,7 @@ https://stream.openplayout.org/hls/dorftv/live.m3u8
 http://stream.fs1.tv:8080/hls/webstream.m3u8
 #EXTINF:-1 tvg-id="FS1Salzburg.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/HSRpYUl.jpg" group-title="",FS1 Salzburg (720p) [Not 24/7]
 https://stream.fs1.tv/hls/webstream.m3u8
-#EXTINF:-1 tvg-id="GoTV.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/UxISEZf.png" group-title="",GoTV (576p) [Offline]
+#EXTINF:-1 tvg-id="GoTV.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/UxISEZf.png" group-title="",GoTV (576p) [Timeout]
 https://nstream17.gotv.at:1443/live/gotvlive/manifest.mpd
 #EXTINF:-1 tvg-id="HitradioO3.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/pb4Iqno.png" group-title="",Hitradio Ö3 (360p)
 http://185.85.28.19/oe3sd/orf.sdp/master.m3u8
@@ -29,7 +29,7 @@ https://d38d1dtxhym0zi.cloudfront.net/LiveHTTPOrigin/okto/playlist.m3u8
 https://d2i6psfxyapxwi.cloudfront.net/out/v1/f0cc8e3aceb64ad8968231dc5a0041d4/index.m3u8
 #EXTINF:-1 tvg-id="ORF1.at" tvg-country="AT" tvg-language="German" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fc/ORF1_logo.svg/1280px-ORF1_logo.svg.png" group-title="General",ORF 1 (540p) [Geo-blocked]
 https://orf1.mdn.ors.at/out/u/orf1/qxb/manifest.m3u8
-#EXTINF:-1 tvg-id="ORF2.at" tvg-country="AT" tvg-language="German" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/ORF2_logo_n.svg/1280px-ORF2_logo_n.svg.png" group-title="",ORF 2 (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="ORF2.at" tvg-country="AT" tvg-language="German" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/ORF2_logo_n.svg/1280px-ORF2_logo_n.svg.png" group-title="",ORF 2 (540p) [Geo-blocked]
 https://orf2.mdn.ors.at/out/u/orf2/qxb/manifest.m3u8
 #EXTINF:-1 tvg-id="ORF3.at" tvg-country="AT" tvg-language="German" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/4/40/ORF_III_Logo.png" group-title="",ORF 3 (720p) [Geo-blocked]
 https://orf3.mdn.ors.at/out/u/orf3/qxb/manifest.m3u8
@@ -39,7 +39,7 @@ https://orfs.mdn.ors.at/out/u/orfs/qxb/manifest.m3u8
 http://p3-6.mov.at:1935/live/weekstream/master.m3u8
 #EXTINF:-1 tvg-id="PremiumChannel.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/XLeth50.jpg" group-title="",Premium Channel [Not 24/7]
 http://premium-channel.tv:88/live/kali.m3u8
-#EXTINF:-1 tvg-id="R9.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/Wu6SMvb.png" group-title="",R9 (720p) [Offline]
+#EXTINF:-1 tvg-id="R9.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/Wu6SMvb.png" group-title="",R9 (720p) [Not 24/7]
 https://ms01.w24.at/R9/smil:liveeventR9.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RedBullTV.at" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/7NeBmWX.jpg" group-title="Sports",Red Bull TV (1080p)
 https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master.m3u8
@@ -47,7 +47,7 @@ https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master.m3u8
 http://iptv.rtv-ooe.at/stream.m3u8
 #EXTINF:-1 tvg-id="SchauTV.at" tvg-country="AT" tvg-language="German" tvg-logo="https://image.schautv.at/images/cfs_616w/3123676/schautv_homepagebanner_twitter.png" group-title="",SchauTV (720p)
 https://schautv.mdn.ors.at/out/u/schautv-nodrm.m3u8
-#EXTINF:-1 tvg-id="SwamijiTV.at" tvg-country="AT" tvg-language="English" tvg-logo="https://i.imgur.com/ygkBFYT.jpg" group-title="Outdoor",Swamiji TV (720p) [Offline]
+#EXTINF:-1 tvg-id="SwamijiTV.at" tvg-country="AT" tvg-language="English" tvg-logo="https://i.imgur.com/ygkBFYT.jpg" group-title="Outdoor",Swamiji TV (720p) [Not 24/7]
 https://stream.swamiji.tv/YogaIPTV/smil:YogaStream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TeinsTV.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/KJie1k5.png" group-title="",Teins TV (1080p) [Not 24/7]
 https://live1.markenfunk.com/t1/live/playlist.m3u8
@@ -57,5 +57,5 @@ https://streaming14.huberwebmedia.at/LiveApp/streams/livestream.m3u8
 http://89.187.168.245:8080/live/sUPPERchannel2/index.m3u8
 #EXTINF:-1 tvg-id="UPPERACommunityTV.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/4fAkcCd.jpg" group-title="",UPPERA Community TV [Geo-blocked]
 http://89.187.168.245:8080/live/sUPPERchannel/index.m3u8
-#EXTINF:-1 tvg-id="W24.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/J25y9ah.png" group-title="",W24 (720p) [Offline]
+#EXTINF:-1 tvg-id="W24.at" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/J25y9ah.png" group-title="",W24 (720p) [Not 24/7]
 https://ms01.w24.at/W24/smil:liveevent.smil/playlist.m3u8
diff --git a/channels/au.m3u b/channels/au.m3u
index a831101c88..72b100dfb5 100644
--- a/channels/au.m3u
+++ b/channels/au.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="3AW.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Uvie0ws.png" group-title="",3AW (Melburne) (574p)
+#EXTINF:-1 tvg-id="3AW.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Uvie0ws.png" group-title="",3AW (Melbourne) (574p)
 http://melb3awvid-lh.akamaihd.net/i/melbournevid_1@109381/master.m3u8
 #EXTINF:-1 tvg-id="7flix.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.mjh.nz/.images/tv.101305020525.png" group-title="",7flix [Geo-blocked]
 https://i.mjh.nz/au/Sydney/tv.101305020525.m3u8
@@ -77,7 +77,7 @@ https://i.mjh.nz/au/Sydney/tv.320203000305.m3u8
 https://i.mjh.nz/au/Sydney/tv.7openshop.m3u8
 #EXTINF:-1 tvg-id="OpenShop.au" tvg-country="AU" tvg-language="English" tvg-logo="https://www.openshop.com.au/resources/images/pc/common/f_logo.png" group-title="",Open Shop (720p) [Offline]
 https://medialive.openshop.com.au/asn-live_1.m3u8
-#EXTINF:-1 tvg-id="RaceCentralTV.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Ot9wh52.png" group-title="",Race Central TV (720p)
+#EXTINF:-1 tvg-id="RaceCentralTV.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Ot9wh52.png" group-title="",Race Central TV (720p) [Timeout]
 https://nrpus.bozztv.com/36bay2/gusa-racecentral/index.m3u8
 #EXTINF:-1 tvg-id="Racingcom.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.mjh.nz/.images/tv.101305020528.png" group-title="",Racing.com [Geo-blocked]
 https://i.mjh.nz/au/Sydney/tv.101305020528.m3u8
@@ -98,18 +98,18 @@ https://skylivesky-i.akamaihd.net/hls/live/569780/skylive/sky1.m3u8
 #EXTINF:-1 tvg-id="SkyRacing1.au" tvg-country="AU" tvg-language="English" tvg-logo="https://media.info/i/lf/300/1514269404/6402.png" group-title="",Sky Racing 1 (720p)
 https://skylivetab-i.akamaihd.net/hls/live/569779/tablive/sky1.m3u8
 #EXTINF:-1 tvg-id="SkyRacing2.au" tvg-country="AU" tvg-language="English" tvg-logo="https://media.info/i/lf/300/1514269377/6411.png" group-title="",Sky Racing 2 (720p)
-https://skylivesky-i.akamaihd.net/hls/live/569780/skylive/sky2.m3u8
-#EXTINF:-1 tvg-id="SkyRacing2.au" tvg-country="AU" tvg-language="English" tvg-logo="https://media.info/i/lf/300/1514269377/6411.png" group-title="",Sky Racing 2 (720p)
 https://skylivetab-i.akamaihd.net/hls/live/569779/tablive/sky2.m3u8
+#EXTINF:-1 tvg-id="SkyRacing2.au" tvg-country="AU" tvg-language="English" tvg-logo="https://media.info/i/lf/300/1514269377/6411.png" group-title="",Sky Racing 2 (540p)
+https://skylivesky-i.akamaihd.net/hls/live/569780/skylive/sky2.m3u8
 #EXTINF:-1 tvg-id="SkyThoroughbredCentral.au" tvg-country="AU" tvg-language="English" tvg-logo="https://www.foxtel.com.au/content/dam/foxtel/shared/channel/SRW/SRH_425x243.png" group-title="",Sky Thoroughbred Central (720p)
 https://skylivesky-i.akamaihd.net/hls/live/569780/skylive/stcsd.m3u8
-#EXTINF:-1 tvg-id="SkyThoroughbredCentral.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.mjh.nz/.images/tv.skyrtc.png" group-title="",Sky Thoroughbred Central (720p)
+#EXTINF:-1 tvg-id="SkyThoroughbredCentral.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.mjh.nz/.images/tv.skyrtc.png" group-title="",Sky Thoroughbred Central (360p)
 https://skylivetab-i.akamaihd.net/hls/live/569779/tablive/stcsd.m3u8
 #EXTINF:-1 tvg-id="SnowyMountainsTelevision.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.mjh.nz/.images/tv.snowy-mountains.png" group-title="Sports",Snowy Mountains Television (1082p) [Geo-blocked]
 https://c.mjh.nz/snowy-mountains
-#EXTINF:-1 tvg-id="SnowyMountainsTelevision.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/vuFx0Zd.jpg" group-title="Sports",Snowy Mountains Television (1082p) [Not 24/7]
+#EXTINF:-1 tvg-id="SnowyMountainsTelevision.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/vuFx0Zd.jpg" group-title="Sports",Snowy Mountains Television (1080p) [Not 24/7]
 https://dcunilive30-lh.akamaihd.net/i/dclive_1@535229/master.m3u8
-#EXTINF:-1 tvg-id="TravelFoodTV.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Ot9wh52.png" group-title="Lifestyle",Travel & Food TV (720p)
+#EXTINF:-1 tvg-id="TravelFoodTV.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Ot9wh52.png" group-title="Lifestyle",Travel & Food TV (720p) [Timeout]
 https://nrpus.bozztv.com/36bay2/gusa-moviemagictv/index.m3u8
 #EXTINF:-1 tvg-id="TVSN.au" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/TuHnkxP.png" group-title="",TVSN (360p) [Not 24/7]
 https://tvsn-i.akamaihd.net/hls/live/261837/tvsn/tvsn.m3u8
diff --git a/channels/az.m3u b/channels/az.m3u
index d15d4dab60..3eb2e27a60 100644
--- a/channels/az.m3u
+++ b/channels/az.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AlvinChannelTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="http://www.alvinchannel.com/templates/Default/images/logo.png" group-title="General",Alvin Channel TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlvinChannelTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="http://www.alvinchannel.com/templates/Default/images/logo.png" group-title="General",Alvin Channel TV (240p) [Not 24/7]
 http://cdn10-alvinchannel.yayin.com.tr/alvinchannel/alvinchannel/playlist.m3u8
 #EXTINF:-1 tvg-id="ARB.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://arbtv.az/assets/uploads/sites/logo.png" group-title="General",ARB (576p) [Not 24/7]
 https://europe2.livetv.az/azerbaijan/arb/playlist.m3u8
@@ -9,19 +9,19 @@ http://85.132.81.184:8080/arb24/live1/index.m3u8
 http://149.255.152.199/arbgunes.m3u8
 #EXTINF:-1 tvg-id="AzTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="http://www.aztv.az/storage/settings/September2019/23bMtFJXZsjnUuC0AwiQ.png" group-title="General",Az TV (576p) [Not 24/7]
 http://streams.livetv.az/azerbaijan/aztv_stream2/playlist.m3u8
+#EXTINF:-1 tvg-id="AzadTVMinus2.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="General",Azad TV -2 (ATV) (720p)
+http://85.132.81.184:8080/atv-2/index.m3u8
+#EXTINF:-1 tvg-id="AzadTVMinus4.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="General",Azad TV -4 (ATV) (720p)
+http://85.132.81.184:8080/atv-4/index.m3u8
 #EXTINF:-1 tvg-id="AzadTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="General",Azad TV (ATV) (720p)
 http://85.132.81.184:8080/atv/index.m3u8
 #EXTINF:-1 tvg-id="AzadTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="General",Azad TV (ATV) (720p)
 http://85.132.81.184:8080/atvlive/atv-e1/index.m3u8
 #EXTINF:-1 tvg-id="AzadTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="General",Azad TV (ATV) (576p) [Not 24/7]
 http://streams.livetv.az/azerbaijan/atv_sd_stream4/playlist.m3u8
-#EXTINF:-1 tvg-id="AzadTVMinus2.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="General",Azad TV -2 (ATV) (720p)
-http://85.132.81.184:8080/atv-2/index.m3u8
-#EXTINF:-1 tvg-id="AzadTVMinus4.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="General",Azad TV -4 (ATV) (720p)
-http://85.132.81.184:8080/atv-4/index.m3u8
 #EXTINF:-1 tvg-id="CBC.az" tvg-country="AZ;TR;GE" tvg-language="Azerbaijani;Russian;English;Persian;Armenian" tvg-logo="http://cbc.az/assets/uploads/sites/Logo_fin.png" group-title="News",CBC (720p) [Not 24/7]
 http://cbctvlive.flashmediacast.com:1935/CBCTVLive/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="ELTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="http://eltv.az/wp-content/uploads/2021/01/alllogo.png" group-title="General",EL TV (432p)
+#EXTINF:-1 tvg-id="ELTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="http://eltv.az/wp-content/uploads/2021/01/alllogo.png" group-title="General",EL TV (260p)
 http://85.132.53.162:1935/live/eltv/playlist.m3u8
 #EXTINF:-1 tvg-id="FTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://apim.livetv.az/images/original/ftvlogo.png" group-title="Movies",FTV (720p) [Not 24/7]
 https://str2.yodacdn.net/publive/ftv/video.m3u8
@@ -45,7 +45,7 @@ http://cdn10-mugantv.yayin.com.tr/mugantv/mugantv/playlist.m3u8
 http://streams.livetv.az/azerbaijan/nax/playlist.m3u8
 #EXTINF:-1 tvg-id="NaxcivanTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://ntv.az/assets/images/logo.png" group-title="General",Naxçıvan TV (720p) [Offline]
 http://canli.naxcivantv.az/media/20210930/index.m3u8
-#EXTINF:-1 tvg-id="QafqazTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://upload.wikimedia.org/wikipedia/az/thumb/6/69/Qafqaz_TV_%282017-h.h.%29.png/640px-Qafqaz_TV_%282017-h.h.%29.png" group-title="General",Qafqaz TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="QafqazTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://upload.wikimedia.org/wikipedia/az/thumb/6/69/Qafqaz_TV_%282017-h.h.%29.png/640px-Qafqaz_TV_%282017-h.h.%29.png" group-title="General",Qafqaz TV (360p) [Not 24/7]
 https://europe2.livetv.az/azerbaijan/qafqaztv/playlist.m3u8
 #EXTINF:-1 tvg-id="QblTV.az" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/degUDMf.png" group-title="General",Qəbələ TV (480p) [Not 24/7]
 https://qebele.tv/live/stream/index.m3u8
diff --git a/channels/ba.m3u b/channels/ba.m3u
index 744a871ecc..b1194a6428 100644
--- a/channels/ba.m3u
+++ b/channels/ba.m3u
@@ -13,11 +13,11 @@ http://webtvstream.bhtelecom.ba/malta.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/ntvic
 #EXTINF:-1 tvg-id="RTVBPK.ba" tvg-country="BA" tvg-language="Bosnian" tvg-logo="https://i.imgur.com/g639yyT.jpg" group-title="",RTV BPK (720p)
 https://webtvstream.bhtelecom.ba/gorazde_cam2.m3u8
-#EXTINF:-1 tvg-id="RTVHB.com" tvg-country="BA" tvg-language="Bosnian" tvg-logo="https://i.imgur.com/EE8C8rR.png" group-title="",RTV HB (576p) [Offline]
+#EXTINF:-1 tvg-id="RTVHB.com" tvg-country="BA" tvg-language="Bosnian" tvg-logo="https://i.imgur.com/EE8C8rR.png" group-title="",RTV HB (576p) [Not 24/7]
 https://prd-hometv-live-open.spectar.tv/ERO_1_083/playlist.m3u8
-#EXTINF:-1 tvg-id="Televizija5.ba" tvg-country="BA" tvg-language="Bosnian" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="",Televizija 5 (240p)
+#EXTINF:-1 tvg-id="Televizija5.ba" tvg-country="BA" tvg-language="Bosnian" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="",Televizija 5 (240p) [Timeout]
 https://balkanmedia.dynu.net/hls/tv5web.m3u8
-#EXTINF:-1 tvg-id="tvslon.ba" tvg-country="BA" tvg-language="Bosnian" tvg-logo="https://www.rtvslon.ba/wp-content/uploads/2020/07/slon-extra-logo-mali-300x277.jpg" group-title="",TV Slon Extra (1080p) [Offline]
+#EXTINF:-1 tvg-id="tvslon.ba" tvg-country="BA" tvg-language="Bosnian" tvg-logo="https://www.rtvslon.ba/wp-content/uploads/2020/07/slon-extra-logo-mali-300x277.jpg" group-title="",TV Slon Extra (1080p) [Not 24/7]
 http://31.47.0.130:8082
 #EXTINF:-1 tvg-id="tvslon.ba" tvg-country="BA" tvg-language="Bosnian" tvg-logo="https://www.rtvslon.ba/wp-content/uploads/2020/07/slon-extra-logo-mali-300x277.jpg" group-title="",TV Slon Extra (1080p) [Offline]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/RTVSLON/live
diff --git a/channels/bd.m3u b/channels/bd.m3u
index b59b0a7ed4..93cc378697 100644
--- a/channels/bd.m3u
+++ b/channels/bd.m3u
@@ -9,7 +9,7 @@ https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeF
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/banglav000.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="BijoyTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/63/BIJOY_TV_Logo_BD.png" group-title="General",Bijoy TV (720p) [Not 24/7]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/bijoy00.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="BoishakhiTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="http://www.boishakhionline.com/frontend_source/assets/images/logo.png" group-title="General",Boishakhi TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="BoishakhiTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="http://www.boishakhionline.com/frontend_source/assets/images/logo.png" group-title="General",Boishakhi TV (720p) [Not 24/7]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/boishakhitv-org.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="BTVChittagong.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://i.imgur.com/CMUHtv3.png" group-title="Local",BTV Chittagong (720p) [Not 24/7]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/btvnational-ctg.stream/playlist.m3u8
@@ -17,7 +17,7 @@ https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeF
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/btvbd-office-sg.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Channel9.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/f/ff/Channel9_bd.svg/350px-Channel9_bd.svg.png" group-title="Local",Channel 9 (720p) [Geo-blocked]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/channel9hd.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="Channel24.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/91/Channel24logo.svg/400px-Channel24logo.svg.png" group-title="News",Channel 24 (1080p)
+#EXTINF:-1 tvg-id="Channel24.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/91/Channel24logo.svg/400px-Channel24logo.svg.png" group-title="News",Channel 24 (720p)
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/channel24-sg-e8e.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="ChannelI.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.channelionline.com/wp-content/uploads/2019/07/channel-i-logo-1.png" group-title="General",Channel I (1080p) [Geo-blocked]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/channeli-8-org.stream/playlist.m3u8
@@ -35,9 +35,9 @@ https://ekusheyserver.com/etvlivesn.m3u8
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/gaanbangla-8-orgd.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="IndependentTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/c/c1/Independent_Television_Logo.svg/157px-Independent_Television_Logo.svg.png" group-title="News",Independent TV (1080p) [Not 24/7]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/independent-8-org.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="JamunaTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.jamuna.tv/wp-content/themes/jtv-news/img/logo.png" group-title="News",Jamuna TV (720p)
+#EXTINF:-1 tvg-id="JamunaTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.jamuna.tv/wp-content/themes/jtv-news/img/logo.png" group-title="News",Jamuna TV (1080p)
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/jamuna-test-sample-ok.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="News24.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.news24bd.tv/assets/desktop/images/logos/logo.png" group-title="News",News 24 (720p)
+#EXTINF:-1 tvg-id="News24.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.news24bd.tv/assets/desktop/images/logos/logo.png" group-title="News",News 24 (1080p)
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/news24local.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="NexusTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://i.imgur.com/XcJZKg4.png" group-title="General",Nexus TV (720p) [Not 24/7]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/nexustv.stream/playlist.m3u8
@@ -54,8 +54,8 @@ https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeF
 #EXTINF:-1 tvg-id="SATV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.satv.tv/wp-content/uploads/2016/07/logo1.png" group-title="General",SATV (720p) [Not 24/7]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/satvoff5666.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="SomoyNewsTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.somoynews.tv/_nuxt/img/somoy-logo-192x192.33c3254.png" group-title="News",Somoy News TV (1080p) [Not 24/7]
-https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/somoyt000011226615544544.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="SomoyNewsTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.somoynews.tv/_nuxt/img/somoy-logo-192x192.33c3254.png" group-title="News",Somoy News TV (1080p) [Not 24/7]
 https://somoy.appv.jagobd.com:444/somoy/somoyt000011226615544544.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="SomoyNewsTV.bd" tvg-country="BD" tvg-language="Bengali" tvg-logo="https://www.somoynews.tv/_nuxt/img/somoy-logo-192x192.33c3254.png" group-title="News",Somoy News TV (720p) [Not 24/7]
+https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/somoyt000011226615544544.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TimeTelevision.us" tvg-country="US" tvg-language="Bengali" tvg-logo="https://www.timetvusa.com/images/ttv200.png" group-title="General",Time Television (720p) [Not 24/7]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/timetvusa.stream/playlist.m3u8
diff --git a/channels/be.m3u b/channels/be.m3u
index ab2adb55a5..cbe6daefbe 100644
--- a/channels/be.m3u
+++ b/channels/be.m3u
@@ -31,7 +31,7 @@ https://contact-lh.akamaihd.net/i/CONTACT_1@321283/master.m3u8
 http://highvolume04.streampartner.nl/radiopros/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioPROS.be" tvg-country="BE" tvg-language="Dutch" tvg-logo="https://i.imgur.com/RMjFeGE.png" group-title="Music",Radio PROS (720p) [Not 24/7]
 https://558bd16067b67.streamlock.net/radiopros/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="ROB" tvg-country="BE" tvg-language="Dutch" tvg-logo="https://i.imgur.com/CzQe0q2.png" group-title="",ROB TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ROB" tvg-country="BE" tvg-language="Dutch" tvg-logo="https://i.imgur.com/CzQe0q2.png" group-title="",ROB TV (540p) [Not 24/7]
 https://api.new.livestream.com/accounts/27755193/events/8462344/live.m3u8
 #EXTINF:-1 tvg-id="RTL-TVi BE" tvg-country="BE;LU" tvg-language="French" tvg-logo="https://i.imgur.com/yjtxdmh.png" group-title="",RTL-TVi (720p)
 https://rtltvi-lh.akamaihd.net/i/TVI_1@319659/master.m3u8
diff --git a/channels/bf.m3u b/channels/bf.m3u
index c07722b044..cc24b6e56d 100644
--- a/channels/bf.m3u
+++ b/channels/bf.m3u
@@ -3,7 +3,7 @@
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.twitch.tv/3tvbf
 #EXTINF:-1 tvg-id="FasoTV.bf" tvg-country="BF" tvg-language="French" tvg-logo="https://fasotv.net/wp-content/uploads/2019/08/log-faso.png" group-title="",Faso TV (480p) [Not 24/7]
 https://playtv4kpro.com:5443/LiveApp/streams/163893638025530331068059.m3u8
-#EXTINF:-1 tvg-id="ImpactTV.bf" tvg-country="BF" tvg-language="French" tvg-logo="https://i.imgur.com/sCGRccj.png" group-title="Religious",Impact TV (360p)
+#EXTINF:-1 tvg-id="ImpactTV.bf" tvg-country="BF" tvg-language="French" tvg-logo="https://i.imgur.com/sCGRccj.png" group-title="Religious",Impact TV (360p) [Timeout]
 https://edge7.vedge.infomaniak.com/livecast/ik:impacttv_1/manifest.m3u8
 #EXTINF:-1 tvg-id="RTB.bf" tvg-country="BF" tvg-language="French" tvg-logo="https://www.rtb.bf/wp-content/uploads/2020/04/LOgo-RTB-272-90-3.png" group-title="",RTB (240p) [Geo-blocked]
 https://edge8.vedge.infomaniak.com/livecast/ik:rtbtvlive1/manifest.m3u8
diff --git a/channels/bg.m3u b/channels/bg.m3u
index 853a3b0591..f816d91560 100644
--- a/channels/bg.m3u
+++ b/channels/bg.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="100AutoMotoTV.bg" tvg-country="BG" tvg-language="Bulgarian;English" tvg-logo="https://i.imgur.com/PjBm4Ic.jpg" group-title="Auto",100% Auto Moto TV (1080p) [Not 24/7]
 http://100automoto.tv:1935/bgtv1/autotv/playlist.m3u8
-#EXTINF:-1 tvg-id="BalkanikaTV.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/S0GrDsQ.png" group-title="Music",Balkanika TV (270p)
+#EXTINF:-1 tvg-id="BalkanikaTV.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/S0GrDsQ.png" group-title="Music",Balkanika TV (270p) [Offline]
 rtsp://stream.teracomm.bg/balkanika
 #EXTINF:-1 tvg-id="BGMusic.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="" group-title="Music",BG Music [Offline]
 https://cdn1.mobiletv.bg/T10/bgmusic/bgmusic_794613_850k.m3u8
@@ -23,7 +23,7 @@ http://edge15.cdn.bg:2006/fls/bonair.stream/playlist.m3u8
 http://hls.cdn.bg:2006/fls/bonair.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Bulgaria On Air" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/fawQSJN.jpg" group-title="News",Bulgaria On Air (576p)
 http://ios.cdn.bg:2006/fls/bonair.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="CityTV.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/CITY_BG_logo.png" group-title="",City TV [Not 24/7]
+#EXTINF:-1 tvg-id="CityTV.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/CITY_BG_logo.png" group-title="",City TV (576p) [Not 24/7]
 https://tv.city.bg/play/tshls/citytv/index.m3u8
 #EXTINF:-1 tvg-id="Diema.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/Diema_BG.png" group-title="",Diema [Offline]
 https://cdn1.mobiletv.bg/T13/diema/diema_794613_850k.m3u8
@@ -37,7 +37,7 @@ https://cdn1.mobiletv.bg/T8/ekids/ekids_794613_850k.m3u8
 https://live.ecomservice.bg/hls/stream.m3u8
 #EXTINF:-1 tvg-id="FishingHuntingChannel.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="" group-title="Outdoor",Fishing & Hunting Channel [Offline]
 https://cdn1.mobiletv.bg/T5/fh/fh_794613_850k.m3u8
-#EXTINF:-1 tvg-id="HomeOneTV.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/v0gJW1l.jpg" group-title="",HomeOne TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="HomeOneTV.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/v0gJW1l.jpg" group-title="",HomeOne TV (1080p) [Timeout]
 https://streamer104.neterra.tv/n1tv/n1tv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="LightChannel.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/qskVMhF.png" group-title="",Light Channel (480p) [Not 24/7]
 https://streamer1.streamhost.org/salive/GMIlcbgM/playlist.m3u8
@@ -49,7 +49,7 @@ https://cdn1.mobiletv.bg/T10/kanal4/kanal4_794613_850k.m3u8
 https://e113-ts.cdn.bg/sportal/fls/sportal_fullhd/chunklist.m3u8?at=c92098d9ab33bf471967c6b6195361e3
 #EXTINF:-1 tvg-id="ThisisBulgaria.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria (1080p) [Offline]
 https://streamer103.neterra.tv/thisisbulgaria/community.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TVPlus.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/W074hkS.jpg" group-title="",TV+ [Offline]
+#EXTINF:-1 tvg-id="TVPlus.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/W074hkS.jpg" group-title="",TV+ [Timeout]
 http://141.136.14.18/kanal1/kanal1.m3u8
 #EXTINF:-1 tvg-id="WnessTV.bg" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/n0YJN6v.png" group-title="",Wness TV (720p) [Offline]
 https://wness103.neterra.tv/wness/wness.smil/playlist.m3u8
diff --git a/channels/bh.m3u b/channels/bh.m3u
index d33628fb03..6eaa4537b9 100644
--- a/channels/bh.m3u
+++ b/channels/bh.m3u
@@ -1,17 +1,17 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="BahrainInternational.bh" tvg-country="BH" tvg-language="Arabic;English" tvg-logo="https://i.imgur.com/uiulhEg.jpg" group-title="General",Bahrain International (720p) [Offline]
 https://5c7b683162943.streamlock.net/live/ngrp:Bahrain+International_all/playlist.m3u8
-#EXTINF:-1 tvg-id="BahrainLawal.bh" tvg-country="BH" tvg-language="Arabic" tvg-logo="https://i.imgur.com/LTD0jIm.png" group-title="General",Bahrain Lawal
+#EXTINF:-1 tvg-id="BahrainLawal.bh" tvg-country="BH" tvg-language="Arabic" tvg-logo="https://i.imgur.com/LTD0jIm.png" group-title="General",Bahrain Lawal (410p)
 https://5c7b683162943.streamlock.net/live/ngrp:Bahrain+Lawal_all/playlist.m3u8
 #EXTINF:-1 tvg-id="BahrainQuran.bh" tvg-country="BH" tvg-language="Arabic" tvg-logo="https://i.imgur.com/OPw6U7j.jpg" group-title="Religious",Bahrain Quran (720p) [Offline]
 https://5c7b683162943.streamlock.net/live/ngrp:Bahrain+Quran_all/playlist.m3u8
 #EXTINF:-1 tvg-id="BahrainSports1.bh" tvg-country="BH" tvg-language="Arabic" tvg-logo="https://i.imgur.com/pQ0QGGl.jpg" group-title="Sports",Bahrain Sports 1 (720p) [Not 24/7]
 http://185.105.4.106:1935/live/Bahrain+Sports/playlist.m3u8
-#EXTINF:-1 tvg-id="BahrainSports1.bh" tvg-country="BH" tvg-language="Arabic" tvg-logo="https://i.imgur.com/pQ0QGGl.jpg" group-title="Sports",Bahrain Sports 1 (720p) [Offline]
+#EXTINF:-1 tvg-id="BahrainSports1.bh" tvg-country="BH" tvg-language="Arabic" tvg-logo="https://i.imgur.com/pQ0QGGl.jpg" group-title="Sports",Bahrain Sports 1 (720p) [Not 24/7]
 https://5c7b683162943.streamlock.net/live/ngrp:Bahrain+Sports_all/playlist.m3u8
 #EXTINF:-1 tvg-id="BahrainSports2.bh" tvg-country="BH" tvg-language="Arabic" tvg-logo="https://i.imgur.com/e5buVPV.jpg" group-title="Sports",Bahrain Sports 2 (720p) [Offline]
 https://5c7b683162943.streamlock.net/live/ngrp:Bahrain+Sports+2_all/playlist.m3u8
 #EXTINF:-1 tvg-id="BahrainTV.bh" tvg-country="BH" tvg-language="Arabic;English" tvg-logo="https://i.imgur.com/LTD0jIm.png" group-title="General",Bahrain TV (720p) [Not 24/7]
 http://185.105.4.106:1935/live/Bahrain+TV/playlist.m3u8
-#EXTINF:-1 tvg-id="BahrainTV.bh" tvg-country="BH" tvg-language="Arabic;English" tvg-logo="https://i.imgur.com/LTD0jIm.png" group-title="General",Bahrain TV (720p) [Offline]
+#EXTINF:-1 tvg-id="BahrainTV.bh" tvg-country="BH" tvg-language="Arabic;English" tvg-logo="https://i.imgur.com/LTD0jIm.png" group-title="General",Bahrain TV (720p) [Not 24/7]
 https://5c7b683162943.streamlock.net/live/ngrp:Bahrain+TV_all/playlist.m3u8
diff --git a/channels/bo.m3u b/channels/bo.m3u
index 167f6c758a..8887816456 100644
--- a/channels/bo.m3u
+++ b/channels/bo.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AlegriaTV.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/jlRMBbu.jpg" group-title="Music",Alegria TV (480p) [Geo-blocked]
 https://593b04c4c5670.streamlock.net/8192/8192/playlist.m3u8
-#EXTINF:-1 tvg-id="ATB.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/DCAtokY.png" group-title="",ATB (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="ATB.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/DCAtokY.png" group-title="",ATB (614p) [Not 24/7]
 http://186.121.206.197/live/daniel/index.m3u8
 #EXTINF:-1 tvg-id="ATB.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/oszItYJ.jpg" group-title="",ATB (360p) [Not 24/7]
 https://mediacp.hostradios.com.ar:19360/atbcochabamba/atbcochabamba.m3u8
@@ -13,7 +13,7 @@ https://video1.getstreamhosting.com:1936/8224/8224/playlist.m3u8
 https://cp.sradiotv.com:1936/8058/8058/playlist.m3u8
 #EXTINF:-1 tvg-id="CTV.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="" group-title="Local",CTV Canal 38 Digital (Viacha) (480p) [Not 24/7]
 https://media2.cdnlayer.biz:8081/8026/index.m3u8
-#EXTINF:-1 tvg-id="MegaTV.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/megatelevisionbolivia/picture?width=300&height=300" group-title="",MegaTV (720p) [Offline]
+#EXTINF:-1 tvg-id="MegaTV.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/megatelevisionbolivia/picture?width=300&height=300" group-title="",MegaTV (720p) [Not 24/7]
 https://solo.disfrutaenlared.com:1936/tvcbba/tvcbba/playlist.m3u8
 #EXTINF:-1 tvg-id="MegaTVYacuiba.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/MegatvYacuiba/picture?width=300&height=300" group-title="",MegaTV (Yacuiba) (720p)
 https://stmv.panel.grupolimalive.com/mega/mega/playlist.m3u8
@@ -33,7 +33,7 @@ https://seo.tv.bo/tv/seo.m3u8
 https://seo.tv.bo/tv/kids.m3u8
 #EXTINF:-1 tvg-id="SEOTVNovelas.bo" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Seo.Tv.sat/picture?width=300&height=300" group-title="Series",SEO TV Novelas (540p) [Not 24/7]
 https://seo.tv.bo/tv/nvls.m3u8
-#EXTINF:-1 tvg-id="TVLatinaCanal42.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://ya.co.ve/3VJ" group-title="",TV Latina Canal 42 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVLatinaCanal42.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://ya.co.ve/3VJ" group-title="",TV Latina Canal 42 (720p) [Not 24/7]
 https://master.tucableip.com/live/tvlatinamontero/playlist.m3u8
 #EXTINF:-1 tvg-id="TVU.bo" tvg-country="BO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/YdiF5k6.png" group-title="",TVU (276p)
 http://136.243.3.70:1935/TvUniversitaria/TvUniversitaria/playlist.m3u8
diff --git a/channels/br.m3u b/channels/br.m3u
index fec03ee341..065149abdc 100644
--- a/channels/br.m3u
+++ b/channels/br.m3u
@@ -27,16 +27,16 @@ https://evpp.mm.uol.com.br/geob_band/bandnewstv/playlist.m3u8
 https://stream01.msolutionbrasil.com.br/hls/canal25/live.m3u8
 #EXTINF:-1 tvg-id="CanaldoBoi.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/Logo_Canal_do_Boi_-_PNG.png/301px-Logo_Canal_do_Boi_-_PNG.png" group-title="Outdoor",Canal do Boi [Offline]
 https://aovivo.equipea.com.br:5443/WebRTCAppEE/streams/713829795440060188004130.m3u8
-#EXTINF:-1 tvg-id="MetropoleNewsTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://www.cmn.tv.br/images/logo_cmn.fw.png" group-title="News",Canal Metropolitano de Noticias (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="MetropoleNewsTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://www.cmn.tv.br/images/logo_cmn.fw.png" group-title="News",Canal Metropolitano de Noticias (720p) [Not 24/7]
 http://in.uaimacks.net.br:1935/macks/macks.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="CanalSaude.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/MXhHP6U.png" group-title="Other",Canal Saúde (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CanalSaude.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/MXhHP6U.png" group-title="",Canal Saúde (360p) [Not 24/7]
 https://arkyvbre1g.zoeweb.tv/fiocruz/fiocruz/playlist.m3u8
-#EXTINF:-1 tvg-id="Catve2.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/qiVfsfB.png" group-title="General",Catve2 (720p)
-https://5b33b873179a2.streamlock.net:1443/catve2/catve2/playlist.m3u8
 #EXTINF:-1 tvg-id="CatveFM.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/w89yw36.png" group-title="General",Catve FM (720p) [Not 24/7]
 https://5b33b873179a2.streamlock.net:1443/radiocamera/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="CatveMasterTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/4m7Iazm.png" group-title="General",Catve Master TV (720p)
 https://5b33b873179a2.streamlock.net:1443/mastertv/livestream/playlist.m3u8
+#EXTINF:-1 tvg-id="Catve2.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/qiVfsfB.png" group-title="General",Catve2 (720p)
+https://5b33b873179a2.streamlock.net:1443/catve2/catve2/playlist.m3u8
 #EXTINF:-1 tvg-id="CBNRio.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/FZwHq8k.png" group-title="News",CBN Rio (720p)
 https://medias.sgr.globo.com/hls/vCBNRJ/vCBNRJ.m3u8
 #EXTINF:-1 tvg-id="CBNSaoPaulo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/FZwHq8k.png" group-title="News",CBN São Paulo (720p)
@@ -53,35 +53,35 @@ http://wowza4.catve.com.br:1935/live/livestream/media.m3u8
 http://flash.softhost.com.br:1935/fonte/fontetv/live.m3u8
 #EXTINF:-1 tvg-id="Futura.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/8e/Canal_Futura.png/300px-Canal_Futura.png" group-title="Education",Futura (540p) [Not 24/7]
 https://tv.unisc.br/hls/test.m3u8
-#EXTINF:-1 tvg-id="GhostTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/ZVO8GVI.png" group-title="Movies",Ghost TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="GhostTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/ZVO8GVI.png" group-title="Movies",Ghost TV (800p) [Not 24/7]
 https://stmv.video.expressolider.com.br/ghostv/ghostv/playlist.m3u8
 #EXTINF:-1 tvg-id="GospelCartoon.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/aoq9CGU.png" group-title="Religious",Gospel Cartoon (480p) [Offline]
 https://stmv1.srvstm.com/gospelcartoon2/gospelcartoon2/playlist.m3u8
-#EXTINF:-1 tvg-id="GospelMovieTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://ipgo.xyz/tv/gmovies/imagens/logo_gospelf_site.png" group-title="Religious",Gospel Movie TV (720p)
+#EXTINF:-1 tvg-id="GospelMovieTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://ipgo.xyz/tv/gmovies/imagens/logo_gospelf_site.png" group-title="Religious",Gospel Movie TV (360p)
 https://stmv1.srvif.com/gospelf/gospelf/playlist.m3u8
 #EXTINF:-1 tvg-id="HotFM.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://imgur.com/hvm6Npo.png" group-title="",Hot FM SP (720p) [Not 24/7]
 http://flash8.crossdigital.com.br/id2266/id2266/playlist.m3u8
-#EXTINF:-1 tvg-id="IMPDTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/D15qpCm.png" group-title="Religious",IMPD TV (1080p)
+#EXTINF:-1 tvg-id="IMPDTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/D15qpCm.png" group-title="Religious",IMPD TV (720p)
 https://58a4464faef53.streamlock.net/impd/ngrp:impd_all/playlist.m3u8
-#EXTINF:-1 tvg-id="ISTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/6/63/Logo-istv.png" group-title="General",ISTV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ISTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/6/63/Logo-istv.png" group-title="General",ISTV (1080p) [Not 24/7]
 https://cdn.jmvstream.com/w/LVW-9883/LVW9883_lFcfKysrHF/chunklist.m3u8
-#EXTINF:-1 tvg-id="ITV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i1.wp.com/itu.tv.br/wp-content/uploads/2020/03/cropped-favicon.png" group-title="Local",ITV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ITV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i1.wp.com/itu.tv.br/wp-content/uploads/2020/03/cropped-favicon.png" group-title="Local",ITV (480p) [Not 24/7]
 http://tv02.logicahost.com.br:1935/itutv/itutv/live.m3u8
 #EXTINF:-1 tvg-id="JovemPanNews.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/2/26/Jovem_Pan_logo_2018.svg/320px-Jovem_Pan_logo_2018.svg.png" group-title="News",Jovem Pan News (1080p)
 https://d6yfbj4xxtrod.cloudfront.net/out/v1/7836eb391ec24452b149f3dc6df15bbd/index.m3u8
 #EXTINF:-1 tvg-id="KpopTVPlay.br" tvg-country="BR" tvg-language="Korean" tvg-logo="https://kpoptv.live/wp-content/uploads/2021/10/logokpoptvplay.png" group-title="Music",KpopTV Play (720p) [Not 24/7]
 https://srv1.zcast.com.br/kpoptv/kpoptv/playlist.m3u8
-#EXTINF:-1 tvg-id="MKKWebTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/TDEDNLK.png" group-title="General",MKK Web TV (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="MKKWebTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/TDEDNLK.png" group-title="General",MKK Web TV (480p) [Not 24/7]
 https://video01.logicahost.com.br/mkkwebtv/mkkwebtv/playlist.m3u8
 #EXTINF:-1 tvg-id="NovaEraTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/IK3F9Uq.png" group-title="Local",Nova Era TV (1080p) [Not 24/7]
 http://wz3.dnip.com.br:1935/novaeratv/novaeratv.sdp/live.m3u8
 #EXTINF:-1 tvg-id="NovoTempo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo (480p)
-http://stream.novotempo.com/tv/tvnovotempo.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="NovoTempo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo (480p)
 http://stream.novotempo.com:1935/tv/smil:tvnovotempo.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="NovoTempo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo (480p)
 http://stream.novotempo.com:1935/tv/tvnovotempo.smil/live.m3u8
 #EXTINF:-1 tvg-id="NovoTempo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo (480p)
+http://stream.novotempo.com/tv/tvnovotempo.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="NovoTempo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo (480p)
 https://stream.live.novotempo.com/tv/smil:tvnovotempo.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="NuevoTiempo.br" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Nuevo Tiempo (720p) [Not 24/7]
 https://stream.live.novotempo.com/tv/smil:tvnuevotiempo.smil/playlist.m3u8
@@ -111,7 +111,7 @@ https://playpluspoa-lh.akamaihd.net/i/pp_poa@377864/index_720_av-p.m3u8
 https://playplusspo-lh.akamaihd.net/i/pp_sp@350176/index_720_av-p.m3u8
 #EXTINF:-1 tvg-id="RedeBrasil.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/thumb/3/39/Logotipo_da_Rede_Brasil_de_Televis%C3%A3o.png/300px-Logotipo_da_Rede_Brasil_de_Televis%C3%A3o.png" group-title="General",Rede Brasil (720p) [Not 24/7]
 https://59f2354c05961.streamlock.net:1443/rbtv/rbtv/playlist.m3u8
-#EXTINF:-1 tvg-id="RedeBrasildeComunicacao.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://portal.rbc1.com.br/public/portal/img/layout/logorbc.png" group-title="Religious",Rede Brasil de Comunicação (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="RedeBrasildeComunicacao.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://portal.rbc1.com.br/public/portal/img/layout/logorbc.png" group-title="Religious",Rede Brasil de Comunicação (720p) [Not 24/7]
 http://rbc.directradios.com:1935/rbc/rbc/live.m3u8
 #EXTINF:-1 tvg-id="RedeCNTCuritiba.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://www.cnt.com.br/public/dist/assets/myDev/image/global/logo.png" group-title="Local",Rede CNT (Curitiba) (360p) [Not 24/7]
 https://dd8umsy8yf96u.cloudfront.net/live/cnt-curitiba.m3u8
@@ -121,15 +121,15 @@ https://dd8umsy8yf96u.cloudfront.net/live/cnt-americana.m3u8
 https://5a1c76baf08c0.streamlock.net/familia/smil:familia.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVGloboRiodeJaneiro.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/q7pYaJR.png" group-title="Sports",Rede Globo RJ (720p) [Offline]
 http://live.video.globo.com/h/1402196682759012345678915746027599876543210hM4EA1neMoQoIiUyVn1TNg/k/app/a/A/u/anyone/d/s/hls-globo-rj/playlist.m3u8
-#EXTINF:-1 tvg-id="RedeGospel.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/yvxG9m5.png" group-title="Religious",Rede Gospel (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="RedeGospel.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/yvxG9m5.png" group-title="Religious",Rede Gospel (720p) [Not 24/7]
 https://cdn.jmvstream.com/w/LVW-8719/LVW8719_AcLVAxWy5J/playlist.m3u8
-#EXTINF:-1 tvg-id="RedeMaoAmiga.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/cqD6DNY.png" group-title="Religious",Rede Mão Amiga (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RedeMaoAmiga.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/cqD6DNY.png" group-title="Religious",Rede Mão Amiga (1080p) [Not 24/7]
 http://streaming03.zas.media:1935/redemaoamiga/redemaoamiga/live.m3u8
 #EXTINF:-1 tvg-id="RedeMinas.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/Tgov03S.jpg" group-title="Education",Rede Minas (1080p) [Not 24/7]
 https://v4-slbps-sambavideos.akamaized.net/live/3282,8114,ec4b5a296d97fa99bf990662f5b4f8e1;base64np;Mc8VDxqNjXKCAf8!/amlst:Mc_tFgfGiHOdQXPB/chunklist_.m3u8
-#EXTINF:-1 tvg-id="RedeRC.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/nc95BPy.png" group-title="Local",Rede RC (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="RedeRC.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/nc95BPy.png" group-title="Local",Rede RC (720p) [Not 24/7]
 http://tv02.logicahost.com.br:1935/rederc/rederc/live.m3u8
-#EXTINF:-1 tvg-id="RedeSeculo21.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/vvrCWVo.jpg" group-title="Religious",Rede Século 21 (240p) [Not 24/7]
+#EXTINF:-1 tvg-id="RedeSeculo21.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/vvrCWVo.jpg" group-title="Religious",Rede Século 21 (1080p) [Not 24/7]
 https://cdn.jmvstream.com/w/LVW-10024/ngrp:LVW10024_H3QLdAY6kx_all/playlist.m3u8
 #EXTINF:-1 tvg-id="RedeSuper.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/3ODbxcM.png" group-title="Religious",Rede Super (432p) [Not 24/7]
 https://api.new.livestream.com/accounts/10205943/events/3429501/live.m3u8
@@ -137,9 +137,9 @@ https://api.new.livestream.com/accounts/10205943/events/3429501/live.m3u8
 https://hls.brasilstream.com.br/live/redetves/redetves/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPampa.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.livetvnews.com.br/wp-content/uploads/2019/03/Logo-RedeTV.png" group-title="General",Rede TV! Pampa (720p) [Not 24/7]
 https://59f1cbe63db89.streamlock.net:1443/tvpampa/tvpampa/playlist.m3u8
-#EXTINF:-1 tvg-id="RedeTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.livetvnews.com.br/wp-content/uploads/2019/03/Logo-RedeTV.png" group-title="General",Rede TV! SP (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="RedeTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.livetvnews.com.br/wp-content/uploads/2019/03/Logo-RedeTV.png" group-title="General",Rede TV! SP (720p) [Not 24/7]
 https://hls.brasilstream.com.br/live/redetv/redetv/playlist.m3u8
-#EXTINF:-1 tvg-id="RedeVida.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/0/0c/Rede_Vida_logo.png/267px-Rede_Vida_logo.png" group-title="Religious",Rede Vida (720p) [Offline]
+#EXTINF:-1 tvg-id="RedeVida.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/0/0c/Rede_Vida_logo.png/267px-Rede_Vida_logo.png" group-title="Religious",Rede Vida (720p) [Not 24/7]
 https://cvd1.cds.ebtcvd.net/live-redevida/smil:redevida.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RedeTVTocantins.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/8fGmJWA.png" group-title="General",RedeTV! Tocantins (720p) [Not 24/7]
 https://59f1cbe63db89.streamlock.net:1443/redetvro/redetvro/playlist.m3u8
@@ -147,7 +147,7 @@ https://59f1cbe63db89.streamlock.net:1443/redetvro/redetvro/playlist.m3u8
 https://stmv1.srvif.com/retrotv/retrotv/playlist.m3u8
 #EXTINF:-1 tvg-id="SantaCeciliaTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/KxYsq1d.png" group-title="Education",Santa Cecilia TV (288p) [Not 24/7]
 http://flash1.crossdigital.com.br/2063/2063/playlist.m3u8
-#EXTINF:-1 tvg-id="RedeMassa.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://cdn.mitvstatic.com/channels/br_rede-massa_m.png" group-title="General",SBT Rede Massa (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="RedeMassa.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://cdn.mitvstatic.com/channels/br_rede-massa_m.png" group-title="General",SBT Rede Massa (720p) [Not 24/7]
 https://cdn-cdn-iguacu.ciclano.io:1443/cdn-iguacu/cdn-iguacu/playlist.m3u8
 #EXTINF:-1 tvg-id="TVCidadeVerde.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://cdn.mitvstatic.com/channels/br_tv-cidade-verde-hd_m.png" group-title="General",SBT TV Cidade Verde (1080p) [Not 24/7]
 https://stmv1.transmissaodigital.com/cidadeverde/cidadeverde/playlist.m3u8
@@ -157,7 +157,7 @@ https://evpp.mm.uol.com.br/ne10/ne10-tvjornal-caruaru-video-web.sdp/playlist.m3u
 #EXTINF:-1 tvg-id="TVJornal.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/IUDRW8l.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0" group-title="General",SBT TV Jornal Recife (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0
 https://evpp.mm.uol.com.br/ne10/ne10.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TVSerraDourada.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://cdn.mitvstatic.com/channels/br_tv-serra-dourada-hd_m.png" group-title="General",SBT TV Serra Dourada (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVSerraDourada.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://cdn.mitvstatic.com/channels/br_tv-serra-dourada-hd_m.png" group-title="General",SBT TV Serra Dourada (360p) [Not 24/7]
 https://5a1c76baf08c0.streamlock.net/tvsd2/smil:tvsd2_20042020.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="SescTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://sesctv.org.br/wp-content/uploads/2018/06/SESCTV-ICON.png" group-title="Music",Sesc TV (1080p) [Not 24/7]
 https://slbps-ml-sambatech.akamaized.net/samba-live/2472/7424/8a00fe7cc36ac263b2c3e9324497d5ff/video/0c884f97-4264-446f-abcd-03aa46089a96_index.m3u8
@@ -179,7 +179,7 @@ http://tv02.logicahost.com.br:1935/tvdigitalbirigui/tvdigitalbirigui/live.m3u8
 https://59f2354c05961.streamlock.net:1443/tvdigitalbirigui/tvdigitalbirigui/playlist.m3u8
 #EXTINF:-1 tvg-id="TVBNO.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.tvbno.com.br/images/LOGOTIPO-BNO-1.png" group-title="Music",TV BNO (270p) [Not 24/7]
 http://tv02.logicahost.com.br:1935/bonner/bonner/live.m3u8
-#EXTINF:-1 tvg-id="TVBrasil.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/1/1c/Logotipo_da_TV_Brasil.png" group-title="General",TV Brasil
+#EXTINF:-1 tvg-id="TVBrasil.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/1/1c/Logotipo_da_TV_Brasil.png" group-title="General",TV Brasil [Timeout]
 https://edge-rj-01.eduplay.rnp.br/media/ocp(r(SOtSyQ)t(AAAAAAAAAAA)p(d(ADo)k(EBE)m(kyMRVuhfTf2jk2bhk4oZVw)n(a(kLbutb9FljfAzjoWmXgS8Rnp6_GUlkq0)s(rRg)'a(T-aZqqGXTwBm6ZHJp3tHyyjZ)s(fvc)))s(t(eT8)b(6P9w9Nu8wcNIUaKqkTKqXRWNHWIhMz8mxUoA4mgo1tqnqVYwaZMCmldOaMbaZB0n33FR3ttihZ1JvOivSGdZIuhde-5ZIl_f4tK0pFaa_lpv5gVXuaKHBhpJxYHQpAySe8UfuTry1gihrKpUq-DVrvTLAVcN_NYL-OR5gME)'t(ccA)b(Q_39q61nTExyyL-LZijmcTvd7twmucXBiaA)))/live_720_index.m3u8
 #EXTINF:-1 tvg-id="TVCamara.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/UpV2PRk.png" group-title="Legislative",TV Câmara (1080p)
 https://stream3.camara.gov.br/tv1/manifest.m3u8
@@ -187,25 +187,25 @@ https://stream3.camara.gov.br/tv1/manifest.m3u8
 https://stream3.camara.gov.br/tv2/manifest.m3u8
 #EXTINF:-1 tvg-id="saopaulo.sp.leg.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/2/27/Logo_tvcamara_.png/320px-Logo_tvcamara_.png" group-title="Legislative",TV Camara de Sao Paulo (720p)
 https://cdn.jmvstream.com/w/LVW-8711/ngrp:LVW8711_tG0F3TEBDL_all/playlist.m3u8
-#EXTINF:-1 tvg-id="TVCapitalLucelia.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://radiocapitalfm777.com/images/415d46e69bdae8276a4cc5cba9cd3d10.jpg" group-title="Other",TV Capital Lucelia (320p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVCapitalLucelia.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://radiocapitalfm777.com/images/415d46e69bdae8276a4cc5cba9cd3d10.jpg" group-title="",TV Capital Lucelia (268p) [Not 24/7]
 http://tv02.logicahost.com.br:1935/tvcapital/tvcapital/live.m3u8
 #EXTINF:-1 tvg-id="TVCarioca.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://pbr-str.srvsite.com/arquivos/7051/cabecalho-7051-20200320104612.png" group-title="General",TV Carioca (720p)
 https://srv5.zcast.com.br/tvcarioca/tvcarioca/playlist.m3u8
 #EXTINF:-1 tvg-id="TVCidadeCanal9.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/mbw27tW.png" group-title="Local",TV Cidade Canal 9 (720p) [Not 24/7]
 https://59f1cbe63db89.streamlock.net:1443/tvcidade/tvcidade/playlist.m3u8
-#EXTINF:-1 tvg-id="TVCidadedePetropolis.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/jaaGxnd.png" group-title="Local",TV Cidade de Petrópolis (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVCidadedePetropolis.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/jaaGxnd.png" group-title="Local",TV Cidade de Petrópolis (1080p) [Not 24/7]
 https://video01.kshost.com.br:4443/inside2133/inside2133/playlist.m3u8
 #EXTINF:-1 tvg-id="TVCidadedeSaoPaulo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/thumb/8/88/Logotipo_da_TV_Cidade_de_S%C3%A3o_Paulo.png/200px-Logotipo_da_TV_Cidade_de_S%C3%A3o_Paulo.png" group-title="Local",TV Cidade de Sao Paulo [Not 24/7]
 https://cast.cdnseguro.com:19360/8012/8012.m3u8
-#EXTINF:-1 tvg-id="TVCinec.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/bEoN2tt.png" group-title="Other",TV Cinec (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVCinec.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/bEoN2tt.png" group-title="",TV Cinec (360p) [Not 24/7]
 http://tv01.logicahost.com.br:1935/tvcinec/tvcinec/live.m3u8
+#EXTINF:-1 tvg-id="TVDestak.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/W1LutVP.png" group-title="General",TV Destak (360p)
+https://59f2354c05961.streamlock.net:1443/pascoal/pascoal/playlist.m3u8
 #EXTINF:-1 tvg-id="TVDestak.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/W1LutVP.png" group-title="General",TV Destak (320p)
 http://tv02.logicahost.com.br:1935/pascoal/pascoal/live.m3u8
-#EXTINF:-1 tvg-id="TVDestak.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/W1LutVP.png" group-title="General",TV Destak (320p)
-https://59f2354c05961.streamlock.net:1443/pascoal/pascoal/playlist.m3u8
 #EXTINF:-1 tvg-id="TVDiariodoSertao.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/uBntXf1.png" group-title="General",TV Diário do Sertão (720p)
 http://painelvj.com.br:1935/pdsertaotv/pdsertaotv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="TVEscola.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://pt.wikipedia.org/wiki/Ficheiro:TV_Escola.png" group-title="Education",TV Escola
+#EXTINF:-1 tvg-id="TVEscola.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://pt.wikipedia.org/wiki/Ficheiro:TV_Escola.png" group-title="Education",TV Escola [Timeout]
 https://edge-pe-01.eduplay.rnp.br/media/ocp(r(SOtSyQ)t(AAAAAAAAAAA)p(d(ADo)k(EBE)m(iKyPRJ66GZqYJf0OVp_mxw)n(a(kLbutb9FljfAzjoWmXgS8Rnp6_GUlkq0)s(rRg)'a(T-aZqqGVQABm6ZHJp3tHyyjZ)s(fvc)))s(t(eT8)b(6P9w9Nu8wcNIUaKqkTKqXRWNHWIhMz8mxUoA4mgo1tqnqVYwaZMCmldOaMbaZB0n33FR3ttihZ1JvOivSGdZIuAfecBVa16Et9eMjlLC13Rq6Cwwi8mycU0Iwr-66QiAe98vgBCT-AiPs61W_9bjrtb8ATEJw-JsxpVNlotY)'t(wDM)b(pbCqvGJQQWqY9cAtI-9-O9bngy67xc2Xu8ug)))/live_540_index.m3u8
 #EXTINF:-1 tvg-id="TVEvangelizar.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/4LG6sA0.png" group-title="Religious",TV Evangelizar (480p)
 https://5f593df7851db.streamlock.net/evangelizar/tv/playlist.m3u8
@@ -219,7 +219,7 @@ https://api.new.livestream.com/accounts/5381476/events/8947634/live.m3u8
 https://streaming01.zas.media/gideoes/programacao/playlist.m3u8
 #EXTINF:-1 tvg-id="TVGuara.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/PafEXRA.png" group-title="General",TV Guará (720p) [Not 24/7]
 https://59f2354c05961.streamlock.net:1443/tvguara/tvguara/playlist.m3u8
-#EXTINF:-1 tvg-id="TVInterlagos.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://www.tvinterlagos.com.br/images/logo_tv2.jpg" group-title="Local",TV Interlagos (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVInterlagos.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://www.tvinterlagos.com.br/images/logo_tv2.jpg" group-title="Local",TV Interlagos (480p) [Not 24/7]
 http://tv.tvalphanet.com.br:1935/tvinterlagos/tvinterlagos/playlist.m3u8
 #EXTINF:-1 tvg-id="TVJornaldoNordeste.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://pa-str.srvsite.com/arquivos/5459/cabecalho-5459-20200226161907.png" group-title="Local",TV Jornal do Nordeste (720p) [Not 24/7]
 https://5cf4a2c2512a2.streamlock.net/jornaldonorteste/jornaldonorteste/playlist.m3u8
@@ -237,7 +237,7 @@ https://cdn-fundacao-2110.ciclano.io:1443/fundacao-2110/fundacao-2110/playlist.m
 https://59f1cbe63db89.streamlock.net:1443/caxiastv/caxiastv/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMon.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/j7EJvHr.png" group-title="Local",TV Mon (720p)
 https://srv1.zcast.com.br/tvmon/tvmon/playlist.m3u8
-#EXTINF:-1 tvg-id="TVNovaOnda.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/1dCdBM5.png" group-title="Local",TV Nova Onda (480p)
+#EXTINF:-1 tvg-id="TVNovaOnda.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/1dCdBM5.png" group-title="Local",TV Nova Onda (720p)
 https://5c483b9d1019c.streamlock.net/8078/8078/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPaiEterno.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.paieterno.com.br/wp-content/uploads/2019/05/cropped-logo-portal-01-192x192.png" group-title="Religious",TV Pai Eterno (360p)
 http://flash8.crossdigital.com.br/2306/2306/playlist.m3u8
@@ -257,15 +257,15 @@ https://stmv1.srvstm.com/tvserie/tvserie/playlist.m3u8
 http://streaming03.zas.media:1935/tvsol/tvsol/playlist.m3u8
 #EXTINF:-1 tvg-id="TVTerceiroAnjo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.terceiroanjo.com/static/img/logo-2019-gif.gif" group-title="Religious",TV Terceiro Anjo (360p) [Not 24/7]
 https://streamer1.streamhost.org/salive/GMI3anjoh/livestream.m3u8
-#EXTINF:-1 tvg-id="TVThathi.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://tv.thathi.com.br/wp-content/uploads/2021/02/tv-thathi-150x150.png" group-title="General",TV Thathi (720p)
+#EXTINF:-1 tvg-id="TVThathi.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://tv.thathi.com.br/wp-content/uploads/2021/02/tv-thathi-150x150.png" group-title="General",TV Thathi (720p) [Not 24/7]
 https://cdn-grupo-10049.ciclano.io:1443/grupo-10049/grupo-10049/playlist.m3u8
-#EXTINF:-1 tvg-id="TVTokyo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b7/TV_Tokyo_logo_20110629.svg/320px-TV_Tokyo_logo_20110629.svg.png" group-title="Animation",TV Tokyo (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVTokyo.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b7/TV_Tokyo_logo_20110629.svg/320px-TV_Tokyo_logo_20110629.svg.png" group-title="Animation",TV Tokyo (360p) [Not 24/7]
 https://stmv1.voxtvhd.com.br/tvtokio/tvtokio/playlist.m3u8
 #EXTINF:-1 tvg-id="TVTropical.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/TD6ZJoa.png" group-title="General",TV Tropical (480p) [Not 24/7]
 https://59f2354c05961.streamlock.net:1443/tvtropical/tvtropical/playlist.m3u8
 #EXTINF:-1 tvg-id="TVUFG.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/Yp3dbJo.png" group-title="Education",TV UFG (720p) [Not 24/7]
 http://flash.softhost.com.br:1935/ufg/tvufgweb/playlist.m3u8
-#EXTINF:-1 tvg-id="TVUFOP.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.upf.br/Assets/img/logo.png" group-title="Science",TV UFOP [Offline]
+#EXTINF:-1 tvg-id="TVUFOP.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.upf.br/Assets/img/logo.png" group-title="Science",TV UFOP [Timeout]
 https://edge-df-01.eduplay.rnp.br/media/ocp(r(iRGrcw)t(AAAAAAAAAAA)p(d(Dxg)k(Qdk)m(6pbmcjLXNoerDLdAhoXBxw)n(a(3LDBWxJLACwHVOavx5cO4BC5lA2ZDpPC)s(HrY)'a(12ztgSdgu3rQqz6xH52ZjVZa)s(Pm8)))s(t(aTo)b(PTsuEXhXAScNjp6w9ssG70foQQQiZk9_8m0vsjgLJ_yzxGPuj8i57PEDMMA4cmTNsKda2B5oX-EEErouZ1HFyuXyAosvuqvlMJtsMkooySBOlQbVM33PgsYPQdea2CdwV3jCwh3bEWxgkPO8qmBPQtt_5bUEV1Mi_2t1AjM)'t(S2o)b(WaBWYarWoWCInKe38WSze3Q_-kcUr5z4MZQ)))/index.m3u8
 #EXTINF:-1 tvg-id="TVUniaoFortaleza.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://cdn.mitvstatic.com/channels/br_tv-uni-o_m.png" group-title="Local",TV Uniao (1080p) [Not 24/7]
 http://stmv1.ifantasy.com.br/admin/admin/playlist.m3u8
@@ -283,31 +283,31 @@ http://stream2.ba.gov.br/hls-live/livepkgr/_definst_/irdeb/pgm-1.m3u8
 http://selpro1348.procergs.com.br:1935/tve/stve/playlist.m3u8
 #EXTINF:-1 tvg-id="TVideoNews.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/vstHOYx.png" group-title="News",TVídeoNews (720p) [Not 24/7]
 https://59f2354c05961.streamlock.net:1443/tvideonews/_definst_/tvideonews/chunklist.m3u8
-#EXTINF:-1 tvg-id="TVMaticComedy.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="Comedy",TVMatic Comedy (720p) [Offline]
+#EXTINF:-1 tvg-id="TVMaticComedy.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="Comedy",TVMatic Comedy (720p) [Timeout]
 http://cdn.tvmatic.net/comedy.m3u8
-#EXTINF:-1 tvg-id="TVMaticCrafts.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Crafts (720p) [Offline]
+#EXTINF:-1 tvg-id="TVMaticCrafts.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Crafts (720p) [Timeout]
 http://cdn.tvmatic.net/crafts.m3u8
-#EXTINF:-1 tvg-id="TVMaticFacebook.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Facebook (720p) [Offline]
+#EXTINF:-1 tvg-id="TVMaticFacebook.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Facebook (720p) [Timeout]
 http://cdn.tvmatic.net/facebook.m3u8
-#EXTINF:-1 tvg-id="TVMaticFight.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Fight (720p) [Offline]
+#EXTINF:-1 tvg-id="TVMaticFight.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Fight (720p) [Timeout]
 http://cdn.tvmatic.net/fight.m3u8
-#EXTINF:-1 tvg-id="TVMaticFunny.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Funny (720p) [Offline]
+#EXTINF:-1 tvg-id="TVMaticFunny.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Funny (720p) [Timeout]
 http://cdn.tvmatic.net/funny.m3u8
-#EXTINF:-1 tvg-id="TVMaticSport.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Sport (720p) [Offline]
+#EXTINF:-1 tvg-id="TVMaticSport.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Sport (720p) [Timeout]
 http://cdn.tvmatic.net/sport.m3u8
-#EXTINF:-1 tvg-id="TVMaticTikTok.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic TikTok (720p) [Offline]
+#EXTINF:-1 tvg-id="TVMaticTikTok.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic TikTok (720p) [Timeout]
 http://cdn.tvmatic.net/tiktok.m3u8
 #EXTINF:-1 tvg-id="TVNBrasil.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/Cywnp02.png" group-title="Local",TVN Brasil (720p) [Not 24/7]
 http://painelvj.com.br:1935/tvnbrasil/tvnbrasil.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TVNBrasil.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/Cywnp02.png" group-title="Local",TVN Brasil (720p) [Not 24/7]
 http://wz3.dnip.com.br/tvnbrasil/tvnbrasil.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="TVunisat.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/x6rVrTt.png" group-title="Local",TVunisat (360p) [Offline]
+#EXTINF:-1 tvg-id="TVunisat.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/x6rVrTt.png" group-title="Local",TVunisat (360p) [Not 24/7]
 https://stmv1.srvstm.com/jurandir3193/jurandir3193/playlist.m3u8
-#EXTINF:-1 tvg-id="UNBTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/Webysther_20160322_-_Logo_UnB_(sem_texto).svg/200px-Webysther_20160322_-_Logo_UnB_(sem_texto).svg.png" group-title="Science",UNBTV [Offline]
+#EXTINF:-1 tvg-id="UNBTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/Webysther_20160322_-_Logo_UnB_(sem_texto).svg/200px-Webysther_20160322_-_Logo_UnB_(sem_texto).svg.png" group-title="Science",UNBTV [Timeout]
 https://edge-go-01.eduplay.rnp.br/media/ocp(r(iRGrcw)t(AAAAAAAAAAA)p(d(Dxg)k(Qdk)m(XavC51HboPDZJtji_e3szw)n(a(3LDBWxJLACwHVOavx5cO4BC5lA2ZDpPC)s(HrY)'a(12ztgSdjsnrQqz6xH52ZjVZa)s(Pm8)))s(t(aTo)b(PTsuEXhXAScNjp6w9ssG70foQQQiZk9_8m0vsjgLJ_yzxGPuj8i57PEDMMA4cmTNsKda2B5oX-EEErouZ1HFyuX9AbUB8KvlMJtsMkooySBOlQbVM33PgsYPQdea2BJ0ehzbwQ39JhRwi_LnomRVQOY02rJ-d2IH3hF-JDM)'t(S2o)b(WaBWYarWoWCInKe38WSze3Q_-kcVqJj_MZQ)))/live_1080_index.m3u8
-#EXTINF:-1 tvg-id="UniTVPortoAlegre.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://www.ufrgs.br/unitv/images/logo.png" group-title="Education",UniTV Porto Alegre (480p)
+#EXTINF:-1 tvg-id="UniTVPortoAlegre.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://www.ufrgs.br/unitv/images/logo.png" group-title="Education",UniTV Porto Alegre (480p) [Timeout]
 http://unitvaovivo.ufrgs.br:8080/live.ogg
-#EXTINF:-1 tvg-id="UPFTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.upf.br/Assets/img/logo.png" group-title="Local",UPFTV [Offline]
+#EXTINF:-1 tvg-id="UPFTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://www.upf.br/Assets/img/logo.png" group-title="Local",UPFTV [Timeout]
 https://edge-df-01.eduplay.rnp.br/media/ocp(r(iRGrcw)t(AAAAAAAAAAA)p(d(Dxg)k(Qdk)m(Zpw89V7JSRj33uzTBmvflA)n(a(3LDBWxJLACwHVOavx5cO4BC5lA2ZDpPC)s(HrY)'a(12ztgSdgu3rQqz6xH52ZjVZa)s(Pm8)))s(t(aTo)b(PTsuEXhXAScNjp6w9ssG70foQQQiZk9_8m0vsjgLJ_yzxGPuj8i57PEDMMA4cmTNsKda2B5oX-EEErouZ1HFyvnyAaUn8qvlMJtsMkooySBOlQbVM33PgsYPQdea2BUvej3szg6oEmxOu__mykl-Ud831Jp-clI-5BB-JDM)'t(S2o)b(WaBWYarWoWCInKe38WSze3Q_-kAUqZ79MZQ)))/live_768_index.m3u8
 #EXTINF:-1 tvg-id="WhamTV.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/vxg8fKd.jpg" group-title="Music",Wham TV (720p) [Offline]
 https://srv5.zcast.com.br/andre4369/andre4369/playlist.m3u8
diff --git a/channels/br_pluto.m3u b/channels/br_pluto.m3u
index fc10c31c91..835e4273f4 100644
--- a/channels/br_pluto.m3u
+++ b/channels/br_pluto.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AVidaModernaDeRocko.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/5f6df6293a12e10007017396/colorLogoPNG.png" group-title="Kids",A vida moderna de Rocko (720p)
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5f6df6293a12e10007017396/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
-#EXTINF:-1 tvg-id="AsAventurasDeJackieChan.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/6079c1539b05aa0007a57495/colorLogoPNG.png" group-title="Kids",As Aventuras de Jackie Chan (720p)
+#EXTINF:-1 tvg-id="AsAventurasDeJackieChan.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/6079c1539b05aa0007a57495/colorLogoPNG.png" group-title="Kids",As Aventuras de Jackie Chan (684p)
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6079c1539b05aa0007a57495/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
 #EXTINF:-1 tvg-id="AsPistasDeBlue.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/5f99aad4e82db50007fac4b2/colorLogoPNG.png" group-title="Kids",As Pistas de Blue (720p)
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5f99aad4e82db50007fac4b2/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
@@ -99,7 +99,7 @@ http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5f1214a637c6fd00079c65
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5fac52f142044f00078e2a51/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
 #EXTINF:-1 tvg-id="PlutoTVNatureza.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/5f1213ba0ecebc00070e170f/colorLogoPNG.png" group-title="Documentary",Pluto TV Natureza (720p)
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5f1213ba0ecebc00070e170f/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
-#EXTINF:-1 tvg-id="PlutoTVPaisagens.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/604a8dedbca75b0007b1c753/colorLogoPNG.png" group-title="Other",Pluto TV Paisagens por Stingray (720p)
+#EXTINF:-1 tvg-id="PlutoTVPaisagens.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/604a8dedbca75b0007b1c753/colorLogoPNG.png" group-title="",Pluto TV Paisagens por Stingray (720p)
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/604a8dedbca75b0007b1c753/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
 #EXTINF:-1 tvg-id="PlutoTVRecordNews.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/6102e04e9ab1db0007a980a1/colorLogoPNG.png" group-title="News",Pluto TV Record News (720p)
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6102e04e9ab1db0007a980a1/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
@@ -119,5 +119,5 @@ http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5fd1419a3b4f4b000773ba
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5f515ebac01c0f00080e8439/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
 #EXTINF:-1 tvg-id="Tokusato.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/5ff609de50ab210008025c1b/colorLogoPNG.png" group-title="Animation",Tokusato (720p)
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5ff609de50ab210008025c1b/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
-#EXTINF:-1 tvg-id="TurmaDaMonica.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/5f997e44949bc70007a6941e/colorLogoPNG.png" group-title="Kids",Turma da Mônica (720p)
+#EXTINF:-1 tvg-id="TurmaDaMonica.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://images.pluto.tv/channels/5f997e44949bc70007a6941e/colorLogoPNG.png" group-title="Kids",Turma da Mônica (480p)
 http://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/5f997e44949bc70007a6941e/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
diff --git a/channels/by.m3u b/channels/by.m3u
index 8c4442340f..c4dfbd6206 100644
--- a/channels/by.m3u
+++ b/channels/by.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="8kanal.by" tvg-country="BY" tvg-language="Russian" tvg-logo="https://i.imgur.com/VpWmrEw.png" group-title="Local",8 канал (Витебск) (576p) [Not 24/7]
 http://95.46.208.8:24433/art
-#EXTINF:-1 tvg-id="Belarus3.by" tvg-country="BY" tvg-language="Russian" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/6/69/Belarus_3.jpg" group-title="News",Беларусь 3 (1080p) [Offline]
+#EXTINF:-1 tvg-id="Belarus3.by" tvg-country="BY" tvg-language="Russian" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/6/69/Belarus_3.jpg" group-title="News",Беларусь 3 (1080p) [Not 24/7]
 https://ngtrk.dc.beltelecom.by/ngtrk/smil:belarus3.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Belarus4.by" tvg-country="BY" tvg-language="Russian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/59/Belarus_4.png" group-title="General",Беларусь 4 (576p)
 http://95.46.208.8:26258/belarus4
diff --git a/channels/ca.m3u b/channels/ca.m3u
index 09f8590c18..898a9b806d 100644
--- a/channels/ca.m3u
+++ b/channels/ca.m3u
@@ -91,7 +91,7 @@ https://iptv-all.lanesh4d0w.repl.co/canada/chek-news
 http://stmv2.srvstm.com/classique/classique/playlist.m3u8
 #EXTINF:-1 tvg-id="ClassiqueTV.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/rhHq745.png" group-title="Movies",Classique TV (480p) [Offline]
 http://stmv3.srvstm.com/classique/classique/playlist.m3u8
-#EXTINF:-1 tvg-id="CPACOttawa.ca" tvg-country="CA" tvg-language="English;French" tvg-logo="https://i.imgur.com/5ym6eJS.png" group-title="Legislative",CPAC (1080p)
+#EXTINF:-1 tvg-id="CPACOttawa.ca" tvg-country="CA" tvg-language="English;French" tvg-logo="https://i.imgur.com/5ym6eJS.png" group-title="Legislative",CPAC (720p)
 https://d7z3qjdsxbwoq.cloudfront.net/groupa/live/f9809cea-1e07-47cd-a94d-2ddd3e1351db/live.isml/.m3u8
 #EXTINF:-1 tvg-id="CPMTV24.ca" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",CPMTV 24 [Offline]
 http://159.69.58.154/cpmtv/cpmtv.m3u8
@@ -107,7 +107,7 @@ https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeF
 http://cdn12.henico.net:8080/live/dncal/index.m3u8
 #EXTINF:-1 tvg-id="EawazTV.ca" tvg-country="CA" tvg-language="Urdu" tvg-logo="https://i.imgur.com/vB4yzen.png" group-title="",Eawaz TV (720p) [Not 24/7]
 https://streamer12.vdn.dstreamone.net/saazoawaz/saazoawaz/playlist.m3u8
-#EXTINF:-1 tvg-id="EETTV.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/k0Hzr3X.png" group-title="",EET TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="EETTV.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/k0Hzr3X.png" group-title="",EET TV (1080p) [Not 24/7]
 https://eu.streamjo.com/eetlive/eettv.m3u8
 #EXTINF:-1 tvg-id="EMCITV.ca" tvg-country="CA" tvg-language="French" tvg-logo="https://i.imgur.com/HRqcIcR.png" group-title="Religious",EMCI TV (1080p)
 https://emci-fr-hls.akamaized.net/hls/live/2007265/emcifrhls/index.m3u8
@@ -199,13 +199,13 @@ http://158.69.124.9:1935/sardaritv/sardaritv/playlist.m3u8
 https://cdn12.henico.net:8443/live/ssct/index.m3u8
 #EXTINF:-1 tvg-id="TAGTV.ca" tvg-country="CA" tvg-language="Hindi" tvg-logo="https://i.imgur.com/4PA2adF.png" group-title="",TAG TV (1080p) [Not 24/7]
 http://cdn11.live247stream.com/tag/tv/playlist.m3u8
-#EXTINF:-1 tvg-id="TamilVisionInternational.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision International (1080p)
+#EXTINF:-1 tvg-id="TamilVisionInternational.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision International (720p)
 http://live.tamilvision.tv:8081/TVI/SD/chunks.m3u8
 #EXTINF:-1 tvg-id="TamilVisionTV.ca" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision TV (1080p)
 http://live.tamilvision.tv:8081/TVI/HD/playlist.m3u8
 #EXTINF:-1 tvg-id="TamilVisionTV.ca" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision TV (720p)
 http://live.tamilvision.tv:8081/TVI/SD/playlist.m3u8
-#EXTINF:-1 tvg-id="TeleCulturelleMedias.ca" tvg-country="CA" tvg-language="French" tvg-logo="https://i.imgur.com/oRigj9q.jpg" group-title="",Télé Culturelle Médias (720p) [Offline]
+#EXTINF:-1 tvg-id="TeleCulturelleMedias.ca" tvg-country="CA" tvg-language="French" tvg-logo="https://i.imgur.com/oRigj9q.jpg" group-title="",Télé Culturelle Médias (720p) [Not 24/7]
 https://5790d294af2dc.streamlock.net/8150/8150/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleMag.ca" tvg-country="CA" tvg-language="French" tvg-logo="https://i.imgur.com/i5Isrob.png" group-title="General",Télé-Mag Québec (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/user/ctmq/live
@@ -227,7 +227,7 @@ https://tvalive-nondai.akamaized.net/Content/HLS/Live/channel(a7315e07-037c-12a8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC0JP0ek-HhcqisiEpsZiQZA/live
 #EXTINF:-1 tvg-id="TVOKids.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/Tvokids-logo.svg/512px-Tvokids-logo.svg.png" group-title="Kids",TVOKids (360p) [Not 24/7]
 https://bcsecurelivehls-i.akamaihd.net/hls/live/623607/15364602001/tvokids/master.m3u8
-#EXTINF:-1 tvg-id="isumatv.ca" tvg-country="CA" tvg-language="English;Inuktitut" tvg-logo="https://i.imgur.com/RR7ATr2.png" group-title="Local",Uvagut TV (720p)
+#EXTINF:-1 tvg-id="isumatv.ca" tvg-country="CA" tvg-language="English;Inuktitut" tvg-logo="https://i.imgur.com/RR7ATr2.png" group-title="Local",Uvagut TV (1080p)
 http://dee7mwgg9dzvl.cloudfront.net/hls/uvagut/playlist.m3u8
 #EXTINF:-1 tvg-id="VBS.ca" tvg-country="CA" tvg-language="Vietnamese" tvg-logo="https://i.imgur.com/IWpevBp.jpg" group-title="",VBS (480p) [Not 24/7]
 https://uni6rtmp.tulix.tv/vbstv/vbsabr.smil/playlist.m3u8
diff --git a/channels/ca_samsung.m3u b/channels/ca_samsung.m3u
index 742f39e20a..0d97ca1d4c 100644
--- a/channels/ca_samsung.m3u
+++ b/channels/ca_samsung.m3u
@@ -21,7 +21,7 @@ https://insighttv-samsung-canada.amagi.tv/playlist.m3u8
 https://inwonder-samsung-canada.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="KidoodleTV.us" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/MaFtbM5.png" group-title="Kids",Kidoodle.TV (720p) [Offline]
 https://kidoodletv-kdtv-1-ca.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="MavTV.us" tvg-country="CA" tvg-language="CA" tvg-logo="https://www.mavtv.com/assets/images/mavtv_logo.png" group-title="Sports",MavTV (720p) [Offline]
+#EXTINF:-1 tvg-id="MavTV.us" tvg-country="CA" tvg-language="" tvg-logo="https://www.mavtv.com/assets/images/mavtv_logo.png" group-title="Sports",MavTV (720p) [Offline]
 https://mavtv-1-ca.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="MHZ.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/a5fw83n.jpg" group-title="",MHZ (720p) [Offline]
 https://mhz-samsung-linear-ca.samsung.wurl.com/manifest/playlist.m3u8
@@ -33,11 +33,11 @@ https://jukin-peopleareawesome-2-ca.samsung.wurl.com/manifest/playlist.m3u8
 https://playerstv-samsungca.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="PowerNation.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/HwAQMJL.png" group-title="",PowerNation (720p) [Offline]
 https://rtmtv-samsung-ca.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="StingrayNaturescape.ca" tvg-country="CA" tvg-language="CA" tvg-logo="https://i.imgur.com/lu8bFhZ.jpg" group-title="Music",Stingray Naturescape (1080p)
+#EXTINF:-1 tvg-id="StingrayNaturescape.ca" tvg-country="CA" tvg-language="" tvg-logo="https://i.imgur.com/lu8bFhZ.jpg" group-title="Music",Stingray Naturescape (1080p)
 https://stingray-naturescape-1-ca.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="Tastemade.ca" tvg-country="CA" tvg-language="CA" tvg-logo="https://i.imgur.com/yuRa9lM.png" group-title="Cooking",Tastemade (720p) [Offline]
+#EXTINF:-1 tvg-id="Tastemade.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/yuRa9lM.png" group-title="Cooking",Tastemade (720p) [Offline]
 https://ti-samsung-ca.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="TheDesignNetwork.ca" tvg-country="CA" tvg-language="CA" tvg-logo="https://i.imgur.com/wCq3E0M.png" group-title="",The Design Network (720p) [Offline]
+#EXTINF:-1 tvg-id="TheDesignNetwork.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/wCq3E0M.png" group-title="",The Design Network (720p) [Offline]
 https://thedesignnetwork-tdn-6-ca.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ThePetCollectiveCanada.us" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/Mk28uUy.png" group-title="Family",The Pet Collective Canada (720p) [Offline]
 https://the-pet-collective-international-ca.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/cd.m3u b/channels/cd.m3u
index 03b69910c7..5a6afc9d90 100644
--- a/channels/cd.m3u
+++ b/channels/cd.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="Afrobeats.cd" tvg-country="CD" tvg-language="English" tvg-logo="" group-title="Music",Afrobeats (720p)
+#EXTINF:-1 tvg-id="Afrobeats.cd" tvg-country="CD" tvg-language="English" tvg-logo="" group-title="Music",Afrobeats (1080p)
 https://stream.ecable.tv/afrobeats/index.m3u8
-#EXTINF:-1 tvg-id="BossBrothersTV.cd" tvg-country="CD" tvg-language="French" tvg-logo="" group-title="General",Boss Brothers TV (720p)
+#EXTINF:-1 tvg-id="BossBrothersTV.cd" tvg-country="CD" tvg-language="French" tvg-logo="" group-title="General",Boss Brothers TV (1080p)
 http://51.254.199.122:8080/bossbrothersTV/index.m3u8
 #EXTINF:-1 tvg-id="CongoPlanetTelevision.cd" tvg-country="CD" tvg-language="French" tvg-logo="https://i.imgur.com/KiyYqPK.jpg" group-title="General",Congo Planet Television (1080p)
-https://radio.congoplanet.com/Congo_Planet_TV.sdp/Congo_Planet_TV/playlist.m3u8
-#EXTINF:-1 tvg-id="CongoPlanetTelevision.cd" tvg-country="CD" tvg-language="French" tvg-logo="https://i.imgur.com/KiyYqPK.jpg" group-title="General",Congo Planet Television (1080p)
 https://radio.congoplanet.com/Congo_Planet_TV_Pop.sdp/Congo_Planet_TV_Pop/playlist.m3u8
+#EXTINF:-1 tvg-id="CongoPlanetTelevision.cd" tvg-country="CD" tvg-language="French" tvg-logo="https://i.imgur.com/KiyYqPK.jpg" group-title="General",Congo Planet Television (1080p)
+https://radio.congoplanet.com/Congo_Planet_TV.sdp/Congo_Planet_TV/playlist.m3u8
diff --git a/channels/ch.m3u b/channels/ch.m3u
index 4196cdcf30..54597cfc47 100644
--- a/channels/ch.m3u
+++ b/channels/ch.m3u
@@ -8,9 +8,9 @@ https://edge3.vedge.infomaniak.com/livecast/ik:canalalpha/playlist.m3u8
 #EXTINF:-1 tvg-id="Couleur3.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/9fAlB8K.png" group-title="",Couleur 3 (720p)
 https://rtsc3video-lh.akamaihd.net/i/rtsc3video_ww@513975/master.m3u8
 #EXTINF:-1 tvg-id="DieNeueZeit.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/9dQuwCc.jpg" group-title="",Die Neue Zeit (576p)
-https://www.onairport.live/die-neue-zeit-tv-live/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="DieNeueZeit.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/9dQuwCc.jpg" group-title="",Die Neue Zeit (576p)
 https://www.onairport.live/die-neue-zeit-tv-live/livestream_high/playlist.m3u8
+#EXTINF:-1 tvg-id="DieNeueZeit.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/9dQuwCc.jpg" group-title="",Die Neue Zeit (576p)
+https://www.onairport.live/die-neue-zeit-tv-live/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="DieuTV.ch" tvg-country="CH" tvg-language="French" tvg-logo="https://i.imgur.com/3sWAEuY.jpg" group-title="",Dieu TV (1080p)
 https://katapy.hs.llnwd.net/dieutvwza1/DIEUTVLIVE/smil:dieutv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ELITTVIsvicre.ch" tvg-country="CH" tvg-language="German" tvg-logo="http://elittv.ch/images/elityenilogokucuk2opy.png" group-title="",ELIT TV Isvicre (720p) [Offline]
@@ -23,7 +23,7 @@ https://livesd2.vedge.infomaniak.com/livecast/livesd2/master.m3u8
 https://latele.vedge.infomaniak.com/livecast/latele/playlist.m3u8
 #EXTINF:-1 tvg-id="LaTele.ch" tvg-country="CH" tvg-language="French" tvg-logo="https://i.imgur.com/JiAnDPu.png" group-title="",La Télé (1080p)
 https://livevideo.infomaniak.com/streaming/livecast/latele/playlist.m3u8
-#EXTINF:-1 tvg-id="LFMCH.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/UE1E3uH.png" group-title="Music",LFM (CH) (1080p)
+#EXTINF:-1 tvg-id="LFMCH.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/UE1E3uH.png" group-title="Music",LFM (CH) (1080p) [Timeout]
 https://edge7.vedge.infomaniak.com/livecast/ik:lfmmd/manifest.m3u8
 #EXTINF:-1 tvg-id="LFMTV.ch" tvg-country="CH" tvg-language="French" tvg-logo="https://i.imgur.com/UE1E3uH.png" group-title="",LFM TV (1080p)
 https://lfmhd.vedge.infomaniak.com/livecast/lfmhd/playlist.m3u8
@@ -37,7 +37,7 @@ https://edge4.vedge.infomaniak.com/livecast/ik:lfmmd/manifest.m3u8
 https://streaming.meteonews.net/hls/stream.m3u8
 #EXTINF:-1 tvg-id="ONEFMTV.ch" tvg-country="CH" tvg-language="German" tvg-logo="" group-title="",ONE FM TV (720p) [Offline]
 https://edge4.vedge.infomaniak.com/livecast/smil:onefmmd.smil/manifest.m3u8
-#EXTINF:-1 tvg-id="OneTV.ch" tvg-country="CH" tvg-language="French" tvg-logo="https://i.imgur.com/YEQ957V.png" group-title="",One TV (720p)
+#EXTINF:-1 tvg-id="OneTV.ch" tvg-country="CH" tvg-language="French" tvg-logo="https://i.imgur.com/YEQ957V.png" group-title="",One TV (720p) [Timeout]
 https://edge9.vedge.infomaniak.com/livecast/ik:onefmmd/manifest.m3u8
 #EXTINF:-1 tvg-id="OttoFMTV.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/2jE6ItV.png" group-title="",Otto FM TV [Offline]
 http://streaming.bitonlive.net:8080/hls/ottofmtv/index.m3u8
@@ -57,7 +57,7 @@ https://rougetv.vedge.infomaniak.com/livecast/rougetv/playlist.m3u8
 http://source2.primetime.ch:2981/play/royaltv/index.m3u8
 #EXTINF:-1 tvg-id="Schweiz5.ch" tvg-country="CH" tvg-language="German" tvg-logo="http://www.schweiz5.ch/wp-content/uploads/2018/10/ch5logo-large-1.png" group-title="",Schweiz 5 (1080p)
 https://stream.schweiz5.ch/schweiz52020/stream.m3u8
-#EXTINF:-1 tvg-id="SwissSportTV.ch" tvg-country="CH" tvg-language="English" tvg-logo="https://i.imgur.com/HC0j4cC.jpg" group-title="Sports",Swiss Sport TV (720p)
+#EXTINF:-1 tvg-id="SwissSportTV.ch" tvg-country="CH" tvg-language="English" tvg-logo="https://i.imgur.com/HC0j4cC.jpg" group-title="Sports",Swiss Sport TV (720p) [Timeout]
 https://av02.upstream-cloud.ch/sstvlinear/ngrp:sstvlinear_all/playlist.m3u8
 #EXTINF:-1 tvg-id="Tele1.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://icanlive.tv/pictures/tele1.jpg" group-title="",Tele 1 (1080p)
 https://cdnapisec.kaltura.com/p/1719221/sp/171922100/playManifest/entryId/1_xias5bqq/format/applehttp/protocol/https/a.m3u8
@@ -71,7 +71,7 @@ https://livevideo.infomaniak.com/streaming/livecast/telebielinguech/playlist.m3u
 https://edge4.vedge.infomaniak.com/livecast/telebielinguech/manifest.m3u8
 #EXTINF:-1 tvg-id="TeleBielingue.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/bPpWJj2.png" group-title="",TeleBielingue (720p) [Offline]
 https://edge5.vedge.infomaniak.com/livecast/telebielinguech/manifest.m3u8
-#EXTINF:-1 tvg-id="TeleTicino.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/HuPkeOg.jpg" group-title="",TeleTicino (720p)
+#EXTINF:-1 tvg-id="TeleTicino.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/HuPkeOg.jpg" group-title="",TeleTicino (360p)
 https://livestream.gruppocdt.ch/hls/teleticino.m3u8
 #EXTINF:-1 tvg-id="TVM3.ch" tvg-country="CH" tvg-language="French" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/96/Logo_TVM3_2015.png/1200px-Logo_TVM3_2015.png" group-title="",TVM 3 (1080p)
 http://livevideo.infomaniak.com/streaming/livecast/tvm3/playlist.m3u8
@@ -81,5 +81,5 @@ https://tvm3.vedge.infomaniak.com/livecast/tvm3/playlist.m3u8
 https://edge5.vedge.infomaniak.com/livecast/tvm3/playlist.m3u8
 #EXTINF:-1 tvg-id="TVOCH.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tvo_ch.png" group-title="",TVO (CH) (720p)
 https://cdnapisec.kaltura.com/p/1719221/sp/171922100/playManifest/entryId/1_t5h46v64/format/applehttp/protocol/https/a.m3u8
-#EXTINF:-1 tvg-id="TVO.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tvo_ch.png" group-title="",TVO (CH) (1080p) [Offline]
+#EXTINF:-1 tvg-id="TVO.ch" tvg-country="CH" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tvo_ch.png" group-title="",TVO (CH) (1080p) [Not 24/7]
 https://s3.welocal.world/tvo/media/447348/videos/hls.m3u8
diff --git a/channels/cl.m3u b/channels/cl.m3u
index d94144cd80..b124ed237c 100644
--- a/channels/cl.m3u
+++ b/channels/cl.m3u
@@ -11,7 +11,7 @@ https://5eff35271151c.streamlock.net:1936/8144/8144/playlist.m3u8
 http://camara.02.cl.cdnz.cl/cdndvr/ngrp:live_all/playlist.m3u8
 #EXTINF:-1 tvg-id="CampoAbiertoTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://www.rodeoenvivo.cl/portal/wp-content/uploads/2016/05/BANNER_CAMPO_ABIERTO_TV.png" group-title="",Campo Abierto TV (Huechuraba) (480p) [Not 24/7]
 http://v3.tustreaming.cl/campoabierto/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal9BioBioTelevision.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/UnWMRrT.png" group-title="",Canal 9 Bío Bío Televisión (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal9BioBioTelevision.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/UnWMRrT.png" group-title="",Canal 9 Bío Bío Televisión (1080p) [Not 24/7]
 https://unlimited6-cl.dps.live/c9/c9.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal9BioBioTelevision.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/UnWMRrT.png" group-title="",Canal 9 Bío Bío Televisión (240p) [Not 24/7]
 https://unlimited1-us.dps.live/c9/c9.smil/playlist.m3u8
@@ -31,11 +31,11 @@ http://camara.03.cl.cdnz.cl/camara19/live/playlist.m3u8
 https://hd.chileservidores.cl:1936/latina/latina/playlist.m3u8
 #EXTINF:-1 tvg-id="CanalSurvisionAlerce.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://tvsurvision.cl/wp-content/uploads/2020/10/LOGO-PNG.png" group-title="",Canal Survision Alerce [Offline]
 http://170.79.102.254:1935/pruebacamara/Survision_tv_alerce/playlist.m3u8
-#EXTINF:-1 tvg-id="CarolinaTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/eaHPbqd.png" group-title="Music",Carolina TV (720p)
+#EXTINF:-1 tvg-id="CarolinaTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/eaHPbqd.png" group-title="Music",Carolina TV (1080p)
 https://unlimited6-cl.dps.live/carolinatv/carolinatv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CarolinaTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://www.carolina.cl/carolina-tv/img/ogimage.png" group-title="Music",Carolina TV (720p) [Not 24/7]
 https://unlimited1-us.dps.live/carolinatv/carolinatv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="CHICMagazine.cl" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="http://chicmagazinetv.online/img/logo-radio.png" group-title="Lifestyle",CHIC Magazine (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CHICMagazine.cl" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="http://chicmagazinetv.online/img/logo-radio.png" group-title="Lifestyle",CHIC Magazine (480p) [Not 24/7]
 https://paneltv.online:1936/8056/8056/playlist.m3u8
 #EXTINF:-1 tvg-id="ChileVision.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/GAsSUqn.png" group-title="General",ChileVisión (720p) [Geo-blocked]
 http://chv-m3u.chorroaeboy.repl.co
@@ -43,7 +43,7 @@ http://chv-m3u.chorroaeboy.repl.co
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/chv_003cl
 #EXTINF:-1 tvg-id="ElPinguinoTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (720p) [Offline]
 https://iptv-all.lanesh4d0w.codes/m3u8/elpinguino_cl.m3u8
-#EXTINF:-1 tvg-id="ElionCanalDigital.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="Local",Elion Canal Digital (Chillan) (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ElionCanalDigital.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="Local",Elion Canal Digital (Chillan) (288p) [Not 24/7]
 https://paneltv.online:1936/8154/8154/playlist.m3u8
 #EXTINF:-1 tvg-id="EnerGeek.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/EnerGeek.chile/picture?width=300&height=300" group-title="Entertainment",EnerGeek (720p) [Not 24/7]
 https://stmv1.voxhdnet.com/energeek/energeek/playlist.m3u8
@@ -59,7 +59,7 @@ http://v3.tustreaming.cl/graciatv/index.m3u8
 https://mediacpstreamchile.com:1936/hiperconectados/hiperconectados/playlist.m3u8
 #EXTINF:-1 tvg-id="HiperTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://lh3.googleusercontent.com/-Jzepv48lTKg/Xm-zbST5B9I/AAAAAAAAw9c/j5ZlS99NHzghrTZ7O-RHN8wIXHEkMRutgCK8BGAsYHg/s0/2020-03-16.png" group-title="",HiperTV (720p)
 https://inliveserver.com:1936/11010/11010/playlist.m3u8
-#EXTINF:-1 tvg-id="Interradio.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="Music",Interradio [Offline]
+#EXTINF:-1 tvg-id="Interradio.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="Music",Interradio (1080p) [Not 24/7]
 https://video01.logicahost.com.br/interradiofrutillar/smil:transcoder.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ITVPatagonia.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQx7H4ZZVpypexXqbp7Devw9Jo8H1FMPIv4eA&usqp=CAU" group-title="",ITV Patagonia (720p)
 https://unlimited1-cl.dps.live/itv/itv.smil/playlist.m3u8
@@ -87,15 +87,15 @@ http://159.69.56.148:25461/live/M3UMix247/89ph5uifoi/4.m3u8
 http://159.69.56.148:25461/live/M3UMix247/89ph5uifoi/2.m3u8
 #EXTINF:-1 tvg-id="MIX247Tropical.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/WCyapaP.jpg" group-title="Music",MIX 24/7 Tropical [Offline]
 http://159.69.56.148:25461/live/M3UMix247/89ph5uifoi/3.m3u8
+#EXTINF:-1 tvg-id="Pauta.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/CFbHdqZ.jpg" group-title="",Pauta (720p)
+https://unlimited6-cl.dps.live/pautatv/pautatv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Pauta.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/CFbHdqZ.jpg" group-title="",Pauta (480p)
 https://unlimited1-us.dps.live/pautatv/pautatv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Pauta.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/CFbHdqZ.jpg" group-title="",Pauta
-https://unlimited6-cl.dps.live/pautatv/pautatv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="PintanaTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://lh3.googleusercontent.com/-tRkb11g6GOI/WoBPJm9cd4I/AAAAAAAAgyc/lrR7FPg27aoiQryOJXRQGuG8FLpKoXxBQCK8BGAs/s132/2018-02-11.png" group-title="",Pintana TV (720p)
 http://cdn.vms.grupoz.cl/lapintanatv/content/5a7c8e25e19d3e641aca9fb2/hls/playlist.m3u8
 #EXTINF:-1 tvg-id="Portalfoxmix.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/portalfoxmixtv/picture?width=320&height=320" group-title="Music",Portalfoxmix (720p) [Not 24/7]
 http://tv.portalfoxmix.club:1935/portalfoxmix/portalfoxmix/playlist.m3u8
-#EXTINF:-1 tvg-id="Portalfoxmix.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/portalfoxmixtv/picture?width=320&height=320" group-title="Music",Portalfoxmix (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Portalfoxmix.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/portalfoxmixtv/picture?width=320&height=320" group-title="Music",Portalfoxmix (288p) [Not 24/7]
 https://593b04c4c5670.streamlock.net/portalfoxmix/portalfoxmix/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioElSembrador.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="",Radio El Sembrador (1080p)
 https://5eff35271151c.streamlock.net:1936/8064/8064/playlist.m3u8
@@ -107,13 +107,13 @@ http://server1.oklanet.cl:1935/maximavideo1/maximavideo1/playlist.m3u8
 https://5eff35271151c.streamlock.net:1936/8056/8056/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioRitmoFM.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="",Radio Ritmo FM (720p) [Not 24/7]
 https://5eff35271151c.streamlock.net:1936/8032/8032/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioUniem.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="Religious",Radio Uniem (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioUniem.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="Religious",Radio Uniem (480p) [Not 24/7]
 https://5eff35271151c.streamlock.net:1936/8110/8110/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioZetaTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://ik.imagekit.io/ulangotv/image/upload/3788384_logo_radio_zeta.png" group-title="",Radio Zeta TV (480p)
 https://unlimited1-cl.dps.live/radioztv/radioztv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioZetaTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://ik.imagekit.io/ulangotv/image/upload/3788384_logo_radio_zeta.png" group-title="",Radio Zeta TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioZetaTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://ik.imagekit.io/ulangotv/image/upload/3788384_logo_radio_zeta.png" group-title="",Radio Zeta TV (240p) [Not 24/7]
 https://unlimited1-us.dps.live/radioztv/radioztv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="RealProOnline.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="",RealPro Online (288p)
+#EXTINF:-1 tvg-id="RealProOnline.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="",RealPro Online (540p)
 https://paneltv.online:1936/8202/8202/playlist.m3u8
 #EXTINF:-1 tvg-id="RetroPlus.cl" tvg-country="CL;PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/i0rZsgG.png" group-title="Music",Retro Plus (720p)
 https://59f1cbe63db89.streamlock.net:1443/retroplustv/retroplustv/playlist.m3u8
@@ -125,7 +125,7 @@ https://59f1cbe63db89.streamlock.net:1443/retroplussenal3/retroplussenal3/playli
 https://tls.cdnz.cl/rewindtv/rewindtv/playlist.m3u8
 #EXTINF:-1 tvg-id="RoccoTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://roccotv.cl/wp-content/uploads/2015/02/roccotv.png" group-title="",Rocco TV (Coyhaique) (240p) [Not 24/7]
 http://evo.eltelon.com:1935/live/rocco-tv/playlist.m3u8
-#EXTINF:-1 tvg-id="RuidosFM.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/IvSqpx0.jpg" group-title="Music",Ruidos FM (360p)
+#EXTINF:-1 tvg-id="RuidosFM.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/IvSqpx0.jpg" group-title="Music",Ruidos FM (720p)
 https://593b04c4c5670.streamlock.net/8038/8038/playlist.m3u8
 #EXTINF:-1 tvg-id="SoloStandUp.cl" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/solostanduptv/picture?width=300&height=300" group-title="Comedy",SoloStandUp (480p) [Not 24/7]
 https://paneltv.online:1936/8116/8116/playlist.m3u8
@@ -139,16 +139,16 @@ https://unlimited1-us.dps.live/teletrak/teletrak.smil/playlist.m3u8
 https://unlimited1-us.dps.live/thema/thema.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ThemaTelevision.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://www.thematelevision.cl/wp-content/uploads/2016/02/LOGO1.png" group-title="",Thema Televisión (La Serena) (720p) [Not 24/7]
 https://unlimited6-cl.dps.live/thema/thema.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TV5Linares.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FvqaFci.png" group-title="",TV5 Linares (720p)
-https://unlimited1-us.dps.live/tv5/tv5.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TV5Linares.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FvqaFci.png" group-title="",TV5 Linares (720p)
-https://unlimited6-cl.dps.live/tv5/tv5.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVCosta.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://image.winudf.com/v2/image1/dHYuY29zdGEzX2ljb25fMTU3MTA1MDcwOV8wODA/icon.png?w=170&fakeurl=1" group-title="",TV Costa (720p) [Not 24/7]
 http://cdn.streamingmedia.cl:1935/live/canalcosta/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPop.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://www.radiopop.cl/wp-content/uploads/2019/01/logo_pop_001.png" group-title="",TV Pop (720p)
 https://v4.tustreaming.cl/poptv/playlist.m3u8
 #EXTINF:-1 tvg-id="TVVision.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="" group-title="",TV Vision (720p) [Not 24/7]
 https://cloudflare.streamgato.us:3750/live/tvvisionlive.m3u8
+#EXTINF:-1 tvg-id="TV5Linares.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FvqaFci.png" group-title="",TV5 Linares (720p)
+https://unlimited1-us.dps.live/tv5/tv5.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="TV5Linares.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FvqaFci.png" group-title="",TV5 Linares (720p)
+https://unlimited6-cl.dps.live/tv5/tv5.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVN.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTLN4WfUMrRsD0b04jbG3EnYrnlV4FYPZURRw&usqp=CAU" group-title="",TVN (720p) [Not 24/7]
 https://unlimited1-us.dps.live/tvn/tvn.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVN.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTLN4WfUMrRsD0b04jbG3EnYrnlV4FYPZURRw&usqp=CAU" group-title="",TVN (720p) [Not 24/7]
@@ -159,19 +159,19 @@ https://unlimited2-cl-movistar.dps.live/tvo/tvo.smil/playlist.m3u8
 http://srv3.zcast.com.br/cristian5592/cristian5592/playlist.m3u8
 #EXTINF:-1 tvg-id="TVR.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://elfiltrador.com/wp-content/uploads/2019/03/53311917_1258469654318918_8926059123426983936_n.png" group-title="",TVR (720p)
 https://unlimited1-cl.dps.live/tvr/tvr.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TVR.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://elfiltrador.com/wp-content/uploads/2019/03/53311917_1258469654318918_8926059123426983936_n.png" group-title="",TVR (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVR.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://elfiltrador.com/wp-content/uploads/2019/03/53311917_1258469654318918_8926059123426983936_n.png" group-title="",TVR (180p) [Not 24/7]
 https://unlimited1-us.dps.live/tvr/tvr.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="UCV3TV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/f/f6/UCV_3.png/revision/latest?cb=20170820170650" group-title="",UCV3 TV (720p)
 http://unlimited1-cl.dps.live/ucvtv2/ucvtv2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="UCV3TV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/f/f6/UCV_3.png/revision/latest?cb=20170820170650" group-title="",UCV3 TV (720p)
+#EXTINF:-1 tvg-id="UCV3TV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/f/f6/UCV_3.png/revision/latest?cb=20170820170650" group-title="",UCV3 TV (480p)
 http://unlimited6-cl.dps.live/ucvtv2/ucvtv2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="UESTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2dVTcSF.png" group-title="",UESTV (720p)
 http://cl.origin.grupoz.cl/uestv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="UESTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://sitios.upla.cl/contenidos/wp-content/uploads/2010/06/logo-canal-tv-2.jpg" group-title="",UESTV (720p)
 http://edge1.cl.grupoz.cl/uestv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="UESTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/1158034752/logo_canal_tv_2.2.JPG" group-title="",UESTV (720p)
+#EXTINF:-1 tvg-id="UESTV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/1158034752/logo_canal_tv_2.2.JPG" group-title="",UESTV (720p) [Offline]
 https://tls.cdnz.cl/uestv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="UMAGTVTelevision.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://www.novasur.cl/sites/default/files/web_umag_tv.png" group-title="",UMAGTV Televisión (Punta Arenas) (720p) [Offline]
+#EXTINF:-1 tvg-id="UMAGTVTelevision.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://www.novasur.cl/sites/default/files/web_umag_tv.png" group-title="",UMAGTV Televisión (Punta Arenas) (720p) [Timeout]
 http://edge1.cl.grupoz.cl/tser5/live/playlist.m3u8
 #EXTINF:-1 tvg-id="UATV.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://uatv.cl/wp-content/uploads/2016/01/marcauatv_2.png" group-title="",Universidad Autónoma Temuco (UATV) (1080p) [Not 24/7]
 https://unlimited1-us.dps.live/uatv/uatv.smil/playlist.m3u8
@@ -179,7 +179,7 @@ https://unlimited1-us.dps.live/uatv/uatv.smil/playlist.m3u8
 https://unlimited6-cl.dps.live/uatv/uatv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="UTVSanClemente.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://www.utvsanclemente.cl/img/logo-utv-sc.png" group-title="",UTV San Clemente (720p) [Geo-blocked]
 http://v3.tustreaming.cl/utvsc/playlist.m3u8
-#EXTINF:-1 tvg-id="VCOnline.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/897eGEd.png" group-title="",VC Online (546p)
+#EXTINF:-1 tvg-id="VCOnline.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/897eGEd.png" group-title="",VC Online (720p)
 https://593b04c4c5670.streamlock.net/8068/8068/playlist.m3u8
 #EXTINF:-1 tvg-id="VTVValledeAconcagua.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="http://images.eltelon.com/cache/media/4151/square_150x150-2.jpg" group-title="",VTV Valle de Aconcagua (720p)
 http://unlimited1-us.dps.live/vtv/vtv.smil/playlist.m3u8
diff --git a/channels/cm.m3u b/channels/cm.m3u
index 53d0b53a3d..7cb7d4e7ec 100644
--- a/channels/cm.m3u
+++ b/channels/cm.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="EmergenceTV.cm" tvg-country="CM" tvg-language="French" tvg-logo="https://i.imgur.com/REJJHir.jpg" group-title="",Emergence TV (480p) [Not 24/7]
 http://connectiktv.ddns.net:5000/emergencetv/emergencetv/playlist.m3u8
-#EXTINF:-1 tvg-id="MyTVChannel.cm" tvg-country="CM" tvg-language="French" tvg-logo="https://i.imgur.com/BuKv5Vj.png" group-title="",My TV Channel (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="MyTVChannel.cm" tvg-country="CM" tvg-language="French" tvg-logo="https://i.imgur.com/BuKv5Vj.png" group-title="",My TV Channel (720p) [Not 24/7]
 http://connectiktv.ddns.net:5000/mytvchannel/@mytvchannel/playlist.m3u8
-#EXTINF:-1 tvg-id="PlayTV.cm" tvg-country="CM" tvg-language="French" tvg-logo="https://i.imgur.com/mvgRAZw.jpg" group-title="Music",Play TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlayTV.cm" tvg-country="CM" tvg-language="French" tvg-logo="https://i.imgur.com/mvgRAZw.jpg" group-title="Music",Play TV (720p) [Not 24/7]
 http://connectiktv.ddns.net:5000/playtv/@playtv/playlist.m3u8
-#EXTINF:-1 tvg-id="Vision4.cm" tvg-country="CM" tvg-language="English;French" tvg-logo="https://i.imgur.com/FekWmTu.jpg" group-title="",Vision 4 (480p)
+#EXTINF:-1 tvg-id="Vision4.cm" tvg-country="CM" tvg-language="English;French" tvg-logo="https://i.imgur.com/FekWmTu.jpg" group-title="",Vision 4 (360p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/vision4/hls_video/index.m3u8
diff --git a/channels/cn.m3u b/channels/cn.m3u
index d73caa19b6..2ecbff42d7 100644
--- a/channels/cn.m3u
+++ b/channels/cn.m3u
@@ -3,10 +3,6 @@
 http://223.110.245.167/ott.js.chinamobile.com/PLTV/3/224/3221226942/index.m3u8
 #EXTINF:-1 tvg-id="BlueMeiJu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/BLUE.png" group-title="",Blue 美剧 (360p) [Not 24/7]
 http://210.210.155.35/dr9445/h/h16/02.m3u8
-#EXTINF:-1 tvg-id="CCTVPlus1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",CCTV+ 1 (720p)
-https://cd-live-stream.news.cctvplus.com/live/smil:CHANNEL1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="CCTVPlus2.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",CCTV+ 2 (720p)
-https://cd-live-stream.news.cctvplus.com/live/smil:CHANNEL2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CCTV1.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/6/65/CCTV-1_Logo.png" group-title="General",CCTV-1综合 (1080p)
 http://39.134.115.163:8080/PLTV/88888910/224/3221225618/index.m3u8
 #EXTINF:-1 tvg-id="CCTV1.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/6/65/CCTV-1_Logo.png" group-title="General",CCTV-1综合 (1080p)
@@ -314,9 +310,9 @@ http://223.110.245.172/PLTV/4/224/3221227304/index.m3u8
 #EXTINF:-1 tvg-id="CCTV8.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/4/49/CCTV-8_Logo.png" group-title="",CCTV-8电视剧 (1080p)
 http://ott.js.chinamobile.com/PLTV/3/224/3221227204/index.m3u8
 #EXTINF:-1 tvg-id="CCTV8.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/4/49/CCTV-8_Logo.png" group-title="",CCTV-8电视剧 (1080p) [Not 24/7]
-http://183.207.248.71/cntv/live1/HD-2500k-1080P-cctv8/HD-2500k-1080P-cctv8
-#EXTINF:-1 tvg-id="CCTV8.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/4/49/CCTV-8_Logo.png" group-title="",CCTV-8电视剧 (1080p) [Offline]
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=21&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
+#EXTINF:-1 tvg-id="CCTV8.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/4/49/CCTV-8_Logo.png" group-title="",CCTV-8电视剧 (1080p) [Not 24/7]
+http://183.207.248.71/cntv/live1/HD-2500k-1080P-cctv8/HD-2500k-1080P-cctv8
 #EXTINF:-1 tvg-id="CCTV8.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/4/49/CCTV-8_Logo.png" group-title="",CCTV-8电视剧 (1080p) [Offline]
 http://223.110.245.155/ott.js.chinamobile.com/PLTV/3/224/3221227304/index.m3u8
 #EXTINF:-1 tvg-id="CCTV8.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/4/49/CCTV-8_Logo.png" group-title="",CCTV-8电视剧 (576p) [Offline]
@@ -328,6 +324,8 @@ http://39.135.138.59:18890/PLTV/88888910/224/3221225626/index.m3u8
 #EXTINF:-1 tvg-id="CCTV9.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/11/CCTV-9_Logo.png" group-title="Documentary",CCTV-9纪录 (1080p)
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=33&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="CCTV9.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/11/CCTV-9_Logo.png" group-title="Documentary",CCTV-9纪录 (1080p)
+http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=33&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
+#EXTINF:-1 tvg-id="CCTV9.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/11/CCTV-9_Logo.png" group-title="Documentary",CCTV-9纪录 (1080p)
 http://183.207.248.71/cntv/live1/cctv-news/cctv-news
 #EXTINF:-1 tvg-id="CCTV9.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/11/CCTV-9_Logo.png" group-title="Documentary",CCTV-9纪录 (1080p)
 http://183.207.249.6/PLTV/3/224/3221225532/index.m3u8
@@ -335,8 +333,6 @@ http://183.207.249.6/PLTV/3/224/3221225532/index.m3u8
 http://223.110.245.161/ott.js.chinamobile.com/PLTV/3/224/3221225868/index.m3u8
 #EXTINF:-1 tvg-id="CCTV9.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/11/CCTV-9_Logo.png" group-title="Documentary",CCTV-9纪录 (360p)
 http://cctvalih5ca.v.myalicdn.com/live/cctvjilu_2/index.m3u8
-#EXTINF:-1 tvg-id="CCTV9.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/11/CCTV-9_Logo.png" group-title="Documentary",CCTV-9纪录
-http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=33&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="CCTV9.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/11/CCTV-9_Logo.png" group-title="Documentary",CCTV-9纪录 (360p) [Offline]
 http://125.210.152.18:9090/live/CCTVJLHD_H265.m3u8
 #EXTINF:-1 tvg-id="CCTV10.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/f/fd/CCTV-10_Logo.png" group-title="Education",CCTV-10科教 (1080p)
@@ -357,10 +353,10 @@ http://183.207.249.34/PLTV/4/224/3221227317/index.m3u8
 http://223.110.245.163/ott.js.chinamobile.com/PLTV/3/224/3221227317/index.m3u8
 #EXTINF:-1 tvg-id="CCTV10.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/f/fd/CCTV-10_Logo.png" group-title="Education",CCTV-10科教 (1080p)
 http://223.110.245.170/PLTV/3/224/3221225550/index.m3u8
+#EXTINF:-1 tvg-id="CCTV10.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/f/fd/CCTV-10_Logo.png" group-title="Education",CCTV-10科教 (1080p) [Not 24/7]
+http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=4&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="CCTV10.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/f/fd/CCTV-10_Logo.png" group-title="Education",CCTV-10科教 (360p) [Not 24/7]
 http://cctvalih5ca.v.myalicdn.com/live/cctv10_2/index.m3u8
-#EXTINF:-1 tvg-id="CCTV10.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/f/fd/CCTV-10_Logo.png" group-title="Education",CCTV-10科教 (1080p) [Offline]
-http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=4&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="CCTV10.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/f/fd/CCTV-10_Logo.png" group-title="Education",CCTV-10科教 (720p) [Offline]
 http://125.210.152.18:9090/live/CCTV10HD_H265.m3u8
 #EXTINF:-1 tvg-id="CCTV11.cn" tvg-country="CN" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/9/9c/CCTV-11_Logo.png" group-title="",CCTV-11戏曲 (1080p)
@@ -447,6 +443,10 @@ http://117.169.120.160:8080/live/HD-4000k-1080P-cctv17/1.m3u8
 http://223.110.245.153/ott.js.chinamobile.com/PLTV/3/224/3221227026/index.m3u8
 #EXTINF:-1 tvg-id="CCTVLaoGuShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",CCTV-老故事 (576p)
 http://223.110.245.145/ott.js.chinamobile.com/PLTV/3/224/3221227043/index.m3u8
+#EXTINF:-1 tvg-id="CCTVPlus1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",CCTV+ 1 (720p) [Offline]
+https://cd-live-stream.news.cctvplus.com/live/smil:CHANNEL1.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="CCTVPlus2.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",CCTV+ 2 (720p) [Offline]
+https://cd-live-stream.news.cctvplus.com/live/smil:CHANNEL2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CETV1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",CETV1 (576p)
 http://183.207.248.71/gitv/live1/G_CETV-1/G_CETV-1
 #EXTINF:-1 tvg-id="CETV2.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",CETV2 (576p)
@@ -459,7 +459,7 @@ http://223.110.245.149/ott.js.chinamobile.com/PLTV/3/224/3221225917/index.m3u8
 http://live.cgtn.com/500/prog_index.m3u8
 #EXTINF:-1 tvg-id="CGTN.cn" tvg-country="CN" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/CGTN.svg/800px-CGTN.svg.png" group-title="News",CGTN (576p)
 http://live.cgtn.com/1000/prog_index.m3u8
-#EXTINF:-1 tvg-id="CGTNArabic.cn" tvg-country="CN" tvg-language="Arabic" tvg-logo="https://ui.cgtn.com/static/resource/images/icon_new/live/live_AR.png" group-title="News",CGTN Arabic (720p)
+#EXTINF:-1 tvg-id="CGTNArabic.cn" tvg-country="CN" tvg-language="Arabic" tvg-logo="https://ui.cgtn.com/static/resource/images/icon_new/live/live_AR.png" group-title="News",CGTN Arabic (576p)
 http://livear.cgtn.com/1000a/prog_index.m3u8
 #EXTINF:-1 tvg-id="CGTNDocumentary.cn" tvg-country="CN" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d6/CGTN_Documentary_logo.png" group-title="Documentary",CGTN Documentary (576p)
 http://39.135.138.59:18890/PLTV/88888910/224/3221225645/index.m3u8
@@ -469,7 +469,7 @@ https://livedoc.cgtn.com/1000d/prog_index.m3u8
 http://livees.cgtn.com/500e/prog_index.m3u8
 #EXTINF:-1 tvg-id="CGTNEspanol.cn" tvg-country="CN" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/CGTN.svg/800px-CGTN.svg.png" group-title="News",CGTN Español (576p)
 https://livees.cgtn.com/1000e/prog_index.m3u8
-#EXTINF:-1 tvg-id="CGTNFrancais.cn" tvg-country="CN" tvg-language="French" tvg-logo="https://rndcdn.dstv.com/dstvcms/2017/10/03/DStv_cgtn_french_4-3_001_xlrg.png" group-title="",CGTN Français (720p)
+#EXTINF:-1 tvg-id="CGTNFrancais.cn" tvg-country="CN" tvg-language="French" tvg-logo="https://rndcdn.dstv.com/dstvcms/2017/10/03/DStv_cgtn_french_4-3_001_xlrg.png" group-title="",CGTN Français (576p)
 https://news.cgtn.com/resource/live/french/cgtn-f.m3u8
 #EXTINF:-1 tvg-id="CGTNJiLu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",CGTN纪录 (576p)
 http://39.134.66.66/PLTV/88888888/224/3221225509/index.m3u8
@@ -553,9 +553,9 @@ http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_Shif
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=73&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="SiTVXinShiJue.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV新视觉 (1080p) [Not 24/7]
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=75&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
-#EXTINF:-1 tvg-id="SiTVXinShiJueTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV新视觉台 (1080p) [Offline]
+#EXTINF:-1 tvg-id="SiTVXinShiJueTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV新视觉台 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/xsjhd/4000000/mnf.m3u8
-#EXTINF:-1 tvg-id="SiTVJiSuQiChe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV极速汽车 (1080p)
+#EXTINF:-1 tvg-id="SiTVJiSuQiChe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV极速汽车 (1080p) [Timeout]
 http://112.25.48.68/live/program/live/jsqchd/4000000/mnf.m3u8
 #EXTINF:-1 tvg-id="SiTVHuanXiaoJuChang.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV欢笑剧场 (1080p)
 http://112.25.48.68/live/program/live/hxjchd/4000000/mnf.m3u8
@@ -563,26 +563,26 @@ http://112.25.48.68/live/program/live/hxjchd/4000000/mnf.m3u8
 http://112.25.48.68/live/program/live/fztd/1300000/mnf.m3u8
 #EXTINF:-1 tvg-id="SiTVYouXiFengYun.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV游戏风云 (1080p)
 http://112.25.48.68/live/program/live/yxfyhd/4000000/mnf.m3u8
-#EXTINF:-1 tvg-id="SiTVShengHuoShiShang.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV生活时尚 (1080p) [Offline]
+#EXTINF:-1 tvg-id="SiTVShengHuoShiShang.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV生活时尚 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/shsshd/4000000/mnf.m3u8
-#EXTINF:-1 tvg-id="SiTVDuShiJuChang.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV都市剧场 (1080p)
+#EXTINF:-1 tvg-id="SiTVDuShiJuChang.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV都市剧场 (1080p) [Offline]
 http://112.25.48.68/live/program/live/dsjchd/4000000/mnf.m3u8
 #EXTINF:-1 tvg-id="SiTVMeiLiZuQiu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV魅力足球 (1080p) [Not 24/7]
-http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=76&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
-#EXTINF:-1 tvg-id="SiTVMeiLiZuQiu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV魅力足球 (1080p) [Offline]
 http://112.25.48.68/live/program/live/mlyyhd/4000000/mnf.m3u8
+#EXTINF:-1 tvg-id="SiTVMeiLiZuQiu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",SiTV魅力足球 (1080p) [Not 24/7]
+http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=76&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="TVBMingZhuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB 明珠台 (240p)
 http://116.199.5.51:8114/hls/Fsv_chan_hls_se_idx=12?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=12&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_rate_id=2&FvSeid=1&Pcontent_id=8114.m3u8&Provider_id=0
 #EXTINF:-1 tvg-id="TVBMingZhuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB明珠台 (576p)
-http://116.199.5.51:8114/00000000/hls/index.m3u8?Fsv_chan_hls_se_idx=12&Fsv_ctype=LIVES&Fsv_otype=1&FvSeid=1&Pcontent_id=.m3u8&Provider_id=
-#EXTINF:-1 tvg-id="TVBMingZhuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB明珠台 (576p)
 http://116.199.5.51:8114/hls/Fsv_chan_hls_se_idx=12&FvSeid=1&Fsv_ctype=LIVES&Fsv_otype=1&Provider_id=0&Pcontent_id=8114.m3u8
 #EXTINF:-1 tvg-id="TVBMingZhuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB明珠台 (576p)
 http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=12&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
-#EXTINF:-1 tvg-id="TVBFeiCuiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB翡翠台 (576p)
-http://116.199.5.52:8114/00000000/index.m3u8?Fsv=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=188&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=&_res_tag_=video
+#EXTINF:-1 tvg-id="TVBMingZhuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB明珠台 (576p) [Timeout]
+http://116.199.5.51:8114/00000000/hls/index.m3u8?Fsv_chan_hls_se_idx=12&Fsv_ctype=LIVES&Fsv_otype=1&FvSeid=1&Pcontent_id=.m3u8&Provider_id=
 #EXTINF:-1 tvg-id="TVBFeiCuiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB翡翠台 (576p)
 http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=188&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
+#EXTINF:-1 tvg-id="TVBFeiCuiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB翡翠台 (576p)
+http://116.199.5.52:8114/00000000/index.m3u8?Fsv=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=188&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=&_res_tag_=video
 #EXTINF:-1 tvg-id="TVBFeiCuiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB翡翠台
 http://116.199.5.51:8114/index.m3u8?Fsv_chan_hls_se_idx=188&Fsv_ctype=LIVES&Fsv_otype=1&FvSeid=1&Pcontent_id=.m3u8&Provider_id=
 #EXTINF:-1 tvg-id="TVBFeiCuiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",TVB翡翠台 (576p) [Not 24/7]
@@ -599,21 +599,21 @@ http://123.146.162.24:8013/tslslive/URetCnP/hls/live_sd.m3u8
 http://123.146.162.24:8013/tslslive/noEX9SG/hls/live_sd.m3u8
 #EXTINF:-1 tvg-id="WanShengXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",万盛新闻综合 (576p) [Not 24/7]
 http://stream0.tv41.ru/live.m3u8
-#EXTINF:-1 tvg-id="SanMingGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",三明公共 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SanMingGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",三明公共 (720p) [Not 24/7]
 http://stream.smntv.cn/smtv2/playlist.m3u8
-#EXTINF:-1 tvg-id="SanMingXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",三明新闻综合 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SanMingXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",三明新闻综合 (720p) [Not 24/7]
 http://stream.smntv.cn/smtv1/playlist.m3u8
 #EXTINF:-1 tvg-id="SanLiXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/gt/SETNews.png" group-title="News",三立新聞 (1080p) [Geo-blocked]
 http://seb.sason.top/sc/sllive_fhd.m3u8
-#EXTINF:-1 tvg-id="ShangHaiICSWaiYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海 ICS外语 (1080p) [Offline]
+#EXTINF:-1 tvg-id="ShangHaiICSWaiYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海 ICS外语 (1080p) [Timeout]
 http://112.25.48.68/live/program/live/wypdhd/4000000/mnf.m3u8
 #EXTINF:-1 tvg-id="ShangHaiDongFangWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海东方卫视 [Offline]
 http://ivi.bupt.edu.cn/hls/dfhd.m3u8
-#EXTINF:-1 tvg-id="ShangHaiDongFangYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海东方影视 (1080p) [Offline]
+#EXTINF:-1 tvg-id="ShangHaiDongFangYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海东方影视 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/dsjpdhd/4000000/mnf.m3u8
-#EXTINF:-1 tvg-id="ShangHaiWuXingTiYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海五星体育 (1080p) [Offline]
+#EXTINF:-1 tvg-id="ShangHaiWuXingTiYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海五星体育 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/ssty/4000000/mnf.m3u8
-#EXTINF:-1 tvg-id="ShangHaiWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海卫视 (1080p)
+#EXTINF:-1 tvg-id="ShangHaiWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海卫视 (1080p) [Offline]
 http://183.207.248.71/cntv/live1/HD-2500k-1080P-dongfangstv/HD-2500k-1080P-dongfangstv
 #EXTINF:-1 tvg-id="ShangHaiWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海卫视 (1080p) [Offline]
 http://223.110.245.159/ott.js.chinamobile.com/PLTV/3/224/3221227396/index.m3u8
@@ -621,15 +621,15 @@ http://223.110.245.159/ott.js.chinamobile.com/PLTV/3/224/3221227396/index.m3u8
 http://223.110.245.159/ott.js.chinamobile.com/PLTV/3/224/3221225856/index.m3u8
 #EXTINF:-1 tvg-id="ShangHaiWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海卫视 [Offline]
 http://223.110.245.159/ott.js.chinamobile.com/PLTV/3/224/3221227208/index.m3u8
-#EXTINF:-1 tvg-id="ShangHaiHaHaXuanDong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海哈哈炫动 (1080p) [Offline]
+#EXTINF:-1 tvg-id="ShangHaiHaHaXuanDong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海哈哈炫动 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/hhxdhd/4000000/mnf.m3u8
-#EXTINF:-1 tvg-id="ShangHaiWaiTanMoYan.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海外滩魔眼
+#EXTINF:-1 tvg-id="ShangHaiWaiTanMoYan.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海外滩魔眼 [Offline]
 rtmp://bililive.kksmg.com/hls/sdi80
 #EXTINF:-1 tvg-id="ShangHaiJiaoYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海教育 (540p) [Not 24/7]
 http://112.25.48.68/live/program/live/setv/1300000/mnf.m3u8
 #EXTINF:-1 tvg-id="ShangHaiJiaoYuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海教育台 (720p) [Offline]
 http://live.setv.sh.cn/slive/shedu02_1200k.m3u8
-#EXTINF:-1 tvg-id="ShangHaiXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海新闻综合 (1080p) [Offline]
+#EXTINF:-1 tvg-id="ShangHaiXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海新闻综合 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/xwzhhd/4000000/mnf.m3u8
 #EXTINF:-1 tvg-id="ShangHaiDiYiCaiJing.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海第一财经 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/dycjhd/4000000/mnf.m3u8
@@ -639,15 +639,15 @@ http://39.134.115.163:8080/PLTV/88888910/224/3221225654/index.m3u8
 http://39.134.115.163:8080/PLTV/88888910/224/3221225655/index.m3u8
 #EXTINF:-1 tvg-id="ShangHaiZheYiKeMoDuYan.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海这一刻魔都眼 (720p)
 http://bililive.kksmg.com/hls/sdi80/playlist.m3u8
-#EXTINF:-1 tvg-id="ShangHaiDuShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海都市 (1080p) [Offline]
+#EXTINF:-1 tvg-id="ShangHaiDuShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海都市 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/ylpdhd/4000000/mnf.m3u8
 #EXTINF:-1 tvg-id="ShangHaiJinShanDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上海金山电视台 (270p)
 http://live.mudu.tv/watch/4zbn2f.m3u8
-#EXTINF:-1 tvg-id="ShangYu1XinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上虞1新闻综合 (576p)
+#EXTINF:-1 tvg-id="ShangYu1XinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上虞1新闻综合 (720p)
 http://l.cztvcloud.com/channels/lantian/SXshangyu1/720p.m3u8
-#EXTINF:-1 tvg-id="ShangYu3XinShangDu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上虞3新商都 (576p)
+#EXTINF:-1 tvg-id="ShangYu3XinShangDu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上虞3新商都 (720p)
 http://l.cztvcloud.com/channels/lantian/SXshangyu3/720p.m3u8
-#EXTINF:-1 tvg-id="ShangYuJingJiWenHua.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上虞經濟文化 (576p)
+#EXTINF:-1 tvg-id="ShangYuJingJiWenHua.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",上虞經濟文化 (720p)
 http://l.cztvcloud.com/channels/lantian/SXshangyu2/720p.m3u8
 #EXTINF:-1 tvg-id="DongNanWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",东南卫视 (1080p)
 http://39.134.115.163:8080/PLTV/88888910/224/3221225657/index.m3u8
@@ -667,7 +667,7 @@ http://183.207.249.15/PLTV/4/224/3221225816/index.m3u8
 http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=23&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="DongNanWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",东南卫视 (360p) [Offline]
 http://125.210.152.18:9090/live/DNWSHD_H265.m3u8
-#EXTINF:-1 tvg-id="DongXiangDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/2/28/%E7%94%98%E8%82%83%E5%8D%AB%E8%A7%86.png" group-title="",东乡电视台 [Offline]
+#EXTINF:-1 tvg-id="DongXiangDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/2/28/%E7%94%98%E8%82%83%E5%8D%AB%E8%A7%86.png" group-title="",东乡电视台 [Timeout]
 http://117.156.28.119/270000001111/1110000131/index.m3u8
 #EXTINF:-1 tvg-id="DongFangWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/dongfang.jpg" group-title="",东方卫视 (1080p)
 http://39.134.66.66/PLTV/88888888/224/3221225672/index.m3u8
@@ -745,9 +745,9 @@ http://live.ilinyi.net/channels/tvie/linyicaijing/flv:500k/live
 http://33809.hlsplay.aodianyun.com/guangdianyun_33809/tv_channel_170.m3u8
 #EXTINF:-1 tvg-id="LeQingShengHuo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",乐清生活 [Geo-blocked]
 http://33809.hlsplay.aodianyun.com/guangdianyun_33809/tv_channel_171.m3u8
-#EXTINF:-1 tvg-id="YunNanIWenShanGongGongTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",云南 Ⅰ 文山公共台
+#EXTINF:-1 tvg-id="YunNanIWenShanGongGongTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",云南 Ⅰ 文山公共台 (1080p)
 http://tvdrs.wsrtv.com.cn:8100/channellive/ch2.flv
-#EXTINF:-1 tvg-id="YunNanIWenShanZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",云南 Ⅰ 文山综合台
+#EXTINF:-1 tvg-id="YunNanIWenShanZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",云南 Ⅰ 文山综合台 [Offline]
 http://tvdrs.wsrtv.com.cn:8100/channellive/ch1.flv
 #EXTINF:-1 tvg-id="YunNanIHongHeZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",云南 Ⅰ 红河综合台 (1080p)
 http://file.hhtv.cc/cms/videos/nmip-media/channellive/channel1/playlist.m3u8
@@ -773,7 +773,7 @@ http://ott.js.chinamobile.com/PLTV/3/224/3221225838/index.m3u8
 http://112.25.48.68/live/program/live/ynws/1300000/mnf.m3u8
 #EXTINF:-1 tvg-id="YunNanWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",云南卫视
 https://hwapi.yunshicloud.com/8xughf/e0bx15.m3u8
-#EXTINF:-1 tvg-id="YunNanWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",云南卫视 (576p) [Offline]
+#EXTINF:-1 tvg-id="YunNanWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",云南卫视 (576p) [Not 24/7]
 http://183.207.248.71/cntv/live1/yunnanstv/yunnanstv
 #EXTINF:-1 tvg-id="YunNanGuoJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/ws/yunnan.png" group-title="",云南国际 [Offline]
 http://yntvpullhls.ynradio.com/live/yunnanguoji/playlist.m3u8
@@ -795,9 +795,9 @@ http://174.127.67.246/live330/playlist.m3u8
 http://sxjc.chinashadt.com:2036/live/stream:jctv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="JingShiJuChang.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",京视剧场 (576p)
 http://223.110.245.143/ott.js.chinamobile.com/PLTV/3/224/3221227040/index.m3u8
-#EXTINF:-1 tvg-id="BoZhouNongCun.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",亳州农村 (360p)
+#EXTINF:-1 tvg-id="BoZhouNongCun.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",亳州农村 (360p) [Timeout]
 http://220.180.110.101:8083/videos/live/39/13/o4ncrHkSp7q09/o4ncrHkSp7q09.m3u8
-#EXTINF:-1 tvg-id="BoZhouXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",亳州新聞頻道 (360p)
+#EXTINF:-1 tvg-id="BoZhouXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",亳州新聞頻道 (360p) [Timeout]
 http://220.180.110.101:8083/videos/live/33/59/NC7XQdEveyncq/NC7XQdEveyncq.m3u8
 #EXTINF:-1 tvg-id="JinRiELuoSi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/1200px-Russia-today-logo.svg.png" group-title="",今日俄罗斯 (720p) [Offline]
 https://rt-news-gd.secure2.footprint.net/1103_2500Kb.m3u8
@@ -857,7 +857,7 @@ http://223.110.245.173/PLTV/4/224/3221225836/index.m3u8
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=17&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="NeiMengMengYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",内蒙蒙语 (240p)
 http://stream.nmtv.cn/3/sd/live.m3u8
-#EXTINF:-1 tvg-id="NongAnXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",农安新闻综合 [Offline]
+#EXTINF:-1 tvg-id="NongAnXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",农安新闻综合 [Geo-blocked]
 http://stream2.jlntv.cn/naxw/sd/live.m3u8
 #EXTINF:-1 tvg-id="FengHuangZhongWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",凤凰中文 (720p)
 http://223.110.245.139/ott.js.chinamobile.com/PLTV/3/224/3221226922/index.m3u8
@@ -911,7 +911,7 @@ http://183.207.248.71/cntv/live1/donghuawg/donghuawg
 http://ivi.bupt.edu.cn/hls/btv10.m3u8
 #EXTINF:-1 tvg-id="BeiJingTiYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",北京体育 (1080p)
 http://116.199.5.51:8114/index.m3u8?Fsv_chan_hls_se_idx=158&Fsv_ctype=LIVES&Fsv_otype=1&FvSeid=1&Pcontent_id=.m3u8&Provider_id=
-#EXTINF:-1 tvg-id="BeiJingDongAoJiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",北京冬奥纪实 (1080p)
+#EXTINF:-1 tvg-id="BeiJingDongAoJiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",北京冬奥纪实 (1080p) [Timeout]
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=158&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="BeiJingQiaKuShaoEr.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="Kids",北京卡酷少儿 (576p)
 http://39.134.66.66/PLTV/88888888/224/3221225562/index.m3u8
@@ -932,8 +932,6 @@ http://183.207.248.71/cntv/live1/HD-2500k-1080P-beijingstv/HD-2500k-1080P-beijin
 #EXTINF:-1 tvg-id="BeiJingWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/bjbtv.jpg" group-title="",北京卫视 (1080p)
 http://183.207.249.7/PLTV/3/224/3221225574/index.m3u8
 #EXTINF:-1 tvg-id="BeiJingWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/bjbtv.jpg" group-title="",北京卫视 (1080p)
-http://183.207.249.8/PLTV/3/224/3221225574/index.m3u8
-#EXTINF:-1 tvg-id="BeiJingWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/bjbtv.jpg" group-title="",北京卫视 (1080p)
 http://223.110.243.173/PLTV/3/224/3221227246/index.m3u8
 #EXTINF:-1 tvg-id="BeiJingWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/bjbtv.jpg" group-title="",北京卫视 (1080p)
 http://223.110.245.139/PLTV/4/224/3221227390/index.m3u8
@@ -947,6 +945,8 @@ http://223.110.245.173/PLTV/4/224/3221227390/index.m3u8
 http://ott.js.chinamobile.com/PLTV/3/224/3221225574/index.m3u8
 #EXTINF:-1 tvg-id="BeiJingWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/bjbtv.jpg" group-title="",北京卫视 [Not 24/7]
 http://ivi.bupt.edu.cn/hls/btv1.m3u8
+#EXTINF:-1 tvg-id="BeiJingWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/bjbtv.jpg" group-title="",北京卫视 (1080p) [Timeout]
+http://183.207.249.8/PLTV/3/224/3221225574/index.m3u8
 #EXTINF:-1 tvg-id="BeiJingWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/bjbtv.jpg" group-title="",北京卫视 (1080p) [Offline]
 http://112.25.48.68/live/program/live/bjwshd/4000000/mnf.m3u8
 #EXTINF:-1 tvg-id="BeiJingWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://parco-zh.github.io/demo/bjbtv.jpg" group-title="",北京卫视 (576p) [Offline]
@@ -999,7 +999,7 @@ http://183.207.248.71/gitv/live1/G_NJJK/G_NJJK
 http://223.110.245.155/ott.js.chinamobile.com/PLTV/3/224/3221227194/index.m3u8
 #EXTINF:-1 tvg-id="NanJingJiaoKe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",南京教科 (720p) [Not 24/7]
 http://live.nbs.cn/channels/njtv/jkpd/m3u8:500k/live.m3u8
-#EXTINF:-1 tvg-id="NanJingXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",南京新闻综合 (1080p)
+#EXTINF:-1 tvg-id="NanJingXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",南京新闻综合 (720p)
 http://live.nbs.cn/channels/njtv/xwzh/m3u8:500k/live.m3u8
 #EXTINF:-1 tvg-id="NanJingShengHuo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",南京生活 (720p)
 http://live.nbs.cn/channels/njtv/shpd/m3u8:500k/live.m3u8
@@ -1007,7 +1007,7 @@ http://live.nbs.cn/channels/njtv/shpd/m3u8:500k/live.m3u8
 http://hnnz.chinashadt.com:1935/live/1002.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="NanNingGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",南宁公共 (720p) [Not 24/7]
 http://hls.nntv.cn/nnlive/NNTV_PUB_A.m3u8
-#EXTINF:-1 tvg-id="NanNingYingShiYuLe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",南宁影视娱乐 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="NanNingYingShiYuLe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",南宁影视娱乐 (50p) [Not 24/7]
 http://hls.nntv.cn/nnlive/NNTV_VOD_A.m3u8
 #EXTINF:-1 tvg-id="NanNingXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",南宁新闻综合 (720p) [Not 24/7]
 http://hls.nntv.cn/nnlive/NNTV_NEWS_A.m3u8
@@ -1055,7 +1055,7 @@ http://hnsf.chinashadt.com:2036/zhuanma/tv1.stream_360p/playlist.m3u8
 http://125.210.152.18:9090/live/FXZL_750.m3u8
 #EXTINF:-1 tvg-id="TaiShiXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/gt/%E5%8F%B0%E8%A7%86%E6%96%B0%E9%97%BB.png" group-title="",台視新聞 (1080p) [Not 24/7]
 http://seb.sason.top/sc/tsxw_fhd.m3u8
-#EXTINF:-1 tvg-id="JiZhouXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",吉州新聞綜合 (1080p)
+#EXTINF:-1 tvg-id="JiZhouXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",吉州新聞綜合 (1080p) [Timeout]
 http://218.204.153.158/10.m3u8
 #EXTINF:-1 tvg-id="JiLin7.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",吉林7 (900p)
 http://stream1.jlntv.cn/fzpd/sd/live.m3u8
@@ -1097,7 +1097,7 @@ http://tv.zkxww.com:1935/live2/mp4:ch2-500k/playlist.m3u8
 http://live1.hrtonline.cn:1935/live/live100/500K/tzwj_video.m3u8
 #EXTINF:-1 tvg-id="HuLunBeiErShengHuoZiXun.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",呼伦贝尔生活资讯 (720p) [Not 24/7]
 http://live1.hrtonline.cn:1935/live/live102/500K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="HeZhengDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/2/28/%E7%94%98%E8%82%83%E5%8D%AB%E8%A7%86.png" group-title="",和政电视台 [Offline]
+#EXTINF:-1 tvg-id="HeZhengDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/2/28/%E7%94%98%E8%82%83%E5%8D%AB%E8%A7%86.png" group-title="",和政电视台 [Timeout]
 http://117.156.28.119/270000001111/1110000149/index.m3u8
 #EXTINF:-1 tvg-id="MiGuShiPin.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",咪咕视频 (1080p)
 http://39.134.66.66/PLTV/88888888/224/3221225613/index.m3u8
@@ -1118,9 +1118,9 @@ http://39.134.66.66/PLTV/88888888/224/3221225638/index.m3u8
 #EXTINF:-1 tvg-id="MiGuShiPin.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",咪咕视频 (1080p) [Not 24/7]
 http://39.134.66.66/PLTV/88888888/224/3221225617/index.m3u8
 #EXTINF:-1 tvg-id="HaHaXuanDong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/b/b5/TOONMAX_logo.png" group-title="Kids",哈哈炫动卫视 (480p) [Not 24/7]
-http://210.210.155.35/qwr9ew/s/s50/index2.m3u8
-#EXTINF:-1 tvg-id="HaHaXuanDong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/b/b5/TOONMAX_logo.png" group-title="Kids",哈哈炫动卫视 (480p) [Not 24/7]
 http://210.210.155.35/qwr9ew/s/s50/index.m3u8
+#EXTINF:-1 tvg-id="HaHaXuanDong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/b/b5/TOONMAX_logo.png" group-title="Kids",哈哈炫动卫视 (480p) [Not 24/7]
+http://210.210.155.35/qwr9ew/s/s50/index2.m3u8
 #EXTINF:-1 tvg-id="WeiXinDianShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/gt/weixin.png" group-title="",唯心電視 (480p)
 http://mobile.ccdntech.com/transcoder/_definst_/vod164_Live/live/playlist.m3u8
 #EXTINF:-1 tvg-id="JiaJiaQiaTong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/qt/jiajiakt.png" group-title="Kids",嘉佳卡通 (576p)
@@ -1135,7 +1135,7 @@ http://scgctvshow.sctv.com/hdlive/sctv5/index.m3u8
 http://scgctvshow.sctv.com/hdlive/sctv4/index.m3u8
 #EXTINF:-1 tvg-id="SiChuanISiChuanJingJiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 四川经济台 (720p)
 http://scgctvshow.sctv.com/hdlive/sctv3/index.m3u8
-#EXTINF:-1 tvg-id="SiChuanIBaZhongZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 巴中综合台 [Not 24/7]
+#EXTINF:-1 tvg-id="SiChuanIBaZhongZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 巴中综合台 (1080p) [Not 24/7]
 http://30814.hlsplay.aodianyun.com/lms_30814/tv_channel_246.flv
 #EXTINF:-1 tvg-id="SiChuanIXingKongGouWuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 星空购物台 (720p) [Not 24/7]
 http://scgctvshow.sctv.com/hdlive/sctv6/index.m3u8
@@ -1145,19 +1145,19 @@ http://tvdrs.weblz.com.cn:8100/channellive/lztv2.flv
 http://tvdrs.weblz.com.cn:8100/channellive/lztv3.flv
 #EXTINF:-1 tvg-id="SiChuanILuZhouZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 泸州综合 [Offline]
 http://tvdrs.weblz.com.cn:8100/channellive/lztv1.flv
-#EXTINF:-1 tvg-id="SiChuanIMianYangGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 绵阳公共
+#EXTINF:-1 tvg-id="SiChuanIMianYangGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 绵阳公共 [Offline]
 http://live.826pc.com/mytv/live.php?id=3
-#EXTINF:-1 tvg-id="SiChuanIMianYangKeJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 绵阳科技
+#EXTINF:-1 tvg-id="SiChuanIMianYangKeJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 绵阳科技 [Offline]
 http://live.826pc.com/mytv/live.php?id=2
-#EXTINF:-1 tvg-id="SiChuanIMianYangZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 绵阳综合
+#EXTINF:-1 tvg-id="SiChuanIMianYangZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 绵阳综合 [Offline]
 http://live.826pc.com/mytv/live.php?id=4
 #EXTINF:-1 tvg-id="SiChuanIDaZhouGongGongTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 达州公共台 (720p) [Not 24/7]
 http://m3u8.channellive.dzxw.net/cms/videos/nmip-media/channellive/channel36/playlist.m3u8
 #EXTINF:-1 tvg-id="SiChuanIDaZhouZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 达州综合台 (720p) [Not 24/7]
 http://m3u8.channellive.dzxw.net/cms/videos/nmip-media/channellive/channel35/playlist.m3u8
-#EXTINF:-1 tvg-id="SiChuanIYaAnGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 雅安公共
+#EXTINF:-1 tvg-id="SiChuanIYaAnGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 雅安公共 (720p)
 http://flv.drs.tv.yatv.tv:8080/channellive/gonggong.flv
-#EXTINF:-1 tvg-id="SiChuanIYaAnZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 雅安综合
+#EXTINF:-1 tvg-id="SiChuanIYaAnZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",四川 Ⅰ 雅安综合 (720p)
 http://flv.drs.tv.yatv.tv:8080/channellive/xinwen.flv
 #EXTINF:-1 tvg-id="SiChuanGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/sheng/sctv9.png" group-title="",四川公共 (720p)
 http://scgctvshow.sctv.com/hdlive/sctv9/index.m3u8
@@ -1233,11 +1233,11 @@ http://media.fantv.hk/m3u8/archive/channel2_stream1.m3u8
 http://61.244.22.5/ch3/ch3.live/playlist.m3u8
 #EXTINF:-1 tvg-id="NuXingShiShang.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",女性时尚 (576p)
 http://223.110.245.169/PLTV/4/224/3221227026/index.m3u8
-#EXTINF:-1 tvg-id="RuDongXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",如东新闻综合 [Not 24/7]
+#EXTINF:-1 tvg-id="RuDongXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",如东新闻综合 (480p) [Not 24/7]
 http://live.rdxmt.com/channels/rudong/news/flv:sd/live
-#EXTINF:-1 tvg-id="XiaoYiXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",孝義新聞綜合 (576p)
+#EXTINF:-1 tvg-id="XiaoYiXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",孝義新聞綜合 (576p) [Timeout]
 http://app.xygdcm.com:2036/live/stream:xy1.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="MengZhouDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",孟州电视台 (1080p) [Offline]
+#EXTINF:-1 tvg-id="MengZhouDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",孟州电视台 (1080p) [Not 24/7]
 http://live.dxhmt.cn:9081/tv/10883-1.m3u8
 #EXTINF:-1 tvg-id="NingXiaWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",宁夏卫视 (576p)
 http://39.134.65.162/PLTV/88888888/224/3221225579/index.m3u8
@@ -1349,7 +1349,7 @@ http://live.ahsz.tv/video/s10001-ggpd/index.m3u8
 http://live.ahsz.tv/video/s10001-szzh/index.m3u8
 #EXTINF:-1 tvg-id="SuZhouKeJiao.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.66zhibo.net/d/file/2018/0711/f91966206d646e5cc94ca9e597b855ec.jpg" group-title="",宿州科教 (1080p) [Not 24/7]
 http://live.ahsz.tv/video/s10001-kxjy/index.m3u8
-#EXTINF:-1 tvg-id="SuQianGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",宿迁公共 (576p)
+#EXTINF:-1 tvg-id="SuQianGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",宿迁公共 (480p)
 http://223.110.245.153/ott.js.chinamobile.com/PLTV/3/224/3221226939/index.m3u8
 #EXTINF:-1 tvg-id="ShanDongIYanTaiYingShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",山东 Ⅰ 烟台影视台 (720p) [Offline]
 http://player.200877926.top/hogejump/yantai.php?id=5
@@ -1457,7 +1457,7 @@ http://pili-live-rtmp.wdit.com.cn/wditlive/fs_sspd.m3u8
 http://pili-live-rtmp.wdit.com.cn/wditlive/fs_nhpd.m3u8
 #EXTINF:-1 tvg-id="GuangDongFoShanGaoMingQu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广东 ‖ 佛山高明区 (404p) [Offline]
 http://pili-live-rtmp.wdit.com.cn/wditlive/fs_gmpd.m3u8
-#EXTINF:-1 tvg-id="GuangDongLingNanXiQuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广东 ‖ 岭南戏曲台 (480p)
+#EXTINF:-1 tvg-id="GuangDongLingNanXiQuTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广东 ‖ 岭南戏曲台 (540p)
 http://szlive.grtn.cn/lnxq/sd/live.m3u8
 #EXTINF:-1 tvg-id="GuangDongQingXinZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广东 ‖ 清新综合台 (1080p)
 http://hls.wiseqx.com/live/qxzh.m3u8
@@ -1513,7 +1513,7 @@ http://149.129.100.78/guangdong.php?id=46
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=83&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="GuangDongShaoEr.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广东少儿 (540p) [Offline]
 http://149.129.100.78/guangdong.php?id=54
-#EXTINF:-1 tvg-id="GuangDongYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广东影视 (576p) [Offline]
+#EXTINF:-1 tvg-id="GuangDongYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广东影视 (576p) [Not 24/7]
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=86&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="GuangDongYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广东影视 (540p) [Offline]
 http://149.129.100.78/guangdong.php?id=53
@@ -1561,10 +1561,10 @@ http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_Shif
 http://149.129.100.78/gztv.php?id=fazhi
 #EXTINF:-1 tvg-id="GuangZhouFaZhi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广州法治 (720p) [Not 24/7]
 https://iptv--iptv.repl.co/Chinese/fazhi
+#EXTINF:-1 tvg-id="GuangZhouJingSai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广州竞赛 (1080p)
+http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=52&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="GuangZhouJingSai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广州竞赛 (720p)
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=0&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
-#EXTINF:-1 tvg-id="GuangZhouJingSai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广州竞赛
-http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=52&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
 #EXTINF:-1 tvg-id="GuangZhouJingSai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广州竞赛 (720p) [Not 24/7]
 http://149.129.100.78/gztv.php?id=jingsai
 #EXTINF:-1 tvg-id="GuangZhouJingSai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",广州竞赛 (720p) [Not 24/7]
@@ -1603,25 +1603,25 @@ http://223.110.245.161/ott.js.chinamobile.com/PLTV/3/224/3221227002/index.m3u8
 http://ott.js.chinamobile.com/PLTV/3/224/3221227002/index.m3u8
 #EXTINF:-1 tvg-id="YanBianXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",延边新闻综合 [Geo-blocked]
 http://stream2.jlntv.cn/jlyb/sd/live.m3u8
-#EXTINF:-1 tvg-id="JianAnDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",建安电视台 (1080p) [Offline]
+#EXTINF:-1 tvg-id="JianAnDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",建安电视台 (1080p) [Not 24/7]
 http://live.dxhmt.cn:9081/tv/11003-1.m3u8
 #EXTINF:-1 tvg-id="KaiZhouZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",开州综合 (720p)
 http://kaixianlive.cbg.cn:10345/1.m3u8
 #EXTINF:-1 tvg-id="YiTanChunQiu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",弈坛春秋 (576p)
 http://223.110.245.139/PLTV/4/224/3221227031/index.m3u8
-#EXTINF:-1 tvg-id="ZhangJiaKouYiTao.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",张家口一套 (720p) [Offline]
+#EXTINF:-1 tvg-id="ZhangJiaKouYiTao.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",张家口一套 (720p) [Not 24/7]
 http://nlive.zjkgdcs.com:8091/live/xwzhpd.m3u8
 #EXTINF:-1 tvg-id="ZhangJiaGangXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",张家港新闻综合 (720p)
 http://3gvod.zjgonline.com.cn:1935/live/xinwenzonghe2/playlist.m3u8
 #EXTINF:-1 tvg-id="ZhangJiaGangSheHuiShengHuo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",张家港社会生活 (720p)
 http://3gvod.zjgonline.com.cn:1935/live/shehuishenghuo2/playlist.m3u8
-#EXTINF:-1 tvg-id="ZhangJiaJie1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",张家界1 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ZhangJiaJie1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",张家界1 (576p) [Not 24/7]
 http://stream.zjjrtv.com/zjjtv1/hd/live.m3u8
 #EXTINF:-1 tvg-id="ZhangJiaJie2Tai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",张家界2台 (576p) [Not 24/7]
 http://stream.zjjrtv.com/zjjtv2/hd/live.m3u8
 #EXTINF:-1 tvg-id="PengShuiWenHuaLuYou.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",彭水文化旅游 (288p)
 http://pengshuilive.cbg.cn/pengshui02.m3u8
-#EXTINF:-1 tvg-id="PengShuiXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",彭水新闻综合 (288p)
+#EXTINF:-1 tvg-id="PengShuiXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",彭水新闻综合 (288p) [Timeout]
 http://pengshuilive.cbg.cn/pengshui01.m3u8
 #EXTINF:-1 tvg-id="XuZhou1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",徐州-1 (1080p)
 http://183.207.249.15/PLTV/3/224/3221225945/index.m3u8
@@ -1671,7 +1671,7 @@ http://video.dztv.tv:1935/live/xwzh_sj/playlist.m3u8
 http://video.dztv.tv:1935/live/dspd_gq/playlist.m3u8
 #EXTINF:-1 tvg-id="XinYueZhiShengGongYiGuangBo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",心约之声公益广播 [Not 24/7]
 http://4521.hlsplay.aodianyun.com/xyzs/stream.m3u8
-#EXTINF:-1 tvg-id="RenZheShenGui.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",忍者神龟
+#EXTINF:-1 tvg-id="RenZheShenGui.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",忍者神龟 (480p)
 http://www.alibabapictures.com/movies/shenggui/poyingerchu.mp4
 #EXTINF:-1 tvg-id="ZhongXianWenLu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",忠县文旅 (576p) [Not 24/7]
 http://qxlmlive.cbg.cn:1935/app_2/_definst_/ls_36.stream/playlist.m3u8
@@ -1719,19 +1719,19 @@ http://m3u8.channel.wsrtv.com.cn/cms/videos/nmip-media/channellive/channel7/play
 http://sxws.chinashadt.com:1938/live/tv10.stream_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="WenShuiShiShangXiu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",文水時尚秀 (360p) [Offline]
 http://sxws.chinashadt.com:1938/live/tv11.stream_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="DouYuDianYing2.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",斗鱼电影2
+#EXTINF:-1 tvg-id="DouYuDianYing2.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",斗鱼电影2 (1080p)
 http://tx2play1.douyucdn.cn/live/20415rnWbjg6Ex1K.xs
-#EXTINF:-1 tvg-id="DouYuDianYing3.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",斗鱼电影3
+#EXTINF:-1 tvg-id="DouYuDianYing3.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",斗鱼电影3 (720p)
 http://tx2play1.douyucdn.cn/live/3928r9p0BHMDG_8000p.flv
-#EXTINF:-1 tvg-id="DouYuDianYing4.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",斗鱼电影4
+#EXTINF:-1 tvg-id="DouYuDianYing4.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",斗鱼电影4 (1080p)
 http://tx2play1.douyucdn.cn/live/122402rK7MO9bXSq_8000p.flv
-#EXTINF:-1 tvg-id="DouYuChePing.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",斗鱼车评 [Not 24/7]
+#EXTINF:-1 tvg-id="DouYuChePing.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",斗鱼车评 (1080p) [Not 24/7]
 http://tx2play1.douyucdn.cn/live/321987r8e6tCsPR_4000.xs?uuid=
 #EXTINF:-1 tvg-id="XinTangRenMeiXi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",新唐人-美西 (486p)
 http://live.ntdimg.com/uwlive520/playlist.m3u8
 #EXTINF:-1 tvg-id="XinTangRenYaTaiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://www.ntdtv.com/assets/themes/ntd/images/logo/logo_ntd.png" group-title="",新唐人亚太臺 (480p)
 https://live.ntdimg.com/aplive200/playlist.m3u8
-#EXTINF:-1 tvg-id="XinTangRenJiaDongTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://www.ntdtv.com/assets/themes/ntd/images/logo/logo_ntd.png" group-title="",新唐人加东臺 (486p)
+#EXTINF:-1 tvg-id="XinTangRenJiaDongTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://www.ntdtv.com/assets/themes/ntd/images/logo/logo_ntd.png" group-title="",新唐人加东臺 (720p)
 https://live.ntdimg.com/mllive860/playlist.m3u8
 #EXTINF:-1 tvg-id="XinTangRenJiaXiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://www.ntdtv.com/assets/themes/ntd/images/logo/logo_ntd.png" group-title="",新唐人加西臺 (216p)
 https://live.ntdimg.com/cwlive220/playlist.m3u8
@@ -1835,9 +1835,9 @@ http://hbjx.chinashadt.com:1935/live/jx2.stream/playlist.m3u8
 http://hbjx.chinashadt.com:1935/live/stream:jx2.stream_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="ZhiHuiJiaoYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",智慧教育 (576p)
 http://111.63.117.13:6060/030000001000/G_CETV-4/G_CETV-4.m3u8
-#EXTINF:-1 tvg-id="ShuoZhou1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.tvyan.com/uploads/dianshi/shuozhou.jpg" group-title="",朔州1 (480p)
+#EXTINF:-1 tvg-id="ShuoZhou1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.tvyan.com/uploads/dianshi/shuozhou.jpg" group-title="",朔州1 (10p)
 http://stream.sxsztv.com/live1/playlist.m3u8
-#EXTINF:-1 tvg-id="ShuoZhou2.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.tvyan.com/uploads/dianshi/shuozhou.jpg" group-title="",朔州2 (480p)
+#EXTINF:-1 tvg-id="ShuoZhou2.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.tvyan.com/uploads/dianshi/shuozhou.jpg" group-title="",朔州2 (10p)
 http://stream.sxsztv.com/live2/playlist.m3u8
 #EXTINF:-1 tvg-id="DongGuangYiTao.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",東光一套 (576p)
 http://hbdg.chinashadt.com:1936/live/stream:dgtv1.stream/playlist.m3u8
@@ -1871,7 +1871,7 @@ http://stream.zhystv.com/ysyt/sd/live.m3u8
 http://stream.hsqtv.cn/2/sd/live.m3u8
 #EXTINF:-1 tvg-id="WuHanWaiYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",武汉外语 (576p)
 http://stream.appwuhan.com/6tzb/sd/live.m3u8
-#EXTINF:-1 tvg-id="WuHanWenTi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",武汉文体 (480p)
+#EXTINF:-1 tvg-id="WuHanWenTi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",武汉文体 (720p)
 http://stream.appwuhan.com/5tzb/sd/live.m3u8
 #EXTINF:-1 tvg-id="WuHanJingJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",武汉经济 (360p)
 http://stream.appwuhan.com/4tzb/sd/live.m3u8
@@ -1889,13 +1889,13 @@ http://jxyx.chinashadt.com:2036/live/1004.stream/playlist.m3u8
 http://jxyx.chinashadt.com:2036/live/1003.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="ShanTouZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",汕头综合 (540p)
 http://dslive.grtn.cn/stzh/playlist.m3u8
-#EXTINF:-1 tvg-id="ShanWeiGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",汕尾公共 (480p)
+#EXTINF:-1 tvg-id="ShanWeiGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",汕尾公共 (540p)
 http://dslive.grtn.cn/swzh/sd/live.m3u8
 #EXTINF:-1 tvg-id="ShanWeiZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",汕尾综合 (540p)
 http://dslive.grtn.cn/swzh/playlist.m3u8
 #EXTINF:-1 tvg-id="JiangJinWenHuaLuYou.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江津文化旅游 (576p)
 http://222.179.155.21:1935/ch2.m3u8
-#EXTINF:-1 tvg-id="JiangJinWenHuaLuYou.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江津文化旅游 (576p)
+#EXTINF:-1 tvg-id="JiangJinWenHuaLuYou.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江津文化旅游 (576p) [Timeout]
 http://jiangjinlive.cbg.cn:1935/ch2.m3u8
 #EXTINF:-1 tvg-id="JiangJinXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江津新闻综合 (576p)
 http://222.179.155.21:1935/ch1.m3u8
@@ -1905,7 +1905,7 @@ http://jiangjinlive.cbg.cn:1935/ch1.m3u8
 http://222.179.155.21:1935/ch0.m3u8
 #EXTINF:-1 tvg-id="JiangJinJingJiShengHuo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江津经济生活 (576p)
 http://jiangjinlive.cbg.cn:1935/ch0.m3u8
-#EXTINF:-1 tvg-id="JiangSuIDongHaiZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江苏 Ⅰ 东海综合台
+#EXTINF:-1 tvg-id="JiangSuIDongHaiZongHeTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江苏 Ⅰ 东海综合台 [Offline]
 rtmp://livetv.dhtv.cn/live/news
 #EXTINF:-1 tvg-id="JiangSuISuZhouWenHua.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江苏 Ⅰ 苏州文化 [Not 24/7]
 rtmp://csztv.2500sz.com/live/c03
@@ -1917,7 +1917,7 @@ rtmp://csztv.2500sz.com/live/c02
 rtmp://csztv.2500sz.com/live/c01
 #EXTINF:-1 tvg-id="JiangSuILianYunGangGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江苏 Ⅰ 连云港公共 (480p) [Not 24/7]
 http://live.lyg1.com/ggpd/sd/live.m3u8
-#EXTINF:-1 tvg-id="JiangSuILianYunGangZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江苏 Ⅰ 连云港综合 (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="JiangSuILianYunGangZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江苏 Ⅰ 连云港综合 (480p) [Not 24/7]
 http://live.lyg1.com/zhpd/sd/live.m3u8
 #EXTINF:-1 tvg-id="JiangSuYouManQiaTong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",江苏优漫卡通 (576p)
 http://39.134.66.66/PLTV/88888888/224/3221225556/index.m3u8
@@ -2085,7 +2085,7 @@ http://tmpstream.hyrtv.cn/hygg/sd/live.m3u8
 http://tmpstream.hyrtv.cn/xwzh/sd/live.m3u8
 #EXTINF:-1 tvg-id="HeYuanZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",河源综合 (480p)
 http://dslive.grtn.cn/hyzh/playlist.m3u8
-#EXTINF:-1 tvg-id="LuoYangZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",洛陽綜合頻道 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="LuoYangZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",洛陽綜合頻道 (1080p) [Not 24/7]
 http://live1.lytv.com.cn:1935/live/LYTV1-1/playlist.m3u8
 #EXTINF:-1 tvg-id="HongYaXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",洪雅新闻综合 (1080p)
 http://117.172.215.250:8083/videos/live/35/39/GQVbrgob5CGJM/GQVbrgob5CGJM.m3u8
@@ -2095,8 +2095,6 @@ http://lives.jnnews.tv/video/s10001-JTV3/index.m3u8
 http://lives.jnnews.tv/video/s10001-JTV4/index.m3u8
 #EXTINF:-1 tvg-id="JiNingJiaoYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",济宁教育 (1080p)
 http://lives.jnnews.tv/video/s10001-JTV2/index.m3u8
-#EXTINF:-1 tvg-id="ZheJiang6Tao.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江6套 (1080p)
-http://hw-m-l.cztv.com/channels/lantian/channel06/1080p.m3u8
 #EXTINF:-1 tvg-id="ZheJiangIZheJiangXiuXian.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江 Ⅰ 浙江休闲 (720p)
 http://hw-m-l.cztv.com/channels/lantian/channel06/720p.m3u8
 #EXTINF:-1 tvg-id="ZheJiangIZheJiangGuoJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江 Ⅰ 浙江国际 (720p)
@@ -2113,10 +2111,12 @@ http://hw-m-l.cztv.com/channels/lantian/channel11/720p.m3u8
 http://hw-m-l.cztv.com/channels/lantian/channel09/720p.m3u8
 #EXTINF:-1 tvg-id="ZheJiangIZheJiangJingJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江 Ⅰ 浙江经济 (720p)
 http://hw-m-l.cztv.com/channels/lantian/channel03/720p.m3u8
-#EXTINF:-1 tvg-id="ZheJiangIShaoXingYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江 Ⅰ 绍兴影视 (576p)
+#EXTINF:-1 tvg-id="ZheJiangIShaoXingYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江 Ⅰ 绍兴影视 (576p) [Timeout]
 http://live.shaoxing.com.cn/video/s10001-sxtv3/index.m3u8
-#EXTINF:-1 tvg-id="ZheJiangIShaoXingZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江 Ⅰ 绍兴综合 (576p)
+#EXTINF:-1 tvg-id="ZheJiangIShaoXingZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江 Ⅰ 绍兴综合 (576p) [Timeout]
 http://live.shaoxing.com.cn/video/s10001-sxtv1/index.m3u8
+#EXTINF:-1 tvg-id="ZheJiang6Tao.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江6套 (1080p)
+http://hw-m-l.cztv.com/channels/lantian/channel06/1080p.m3u8
 #EXTINF:-1 tvg-id="ZheJiangGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",浙江公共 (1080p)
 http://hw-m-l.cztv.com/channels/lantian/channel07/1080p.m3u8
 #EXTINF:-1 tvg-id="ZheJiangWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/ws/zhejiang.png" group-title="",浙江卫视 (1080p)
@@ -2152,9 +2152,9 @@ http://223.110.245.143/ott.js.chinamobile.com/PLTV/3/224/3221227483/index.m3u8
 #EXTINF:-1 tvg-id="ZheJiangWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/ws/zhejiang.png" group-title="",浙江卫视 (576p) [Offline]
 http://183.207.248.71/gitv/live1/G_ZHEJIANG/G_ZHEJIANG
 #EXTINF:-1 tvg-id="ZheJiangGuoJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://ohudong.cztv.com/1/logos/2017/04/12/72d035c03412d7cb2d319c6607fef8e9.png" group-title="",浙江国际 (1080p)
-http://hw-m-l.cztv.com/channels/lantian/channel010/1080p.m3u8
-#EXTINF:-1 tvg-id="ZheJiangGuoJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://ohudong.cztv.com/1/logos/2017/04/12/72d035c03412d7cb2d319c6607fef8e9.png" group-title="",浙江国际 (1080p)
 http://hw-m-l.cztv.com/channels/lantian/channel10/1080p.m3u8
+#EXTINF:-1 tvg-id="ZheJiangGuoJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://ohudong.cztv.com/1/logos/2017/04/12/72d035c03412d7cb2d319c6607fef8e9.png" group-title="",浙江国际 (1080p)
+http://hw-m-l.cztv.com/channels/lantian/channel010/1080p.m3u8
 #EXTINF:-1 tvg-id="ZheJiangShaoEr.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://ohudong.cztv.com/1/logos/2017/04/12/33b59c051574c604f93157baa61455b2.png" group-title="",浙江少儿 (1080p)
 http://hw-m-l.cztv.com/channels/lantian/channel008/1080p.m3u8
 #EXTINF:-1 tvg-id="ZheJiangShaoEr.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://ohudong.cztv.com/1/logos/2017/04/12/33b59c051574c604f93157baa61455b2.png" group-title="",浙江少儿 (1080p)
@@ -2351,11 +2351,11 @@ http://live.hnxttv.com:9601/live/dspd/800K/tzwj_video.m3u8
 http://live.hnxttv.com:9601/live/xwzh/800K/tzwj_video.m3u8
 #EXTINF:-1 tvg-id="ZhanJiangZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",湛江综合 (540p)
 http://dslive.grtn.cn/zjzh/playlist.m3u8
-#EXTINF:-1 tvg-id="ChuZhouGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滁州公共 (450p)
+#EXTINF:-1 tvg-id="ChuZhouGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滁州公共 (450p) [Offline]
 http://183.167.193.45:1935/live/cztvgg/playlist.m3u8
-#EXTINF:-1 tvg-id="ChuZhouXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滁州新闻综合 (450p)
+#EXTINF:-1 tvg-id="ChuZhouXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滁州新闻综合 (450p) [Timeout]
 http://183.167.193.45:1935/live/cztvzh/playlist.m3u8
-#EXTINF:-1 tvg-id="ChuZhouKeJiao.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滁州科教 (450p)
+#EXTINF:-1 tvg-id="ChuZhouKeJiao.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滁州科教 (450p) [Timeout]
 http://183.167.193.45:1935/live/cztvkj/playlist.m3u8
 #EXTINF:-1 tvg-id="LuanXianZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滦县综合 (576p)
 http://hblxx.chinashadt.com:2036/live/stream:lx1.stream/playlist.m3u8
@@ -2367,17 +2367,17 @@ http://stream.bzcm.net/1/sd/live.m3u8
 http://stream.bzcm.net/2/sd/live.m3u8
 #EXTINF:-1 tvg-id="BinZhouCeShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滨州测试 (576p)
 http://stream.bzcm.net/4/sd/live.m3u8
-#EXTINF:-1 tvg-id="BinHaiXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://static2.tvzhe.com/tvstation/logo/JSBHTV.gif" group-title="",滨海新闻 (576p)
+#EXTINF:-1 tvg-id="BinHaiXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://static2.tvzhe.com/tvstation/logo/JSBHTV.gif" group-title="",滨海新闻 (1080p)
 http://60.30.52.41/live/bhtv1/playlist.m3u8
 #EXTINF:-1 tvg-id="BinHaiXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",滨海新闻综合 (576p)
 http://jsbh.chinashadt.com:2036/live/bh11.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="BinHaiDuShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://static2.tvzhe.com/tvstation/logo/JSBHTV.gif" group-title="",滨海都市 (576p)
+#EXTINF:-1 tvg-id="BinHaiDuShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://static2.tvzhe.com/tvstation/logo/JSBHTV.gif" group-title="",滨海都市 (1080p)
 http://60.30.52.41/live/bhtv2/playlist.m3u8
 #EXTINF:-1 tvg-id="ZhangZhouXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",漳州新闻综合 (720p) [Not 24/7]
 http://31182.hlsplay.aodianyun.com/lms_31182/tv_channel_175.m3u8
 #EXTINF:-1 tvg-id="ChaoAnYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",潮安影视 [Offline]
 http://chaoan.chaoantv.com:8278/h_yingshi_1028/playlist.m3u8
-#EXTINF:-1 tvg-id="ChaoAnZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",潮安综合 (540p)
+#EXTINF:-1 tvg-id="ChaoAnZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",潮安综合 (360p)
 http://chaoan.chaoantv.com:8278/live/chaoanzongyi.m3u8
 #EXTINF:-1 tvg-id="ChaoZhouGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.jisutiyu.com/uploads/150706/16-150F61J645626.jpg" group-title="",潮州公共 [Offline]
 http://live.zscz0768.com/live/ggpd.m3u8
@@ -2409,7 +2409,7 @@ http://61.244.22.4/ch4/sport_ch4.live/playelist.m3u8
 http://117.156.28.119/270000001111/1110000145/index.m3u8
 #EXTINF:-1 tvg-id="XuanDongQiaTong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="Kids",炫动卡通 (540p)
 http://183.207.255.188/live/program/live/xdkt/1300000/mnf.m3u8
-#EXTINF:-1 tvg-id="XuanDongQiaTong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="Kids",炫动卡通 (576p) [Offline]
+#EXTINF:-1 tvg-id="XuanDongQiaTong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="Kids",炫动卡通 (576p) [Timeout]
 http://223.110.245.139/PLTV/4/224/3221226388/index.m3u8
 #EXTINF:-1 tvg-id="DianZhangCaiJing.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://i.imgur.com/N8YdX6W.png" group-title="",点掌财经 (712p)
 http://cclive.aniu.tv/live/anzb.m3u8
@@ -2467,7 +2467,7 @@ http://live.pybtv.cn/channel1/sd/live.m3u8
 http://stream2.jlntv.cn/baicheng1/sd/live.m3u8
 #EXTINF:-1 tvg-id="BaiShanXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",白山新闻综合 [Geo-blocked]
 http://stream2.jlntv.cn/baishan1/sd/live.m3u8
-#EXTINF:-1 tvg-id="BaiShiTongTiYu1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",百事通体育1 (1080p) [Offline]
+#EXTINF:-1 tvg-id="BaiShiTongTiYu1.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",百事通体育1 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/hdnba1/4000000/mnf.m3u8
 #EXTINF:-1 tvg-id="BaiShiTongTiYu2.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",百事通体育2 (1080p) [Not 24/7]
 http://112.25.48.68/live/program/live/hdnba2/4000000/mnf.m3u8
@@ -2481,17 +2481,17 @@ http://112.25.48.68/live/program/live/hdnba7/4000000/mnf.m3u8
 http://149.129.100.78/anhui.php?id=85
 #EXTINF:-1 tvg-id="ShiJingShanDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",石景山电视台 (1080p) [Not 24/7]
 http://live.sjsrm.com/bjsjs/sd/live.m3u8
-#EXTINF:-1 tvg-id="FuFJianJGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J公共
+#EXTINF:-1 tvg-id="FuFJianJGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J公共 [Offline]
 rtsp://183.252.176.54:554/PLTV/88888888/224/3221226113/10000100000000060000000002358064_0.smil
-#EXTINF:-1 tvg-id="FuFJianJShaoEr.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J少儿
+#EXTINF:-1 tvg-id="FuFJianJShaoEr.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J少儿 [Offline]
 rtsp://183.252.176.54:554/PLTV/88888888/224/3221226120/10000100000000060000000002358082_0.smil
-#EXTINF:-1 tvg-id="FuFJianJXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J新闻
+#EXTINF:-1 tvg-id="FuFJianJXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J新闻 [Offline]
 rtsp://183.252.176.54:554/PLTV/88888888/224/3221226116/10000100000000060000000002358068_0.smil
-#EXTINF:-1 tvg-id="FuFJianJLuYou.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J旅游
+#EXTINF:-1 tvg-id="FuFJianJLuYou.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J旅游 [Offline]
 rtsp://183.252.176.54:554/PLTV/88888888/224/3221226125/10000100000000060000000002358191_0.smil
-#EXTINF:-1 tvg-id="FuFJianJDianShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J电视
+#EXTINF:-1 tvg-id="FuFJianJDianShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J电视 [Offline]
 rtsp://183.252.176.54:554/PLTV/88888888/224/3221226115/10000100000000060000000002358067_0.smil
-#EXTINF:-1 tvg-id="FuFJianJJingJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J经济
+#EXTINF:-1 tvg-id="FuFJianJJingJi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福F建J经济 [Offline]
 rtsp://183.252.176.54:554/PLTV/88888888/224/3221226117/10000100000000060000000002358072_0.smil
 #EXTINF:-1 tvg-id="FuShanShengHuo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",福山生活 (576p) [Not 24/7]
 http://live.jiaodong.net:82/tvfushan/hls/tv_shenghuo.m3u8
@@ -2551,7 +2551,7 @@ http://39.134.115.163:8080/PLTV/88888910/224/3221225786/index.m3u8
 http://60.160.23.32:6055/sjtv/sjtv.m3u8
 #EXTINF:-1 tvg-id="JiXuJiaoYu.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",继续教育 (576p)
 http://111.63.117.13:6060/030000001000/G_CETV-2/G_CETV-2.m3u8
-#EXTINF:-1 tvg-id="LuoShanDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",罗山电视台 (1080p) [Offline]
+#EXTINF:-1 tvg-id="LuoShanDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",罗山电视台 (1080p) [Not 24/7]
 http://live.dxhmt.cn:9081/tv/11521-1.m3u8
 #EXTINF:-1 tvg-id="LuoMaNiYaSTV.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",罗马尼亚STV [Not 24/7]
 http://s2.streamnet.ro:8035/stream.flv
@@ -2569,19 +2569,19 @@ http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_Shif
 http://202.69.67.66:443/webcast/bshdlive-mobile/playlist.m3u8
 #EXTINF:-1 tvg-id="YaoCaiCaiJing.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",耀才财经
 http://202.69.67.66/webcast/bshdlive-pc/playlist.m3u8
-#EXTINF:-1 tvg-id="YaoCaiCaiJing.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",耀才财经
+#EXTINF:-1 tvg-id="YaoCaiCaiJing.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",耀才财经 [Offline]
 rtmp://202.69.69.180/webcast/bshdlive-pc
 #EXTINF:-1 tvg-id="SuZhouDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://i.imgur.com/WcPcluo.png" group-title="",肃州电视台 (1080p)
 http://117.156.28.119/270000001111/1110000123/index.m3u8
 #EXTINF:-1 tvg-id="ZhaoQingZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",肇庆综合 (480p)
 http://dslive.grtn.cn/zqzh/playlist.m3u8
-#EXTINF:-1 tvg-id="ZhouShanGongGongShengHuo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",舟山公共生活 (576p)
+#EXTINF:-1 tvg-id="ZhouShanGongGongShengHuo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",舟山公共生活 (720p)
 http://live.wifizs.cn/ggsh/sd/live.m3u8
 #EXTINF:-1 tvg-id="ZhouShanXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://static2.tvzhe.com/channel/logo/ZJZS-ZH.jpg" group-title="",舟山新闻综合 (576p)
 http://live.wifizs.cn/xwzh/sd/live.m3u8
 #EXTINF:-1 tvg-id="ZhouShanXinWenZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://static2.tvzhe.com/channel/logo/ZJZS-ZH.jpg" group-title="",舟山新闻综合 (576p)
 http://stream.wifizs.cn/xwzh/sd/live.m3u8
-#EXTINF:-1 tvg-id="ZhouShanQunDaoLuYou.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",舟山群岛旅游 (576p)
+#EXTINF:-1 tvg-id="ZhouShanQunDaoLuYou.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",舟山群岛旅游 (720p)
 http://live.wifizs.cn/qdly/sd/live.m3u8
 #EXTINF:-1 tvg-id="WuHuGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",芜湖公共 (576p)
 http://live1.wuhubtv.com/channel3/sd/live.m3u8
@@ -2611,7 +2611,7 @@ http://61.162.225.122:8181/live/test2.m3u8
 http://149.129.100.78/lotus.php?id=1
 #EXTINF:-1 tvg-id="HuaShiXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://piceltaott-elta.cdn.hinet.net/upload/channel/910.png" group-title="",華視新聞 [Geo-blocked]
 http://seb.sason.top/sc/hsxw_fhd.m3u8
-#EXTINF:-1 tvg-id="HuaCangWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://www.hwazan.org/statics/images/newhztv_logo.png" group-title="",華藏衛視 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="HuaCangWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://www.hwazan.org/statics/images/newhztv_logo.png" group-title="",華藏衛視 (1080p) [Not 24/7]
 http://118.163.88.61:1935/hwazanlivetv/live.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="PingXiangGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",萍鄉公共頻道 (1080p) [Not 24/7]
 http://www.pxitv.com:8099/hls-live/livepkgr/_definst_/pxitvevent/pxtv3stream.m3u8
@@ -2643,7 +2643,7 @@ http://stream2.xiancity.cn/xatv6/playlist.m3u8
 http://stream2.xiancity.cn/xatv3/playlist.m3u8
 #EXTINF:-1 tvg-id="XiAnYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.tvyan.com/uploads/dianshi/xatv4.jpg" group-title="",西安影视 (576p)
 http://stream2.xiancity.cn/xatv4/playlist.m3u8
-#EXTINF:-1 tvg-id="XiAnXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",西安新闻 (576p)
+#EXTINF:-1 tvg-id="XiAnXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",西安新闻 (1080p)
 http://stream2.xiancity.cn/xatv1/playlist.m3u8
 #EXTINF:-1 tvg-id="XiAnBaiGe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",西安白鸽 (576p)
 http://stream2.xiancity.cn/xatv2/playlist.m3u8
@@ -2731,7 +2731,7 @@ http://stream01.dqtv123.com:1935/live/xinwenzonghe.stream/playlist.m3u8
 http://stream01.dqtv123.com:1935/live/diqingzangyu.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TongHuaXinWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",通化新闻 [Geo-blocked]
 http://stream2.jlntv.cn/tonghua1/sd/live.m3u8
-#EXTINF:-1 tvg-id="TongZhouDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.dayuntongzhou.com/web/style/images/logo.png" group-title="",通州电视台 (720p)
+#EXTINF:-1 tvg-id="TongZhouDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.dayuntongzhou.com/web/style/images/logo.png" group-title="",通州电视台 (720p) [Timeout]
 http://pull.dayuntongzhou.com/live/tztv.m3u8
 #EXTINF:-1 tvg-id="SuiNingGongGongGongYi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",遂宁公共公益 [Offline]
 http://snlive.scsntv.com:8091/live/gggy.m3u8
@@ -2825,7 +2825,7 @@ http://34766.hlsplay.aodianyun.com/guangdianyun_34766/tv_channel_304.m3u8
 http://34766.hlsplay.aodianyun.com/guangdianyun_34766/tv_channel_305.m3u8
 #EXTINF:-1 tvg-id="JiAnZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",集安综合 [Geo-blocked]
 http://stream2.jlntv.cn/ja/sd/live.m3u8
-#EXTINF:-1 tvg-id="HuoShanZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",霍山综合 (576p)
+#EXTINF:-1 tvg-id="HuoShanZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",霍山综合 (576p) [Timeout]
 http://ahhs.chinashadt.com:1936/live/stream:hs1.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="BaZhouGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",霸州公共頻道 (576p) [Offline]
 http://hbbz.chinashadt.com:2036/live/stream:bzgg.stream/playlist.m3u8
@@ -2865,7 +2865,7 @@ http://visit.jjbctv.com:1935/live/xwzhpc/playlist.m3u8
 http://visit.jjbctv.com:1935/live/xwzhmb/playlist.m3u8
 #EXTINF:-1 tvg-id="JingNingZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/2/28/%E7%94%98%E8%82%83%E5%8D%AB%E8%A7%86.png" group-title="",静宁综合 (1080p)
 http://117.156.28.119/270000001111/1110000147/index.m3u8
-#EXTINF:-1 tvg-id="AnShanTuWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",鞍山图文 (576p)
+#EXTINF:-1 tvg-id="AnShanTuWen.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",鞍山图文 (576p) [Timeout]
 http://116.199.5.51:8114/index.m3u8?Fsv_chan_hls_se_idx=12&Fsv_ctype=LIVES&Fsv_otype=1&FvSeid=1&Pcontent_id=.m3u8&Provider_id=
 #EXTINF:-1 tvg-id="ShaoGuanGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",韶关公共 (480p)
 http://dslive.grtn.cn/sgxwzhHD/playlist.m3u8
@@ -2873,7 +2873,7 @@ http://dslive.grtn.cn/sgxwzhHD/playlist.m3u8
 http://183.207.248.71/cntv/live1/fengshanggw/fengshanggw
 #EXTINF:-1 tvg-id="YuYaoYaoJiangWenHua.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",餘姚姚江文化 (576p)
 http://l.cztvcloud.com/channels/lantian/SXyuyao2/720p.m3u8
-#EXTINF:-1 tvg-id="MaYunDuiHua.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",马云对话
+#EXTINF:-1 tvg-id="MaYunDuiHua.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",马云对话 (480p)
 http://www.alibabapictures.com/movies/10/mayunduihua.mp4
 #EXTINF:-1 tvg-id="GaoTaiDianShiTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/2/28/%E7%94%98%E8%82%83%E5%8D%AB%E8%A7%86.png" group-title="",高台电视台 (1080p)
 http://117.156.28.119/270000001111/1110000146/index.m3u8
@@ -2927,17 +2927,17 @@ http://183.207.249.36/PLTV/4/224/3221227323/index.m3u8
 http://223.110.254.143:6610/cntv/live1/HD-8000k-1080P-heilongjiangstv/HD-8000k-1080P-heilongjiangstv/1.m3u8
 #EXTINF:-1 tvg-id="HeiLongJiangWeiShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://s.wasu.cn/data/images/201512/24/567b9d67870b3.png" group-title="",黑龙江卫视 (576p)
 http://116.199.5.51:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=27&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
-#EXTINF:-1 tvg-id="HeiLongJiangTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江台 [Offline]
+#EXTINF:-1 tvg-id="HeiLongJiangTai.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江台 [Timeout]
 http://stream3.hljtv.com/hljws2/sd/live.m3u8
 #EXTINF:-1 tvg-id="HeiLongJiangShaoEr.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江少儿 [Offline]
 http://stream3.hljtv.com/hljse2/sd/live.m3u8
-#EXTINF:-1 tvg-id="HeiLongJiangYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江影视 [Offline]
+#EXTINF:-1 tvg-id="HeiLongJiangYingShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江影视 [Timeout]
 http://stream3.hljtv.com/hljys2/sd/live.m3u8
-#EXTINF:-1 tvg-id="HeiLongJiangWenTi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江文体 [Offline]
+#EXTINF:-1 tvg-id="HeiLongJiangWenTi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江文体 [Timeout]
 http://stream3.hljtv.com/hljwy2/sd/live.m3u8
-#EXTINF:-1 tvg-id="HeiLongJiangXinWenFaZhi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江新闻法治 [Offline]
+#EXTINF:-1 tvg-id="HeiLongJiangXinWenFaZhi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江新闻法治 [Timeout]
 http://stream3.hljtv.com/hljxw2/sd/live.m3u8
-#EXTINF:-1 tvg-id="HeiLongJiangDuShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江都市 [Offline]
+#EXTINF:-1 tvg-id="HeiLongJiangDuShi.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黑龙江都市 [Timeout]
 http://stream3.hljtv.com/hljdd2/sd/live.m3u8
 #EXTINF:-1 tvg-id="QianXiNanGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",黔西南公共 (288p) [Geo-blocked]
 http://live.qxndt.com/channel3/sd/live.m3u8
@@ -2951,7 +2951,7 @@ http://yslk.chinashadt.com:1635/live/stream:di4.stream/playlist.m3u8
 http://yslk.chinashadt.com:1635/live/stream:di1.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="LongKouShengHuo.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",龙口生活 (576p) [Offline]
 http://yslk.chinashadt.com:1635/live/stream:di2.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="LongYanGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",龙岩公共 [540p]
+#EXTINF:-1 tvg-id="LongYanGongGong.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",龙岩公共 (540p)
 http://stream.lytv.net.cn/1/sd/live.m3u8
 #EXTINF:-1 tvg-id="LongYanZongHe.cn" tvg-country="CN" tvg-language="Chinese" tvg-logo="" group-title="",龙岩综合 (540p)
 http://stream.lytv.net.cn/2/sd/live.m3u8
diff --git a/channels/co.m3u b/channels/co.m3u
index 254b84a811..09e211fd64 100644
--- a/channels/co.m3u
+++ b/channels/co.m3u
@@ -3,7 +3,7 @@
 https://5b464b69d264e.streamlock.net/Channels_live/ngrp:amordiscos_all/playlist.m3u8
 #EXTINF:-1 tvg-id="ATV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/canal-atv-1694.jpg" group-title="Local",ATV (Soacha | Cundinamarca) (360p) [Not 24/7]
 https://movil.ejeserver.com/live/verteve.m3u8
-#EXTINF:-1 tvg-id="AvivamientoTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/7YB94Hf.png" group-title="Religious",Avivamiento TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AvivamientoTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/7YB94Hf.png" group-title="Religious",Avivamiento TV (1080p) [Not 24/7]
 https://s1.abntelevision.com/avivamientoabr/stream/avivamientohd/avivamientohd/playlist.m3u8
 #EXTINF:-1 tvg-id="BuenisimaRadioTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/buenisima-radio-tv-4865.jpg" group-title="Local",Buenísima Radio TV (Gamarra | Cesar) (1080p) [Not 24/7]
 https://streamyes.alsolnet.com/buturama/live/playlist.m3u8
@@ -21,7 +21,7 @@ https://mdstrm.com/live-stream-playlist/57d01d6c28b263eb73b59a5a.m3u8
 https://mdstrm.com/live-stream-playlist/574463697b9817cf0886fc17.m3u8
 #EXTINF:-1 tvg-id="CanalDos.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/BYsyNHZ.jpg" group-title="Local",Canal Dos (Yopal | Casanare) (720p) [Not 24/7]
 http://131.221.42.25:1935/streaming/canal2/playlist.m3u8
-#EXTINF:-1 tvg-id="CanalInstitucionalTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/canal-institucional-tv-2599.jpg" group-title="General",Canal Institucional TV (720p)
+#EXTINF:-1 tvg-id="CanalInstitucionalTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/canal-institucional-tv-2599.jpg" group-title="General",Canal Institucional TV (1080p)
 https://streaming.rtvc.gov.co/TV_CanalInstitucional_live/smil:live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CanalRCNNovelas.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="" group-title="Entertainment",Canal RCN Novelas (480p)
 http://45.179.140.242:8000/play/a0jf
@@ -35,7 +35,7 @@ https://movil.ejeserver.com/live/visiondorada.m3u8
 https://videostreaming.cloudserverlatam.com/chavotv/chavotv/playlist.m3u8
 #EXTINF:-1 tvg-id="CinemaMás.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="" group-title="Movies",Cinema+ (720p)
 https://hvtrafico.ddns.net/cinema720/cinema720.stream_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="Eduvision.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/eduvision-2592.jpg" group-title="Education",Eduvision (720p)
+#EXTINF:-1 tvg-id="Eduvision.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/eduvision-2592.jpg" group-title="Education",Eduvision (720p) [Timeout]
 http://66.240.236.25:1936/eduvision/eduvision/playlist.m3u8
 #EXTINF:-1 tvg-id="EnlaceTelevision.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/enlace-television-3301.jpg" group-title="General",Enlace Televisión (720p) [Not 24/7]
 https://iptv-all.lanesh4d0w.repl.co/colombia/enlace.m3u8
@@ -45,11 +45,11 @@ https://rtmp02.portalexpress.es/thefchanel/thefchanel/playlist.m3u8
 https://iptv-all.lanesh4d0w.repl.co/latam
 #EXTINF:-1 tvg-id="MarinaStereo.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://www.marinastereo.co/wp-content/uploads/2019/11/LOGO-4-300x136.png" group-title="",Marina Stereo (720p) [Offline]
 https://rtmp02.portalexpress.es/marinastereo/marinastereo/playlist.m3u8
-#EXTINF:-1 tvg-id="MelodyChannelColombia.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://melodychannel.tv/wp-content/uploads/2021/01/cropped-logoMelody-2.png" group-title="Music",Melody Channel Colombia (720p)
+#EXTINF:-1 tvg-id="MelodyChannelColombia.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://melodychannel.tv/wp-content/uploads/2021/01/cropped-logoMelody-2.png" group-title="Music",Melody Channel Colombia (480p)
 https://5b464b69d264e.streamlock.net/Channels_live/ngrp:MelodyChannel_all/playlist.m3u8
 #EXTINF:-1 tvg-id="MiGenteTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/pe_mi-gente_m.png" group-title="",Mi Gente TV (720p) [Not 24/7]
 https://hvtrafico.ddns.net/migente720/migente720.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="MovieFe.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="http://moviefe.com/logo%20moviefe.png" group-title="Movies",MovieFe (360p) [Offline]
+#EXTINF:-1 tvg-id="MovieFe.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="http://moviefe.com/logo%20moviefe.png" group-title="Movies",MovieFe (360p) [Not 24/7]
 https://vcp.myplaytv.com/moviefe/ngrp:moviefe_all/playlist.m3u8
 #EXTINF:-1 tvg-id="MundoMas.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/CREs19T.png" group-title="",Mundo Mas (560p) [Not 24/7]
 http://vcp1.myplaytv.com:1935/mundomas/mundomas/playlist.m3u8
@@ -59,15 +59,15 @@ https://mdstrm.com/live-stream-playlist/58dc3d471cbe05ff3c8e463e.m3u8
 https://streaming.rtvc.gov.co/TV_Senal_Colombia_live/smil:live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="SuramTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/6d2fOjq.png" group-title="Local",Suram TV (1080p) [Not 24/7]
 https://5b3050bb1b2d8.streamlock.net/suramtv/suramtv/playlist.m3u8
-#EXTINF:-1 tvg-id="TDIColombia.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/tdi-colombia-4792.jpg" group-title="General",TDI Colombia (936p) [Not 24/7]
+#EXTINF:-1 tvg-id="TDIColombia.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.colombia.com/canales/tdi-colombia-4792.jpg" group-title="General",TDI Colombia (720p) [Not 24/7]
 https://play.amelbasoluciones.co:3971/live/tdicolombiatvlive.m3u8
 #EXTINF:-1 tvg-id="Teleamiga.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="" group-title="Local",Teleamiga (Bogotà | Cundinamarca) (480p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.instantvideocloud.net/
 https://liveingesta118.cdnmedia.tv/teleamigatvlive/smil:dvrlive.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Teleantioquia.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/co_teleantioquia-hd_m.png" group-title="General",Teleantioquia (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Teleantioquia.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/co_teleantioquia-hd_m.png" group-title="General",Teleantioquia (360p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.instantvideocloud.net/
 https://liveingesta118.cdnmedia.tv/teleantioquialive/smil:dvrlive.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Teleantioquia2.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="" group-title="General",Teleantioquia 2 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Teleantioquia2.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="" group-title="General",Teleantioquia 2 (360p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.instantvideocloud.net/
 https://liveingesta118.cdnmedia.tv/teleantioquialive/smil:dvrlive2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Telecafe.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="http://cdn-std-1.sibasa.netdna-cdn.com/co/b3aef974216995f45cbb271e6be36964.jpg" group-title="General",Telecafé [Offline]
@@ -75,10 +75,10 @@ http://38.131.11.9:1080/play/a0ct
 #EXTINF:-1 tvg-id="Telecaribe.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/i5wyEor.png" group-title="General",Telecaribe (720p) [Offline]
 https://iptv-all.lanesh4d0w.repl.co/colombia/telecaribe_adaptive
 #EXTINF:-1 tvg-id="Teleislas.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/4xNgb8H.png" group-title="General",Teleislas (486p) [Not 24/7]
-https://5ab772334c39c.streamlock.net/live-teleislas/teleislas/playlist.m3u8
-#EXTINF:-1 tvg-id="Teleislas.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/4xNgb8H.png" group-title="General",Teleislas (480p) [Not 24/7]
 http://vbox2.cehis.net/live-teleislas/smil:teleislas.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TelemusicaTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/bwp5lST.png" group-title="Music",Telemúsica TV (720p)
+#EXTINF:-1 tvg-id="Teleislas.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/4xNgb8H.png" group-title="General",Teleislas (486p) [Not 24/7]
+https://5ab772334c39c.streamlock.net/live-teleislas/teleislas/playlist.m3u8
+#EXTINF:-1 tvg-id="TelemusicaTV.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/bwp5lST.png" group-title="Music",Telemúsica TV (480p)
 https://5b464b69d264e.streamlock.net/Channels_live/ngrp:telemusica_all/playlist.m3u8
 #EXTINF:-1 tvg-id="Telepacifico.co" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://www.lyngsat-stream.com/logo/tv/tt/telepacifico_co.png" group-title="Local",Telepacífico (Santiago de Cali | Valle del Cauca) (720p) [Not 24/7]
 https://stream.logicideas.media/telepacifico-live/smil:live.smil/playlist.m3u8
diff --git a/channels/cr.m3u b/channels/cr.m3u
index d06a4d29fb..ab0bba830e 100644
--- a/channels/cr.m3u
+++ b/channels/cr.m3u
@@ -1,19 +1,19 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="88Stereo.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="" group-title="",88 Stereo (486p)
+#EXTINF:-1 tvg-id="88Stereo.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="" group-title="",88 Stereo (720p)
 http://k3.usastreams.com/CableLatino/88stereo/playlist.m3u8
-#EXTINF:-1 tvg-id="AgrotendenciaTV.cr" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/agrotendencia/picture?width=320&height=320" group-title="Outdoor",AgrotendenciaTV (480p)
+#EXTINF:-1 tvg-id="AgrotendenciaTV.cr" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/agrotendencia/picture?width=320&height=320" group-title="Outdoor",AgrotendenciaTV (360p)
 https://inliveserver.com:1936/15506/15506/playlist.m3u8
-#EXTINF:-1 tvg-id="AnexionTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/PrOYyU1.png" group-title="",Anexión TV (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="AnexionTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/PrOYyU1.png" group-title="",Anexión TV (720p) [Not 24/7]
 http://rtmp.info:8081/anexiontv/envivo/index.m3u8
 #EXTINF:-1 tvg-id="AnexionTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/PrOYyU1.png" group-title="",Anexión TV (360p) [Not 24/7]
 https://rtmp.info/anexiontv/envivo/playlist.m3u8
 #EXTINF:-1 tvg-id="AntenaSeisTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://lh3.googleusercontent.com/V-_fSNpzlQPfFuUG0wLkrR7-PQ3RDx3n9tE4zA_8Exm_OKVeU24Kt2HiKLYweJXItgY" group-title="",Antena Seis TV (720p) [Geo-blocked]
 http://inliveserver.com:1935/14510/14510/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal6.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/6_de_costa_rica-mediano.png" group-title="",Canal 6 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal6.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/6_de_costa_rica-mediano.png" group-title="",Canal 6 (270p) [Not 24/7]
 https://d3ou4v1ntyo64z.cloudfront.net/repretel/canal6/smil:live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal8.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://image.multimedios.cr/sites/default/files/styles/social_share/public/multimedios1.jpg" group-title="",Canal 8 (720p)
 http://mdstrm.com/live-stream-playlist/5a7b1e63a8da282c34d65445.m3u8
-#EXTINF:-1 tvg-id="Canal11.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://es.wikipedia.org/wiki/Canal_11_(Costa_Rica)#/media/Archivo:Repretel_11_logo.png" group-title="General",Canal 11 (160p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal11.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://es.wikipedia.org/wiki/Canal_11_(Costa_Rica)#/media/Archivo:Repretel_11_logo.png" group-title="General",Canal 11 (360p) [Not 24/7]
 https://d3ou4v1ntyo64z.cloudfront.net/repretel/canal11/smil:live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal13Sinart.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://costaricamedios.cr/wp-content/uploads/2018/11/logo-header-sinartcr.png" group-title="",Canal 13 Sinart (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x7vh8g3
@@ -51,13 +51,13 @@ https://d3ou4v1ntyo64z.cloudfront.net/repretel/canal2/smil:live.smil/playlist.m3
 http://tvretropalmares.com:8090/hls/envivo.m3u8
 #EXTINF:-1 tvg-id="SanRafaelenLinea.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i0.wp.com/telemascr.com/wp-content/uploads/2020/10/LOGO-WEB.png" group-title="Local",San Rafael en Linea (720p) [Geo-blocked]
 https://cp.sradiotv.com:1936/8064/8064/playlist.m3u8
-#EXTINF:-1 tvg-id="SMOTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/UYAL51B.png" group-title="Religious",SMO TV [Offline]
+#EXTINF:-1 tvg-id="SMOTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/UYAL51B.png" group-title="Religious",SMO TV [Timeout]
 http://186.15.50.30:8080/hls/smotv.m3u8
 #EXTINF:-1 tvg-id="STVElCamalFamiliar.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://serenotv.com/wp-content/uploads/2020/10/Canal-stv-en-vivo.jpg" group-title="",STV El Camal Familiar (720p) [Not 24/7]
 http://tiquiciatv.com:1935/stv/web/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleUno.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i0.wp.com/directostv.teleame.com/wp-content/uploads/2016/06/Tele-Uno-Costa-Rica-en-vivo-Online.png?fit=1920%2C1080" group-title="",Tele Uno (720p) [Not 24/7]
 http://tv.teleunotv.cr:1935/TVUNO/TVUNO/playlist.m3u8
-#EXTINF:-1 tvg-id="TeleredTelevision.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/iO6qmgY.png" group-title="",Telered Television (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TeleredTelevision.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/iO6qmgY.png" group-title="",Telered Television (486p) [Not 24/7]
 http://k4.usastreams.com/ARBtv/teleplus/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleSURCostaRica.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/r5p97Ex.jpg" group-title="",TeleSUR Costa Rica (720p) [Not 24/7]
 http://k3.usastreams.com/telesur/telesur/playlist.m3u8
@@ -67,9 +67,9 @@ https://59ef525c24caa.streamlock.net/telesur/telesur/playlist.m3u8
 http://201.220.141.118:8000/play/a02r/index.m3u8
 #EXTINF:-1 tvg-id="TVSurCanal9.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTQ-pLqFOvp-6R_dr9whF_Q5IBLtvtRcMjOY2xmROz5zFlIu7Y88Q&s" group-title="",TV Sur Canal 9 (480p) [Not 24/7]
 http://tv.ticosmedia.com:1935/TVSUR/TVSUR/playlist.m3u8
-#EXTINF:-1 tvg-id="TVSurCanal14.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://www.tvsur.co.cr/wp-content/uploads/2020/05/tvsur-logo.png" group-title="",TV Sur Canal 14 (1080p)
+#EXTINF:-1 tvg-id="TVSurCanal14.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://www.tvsur.co.cr/wp-content/uploads/2020/05/tvsur-logo.png" group-title="",TV Sur Canal 14 (1080p) [Timeout]
 https://5bf8041cb3fed.streamlock.net/TVSURCANAL14/TVSURCANAL14/playlist.m3u8
 #EXTINF:-1 tvg-id="VideoTourChannel.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/l1oc3ER.png" group-title="Music",Video Tour Channel (720p) [Not 24/7]
 http://k4.usastreams.com/videotour/videotour/playlist.m3u8
-#EXTINF:-1 tvg-id="ZonaFilmsTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="" group-title="Music",Zona Films TV (360p)
+#EXTINF:-1 tvg-id="ZonaFilmsTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="" group-title="Music",Zona Films TV (360p) [Offline]
 http://cdn2.envivo.win/HLS?c=ZwNjYwRkBF4kBQLhZmt=&canal=zonafilmstv&p=ZGH4AGD1ZGtjZN==
diff --git a/channels/cu.m3u b/channels/cu.m3u
index c25fde26da..a578f9a39b 100644
--- a/channels/cu.m3u
+++ b/channels/cu.m3u
@@ -1,13 +1,13 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="CanalEducativo.cu" tvg-country="CU" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/ce.jpg" group-title="",Canal Educativo [Offline]
+#EXTINF:-1 tvg-id="CanalEducativo.cu" tvg-country="CU" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/ce.jpg" group-title="",Canal Educativo [Timeout]
 http://177.52.221.214:8000/play/a0dw/index.m3u8
-#EXTINF:-1 tvg-id="CanalEducativo2.cu" tvg-country="CU" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/ce2.jpg" group-title="",Canal Educativo 2 [Offline]
+#EXTINF:-1 tvg-id="CanalEducativo2.cu" tvg-country="CU" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/ce2.jpg" group-title="",Canal Educativo 2 [Timeout]
 http://177.52.221.214:8000/play/a0dx/index.m3u8
-#EXTINF:-1 tvg-id="CubaVision.cu" tvg-country="CU" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/cubavision.jpg" group-title="",CubaVision [Offline]
+#EXTINF:-1 tvg-id="CubaVision.cu" tvg-country="CU" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/cubavision.jpg" group-title="",CubaVision [Timeout]
 http://177.52.221.214:8000/play/a0dc/index.m3u8
 #EXTINF:-1 tvg-id="CubaVisionInternacional.cu" tvg-country="CU;HISPAM" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/cvi.jpg" group-title="",CubaVision Internacional (480p) [Not 24/7]
 http://190.122.96.187:8888/http/010
 #EXTINF:-1 tvg-id="CubaVisionInternacional.cu" tvg-country="CU;HISPAM" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/cvi.jpg" group-title="",CubaVision Internacional [Offline]
 http://177.52.221.214:8000/play/a0dy/index.m3u8
-#EXTINF:-1 tvg-id="TeleRebelde.cu" tvg-country="CU" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/tr.jpg" group-title="",Tele Rebelde [Offline]
+#EXTINF:-1 tvg-id="TeleRebelde.cu" tvg-country="CU" tvg-language="Spanish" tvg-logo="https://www.tvcubana.icrt.cu/images/logos-canales/logo-mascara/tr.jpg" group-title="",Tele Rebelde [Timeout]
 http://177.52.221.214:8000/play/a0dd/index.m3u8
diff --git a/channels/cy.m3u b/channels/cy.m3u
index be2a922187..1998628ae1 100644
--- a/channels/cy.m3u
+++ b/channels/cy.m3u
@@ -29,7 +29,7 @@ https://dev.aftermind.xyz/hls/unitrust/citychannel/index.m3u8?token=8TXWzhY3h6jr
 https://l8.cloudskep.com/digital/dtv/playlist.m3u8
 #EXTINF:-1 tvg-id="KuzeyKibrisTV.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="" group-title="",Kuzey Kibris TV (720p) [Not 24/7]
 http://kuzeykibris.tv/m3u8/tv_kktv.m3u8
-#EXTINF:-1 tvg-id="Reload.cy" tvg-country="CY" tvg-language="English;Greek" tvg-logo="" group-title="Music",Reload (720p)
+#EXTINF:-1 tvg-id="Reload.cy" tvg-country="CY" tvg-language="English;Greek" tvg-logo="" group-title="Music",Reload (360p)
 http://web.onair-radio.eu:1935/video/video/playlist.m3u8
 #EXTINF:-1 tvg-id="RIK1CYBC1.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="http://cybc.com.cy/wp-content/uploads/daphne-lopezcybc-com-cy/2018/02/RIK1-4.png" group-title="",RIK 1 (CYBC 1) [Geo-blocked]
 http://l6.cloudskep.com/rikcy/rik1/playlist.m3u8
@@ -41,7 +41,7 @@ http://l6.cloudskep.com/rikcy/rikhd/playlist.m3u8
 https://l3.cloudskep.com/cybcsat/abr/playlist.m3u8
 #EXTINF:-1 tvg-id="SAT7ARABIC.cy" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/xvJw3qt.png" group-title="Religious",SAT-7 ARABIC (720p)
 https://svs.itworkscdn.net/sat7arabiclive/sat7arabic.smil/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="SAT7KIDS.cy" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="" group-title="Kids",SAT-7 KIDS (720p)
+#EXTINF:-1 tvg-id="SAT7KIDS.cy" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="" group-title="Kids",SAT-7 KIDS (1080p)
 https://svs.itworkscdn.net/sat7kidslive/sat7kids.smil/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="SAT7PARS.cy" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/wrOg8vL.png" group-title="Religious",SAT-7 PARS (720p)
 https://svs.itworkscdn.net/sat7parslive/sat7pars.smil/playlist_dvr.m3u8
diff --git a/channels/cz.m3u b/channels/cz.m3u
index 6520687de3..875bbb3e2a 100644
--- a/channels/cz.m3u
+++ b/channels/cz.m3u
@@ -41,12 +41,12 @@ http://slagrtv-live-hls.ssl.cdn.cra.cz/channels/slagrtv/playlist.m3u8
 https://stream-6.mazana.tv/slagr.m3u
 #EXTINF:-1 tvg-id="TVNatura.cz" tvg-country="CZ" tvg-language="Czech" tvg-logo="" group-title="",TV Natura (360p) [Not 24/7]
 https://media1.tvnatura.cz/live_out/1/live.m3u8
-#EXTINF:-1 tvg-id="TVNOE.cz" tvg-country="CZ" tvg-language="Czech" tvg-logo="https://i.imgur.com/Dg9edVr.jpg" group-title="",TV NOE (720p)
+#EXTINF:-1 tvg-id="TVNOE.cz" tvg-country="CZ" tvg-language="Czech" tvg-logo="https://i.imgur.com/Dg9edVr.jpg" group-title="",TV NOE (720p) [Offline]
 https://w101.quickmedia.tv/prozeta-live04/prozeta-live04.smil/Playlist.m3u8
 #EXTINF:-1 tvg-id="VychodoceskaTV.cz" tvg-country="CZ" tvg-language="Czech" tvg-logo="https://i.iinfo.cz/images/409/v1-vychodoceska-televize-1.jpg" group-title="",Východočeská TV (576p)
 https://stream.polar.cz/vctv/vctvlive-1/playlist.m3u8
 #EXTINF:-1 tvg-id="NastoyashcheeVremya.cz" tvg-country="RU" tvg-language="Russian" tvg-logo="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",Настоящее Время (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s61/index.m3u8
-#EXTINF:-1 tvg-id="NastoyashcheeVremya.cz" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Настоящее Время (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="NastoyashcheeVremya.cz" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Настоящее Время (720p) [Not 24/7]
 http://rfe-lh.akamaihd.net/i/rfe_tvmc5@383630/master.m3u8
diff --git a/channels/de.m3u b/channels/de.m3u
index 7f5dcedeac..30d7cbd5a3 100644
--- a/channels/de.m3u
+++ b/channels/de.m3u
@@ -5,11 +5,11 @@ http://123tv-mx1.flex-cdn.net/index.m3u8
 https://zdf-hls-18.akamaized.net/hls/live/2016501/dach/high/master.m3u8
 #EXTINF:-1 tvg-id="atv.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/tupATym.png" group-title="",a.tv (1080p) [Not 24/7]
 https://augsburgtv.iptv-playoutcenter.de/augsburgtv/augsburgtv.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="ADRIAMusic.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/pPAj9Ua.png" group-title="Music",ADRIA Music (1080p) [Offline]
+#EXTINF:-1 tvg-id="ADRIAMusic.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/pPAj9Ua.png" group-title="Music",ADRIA Music (1080p) [Timeout]
 https://serve-first.folxplay.tv/folx/ch-1/master.m3u8
-#EXTINF:-1 tvg-id="AlexBerlin.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/eTmHk4e.png" group-title="",Alex Berlin (1080p) [Offline]
+#EXTINF:-1 tvg-id="AlexBerlin.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/eTmHk4e.png" group-title="",Alex Berlin (1080p) [Not 24/7]
 https://alex-stream.rosebud-media.de/live/alexlivetv40.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AnixeHD.de" tvg-country="DE" tvg-language="German" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c0/Anixe_HD.svg/641px-Anixe_HD.svg.png" group-title="",Anixe HD (720p)
+#EXTINF:-1 tvg-id="AnixeHD.de" tvg-country="DE" tvg-language="German" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c0/Anixe_HD.svg/641px-Anixe_HD.svg.png" group-title="",Anixe HD (360p)
 https://ma.anixa.tv/clips/stream/anixehd/index.m3u8
 #EXTINF:-1 tvg-id="AntenneVorarlberg.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/TpBbZwq.png" group-title="",Antenne Vorarlberg (720p) [Not 24/7]
 http://5857db5306b83.streamlock.net/antennevorarlberg-live/_definst_/mp4:livestream/playlist.m3u8
@@ -27,7 +27,7 @@ http://163.172.39.215:25461/line/C4@!a3a1@!w72A/139
 http://163.172.39.215:25461/live/line/C4@!a3a1@!w72A/139.m3u8
 #EXTINF:-1 tvg-id="BadenTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Baden TV (720p)
 https://cdn.icu.de/rtplive/btv.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="BadenTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Baden TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="BadenTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Baden TV (1080p) [Not 24/7]
 http://badentv-stream2.siebnich.info/rtplive/btv.stream/live.m3u8
 #EXTINF:-1 tvg-id="BadenTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Baden TV (720p) [Not 24/7]
 http://badentv-stream2.siebnich.info/rtplive/btv.stream/playlist.m3u8
@@ -73,12 +73,12 @@ http://163.172.39.215:25461/line/C4@!a3a1@!w72A/25
 http://163.172.39.215:25461/live/line/C4@!a3a1@!w72A/25.m3u8
 #EXTINF:-1 tvg-id="CroTVHD.de" tvg-country="CZ" tvg-language="Czech" tvg-logo="" group-title="",CroTV HD (1080p)
 http://92.204.40.139:8081/crotv/televizijahrvatskedijaspore/playlist.m3u8
-#EXTINF:-1 tvg-id="DaVinci.de" tvg-country="CIS" tvg-language="Russian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/da_vinci_learning.png" group-title="Kids",Da Vinci [Offline]
+#EXTINF:-1 tvg-id="DaVinci.de" tvg-country="CIS" tvg-language="Russian" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/da_vinci_learning.png" group-title="Kids",Da Vinci [Timeout]
 http://sc.id-tv.kz/DaVinci_38_39.m3u8
 #EXTINF:-1 tvg-id="DasErste.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/7wABSuo.png" group-title="",Das Erste (720p)
 https://derste247liveint.akamaized.net/hls/live/662735/daserste_int/master.m3u8
 #EXTINF:-1 tvg-id="DasErste.de" tvg-country="DE" tvg-language="German" tvg-logo="http://logos.zattic.com/images/channels/logos/2a2a4aee64bbd6f7f817/black/84x48.png" group-title="",Das Erste (720p)
-https://mcdn.daserste.de/daserste/int/master.m3u8
+https://mcdn.daserste.de/daserste/de/master.m3u8
 #EXTINF:-1 tvg-id="DasErste.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/7wABSuo.png" group-title="",Das Erste (720p) [Geo-blocked]
 https://derste247livede.akamaized.net/hls/live/658317/daserste_de/master.m3u8
 #EXTINF:-1 tvg-id="DasErste.de" tvg-country="DE" tvg-language="German" tvg-logo="http://logos.zattic.com/images/channels/logos/2a2a4aee64bbd6f7f817/black/84x48.png" group-title="",Das Erste (720p) [Geo-blocked]
@@ -91,7 +91,7 @@ http://tv.artcom-venture.de:1322/dmf/tv.m3u8
 https://tv.artcom-venture.de/dmf/tv.m3u8
 #EXTINF:-1 tvg-id="DresdenFernsehen.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Dresden Fernsehen (1080p) [Not 24/7]
 https://dresden.iptv-playoutcenter.de/dresden/dresdenfernsehen.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="DW.de" tvg-country="DE;AT;BE;LI;LU;CH" tvg-language="German" tvg-logo="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="News",DW (480p)
+#EXTINF:-1 tvg-id="DW.de" tvg-country="DE;AT;BE;LI;LU;CH" tvg-language="German" tvg-logo="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="News",DW (480p) [Timeout]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s26/index.m3u8
 #EXTINF:-1 tvg-id="DWArabic.de" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/A1xzjOI.png" group-title="News",DW Arabic (1080p)
@@ -122,15 +122,15 @@ https://5856e1a25f71a.streamlock.net/easycast9-live/mp4:livestreamhd5/playlist.m
 http://14000-l.z.core.cdn.streamfarm.net/007erfiphonelive/smil:stream_live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ErzTVStollberg.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/VenSjan.png" group-title="",Erz-TV Stollberg (576p)
 https://5acade5fc0c29.streamlock.net/kabeljournal/live2020.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="EuroAlTV.de" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/qLaEmIT.png" group-title="",EuroAl TV (720p)
+#EXTINF:-1 tvg-id="EuroAlTV.de" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/qLaEmIT.png" group-title="",EuroAl TV (720p) [Timeout]
 http://5.135.92.131:1935/live/euroAl/playlist.m3u8
 #EXTINF:-1 tvg-id="Filstalwelle.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/19iKLvf.png" group-title="",Filstalwelle (576p)
 http://62.113.210.2/filstalwelle-live/mp4:livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="FinestTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Finest TV (288p)
+#EXTINF:-1 tvg-id="FinestTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Finest TV (288p) [Not 24/7]
 http://media.finest.tv/hls/live.m3u8
-#EXTINF:-1 tvg-id="FOLXMusic.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/R9f5Fmx.png" group-title="Music",FOLX Music (1080p) [Offline]
+#EXTINF:-1 tvg-id="FOLXMusic.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/R9f5Fmx.png" group-title="Music",FOLX Music (1080p) [Timeout]
 https://serve-first.folxplay.tv/folx/ch-4/master.m3u8
-#EXTINF:-1 tvg-id="FOLXSlovenija.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/R9f5Fmx.png" group-title="Music",FOLX Slovenija (1080p) [Offline]
+#EXTINF:-1 tvg-id="FOLXSlovenija.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/R9f5Fmx.png" group-title="Music",FOLX Slovenija (1080p) [Timeout]
 https://serve-first.folxplay.tv/folx/ch-5/master.m3u8
 #EXTINF:-1 tvg-id="FrankenTV.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/frankenfernsehen.png" group-title="",Franken Fernsehen (1080p)
 https://s3.welocal.world/frankenfernsehen/media/191627/videos/hls.m3u8
@@ -138,7 +138,7 @@ https://s3.welocal.world/frankenfernsehen/media/191627/videos/hls.m3u8
 https://frankentv.iptv-playoutcenter.de/frankentv/frankentv.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="FriesischerRundfunkFriedeburg.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/jynL4Xl.png" group-title="",Friesischer Rundfunk Friedeburg (350p) [Not 24/7]
 https://583548fa0d82b.streamlock.net/friesischerRundfunk-live/mp4:friesischerrundfunk/playlist.m3u8
-#EXTINF:-1 tvg-id="Hamburg1.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/9TRhahY.png" group-title="",Hamburg 1 [Offline]
+#EXTINF:-1 tvg-id="Hamburg1.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/9TRhahY.png" group-title="",Hamburg 1 (720p) [Not 24/7]
 https://live2.telvi.de/hls/hamburg1.m3u8
 #EXTINF:-1 tvg-id="Handystar.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Handystar (404p)
 http://mediaspar-live.hls.adaptive.level3.net/ses/mediaspar/stream1/streamPlaylist.m3u8
@@ -146,7 +146,7 @@ http://mediaspar-live.hls.adaptive.level3.net/ses/mediaspar/stream1/streamPlayli
 https://live2.telvi.de/hls/hauptstadttv_hd720.m3u8
 #EXTINF:-1 tvg-id="HealthTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Health TV (720p)
 http://62.67.13.53:1935/HealthTV/ghtv_live_master.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="HR.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/hr.png" group-title="",hr-fernsehen (1080p)
+#EXTINF:-1 tvg-id="HR.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/hr.png" group-title="",hr-fernsehen (1080p) [Timeout]
 https://hrhls.akamaized.net/hls/live/2024525/hrhls/index.m3u8
 #EXTINF:-1 tvg-id="HSE.de" tvg-country="DE" tvg-language="German" tvg-logo="https://cdn.hd-plus.de/senderlogos/bright-cropped/24483-2.png" group-title="",HSE (1080p)
 https://hse24.akamaized.net/hls/live/2006663/hse24/playlist.m3u8
@@ -156,7 +156,7 @@ https://hse24extra.akamaized.net/hls/live/2006596/hse24extra/playlist.m3u8
 https://hse24trend.akamaized.net/hls/live/2006597/hse24trend/playlist.m3u8
 #EXTINF:-1 tvg-id="IsarTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Isar TV (1080p) [Not 24/7]
 https://isar-tv.iptv-playoutcenter.de/isar-tv/isar-tv.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="JenaTV.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/o3D4bQI.png" group-title="",JenaTV (1080p)
+#EXTINF:-1 tvg-id="JenaTV.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/o3D4bQI.png" group-title="",JenaTV (1080p) [Timeout]
 https://stream7.sehradar.de/jenatv/ngrp:livestream_all/playlist.m3u8
 #EXTINF:-1 tvg-id="KTVFernsehen.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",K-TV (Fernsehen) (720p)
 https://d1pz8zear993v8.cloudfront.net/hlsme/kathtv.m3u8
@@ -206,14 +206,14 @@ https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_hh/master.m3u8
 https://ndrfs-lh.akamaihd.net/i/ndrfs_hh@430231/master.m3u8
 #EXTINF:-1 tvg-id="NDRInternational.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild108_v-contentxl.jpg" group-title="",NDR International (720p) [Geo-blocked]
 https://ndrfs-lh.akamaihd.net/i/ndrfs_int@430236/master.m3u8
-#EXTINF:-1 tvg-id="NDRMecklenburgVorpommern.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild102_v-contentxl.jpg" group-title="",NDR Mecklenburg-Vorpommern (720p)
-https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_mv/master.m3u8
 #EXTINF:-1 tvg-id="NDRMecklenburgVorpommern.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild102_v-contentxl.jpg" group-title="",NDR Mecklenburg-Vorpommern (720p) [Geo-blocked]
 https://ndrfs-lh.akamaihd.net/i/ndrfs_mv@430232/master.m3u8
-#EXTINF:-1 tvg-id="NDRNiedersachsen.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild104_v-contentxl.jpg" group-title="",NDR Niedersachsen (720p)
-https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_nds/master.m3u8
+#EXTINF:-1 tvg-id="NDRMecklenburgVorpommern.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild102_v-contentxl.jpg" group-title="",NDR Mecklenburg-Vorpommern (720p) [Timeout]
+https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_mv/master.m3u8
 #EXTINF:-1 tvg-id="NDRNiedersachsen.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild104_v-contentxl.jpg" group-title="",NDR Niedersachsen (720p) [Geo-blocked]
 https://ndrfs-lh.akamaihd.net/i/ndrfs_nds@430233/master.m3u8
+#EXTINF:-1 tvg-id="NDRNiedersachsen.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild104_v-contentxl.jpg" group-title="",NDR Niedersachsen (720p) [Timeout]
+https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_nds/master.m3u8
 #EXTINF:-1 tvg-id="NDRSchleswigHolstein.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild106_v-contentxl.jpg" group-title="",NDR Schleswig-Holstein (720p)
 https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_sh/master.m3u8
 #EXTINF:-1 tvg-id="NDRSchleswigHolstein.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ndr.de/fernsehen/livestreamteaserbild106_v-contentxl.jpg" group-title="",NDR Schleswig-Holstein (720p) [Geo-blocked]
@@ -231,13 +231,13 @@ https://hls1.wtnet.de/noa4/apple/wifi6500.m3u8
 #EXTINF:-1 tvg-id="NRT2.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",NRT 2 (480p) [Not 24/7]
 http://163.172.39.215:25461/live/line/C4@!a3a1@!w72A/54.m3u8
 #EXTINF:-1 tvg-id="NRWision.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/RkF2Kmx.png" group-title="",NRWision (1080p)
-https://fms.nrwision.de/live/livestreamHD.stream/playlist.m3u8
+https://fms.nrwision.de/live/livestreamHD.stream_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="NRWISION.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",NRWISION (1080p)
 https://fms.nrwision.de/live/livestreamHD.stream_source/playlist.m3u8
+#EXTINF:-1 tvg-id="NRWision.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/RkF2Kmx.png" group-title="",NRWision (1080p)
+https://fms.nrwision.de/live/livestreamHD.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="NRWision.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/RkF2Kmx.png" group-title="",NRWision (720p)
 https://fms.nrwision.de/live/livestreamHD.stream_1080p/playlist.m3u8
-#EXTINF:-1 tvg-id="NRWision.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/RkF2Kmx.png" group-title="",NRWision (360p)
-https://fms.nrwision.de/live/livestreamHD.stream_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="OberlausitzTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Oberlausitz TV (1080p)
 http://5856e1a25f71a.streamlock.net:1935/easycast8-live/mp4:livestreamhd4/playlist.m3u8
 #EXTINF:-1 tvg-id="OberpfalzTV.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Oberpfalz TV (1080p)
@@ -260,7 +260,7 @@ https://s.ok54.de/abr_okkl/webstream/playlist.m3u8
 https://s.ok54.de/mok-ks/kassel/playlist.m3u8
 #EXTINF:-1 tvg-id="OKKiel.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/A8rLufC.png" group-title="",OK Kiel (576p) [Offline]
 https://d1lv1lpzlrjn3y.cloudfront.net/play/hls/kieltv/index.m3u8
-#EXTINF:-1 tvg-id="OKLudwigshafen.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/okludwigshafen.png" group-title="",OK Ludwigshafen (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="OKLudwigshafen.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/okludwigshafen.png" group-title="",OK Ludwigshafen (720p) [Not 24/7]
 https://s.ok54.de/oklu/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="OKMagdeburg.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/okmagdeburg.png" group-title="",OK Magdeburg (1080p)
 http://58bd5b7a98e04.streamlock.net/medienasa-live/ok-magdeburg_high/playlist.m3u8
@@ -300,15 +300,15 @@ http://58bd5b7a98e04.streamlock.net/medienasa-live/mp4:ok-wernigerode_high/playl
 http://58bd5b7a98e04.streamlock.net/medienasa-live/ok-wernigerode_high/playlist.m3u8
 #EXTINF:-1 tvg-id="oldenburgeins.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/oldenburgeins.png" group-title="",oldenburg eins (1080p) [Not 24/7]
 https://oeins.de/live/studio.m3u8
-#EXTINF:-1 tvg-id="ONE1Music.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/fHbHbEH.png" group-title="Music",ONE1 Music (1080p) [Offline]
+#EXTINF:-1 tvg-id="ONE1Music.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/fHbHbEH.png" group-title="Music",ONE1 Music (1080p) [Timeout]
 https://serve-first.folxplay.tv/folx/ch-3/master.m3u8
-#EXTINF:-1 tvg-id="ONE1Slovenija.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/fHbHbEH.png" group-title="Music",ONE1 Slovenija (1080p) [Offline]
+#EXTINF:-1 tvg-id="ONE1Slovenija.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/fHbHbEH.png" group-title="Music",ONE1 Slovenija (1080p) [Timeout]
 https://serve-first.folxplay.tv/folx/ch-6/master.m3u8
 #EXTINF:-1 tvg-id="Parlamentsfernsehen1.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/parlamentsfernsehen.png" group-title="",Parlamentsfernsehen 1 (1080p)
 https://cldf-hlsgw.r53.cdn.tv1.eu/1000153copo/hk1.m3u8
 #EXTINF:-1 tvg-id="Parlamentsfernsehen1.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/parlamentsfernsehen.png" group-title="",Parlamentsfernsehen 1 (1080p) [Not 24/7]
 https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk1.m3u8
-#EXTINF:-1 tvg-id="Parlamentsfernsehen2.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/parlamentsfernsehen.png" group-title="",Parlamentsfernsehen 2 (1080p)
+#EXTINF:-1 tvg-id="Parlamentsfernsehen2.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/parlamentsfernsehen.png" group-title="",Parlamentsfernsehen 2 (270p)
 https://cldf-hlsgw.r53.cdn.tv1.eu/1000153copo/hk2.m3u8
 #EXTINF:-1 tvg-id="Parlamentsfernsehen2.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/parlamentsfernsehen.png" group-title="",Parlamentsfernsehen 2 (1080p) [Not 24/7]
 https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
@@ -422,12 +422,10 @@ http://live1.markenfunk.com/t1/live/chunklist.m3u8
 https://5856e1a25f71a.streamlock.net/easycast8-live/mp4:livestreamhd8/playlist.m3u8
 #EXTINF:-1 tvg-id="TesasTV.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/xEGCX1f.png" group-title="",Tesas TV (720p) [Not 24/7]
 https://jola.live:16200/tesastv.m3u8
-#EXTINF:-1 tvg-id="TideTV.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tidetv.png" group-title="",Tide TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="TideTV.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tidetv.png" group-title="",Tide TV (1080p) [Not 24/7]
 https://5889e7d0d6e28.streamlock.net/tide-live/smil:livestream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="tiviTURK.de" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/9TDs8q8/IFE6LHH.jpg" group-title="",tiviTÜRK (720p)
 https://stream.tiviturk.de/live/tiviturk.m3u8
-#EXTINF:-1 tvg-id="TV38SudostNiedersachen.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/ob9JJPU.png" group-title="",TV38 Südost-Niedersachen (576p)
-http://62.113.221.3/tv38-live/_definst_/mp4:livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="TVBayernLive.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/WyJLIzA.jpg" group-title="",TV Bayern Live (1080p) [Not 24/7]
 https://s3.welocal.world/tvbayernlive/media/134371/videos/hls.m3u8
 #EXTINF:-1 tvg-id="TVHalle.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tvhalle.png" group-title="",TV Halle (720p)
@@ -446,6 +444,8 @@ https://stream01.stream.welocal.world/stream/tvm/ngrp:tvm.stream_all/playlist.m3
 https://sdn-global-live-http-cache.3qsdn.com/2979/amlst:5714-sbr/playlist.m3u8
 #EXTINF:-1 tvg-id="TVOberfranken.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tvo.png" group-title="",TV Oberfranken (1080p) [Offline]
 https://stream02.stream.welocal.world/stream/tvo/ngrp:tvo.stream_all/playlist.m3u8
+#EXTINF:-1 tvg-id="TV38SudostNiedersachen.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/ob9JJPU.png" group-title="",TV38 Südost-Niedersachen (576p)
+http://62.113.221.3/tv38-live/_definst_/mp4:livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="TVA.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",TVA (1080p) [Not 24/7]
 https://tvaktuellr.iptv-playoutcenter.de/tvaktuellr/tvaktuellr.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="TVAOstbayern.de" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tva.png" group-title="",TVA Ostbayern (1080p) [Offline]
@@ -456,7 +456,7 @@ https://tvoberfranken.iptv-playoutcenter.de/tvoberfranken/tvoberfranken.stream_1
 https://srunserding-lh.akamaihd.net/i/visualradio_ud@197013/master.m3u8
 #EXTINF:-1 tvg-id="WDRFernsehen.de" tvg-country="DE" tvg-language="German" tvg-logo="http://www.yilmaztv.com/logo/wdr.png" group-title="",WDR Fernsehen (720p) [Offline]
 https://wdr_fs-lh.akamaihd.net/i/wdrfs_weltweit@112033/master.m3u8
-#EXTINF:-1 tvg-id="WDRKoeln.de" tvg-country="DE" tvg-language="German" tvg-logo="http://logos.zattic.com/images/channels/logos/da2f7b1155f1c2586f93/black/84x48.png" group-title="",WDR Koeln (720p)
+#EXTINF:-1 tvg-id="WDRKoeln.de" tvg-country="DE" tvg-language="German" tvg-logo="http://logos.zattic.com/images/channels/logos/da2f7b1155f1c2586f93/black/84x48.png" group-title="",WDR Koeln (720p) [Timeout]
 https://wdrfsww247.akamaized.net/hls/live/2009628/wdr_msl4_fs247ww/master.m3u8
 #EXTINF:-1 tvg-id="Welt.de" tvg-country="DE" tvg-language="German" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/welt.png" group-title="News",WELT [Geo-blocked]
 https://live2weltcms-lh.akamaihd.net/i/Live2WeltCMS_1@444563/master.m3u8
@@ -470,5 +470,5 @@ https://zdf-hls-15.akamaized.net/hls/live/2016498/de/high/master.m3u8
 https://zdf-hls-17.akamaized.net/hls/live/2016500/de/high/master.m3u8
 #EXTINF:-1 tvg-id="ZDFneo.de" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",ZDFneo [Geo-blocked]
 https://zdf-hls-16.akamaized.net/hls/live/2016499/de/high/master.m3u8
-#EXTINF:-1 tvg-id="ZWEI2Music.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/VVwHID9.png" group-title="Music",ZWEI2 Music (1080p) [Offline]
+#EXTINF:-1 tvg-id="ZWEI2Music.de" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/VVwHID9.png" group-title="Music",ZWEI2 Music (1080p) [Timeout]
 https://serve-first.folxplay.tv/folx/ch-2/master.m3u8
diff --git a/channels/dk.m3u b/channels/dk.m3u
index 9335086657..c6dedc4895 100644
--- a/channels/dk.m3u
+++ b/channels/dk.m3u
@@ -5,11 +5,11 @@ https://59b954022ec35.streamlock.net/liveTV2/smil:liveTVstream2.transcoder.smil/
 http://stream.kkr.dk/live/kkr/playlist.m3u8
 #EXTINF:-1 tvg-id="KKRtv.dk" tvg-country="DK" tvg-language="Danish" tvg-logo="https://i.imgur.com/cpl90ZC.png" group-title="",KKRtv (720p)
 http://stream.kkr.dk/live/ngrp:kkr_adaptive/playlist.m3u8
+#EXTINF:-1 tvg-id="TV2Fyn.dk" tvg-country="DK" tvg-language="Danish" tvg-logo="https://vignette1.wikia.nocookie.net/logopedia/images/6/6e/TV_2_Fyn.png" group-title="",TV2 Fyn (270p) [Not 24/7]
+https://cdnapisec.kaltura.com/p/1966291/sp/1966291/playManifest/entryId/0_vsfrv0zm/format/applehttp/protocol/https/flavorId/0_8g29e3jz/name/a.mp4/index.m3u8
 #EXTINF:-1 tvg-id="TV2Bornholm.dk" tvg-country="DK" tvg-language="Danish" tvg-logo="https://i.imgur.com/ylB5ea2.jpg" group-title="",TV2/Bornholm (1080p) [Not 24/7]
 https://live.tv2bornholm.dk/stream/live/playlist.m3u8
 #EXTINF:-1 tvg-id="TV2Lorry.dk" tvg-country="DK" tvg-language="Danish" tvg-logo="https://i.imgur.com/IxJIiLJ.jpg" group-title="",TV2/Lorry (720p)
 https://cdnapisec.kaltura.com/p/2045321/sp/204532100/playManifest/entryId/1_2kojfk4m/format/applehttp/protocol/https/uiConfId/32599481/a.m3u8
 #EXTINF:-1 tvg-id="TV2Ostjylland.dk" tvg-country="DK" tvg-language="Danish" tvg-logo="https://i.imgur.com/rC07Op2.jpg" group-title="",TV2/Østjylland (720p)
 https://cdnapisec.kaltura.com/p/2102081/sp/2102081/playManifest/entryId/0_x4p3licd/flavorIds/0_pcvatr5k,0_aezqkdsi,0_dkeq429y,0_99pivdxs/deliveryProfileId/10552/protocol/https/format/applehttp/a.m3u8
-#EXTINF:-1 tvg-id="TV2Fyn.dk" tvg-country="DK" tvg-language="Danish" tvg-logo="https://vignette1.wikia.nocookie.net/logopedia/images/6/6e/TV_2_Fyn.png" group-title="",TV2 Fyn (270p) [Not 24/7]
-https://cdnapisec.kaltura.com/p/1966291/sp/1966291/playManifest/entryId/0_vsfrv0zm/format/applehttp/protocol/https/flavorId/0_8g29e3jz/name/a.mp4/index.m3u8
diff --git a/channels/do.m3u b/channels/do.m3u
index 6895776c84..cf5cd686c7 100644
--- a/channels/do.m3u
+++ b/channels/do.m3u
@@ -13,13 +13,13 @@ https://cdn4.hostlagarto.com:8081/static/telecanal12/playlist.m3u8
 https://cloudflare.streamgato.us:3549/live/canal56live.m3u8
 #EXTINF:-1 tvg-id="CanalAme47.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/qExHiPc.png" group-title="",Canal Amé 47 (720p)
 http://ss6.domint.net:2028/ame_str/amecanal47/master.m3u8
-#EXTINF:-1 tvg-id="Carivision.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/hufTLyq.png" group-title="",Carivision (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="Carivision.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/hufTLyq.png" group-title="",Carivision (720p) [Not 24/7]
 http://ss6.domint.net:2012/tes_str/teleelsalvador/playlist.m3u8
 #EXTINF:-1 tvg-id="ChinolaTV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/axesNOe.png" group-title="Kids",Chinola TV (480p) [Not 24/7]
 https://cdn4.hostlagarto.com:8081/static/Chinolatv/playlist.m3u8
 #EXTINF:-1 tvg-id="CinevisionCanal19.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://yt3.ggpht.com/a/AGF-l79S5nkYhOxf6MqoTzBLUEnrDQRl6hGgy01i0g=s900-c-k-c0xffffffff-no-rj-mo" group-title="",Cinevision Canal 19 (720p)
 https://live.teledom.info:3713/live/cinevisionlive.m3u8
-#EXTINF:-1 tvg-id="ColorVisionCanal9.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",Color Vision Canal 9 [Offline]
+#EXTINF:-1 tvg-id="ColorVisionCanal9.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",Color Vision Canal 9 [Timeout]
 http://177.52.221.214:8000/play/a0c0/index.m3u8
 #EXTINF:-1 tvg-id="ComunionTV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/BNtmf7o.png" group-title="",Comunion TV (720p) [Not 24/7]
 http://50.30.37.36:1935/live/smil:MyStream.smil/playlist.m3u8
@@ -27,7 +27,7 @@ http://50.30.37.36:1935/live/smil:MyStream.smil/playlist.m3u8
 http://50.30.37.36:1935/live/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="DANTV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",DAN TV (720p) [Not 24/7]
 http://cm.hostlagarto.com:8081/Punaltv/punaltvHD.myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="Digital15.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/15_republica_dominicana-mediano.png" group-title="",Digital 15 [Offline]
+#EXTINF:-1 tvg-id="Digital15.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/15_republica_dominicana-mediano.png" group-title="",Digital 15 [Timeout]
 http://209.91.213.10:8088/play/a01h
 #EXTINF:-1 tvg-id="DigitalVision.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",Digital Vision (720p) [Not 24/7]
 https://ss3.domint.net:3120/dv6_str/digitalvision/playlist.m3u8
@@ -37,7 +37,7 @@ https://vdo1.streamgato.us:3014/live/ecovisionlive.m3u8
 https://video.misistemareseller.com/Fuegotv/Fuegotv/playlist.m3u8
 #EXTINF:-1 tvg-id="GDMTV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i0.wp.com/www.gdm.do/wp-content/uploads/2020/01/Logo-GDM.png?w=696&ssl=1" group-title="",GDMTV (720p) [Not 24/7]
 https://ss2.domint.net:3200/gdm_str/gdmtv/playlist.m3u8
-#EXTINF:-1 tvg-id="GHTelevisionCanal10.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",GH Television Canal 10 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="GHTelevisionCanal10.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",GH Television Canal 10 (480p) [Not 24/7]
 https://cloudflare.streamgato.us:3352/live/ghtelevisionhdlive.m3u8
 #EXTINF:-1 tvg-id="HermanasMirabalTV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://emisoradominicana.net/television/wp-content/uploads/2015/06/hermanas-mirabal-tv.jpg" group-title="",Hermanas Mirabal TV (720p) [Not 24/7]
 https://cm.hostlagarto.com:4445/Hmtv/hmtv.myStream/playlist.m3u8
@@ -51,13 +51,13 @@ https://primary-out.iptv-global.net/HilandoFinoTV/ngrp:HilandoFinoTV_all/playlis
 http://cm.hostlagarto.com:8081/hits360tv/hits360HD.myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="HM.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="http://emisoradominicana.net/television/wp-content/uploads/2015/06/hermanas-mirabal-tv.jpg" group-title="",HM (720p) [Geo-blocked]
 http://cm.hostlagarto.com:8081/Hmtv/hmtv.myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="LAMIATV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/77uVMGw.png" group-title="",LA MIA TV (720p)
+#EXTINF:-1 tvg-id="LAMIATV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/77uVMGw.png" group-title="",LA MIA TV (720p) [Offline]
 https://ss8.domint.net:3108/mia_str/lamiatv/playlist.m3u8
 #EXTINF:-1 tvg-id="LocomotionTV.do" tvg-country="HISPAM;ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/auEJJvP.png" group-title="Animation",Locomotion TV (480p) [Not 24/7]
 http://51.222.85.85:81/hls/loco/index.m3u8
 #EXTINF:-1 tvg-id="LocomotionTV.do" tvg-country="HISPAM;ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/auEJJvP.png" group-title="Animation",Locomotion TV (480p) [Not 24/7]
 http://locomotiontv.com/envivo/loco_ch/stream.m3u8
-#EXTINF:-1 tvg-id="LVM.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://images-na.ssl-images-amazon.com/images/I/814AENk%2BEaL.png" group-title="",LVM (480p)
+#EXTINF:-1 tvg-id="LVM.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://images-na.ssl-images-amazon.com/images/I/814AENk%2BEaL.png" group-title="",LVM (720p)
 https://uni01rtmp.tulix.tv/playout2multi9/lavozdemaria.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="MegavisionCanal43.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://directostv.teleame.com/wp-content/uploads/2017/10/megavision.png" group-title="",Megavision Canal 43 (480p) [Not 24/7]
 http://stream3.prostudionetwork.com:1943/megavision/MV/playlist.m3u8
@@ -75,7 +75,7 @@ https://cm.hostlagarto.com:4445/phtv/Phtv.myStream/chunks.m3u8
 https://cdn4.hostlagarto.com:8081/static/puntacanatv/playlist.m3u8
 #EXTINF:-1 tvg-id="Radio105full.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://ru0-cdn.onlineradiobox.com/img/l/2/94192.v2.png" group-title="Music",Radio105 full (720p) [Not 24/7]
 https://cloudflare.streamgato.us:3901/live/radio105live.m3u8
-#EXTINF:-1 tvg-id="ReadyTVCanal6.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="http://juanvmedrano.com/readytv/wp-content/uploads/2016/12/Ready-Logo-2016-oi2.png" group-title="",Ready TV Canal 6 (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="ReadyTVCanal6.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="http://juanvmedrano.com/readytv/wp-content/uploads/2016/12/Ready-Logo-2016-oi2.png" group-title="",Ready TV Canal 6 (720p) [Not 24/7]
 http://190.103.183.24:1935/ReadyTV/ReadyHD/playlist.m3u8
 #EXTINF:-1 tvg-id="RNN.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://2.bp.blogspot.com/-dNgkjv_lHvA/WrukdUgXxuI/AAAAAAAAdEc/lr2WVL7zy20Nl9G1XIXzwu9BlBJj4buhwCLcBGAs/s200/RNN%2B-%2BRed%2BNacional%2BNoticias.png" group-title="",RNN (720p) [Not 24/7]
 https://ss2.domint.net:3202/rnn_str/canal27/playlist.m3u8
@@ -91,7 +91,7 @@ http://190.122.96.186:8888/http/005
 http://ss8.domint.net:2128/stv_str/tv55/playlist.m3u8
 #EXTINF:-1 tvg-id="SuperTV55Santiago.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/aJcpxHL.jpg" group-title="",Super TV 55 (Santiago) (720p) [Not 24/7]
 https://ss8.domint.net:3128/stv_str/tv55/master.m3u8
-#EXTINF:-1 tvg-id="TDNMedios.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcRhNXeL2j6nDfgnmZxLlnMTAMne2l7IZ7boVIGUPL8h0VaFCFV2" group-title="",TDN Medios (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="TDNMedios.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcRhNXeL2j6nDfgnmZxLlnMTAMne2l7IZ7boVIGUPL8h0VaFCFV2" group-title="",TDN Medios (480p) [Not 24/7]
 http://108.175.14.125:1935/tdn/tdn/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleBendicion.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/7v46dB1.png" group-title="",TeleBendicion (720p) [Not 24/7]
 http://ss8.domint.net:2124/tbt_str/telebendicion/playlist.m3u8
@@ -115,7 +115,7 @@ http://newyorkstream.ddns.net:1935/telenord8/telenord8/playlist.m3u8
 http://newyorkstream.ddns.net:1935/telenord12/telenord12/playlist.m3u8
 #EXTINF:-1 tvg-id="TelenordCanal10.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",Telenord Canal 10 (1080p) [Not 24/7]
 http://newyorkstream.ddns.net:1935/telenord10/telenord10/playlist.m3u8
-#EXTINF:-1 tvg-id="Telesistema11.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",Telesistema 11 [Offline]
+#EXTINF:-1 tvg-id="Telesistema11.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",Telesistema 11 [Timeout]
 http://177.52.221.214:8000/play/a0fk/index.m3u8
 #EXTINF:-1 tvg-id="TelesurCanal10.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://www.telesur.com.do/images/telesur_canal_10_logo2.png" group-title="",Telesur Canal (360p) [Not 24/7]
 https://ss3.domint.net:3124/tls_str/telesur/playlist.m3u8
@@ -125,7 +125,7 @@ http://server3.prostudionetwork.com:1945/teleunion/TU/playlist.m3u8
 http://tengomusica.ddns.net:1935/telever/telever.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TVÉxitos.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",TV Éxitos (720p)
 https://vdo1.streamgato.us:3359/live/tvexitoslive.m3u8
-#EXTINF:-1 tvg-id="TVMontanaCanal10.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2Sgckg3.jpg" group-title="",TV Montaña Canal 10 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVMontanaCanal10.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2Sgckg3.jpg" group-title="",TV Montaña Canal 10 (1080p) [Not 24/7]
 http://ss6.domint.net:2060/tvm_str/montanatv/master.m3u8
 #EXTINF:-1 tvg-id="TVPlata.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://1.bp.blogspot.com/-33hgi3XzfLk/XaTZchnPFzI/AAAAAAAAoXM/_4Dev7Cb_II0S6JPEDyqOShzfmInR42vACLcBGAsYHQ/s200/tvplata.png" group-title="",TV Plata (1080p) [Not 24/7]
 https://ss6.domint.net:3104/tvp_str/tvplata/playlist.m3u8
@@ -135,11 +135,11 @@ http://cm.hostlagarto.com:8081/Tvstv/TvstvHD.myStream/playlist.m3u8
 http://190.103.183.24:1935/Vallevision/ValleHD/playlist.m3u8
 #EXTINF:-1 tvg-id="VallevisionCanal10.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://es.live-tv-channels.org/pt-data/uploads/logo/do-vallevision-canal-10-9607-300x225.jpg" group-title="",Vallevision Canal 10 (720p) [Not 24/7]
 https://streaming.telecablecentral.com.do/Vallevision/ValleHD/playlist.m3u8
-#EXTINF:-1 tvg-id="VegaTeve.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://1.bp.blogspot.com/-5JBZ6ZO0ybk/XaS-xAYTF7I/AAAAAAAAoXA/u1OK-aVn_sQNM86uwWFBqLuk5Q-Uzo7hgCLcBGAsYHQ/s200/vegateve.jpg" group-title="",Vega Teve (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="VegaTeve.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://1.bp.blogspot.com/-5JBZ6ZO0ybk/XaS-xAYTF7I/AAAAAAAAoXA/u1OK-aVn_sQNM86uwWFBqLuk5Q-Uzo7hgCLcBGAsYHQ/s200/vegateve.jpg" group-title="",Vega Teve (720p) [Not 24/7]
 https://ss6.domint.net:3012/tes_str/teleelsalvador/playlist.m3u8
 #EXTINF:-1 tvg-id="VivaCanal5.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="" group-title="",Viva Canal 5 (720p) [Not 24/7]
 https://iptv-all.lanesh4d0w.repl.co/dominicanrepublic/viva-canal-5
 #EXTINF:-1 tvg-id="Zol106.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://2.bp.blogspot.com/-OlrTJEjmmAI/Wr1YlnuxLOI/AAAAAAAAdIU/vTw_1pzwsTUbHwz_4zPiZwnbaeHDwiYAwCLcBGAs/s200/Zol%2B106.png" group-title="",Zol106 (720p)
 https://ss3.domint.net:3108/zol_str/vzol/playlist.m3u8
-#EXTINF:-1 tvg-id="ZTV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://z101digital.com/wp-content/themes/z-101-digital/imgs/podcasts/audios-destacados.jpg" group-title="",ZTV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ZTV.do" tvg-country="DO" tvg-language="Spanish" tvg-logo="https://z101digital.com/wp-content/themes/z-101-digital/imgs/podcasts/audios-destacados.jpg" group-title="",ZTV (720p) [Not 24/7]
 https://lb00zdigital.streamprolive.com/mnt/hls/live.m3u8
diff --git a/channels/ec.m3u b/channels/ec.m3u
index a86795b46f..51fef19d69 100644
--- a/channels/ec.m3u
+++ b/channels/ec.m3u
@@ -3,21 +3,21 @@
 https://59d39900ebfb8.streamlock.net/canelatv/canelatv/playlist.m3u8
 #EXTINF:-1 tvg-id="Ecotel.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Ecotel (720p) [Not 24/7]
 https://ecotel.streamseguro.com/hls/ecoteltv.m3u8
-#EXTINF:-1 tvg-id="EcuadorTV.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/357.png" group-title="",Ecuador TV
+#EXTINF:-1 tvg-id="EcuadorTV.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/357.png" group-title="",Ecuador TV (480p)
 http://45.179.140.242:8000/play/a0jp
 #EXTINF:-1 tvg-id="EducaTV.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="Education",EducaTV (1080p)
 https://cloud7.streamingcnt.net/cnt/educa/playlist.m3u8
-#EXTINF:-1 tvg-id="ElSolRadioTelevision.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",El Sol Radio y Television (240p) [Not 24/7]
+#EXTINF:-1 tvg-id="ElSolRadioTelevision.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",El Sol Radio y Television (360p) [Not 24/7]
 http://streaming5.globalhostla.com/rtplive/elsolrad/playlist.m3u8
 #EXTINF:-1 tvg-id="EliteRadioTelevisión.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Elite Radio Televisión (480p) [Not 24/7]
 https://tv.portalexpress.es:3785/live/trincheratvlive.m3u8
-#EXTINF:-1 tvg-id="HechosEcuador.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="https://i.imgur.com8YPXrcX.png" group-title="",Hechos Ecuador (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="HechosEcuador.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="https://i.imgur.com8YPXrcX.png" group-title="",Hechos Ecuador (720p) [Not 24/7]
 http://37.187.7.106/hechostv/live.m3u8
 #EXTINF:-1 tvg-id="LoretoTV.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Loreto TV (720p) [Not 24/7]
 https://srv1.zcast.com.br/diego3282/diego3282/playlist.m3u8
 #EXTINF:-1 tvg-id="MulticanalCatamayo.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Multicanal Catamayo (720p) [Not 24/7]
 https://multicanal.streamseguro.com/hls/streaming.m3u8
-#EXTINF:-1 tvg-id="ParaísoDigital.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Paraíso Digital (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ParaísoDigital.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Paraíso Digital (404p) [Not 24/7]
 https://cloudvideo.servers10.com:8081/8106/index.m3u8
 #EXTINF:-1 tvg-id="PasiónTV.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Pasión TV (720p) [Not 24/7]
 https://tv.portalexpress.es:3753/hybrid/play.m3u8
@@ -27,7 +27,7 @@ https://tv.portalexpress.es:3084/hybrid/play.m3u8
 https://srv.panelcast.net/puruwalive/puruwalive/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioImpacto2.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Radio Impacto 2 (1080p) [Not 24/7]
 https://sv72.ecuaradiotv.net/impacto2tv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="RTS.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",RTS (RadioTeleSistema)
+#EXTINF:-1 tvg-id="RTS.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",RTS (RadioTeleSistema) (480p)
 http://45.179.140.242:8000/play/a0kw
 #EXTINF:-1 tvg-id="Teleamazonas.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="https://i.imgur.com/of0fNUU.png" group-title="",Teleamazonas (720p) [Not 24/7]
 https://api.new.livestream.com/accounts/1359588/events/4428723/live.m3u8
@@ -37,7 +37,7 @@ https://59c3c7bda15f4.streamlock.net:444/universal/smil:universal.smil/playlist.
 http://ecuastreamhd.com:1935/UCSGHQ/UCSGHQ/chunklist.m3u
 #EXTINF:-1 tvg-id="Unisión.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="",Unisión (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://player.vimeo.com/video/645807901
-#EXTINF:-1 tvg-id="VisionRadioTelevision.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="Local",Visión Radio Televisión (720p)
+#EXTINF:-1 tvg-id="VisionRadioTelevision.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="Local",Visión Radio Televisión (1080p)
 https://stmv.panel.mivideo.pro/vision/vision/playlist.m3u8
 #EXTINF:-1 tvg-id="WuanPlus.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/WuanPlus/picture?width=320&height=320" group-title="General",Wuan+ (720p)
 https://streamingwowza.com:1936/wuanplus/wuanplus/playlist.m3u8
diff --git a/channels/ee.m3u b/channels/ee.m3u
index 0c7a6bc474..493807b00b 100644
--- a/channels/ee.m3u
+++ b/channels/ee.m3u
@@ -3,10 +3,10 @@
 https://errstreams4.cdn.eurovisioncdn.net/live/etv.m3u8
 #EXTINF:-1 tvg-id="ETV.ee" tvg-country="EE" tvg-language="Estonian" tvg-logo="https://static.iptv-epg.com/ee/ETV.ee.png" group-title="",ETV (720p)
 https://sb.err.ee/live/etv.m3u8
-#EXTINF:-1 tvg-id="ETV2.ee" tvg-country="EE" tvg-language="Estonian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/33/ETV2_logo.svg/240px-ETV2_logo.svg.png" group-title="",ETV2 (180p)
-https://errstreams4.cdn.eurovisioncdn.net/live/etv2.m3u8
-#EXTINF:-1 tvg-id="ETVPlus.ee" tvg-country="EE" tvg-language="Estonian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a2/ETV%2B_logo.png/225px-ETV%2B_logo.png" group-title="",ETV+ (180p)
+#EXTINF:-1 tvg-id="ETVPlus.ee" tvg-country="EE" tvg-language="Estonian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a2/ETV%2B_logo.png/225px-ETV%2B_logo.png" group-title="",ETV+ (720p)
 https://errstreams4.cdn.eurovisioncdn.net/live/etvpluss.m3u8
+#EXTINF:-1 tvg-id="ETV2.ee" tvg-country="EE" tvg-language="Estonian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/33/ETV2_logo.svg/240px-ETV2_logo.svg.png" group-title="",ETV2 (720p)
+https://errstreams4.cdn.eurovisioncdn.net/live/etv2.m3u8
 #EXTINF:-1 tvg-id="LifeTV.ee" tvg-country="EE" tvg-language="Estonian" tvg-logo="https://i.imgur.com/RBUmENQ.png" group-title="",Life TV (432p) [Not 24/7]
 https://lifetv.bitflip.ee/live/stream1.m3u8
 #EXTINF:-1 tvg-id="Riigikogu.ee" tvg-country="EE" tvg-language="Estonian" tvg-logo="https://i.imgur.com/xuySaSN.png" group-title="",Riigikogu (720p)
diff --git a/channels/eg.m3u b/channels/eg.m3u
index 1a3daa9fe6..20c225aca1 100644
--- a/channels/eg.m3u
+++ b/channels/eg.m3u
@@ -7,19 +7,19 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/algha
 http://media.islamexplained.com:1935/live/_definst_mp4:ahme.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Alrafidain.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Alrafidain (1024p) [Not 24/7]
 http://cdg3.edge.tmed.pw/arrafidaintv/live_1024p/chunks.m3u8
-#EXTINF:-1 tvg-id="AppleAflam.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Aflam (576p)
+#EXTINF:-1 tvg-id="AppleAflam.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Aflam (576p) [Timeout]
 http://213.162.202.5:4000/play/a09p/index.m3u8
-#EXTINF:-1 tvg-id="AppleAlwan.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Alwan (576p)
+#EXTINF:-1 tvg-id="AppleAlwan.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Alwan (576p) [Timeout]
 http://213.162.202.5:4000/play/a09d/index.m3u8
-#EXTINF:-1 tvg-id="AppleCinema.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Cinema (576p)
+#EXTINF:-1 tvg-id="AppleCinema.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Cinema (576p) [Timeout]
 http://213.162.202.5:4000/play/a09b/index.m3u8
-#EXTINF:-1 tvg-id="AppleComedy.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Comedy (576p)
+#EXTINF:-1 tvg-id="AppleComedy.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Comedy (576p) [Timeout]
 http://213.162.202.5:4000/play/a09a/index.m3u8
-#EXTINF:-1 tvg-id="AppleHekayat.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Hekayat (576p)
+#EXTINF:-1 tvg-id="AppleHekayat.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Hekayat (576p) [Timeout]
 http://213.162.202.5:4000/play/a0a1/index.m3u8
-#EXTINF:-1 tvg-id="AppleMoslsalat.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Moslsalat (576p)
+#EXTINF:-1 tvg-id="AppleMoslsalat.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Moslsalat (576p) [Timeout]
 http://213.162.202.5:4000/play/a09l/index.m3u8
-#EXTINF:-1 tvg-id="AppleToday.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Today (576p)
+#EXTINF:-1 tvg-id="AppleToday.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Apple Today (576p) [Timeout]
 http://213.162.202.5:4000/play/a09k/index.m3u8
 #EXTINF:-1 tvg-id="ATVSat.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/14EjTS3.png" group-title="",ATVSat (1080p) [Not 24/7]
 https://stream.atvsat.com/atvsatlive/smil:atvsatlive.smil/playlist.m3u8
@@ -37,11 +37,11 @@ https://58cc65c534c67.streamlock.net/ctvchannel.tv/ctv.smil/playlist.m3u8
 https://mn-nl.mncdn.com/elsharq_live/live/playlist.m3u8
 #EXTINF:-1 tvg-id="eXtraNews.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://extranews.tv/assets/images/Extranews_logo_R.png" group-title="News",eXtra News (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC65F33K2cXk9hGDbOQYhTOw/live
-#EXTINF:-1 tvg-id="Huda.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/7dnjDgw.jpg" group-title="",Huda (720p) [Offline]
+#EXTINF:-1 tvg-id="Huda.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/7dnjDgw.jpg" group-title="",Huda (720p) [Timeout]
 https://cdn.videoevent.live:19360/elfaro2/elfaro2.m3u8
-#EXTINF:-1 tvg-id="KoogiTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/I5A1mMZ.jpg" group-title="Kids",Koogi TV (1080p)
+#EXTINF:-1 tvg-id="KoogiTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/I5A1mMZ.jpg" group-title="Kids",Koogi TV (720p)
 https://5d658d7e9f562.streamlock.net/koogi.tv/koogi.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="MekameleenTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/K0MQiNB.png" group-title="News",Mekameleen TV (720p)
+#EXTINF:-1 tvg-id="MekameleenTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/K0MQiNB.png" group-title="News",Mekameleen TV (1080p)
 https://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MESat.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://copticocc.org/mesat/wp-content/uploads/2018/07/logo-width12.png" group-title="Religious",MESat (480p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCg5uHOxrP5GkMWldOavPKGQ/live
@@ -66,15 +66,15 @@ http://livestreaming5.onlinehorizons.net/hls-live/NTNNileLife/_definst_/liveeven
 #EXTINF:-1 tvg-id="NileTVSport.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="http://www.niletc.tv/images/sport/sport.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36" group-title="Sports",Nile TV Sport (576p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36
 http://livestreaming5.onlinehorizons.net/hls-live/NTNNileSport/_definst_/liveevent/livestream.m3u8
-#EXTINF:-1 tvg-id="NobleTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Noble TV (1080p)
+#EXTINF:-1 tvg-id="NobleTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Noble TV (360p)
 https://5d39f1ab8ba65.streamlock.net:1935/arabic-test/arabic-test/playlist.m3u8
-#EXTINF:-1 tvg-id="NogoumFMTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://storage.googleapis.com/nogoumfm-eu-web/1/2019/12/logo-nogoum-1.png" group-title="Music",Nogoum FM TV (180p) [Not 24/7]
+#EXTINF:-1 tvg-id="NogoumFMTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://storage.googleapis.com/nogoumfm-eu-web/1/2019/12/logo-nogoum-1.png" group-title="Music",Nogoum FM TV (506p) [Not 24/7]
 https://stream-speed.extremesolution.mobi/nogoumfm/nogoumfmlive/playlist.m3u8
-#EXTINF:-1 tvg-id="OmgChannelTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="http://omgchannel.net/image/cache/catalog/logo-210x89.png" group-title="",Omg Channel TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="OmgChannelTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="http://omgchannel.net/image/cache/catalog/logo-210x89.png" group-title="",Omg Channel TV (1080p) [Not 24/7]
 http://media6.smc-host.com:1935/omgchannel.net/omgtv/playlist.m3u8
 #EXTINF:-1 tvg-id="OmgSeriesTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="http://omgchannel.net/image/cache/catalog/logo-210x89.png" group-title="",Omg Series TV (720p) [Not 24/7]
 http://media6.smc-host.com:1935/omgchannel.net/omgseries/playlist.m3u8
-#EXTINF:-1 tvg-id="QuranTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Quran TV (576p)
+#EXTINF:-1 tvg-id="QuranTV.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="" group-title="",Quran TV (576p) [Timeout]
 http://213.162.202.5:4000/play/a09u/index.m3u8
 #EXTINF:-1 tvg-id="SadaElbalad.eg" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://elbaladtv.net/wp-content/uploads/2020/02/Sada-Logo-190.webp" group-title="",Sada Elbalad (480p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/elbaladtv
diff --git a/channels/es.m3u b/channels/es.m3u
index ad87c3c644..f37e4c29a5 100644
--- a/channels/es.m3u
+++ b/channels/es.m3u
@@ -1,36 +1,4 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="324.es" tvg-country="ES;AD" tvg-language="Catalan" tvg-logo="https://i.imgur.com/CnIVW9o.jpg" group-title="News",3/24 (1080p)
-https://directes-tv-int.ccma.cat/int/ngrp:324_web/master.m3u8
-#EXTINF:-1 tvg-id="7LaRioja.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",7 La Rioja (1080p) [Not 24/7]
-https://pc-la7delarioja-hls.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="7Noticias.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="News",7 Noticias (1080p)
-https://amg01573-7nn-7nnono-ono-pcdj3.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="7TelevisionRegiondeMurcia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/M0JqHa9.png" group-title="Local",7 Televisión Región de Murcia (360p)
-https://rtvmurcia_01-lh.akamaihd.net/i/rtvmurcia_1_0@507973/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndalucia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (720p)
-https://dcunilive93-lh.akamaihd.net/i/dclive_1@835804/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndaluciaBahia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Bahía) (576p)
-https://dcunilive93-lh.akamaihd.net/i/dclive_1@835790/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndaluciaCordoba.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Córdoba) (720p) [Not 24/7]
-https://dcunilive265-lh.akamaihd.net/i/dclive_1@409360/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndaluciaCostaNoroeste.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Costa Noroeste) (404p)
-https://dcunilive93-lh.akamaihd.net/i/dclive_1@835802/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndaluciaJaen.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Jaén) (404p)
-https://dcunilive266-lh.akamaihd.net/i/dclive_1@426886/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndaluciaJerez.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Jerez) (404p)
-https://dcunilive93-lh.akamaihd.net/i/dclive_1@835794/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndaluciaMalaga.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Málaga) [Offline]
-https://dcunilive93-lh.akamaihd.net/i/dclive_1@835798/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndaluciaSevilla.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Sevilla) (404p)
-https://dcunilive93-lh.akamaihd.net/i/dclive_1@835800/master.m3u8
-#EXTINF:-1 tvg-id="7TVAndaluciaSierra.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Sierra) (404p)
-https://dcunilive93-lh.akamaihd.net/i/dclive_1@835792/master.m3u8
-#EXTINF:-1 tvg-id="8TVCadiz.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",8 TV Cádiz (360p) [Not 24/7]
-https://5940924978228.streamlock.net/8289/smil:8289.smil/master.m3u8
-#EXTINF:-1 tvg-id="9laLomaTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/fpUaXqe.png" group-title="",9 la Loma TV [Geo-blocked]
-https://9laloma.tv/live.m3u8
-#EXTINF:-1 tvg-id="11TV.es" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/Uo3iDXN.jpg" group-title="Music",11 TV (576p) [Not 24/7]
-http://51.210.199.43/hls/stream.m3u8
 #EXTINF:-1 tvg-id="Plus24.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",+24 (576p)
 https://hlsliveamdgl0-lh.akamaihd.net/i/hlslive_1@586402/master.m3u8
 #EXTINF:-1 tvg-id="Plus24.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",+24 (576p)
@@ -39,20 +7,6 @@ https://hlsliveamdgl0-lh.akamaihd.net/i/hlslive_1@586403/master.m3u8
 https://hlsliveamdgl0-lh.akamaihd.net/i/hlslive_1@586404/master.m3u8
 #EXTINF:-1 tvg-id="Plus24.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",+24 (576p)
 https://hlsliveamdgl0-lh.akamaihd.net/i/hlslive_1@586405/master.m3u8
-#EXTINF:-1 tvg-id="24h.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Logo_TVE-24h.svg/2084px-Logo_TVE-24h.svg.png" group-title="News",24 Horas (1080p)
-https://rtvelivestreamv3.akamaized.net/24h/24h_main_dvr.m3u8
-#EXTINF:-1 tvg-id="24h.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Logo_TVE-24h.svg/2084px-Logo_TVE-24h.svg.png" group-title="News",24 Horas (1080p)
-https://rtvelivestreamv3.akamaized.net/rtvesec/24h_bkp_dvr.m3u8
-#EXTINF:-1 tvg-id="25TV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/sADbx7S.png" group-title="",25 TV (480p) [Not 24/7]
-https://cdnlive.shooowit.net/25televisiolive/smil:channel1.smil/master.m3u8
-#EXTINF:-1 tvg-id="28kanala.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/28kanala/picture?width=320&height=320" group-title="",28 kanala (720p) [Geo-blocked]
-https://5940924978228.streamlock.net/8157/8157/master.m3u8
-#EXTINF:-1 tvg-id="101TeleAntequera.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/ZhvkYeg.jpg" group-title="Music",101 Tele Antequera (1080p)
-https://limited38.todostreaming.es/live/101tv-AntequeraHD.m3u8
-#EXTINF:-1 tvg-id="101TVMalaga.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/CXHLhZD.png" group-title="News",101TV Malaga (1080p) [Not 24/7]
-https://limited38.todostreaming.es/live/101tv-web101tv.m3u8
-#EXTINF:-1 tvg-id="324.es" tvg-country="ES" tvg-language="Catalan" tvg-logo="https://i.imgur.com/CnIVW9o.jpg" group-title="News",324 (1080p)
-https://directes-tv-int.ccma.cat/int/ngrp:324_web/playlist_DVR.m3u8
 #EXTINF:-1 tvg-id="Plustdp.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",+tdp [Geo-blocked]
 https://hlsliveamdgl1-lh.akamaihd.net/i/hlsdvrlive_1@39732/master.m3u8
 #EXTINF:-1 tvg-id="Plustdp.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",+tdp [Geo-blocked]
@@ -65,6 +19,52 @@ https://hlsliveamdgl1-lh.akamaihd.net/i/hlslive_1@125702/master.m3u8
 https://hlsliveamdgl1-lh.akamaihd.net/i/hlslive_1@125703/master.m3u8
 #EXTINF:-1 tvg-id="Plustdp.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",+tdp [Geo-blocked]
 https://hlsliveamdgl1-lh.akamaihd.net/i/hlslive_1@143656/master.m3u8
+#EXTINF:-1 tvg-id="324.es" tvg-country="ES;AD" tvg-language="Catalan" tvg-logo="https://i.imgur.com/CnIVW9o.jpg" group-title="News",3/24 (1080p)
+https://directes-tv-int.ccma.cat/int/ngrp:324_web/master.m3u8
+#EXTINF:-1 tvg-id="7LaRioja.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",7 La Rioja (1080p) [Not 24/7]
+https://pc-la7delarioja-hls.flumotion.com/playlist.m3u8
+#EXTINF:-1 tvg-id="7Noticias.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="News",7 Noticias (1080p)
+https://amg01573-7nn-7nnono-ono-pcdj3.amagi.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="7TelevisionRegiondeMurcia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/M0JqHa9.png" group-title="Local",7 Televisión Región de Murcia (360p)
+https://rtvmurcia_01-lh.akamaihd.net/i/rtvmurcia_1_0@507973/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndalucia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (720p) [Offline]
+https://dcunilive93-lh.akamaihd.net/i/dclive_1@835804/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndaluciaBahia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Bahía) (576p) [Offline]
+https://dcunilive93-lh.akamaihd.net/i/dclive_1@835790/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndaluciaCordoba.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Córdoba) (720p) [Not 24/7]
+https://dcunilive265-lh.akamaihd.net/i/dclive_1@409360/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndaluciaCostaNoroeste.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Costa Noroeste) (404p) [Offline]
+https://dcunilive93-lh.akamaihd.net/i/dclive_1@835802/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndaluciaJaen.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Jaén) (404p) [Offline]
+https://dcunilive266-lh.akamaihd.net/i/dclive_1@426886/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndaluciaJerez.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Jerez) (404p) [Offline]
+https://dcunilive93-lh.akamaihd.net/i/dclive_1@835794/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndaluciaMalaga.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Málaga) [Offline]
+https://dcunilive93-lh.akamaihd.net/i/dclive_1@835798/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndaluciaSevilla.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Sevilla) (404p) [Offline]
+https://dcunilive93-lh.akamaihd.net/i/dclive_1@835800/master.m3u8
+#EXTINF:-1 tvg-id="7TVAndaluciaSierra.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/7TelevisionAndalucia/picture?width=320&height=320" group-title="News",7 TV Andalucía (Sierra) (404p) [Offline]
+https://dcunilive93-lh.akamaihd.net/i/dclive_1@835792/master.m3u8
+#EXTINF:-1 tvg-id="8TVCadiz.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",8 TV Cádiz (360p) [Not 24/7]
+https://5940924978228.streamlock.net/8289/smil:8289.smil/master.m3u8
+#EXTINF:-1 tvg-id="9laLomaTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/fpUaXqe.png" group-title="",9 la Loma TV [Geo-blocked]
+https://9laloma.tv/live.m3u8
+#EXTINF:-1 tvg-id="11TV.es" tvg-country="AF" tvg-language="Pashto" tvg-logo="https://i.imgur.com/Uo3iDXN.jpg" group-title="Music",11 TV (576p) [Not 24/7]
+http://51.210.199.43/hls/stream.m3u8
+#EXTINF:-1 tvg-id="24h.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Logo_TVE-24h.svg/2084px-Logo_TVE-24h.svg.png" group-title="News",24 Horas (1080p)
+https://rtvelivestreamv3.akamaized.net/rtvesec/24h_bkp_dvr.m3u8
+#EXTINF:-1 tvg-id="24h.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Logo_TVE-24h.svg/2084px-Logo_TVE-24h.svg.png" group-title="News",24 Horas (720p)
+https://rtvelivestreamv3.akamaized.net/24h/24h_main_dvr.m3u8
+#EXTINF:-1 tvg-id="25TV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/sADbx7S.png" group-title="",25 TV (480p) [Not 24/7]
+https://cdnlive.shooowit.net/25televisiolive/smil:channel1.smil/master.m3u8
+#EXTINF:-1 tvg-id="28kanala.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/28kanala/picture?width=320&height=320" group-title="",28 kanala (720p) [Geo-blocked]
+https://5940924978228.streamlock.net/8157/8157/master.m3u8
+#EXTINF:-1 tvg-id="101TeleAntequera.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/ZhvkYeg.jpg" group-title="Music",101 Tele Antequera (1080p)
+https://limited38.todostreaming.es/live/101tv-AntequeraHD.m3u8
+#EXTINF:-1 tvg-id="101TVMalaga.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/CXHLhZD.png" group-title="News",101TV Malaga (1080p) [Not 24/7]
+https://limited38.todostreaming.es/live/101tv-web101tv.m3u8
+#EXTINF:-1 tvg-id="324.es" tvg-country="ES" tvg-language="Catalan" tvg-logo="https://i.imgur.com/CnIVW9o.jpg" group-title="News",324 (1080p)
+https://directes-tv-int.ccma.cat/int/ngrp:324_web/playlist_DVR.m3u8
 #EXTINF:-1 tvg-id="APunt.es" tvg-country="ES" tvg-language="Catalan" tvg-logo="https://graph.facebook.com/apuntmedia/picture?width=200&height=200" group-title="General",À Punt (720p)
 https://bcovlive-a.akamaihd.net/469e448f034b4d46afa4bcac53297d60/eu-central-1/6057955885001/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="APunt.es" tvg-country="ES" tvg-language="Catalan" tvg-logo="https://graph.facebook.com/apuntmedia/picture?width=200&height=200" group-title="General",À Punt (720p) [Geo-blocked]
@@ -83,9 +83,9 @@ https://cartv.streaming.aranova.es/hls/live/aragonradio_aragonradio1.m3u8
 https://cartv.streaming.aranova.es/hls/live/aragontv_canal1.m3u8
 #EXTINF:-1 tvg-id="BailenTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Bailén TV (720p) [Not 24/7]
 http://cpd.bailen.tv:8080/Playlist_CANAL_24H/playlist.m3u8
-#EXTINF:-1 tvg-id="BarcaTV.es" tvg-country="ES" tvg-language="Spanish;Catalan" tvg-logo="https://www.movistarplus.es/recorte/m-NEO/canal/BARNA.png" group-title="Sports",Barça TV [Offline]
+#EXTINF:-1 tvg-id="BarcaTV.es" tvg-country="ES" tvg-language="Spanish;Catalan" tvg-logo="https://www.movistarplus.es/recorte/m-NEO/canal/BARNA.png" group-title="Sports",Barça TV [Timeout]
 http://5.255.90.184:2002/play/a01z
-#EXTINF:-1 tvg-id="BARVATV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="http://barvatvplus.com/wp-content/uploads/2020/12/PicsArt_11-24-11.04.44.png" group-title="",BARVA.TV (268p)
+#EXTINF:-1 tvg-id="BARVATV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="http://barvatvplus.com/wp-content/uploads/2020/12/PicsArt_11-24-11.04.44.png" group-title="",BARVA.TV (398p)
 https://cp.sradiotv.com:1936/8076/8076/playlist.m3u8
 #EXTINF:-1 tvg-id="beteve.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",betevé (1080p)
 https://cdnapisec.kaltura.com/p/2346171/sp/234617100/playManifest/entryId/1_n6442jz0/format/applehttp/.m3u8?referrer=aHR0cHM6Ly9iZXRldmUuY2F0
@@ -113,7 +113,7 @@ https://hlsliveamdgl8-lh.akamaihd.net/i/hlslive_1@300207/master.m3u8
 http://hlsliveamdgl8-lh.akamaihd.net/i/hlsdvrlive_1@583030/master.m3u8
 #EXTINF:-1 tvg-id="Canal25TV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2BBGZ1H.png" group-title="Local",Canal 25 TV (Barbastro) (720p) [Not 24/7]
 https://common01.todostreaming.es/live/tvbarbastro-livestream.m3u8
-#EXTINF:-1 tvg-id="Canal33Madrid.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/1zJpDIX.png" group-title="",Canal 33 Madrid (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal33Madrid.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/1zJpDIX.png" group-title="",Canal 33 Madrid (720p) [Not 24/7]
 https://5ab29cc78f681.streamlock.net/canal33tvmadridgmailcom/livestream/master.m3u8
 #EXTINF:-1 tvg-id="CANAL45TV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2016/02/Canal-45-Ja%C3%A9n.png" group-title="",CANAL 45 TV (360p) [Not 24/7]
 https://cdn01.yowi.tv/503L6OKTE2/master.m3u8
@@ -183,7 +183,7 @@ https://streaming.cloud.innovasur.es/mmj/index.m3u8
 https://cdn01.yowi.tv/KQRSDA7GDB/master.m3u8
 #EXTINF:-1 tvg-id="DurangaldekoTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Durangaldeko TV (404p) [Not 24/7]
 https://cdn01.yowi.tv/AAAAAAAAAA/master.m3u8
-#EXTINF:-1 tvg-id="EITB.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/BU8zXRW.jpg" group-title="Local",EITB (360p)
+#EXTINF:-1 tvg-id="EITB.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/BU8zXRW.jpg" group-title="Local",EITB (480p)
 https://etbvnogeo-lh.akamaihd.net/i/ETBEITBEUS_1@300391/master.m3u8
 #EXTINF:-1 tvg-id="EiTB2.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/mrGvcPV.png" group-title="",EiTB 2 (720p)
 https://etbvnogeo-lh.akamaihd.net/i/ETBSTR2_1@595582/master.m3u8
@@ -196,9 +196,9 @@ https://streaming.elche7tv.es/hls/canal2.m3u8
 #EXTINF:-1 tvg-id="ESNETV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/VbxfLY5.png" group-title="Religious",ESNE TV (1080p)
 https://zypelive-lh.akamaihd.net/i/default_1@710948/master.m3u8
 #EXTINF:-1 tvg-id="Esport3.es" tvg-country="ES;AD" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Esport3/picture?width=320&height=320" group-title="Sports",Esport3 (1080p) [Not 24/7]
-https://directes-tv-int.ccma.cat/int/ngrp:es3_web/playlist.m3u8
-#EXTINF:-1 tvg-id="Esport3.es" tvg-country="ES;AD" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Esport3/picture?width=320&height=320" group-title="Sports",Esport3 (1080p) [Not 24/7]
 https://directes-tv-int.ccma.cat/int/ngrp:es3_web/playlist_DVR.m3u8
+#EXTINF:-1 tvg-id="Esport3.es" tvg-country="ES;AD" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Esport3/picture?width=320&height=320" group-title="Sports",Esport3 (1080p) [Not 24/7]
+https://directes-tv-int.ccma.cat/int/ngrp:es3_web/playlist.m3u8
 #EXTINF:-1 tvg-id="EsteponaTelevision.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/rMAB720.png" group-title="",Estepona Televisión (720p) [Offline]
 https://5b38ce71f1f00.streamlock.net/8122/8122/playlist.m3u8
 #EXTINF:-1 tvg-id="ETB1.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/KeBXBJE.png" group-title="Local",ETB 1 (720p)
@@ -207,13 +207,13 @@ https://etbvnogeo-lh.akamaihd.net/i/ETBSTR1_1@595581/master.m3u8
 https://etbvnogeo-lh.akamaihd.net/i/OCA1HD_1@748519/master.m3u8
 #EXTINF:-1 tvg-id="EuropaPressTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/europapress.es/picture?width=320&height=320" group-title="",EuropaPress TV [Offline]
 https://cdnlive.shooowit.net/europapresslive/ep.smil/master.m3u8
-#EXTINF:-1 tvg-id="FactoriadeFiccion.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://programacion-tv.elpais.com/imagenes/canales/506.jpg" group-title="",Factoría de Ficción (720p)
+#EXTINF:-1 tvg-id="FactoriadeFiccion.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://programacion-tv.elpais.com/imagenes/canales/506.jpg" group-title="",Factoría de Ficción (720p) [Timeout]
 http://91.126.141.201:1935/live/smil:fdf.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="FibracatTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Fibracat TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="FibracatTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Fibracat TV (1080p) [Not 24/7]
 https://cdn02.fibracat.cat/fibracattv/index.m3u8
 #EXTINF:-1 tvg-id="Fibwi.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Fibwi (1080p) [Geo-blocked]
 http://109.232.71.249/fibwiLIVE_movil/index.m3u8
-#EXTINF:-1 tvg-id="FionTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/lOkkf0D.png" group-title="",Fion TV (720p)
+#EXTINF:-1 tvg-id="FionTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/lOkkf0D.png" group-title="",Fion TV (720p) [Timeout]
 http://stream.fion.es:1936/live/smil:fion.smil/master.m3u8
 #EXTINF:-1 tvg-id="GCMTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",GCM TV (720p) [Not 24/7]
 https://cloud.streamingconnect.tv:455/tbmadrid/tbmadrid.m3u8
@@ -221,47 +221,47 @@ https://cloud.streamingconnect.tv:455/tbmadrid/tbmadrid.m3u8
 https://zuzenean.goienamedia.eus:8443/goiena-telebista.m3u8
 #EXTINF:-1 tvg-id="GOL.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",GOL (720p) [Offline]
 https://api.goltelevision.com/api/v1/stream/live/stream.m3u8
-#EXTINF:-1 tvg-id="GuadaTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Guada TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="GuadaTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Guada TV (1080p) [Not 24/7]
 https://cloud.streamingconnect.tv:455/guadatv/guadatv.m3u8
 #EXTINF:-1 tvg-id="HamaikaTelebista.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/HR3G3Ie.png" group-title="",Hamaika Telebista (1080p) [Not 24/7]
 https://wowzaprod130-i.akamaihd.net/hls/live/570468/275f3ea5/playlist.m3u8
 #EXTINF:-1 tvg-id="HermesTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Hermes TV (720p) [Offline]
 https://cdn01.yowi.tv/1H23S04G4M/master.m3u8
-#EXTINF:-1 tvg-id="HQMArabic.es" tvg-country="ES" tvg-language="Arabic" tvg-logo="https://hqm.es/wp-content/uploads/arabic-hqm-logo.png" group-title="Music",HQM Arabic (1080p)
+#EXTINF:-1 tvg-id="HQMArabic.es" tvg-country="ES" tvg-language="Arabic" tvg-logo="https://hqm.es/wp-content/uploads/arabic-hqm-logo.png" group-title="Music",HQM Arabic (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/39596c72840d27b213caf4e58c39599a6f2ed203/master.m3u8
-#EXTINF:-1 tvg-id="HQMBaladas.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/baladas-hqm-logo.png" group-title="Music",HQM Baladas (1080p)
+#EXTINF:-1 tvg-id="HQMBaladas.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/baladas-hqm-logo.png" group-title="Music",HQM Baladas (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/5d7d2c21e0ec7a8a99fd1fdbc52cbdc0782f77fc/master.m3u8
-#EXTINF:-1 tvg-id="HQMBlues.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/relax-hqm-logo.png" group-title="Music",HQM Blues (1080p)
+#EXTINF:-1 tvg-id="HQMBlues.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/relax-hqm-logo.png" group-title="Music",HQM Blues (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/81c601f370e44dc566113fd752204be5f5f53b61/master.m3u8
-#EXTINF:-1 tvg-id="HQMChillOut.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/chillout-hqm-logo.png" group-title="Music",HQM Chill Out (1080p)
+#EXTINF:-1 tvg-id="HQMChillOut.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/chillout-hqm-logo.png" group-title="Music",HQM Chill Out (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/183a351ddb0e57af6d735256226e6033c32219ab/master.m3u8
-#EXTINF:-1 tvg-id="HQMClassic.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/classic-hqm-logo.png" group-title="Music",HQM Classic (1080p)
+#EXTINF:-1 tvg-id="HQMClassic.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/classic-hqm-logo.png" group-title="Music",HQM Classic (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/f04129475945936b248aa723de56519ea2ff10fc/master.m3u8
-#EXTINF:-1 tvg-id="HQMDance.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/dance-hqm-logo.png" group-title="Music",HQM Dance (1080p)
+#EXTINF:-1 tvg-id="HQMDance.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/dance-hqm-logo.png" group-title="Music",HQM Dance (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/57cf2f51b07ff21988a7a6f0270a66d41086d4a4/master.m3u8
-#EXTINF:-1 tvg-id="HQMFolk.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/folk-hqm-logo.png" group-title="Music",HQM Folk (1080p)
+#EXTINF:-1 tvg-id="HQMFolk.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/folk-hqm-logo.png" group-title="Music",HQM Folk (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/9f5310c179e8e840188d183be235f755b18cf703/master.m3u8
-#EXTINF:-1 tvg-id="HQMGym.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/gym-hqm-logo.png" group-title="Music",HQM Gym (1080p)
+#EXTINF:-1 tvg-id="HQMGym.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/gym-hqm-logo.png" group-title="Music",HQM Gym (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/abb87f329d0ed03072b1930e9636a53e8076c8d5/master.m3u8
-#EXTINF:-1 tvg-id="HQMHipHop.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/hiphop-hqm-logo.png" group-title="Music",HQM Hip Hop (1080p)
+#EXTINF:-1 tvg-id="HQMHipHop.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/hiphop-hqm-logo.png" group-title="Music",HQM Hip Hop (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/8327abc87895df4c76db1155435fdca6a3607bbd/master.m3u8
-#EXTINF:-1 tvg-id="HQMHits.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/hits-hqm-logo.png" group-title="Music",HQM Hits (1080p)
+#EXTINF:-1 tvg-id="HQMHits.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/hits-hqm-logo.png" group-title="Music",HQM Hits (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/5e2db2017a8fd03f73b40ede363d1a586db4e9a6/master.m3u8
-#EXTINF:-1 tvg-id="HQMJazz.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/jazz-hqm-logo.png" group-title="Music",HQM Jazz (1080p)
+#EXTINF:-1 tvg-id="HQMJazz.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/jazz-hqm-logo.png" group-title="Music",HQM Jazz (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/f204aa5b3f0691e69851b54b7746ef09ede26f6a/master.m3u8
-#EXTINF:-1 tvg-id="HQMKids.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/kids-hqm-logo.png" group-title="Music",HQM Kids (1080p)
+#EXTINF:-1 tvg-id="HQMKids.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/kids-hqm-logo.png" group-title="Music",HQM Kids (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/e4bc12dafe33c3ceb3e382e3acc0ec2c012cf7fd/master.m3u8
-#EXTINF:-1 tvg-id="HQMLatin.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/latin-hqm-logo.png" group-title="Music",HQM Latin (1080p)
+#EXTINF:-1 tvg-id="HQMLatin.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/latin-hqm-logo.png" group-title="Music",HQM Latin (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/9a4da7871ec57b4b63ed49597a13d09869172be0/master.m3u8
-#EXTINF:-1 tvg-id="HQMPop.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/rock-hqm-logo.png" group-title="Music",HQM Pop (1080p)
+#EXTINF:-1 tvg-id="HQMPop.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/rock-hqm-logo.png" group-title="Music",HQM Pop (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/eb2fa68a058a701fa5bd2c80f6c8a6075896f71d/master.m3u8
-#EXTINF:-1 tvg-id="HQMRelax.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/relax-hqm-logo.png" group-title="Music",HQM Relax (1080p)
+#EXTINF:-1 tvg-id="HQMRelax.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/relax-hqm-logo.png" group-title="Music",HQM Relax (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/dc1b71c6fda2e687050facaa7242062cbf5a7f2a/master.m3u8
-#EXTINF:-1 tvg-id="HQMRemember.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/remember-hqm-logo.png" group-title="Music",HQM Remember (1080p)
+#EXTINF:-1 tvg-id="HQMRemember.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/remember-hqm-logo.png" group-title="Music",HQM Remember (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/57c98e2e295a0b69b52dc5f84edc4b1b68783ba2/master.m3u8
-#EXTINF:-1 tvg-id="HQMRock.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/rock-hqm-logo.png" group-title="Music",HQM Rock (1080p)
+#EXTINF:-1 tvg-id="HQMRock.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/rock-hqm-logo.png" group-title="Music",HQM Rock (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/0d6c7ccfac89946bfd41ae34c527e8d94734065c/master.m3u8
-#EXTINF:-1 tvg-id="HQMSpanish.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/spanish-hqm-logo.png" group-title="Music",HQM Spanish (1080p)
+#EXTINF:-1 tvg-id="HQMSpanish.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://hqm.es/wp-content/uploads/spanish-hqm-logo.png" group-title="Music",HQM Spanish (1080p) [Timeout]
 https://livelist01.yowi.tv/lista/8635ae40f8d1a32eccd63d1f58b55662c9c98f9f/master.m3u8
 #EXTINF:-1 tvg-id="HuescaTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/hmYDqGV.png" group-title="",Huesca TV (240p) [Not 24/7]
 https://streaming2.radiohuesca.com/hls-live/livepkgr/_definst_/huescatv/huescatv.m3u8
@@ -293,25 +293,23 @@ https://hlsliveamdgl7-lh.akamaihd.net/i/hlsdvrlive_1@130182/master.m3u8
 https://hlsliveamdgl7-lh.akamaihd.net/i/hlslive_1@117262/master.m3u8
 #EXTINF:-1 tvg-id="La2.es" tvg-country="ES;AD" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/1168862725369413632/pogqv5Ob_400x400.png" group-title="Documentary",La 2 (720p)
 https://hlsliveamdgl0-lh.akamaihd.net/i/hlsdvrlive_1@60531/master.m3u8
-#EXTINF:-1 tvg-id="LA7.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/rtvcyl/picture?width=320&height=320" group-title="",LA7 (720p)
-https://cdnlive.shooowit.net/la7live/smil:channel1.smil/master.m3u8
 #EXTINF:-1 tvg-id="La8Avila.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Avila (720p)
 https://cdnlive.shooowit.net/la8avilalive/smil:streamswitchingchannel.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="La8Bierzo.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Bierzo (720p)
 https://cdnlive.shooowit.net/la8bierzolive/smil:streamswitchingchannel.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="La8Burgos.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Burgos (720p)
+#EXTINF:-1 tvg-id="La8Burgos.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Burgos (480p)
 https://cdnlive.shooowit.net/la8burgoslive/smil:streamswitchingchannel.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="La8Leon.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Leon (720p)
 https://cdnlive.shooowit.net/la8leonlive/smil:streamswitchingchannel.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="La8Mediterraneo.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Mediterráneo (1080p) [Not 24/7]
 https://play.cdn.enetres.net/489DDF7FE98241D19D8970314BC9D3EF021/0226/playlist.m3u8
-#EXTINF:-1 tvg-id="La8Palencia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Palencia (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="La8Palencia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Palencia (404p) [Not 24/7]
 https://cdnlive.shooowit.net/la8palencialive/smil:streamswitchingchannel.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="La8Salamanca.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Salamanca (720p)
 https://cdnlive.shooowit.net/la8salamancalive/smil:streamswitchingchannel.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="La8Segovia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Segovia (720p)
+#EXTINF:-1 tvg-id="La8Segovia.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Segovia (480p)
 https://cdnlive.shooowit.net/la8segovialive/smil:streamswitchingchannel.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="La8Soria.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Soria (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="La8Soria.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Soria (480p) [Not 24/7]
 https://cdnlive.shooowit.net/la8sorialive/smil:streamswitchingchannel.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="La8Valladolid.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",La 8 Valladolid (720p)
 https://cdnlive.shooowit.net/la8valladolidlive/smil:streamswitchingchannel.smil/playlist.m3u8
@@ -321,13 +319,15 @@ https://cdnlive.shooowit.net/la8zamoralive/smil:streamswitchingchannel.smil/play
 https://urbanrevolution.es:8443/live/TV/playlist.m3u8
 #EXTINF:-1 tvg-id="LaVoz24h.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/Vp26cr1.jpg" group-title="Entertainment",La Voz 24h (720p)
 https://pull12.atresmedia.com/lavoz/master.m3u8
+#EXTINF:-1 tvg-id="LA7.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/rtvcyl/picture?width=320&height=320" group-title="",LA7 (720p)
+https://cdnlive.shooowit.net/la7live/smil:channel1.smil/master.m3u8
 #EXTINF:-1 tvg-id="LancelotTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/GIldurl.jpg" group-title="",Lancelot TV (576p) [Not 24/7]
 https://cdn01.yowi.tv/I7V5TFE97R/master.m3u8
 #EXTINF:-1 tvg-id="LaOtra.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/laotra-mediano.png" group-title="",LaOtra (720p)
 https://telemadridhls2-live-hls.secure2.footprint.net/egress/chandler/telemadrid/laotra_1/index.m3u8
 #EXTINF:-1 tvg-id="LebrijaTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/oe66woA.png" group-title="",Lebrija TV (360p) [Not 24/7]
 http://212.104.160.156:1935/live/lebrijatv2/playlist3.m3u8
-#EXTINF:-1 tvg-id="LevanteTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/levantetv/picture?width=320&height=320" group-title="",Levante TV (320p) [Not 24/7]
+#EXTINF:-1 tvg-id="LevanteTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/levantetv/picture?width=320&height=320" group-title="",Levante TV (576p) [Not 24/7]
 https://play.cdn.enetres.net/C2F6CBB67E5B4D08A16CE5FE67ABCEC9023/029/playlist.m3u8
 #EXTINF:-1 tvg-id="LleidaTelevisio.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/6qZNM6E.png" group-title="",Lleida Televisio (720p) [Not 24/7]
 https://cdn01.yowi.tv/lleida/playlist.m3u8
@@ -343,9 +343,9 @@ https://stream.maestrat.tv/hls/stream.m3u8
 http://iptv.btpba1.es.network.do:8080/martv-web/video.m3u8
 #EXTINF:-1 tvg-id="MirameTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Mírame TV (360p) [Not 24/7]
 https://bit.controlstreams.com:5443/LiveApp/streams/mirametv.m3u8
-#EXTINF:-1 tvg-id="NavarraTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Navarra TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="NavarraTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Navarra TV (576p) [Not 24/7]
 https://pc-sumandocomunicacion-hls.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="NegociosTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Negocios TV (720p)
+#EXTINF:-1 tvg-id="NegociosTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Negocios TV (720p) [Offline]
 https://play.gooru.live/playnegocios/5646-1603313320000/master.m3u8
 #EXTINF:-1 tvg-id="NIUS.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/NiusDiario/picture?width=320&height=320" group-title="",NIUS (720p)
 https://mdslivehlsb-i.akamaihd.net/hls/live/875601/niusdiario/01.m3u8
@@ -363,7 +363,7 @@ https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://facebook.
 https://5940924978228.streamlock.net/8161/8161/master.m3u8
 #EXTINF:-1 tvg-id="OlympicsChannel.es" tvg-country="INT" tvg-language="English" tvg-logo="http://i.mjh.nz/.images/tv.7olympics.png" group-title="",Olympics Channel (1080p) [Geo-blocked]
 https://iptv-all.lanesh4d0w.repl.co/special/olympics
-#EXTINF:-1 tvg-id="OndaCadiz.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Onda Cádiz (480p)
+#EXTINF:-1 tvg-id="OndaCadiz.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Onda Cádiz (1080p)
 https://adc-hls.flumotion.com/playlist.m3u8
 #EXTINF:-1 tvg-id="OndaMadrid.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/ondamadridradio/picture?width=320&height=320" group-title="",Onda Madrid (360p) [Offline]
 http://ondamadridhls-live.hls.adaptive.level3.net/telemadrid/ondamadrid1/index.m3u8
@@ -375,7 +375,7 @@ https://cloud.streamingconnect.tv:455/mezquita/mezquita.m3u8
 https://canadaremar2.todostreaming.es/live/peque-pequetv.m3u8
 #EXTINF:-1 tvg-id="PlatziTV.es" tvg-country="HISPAM;ES" tvg-language="Spanish" tvg-logo="https://platform-static.cdn.mdstrm.com/player/logo/s-live-5b9076d18ef7b22560354649.png?184" group-title="Education",Platzi TV (1080p)
 https://mdstrm.com/live-stream-playlist/5b9076d18ef7b22560354649.m3u8
-#EXTINF:-1 tvg-id="PopularTVCantabria.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/hwlTrtF.png" group-title="",Popular TV Cantabria (512p) [Not 24/7]
+#EXTINF:-1 tvg-id="PopularTVCantabria.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/hwlTrtF.png" group-title="",Popular TV Cantabria (576p) [Not 24/7]
 https://limited12.todostreaming.es/live/ptvcantabria-livestream.m3u8
 #EXTINF:-1 tvg-id="PopularTVMelilla.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/hwlTrtF.png" group-title="Local",Popular TV Melilla (720p)
 http://5940924978228.streamlock.net:1935/8009/8009/playlist.m3u8
@@ -399,7 +399,7 @@ https://rmtvlive-lh.akamaihd.net/i/rmtv_1@154306/master.m3u8
 https://rt-esp-gd.secure2.footprint.net/1102.m3u8
 #EXTINF:-1 tvg-id="RTVVida.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",RTV Vida (1080p)
 https://vidartv2.todostreaming.es/live/radiovida-emisiontvhd.m3u8
-#EXTINF:-1 tvg-id="RTVC.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/0/09/Logo_del_Ente_P%C3%BAblico_Radio_Televisi%C3%B3n_Canaria.svg/1920px-Logo_del_Ente_P%C3%BAblico_Radio_Televisi%C3%B3n_Canaria.svg.png" group-title="General",RTVC (Radio Televisión Canaria) (576p)
+#EXTINF:-1 tvg-id="RTVC.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/0/09/Logo_del_Ente_P%C3%BAblico_Radio_Televisi%C3%B3n_Canaria.svg/1920px-Logo_del_Ente_P%C3%BAblico_Radio_Televisi%C3%B3n_Canaria.svg.png" group-title="General",RTVC (Radio Televisión Canaria) (720p)
 https://rtvc-live1-rm.flumotion.com/playlist.m3u8
 #EXTINF:-1 tvg-id="RTVE.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",RTVE (576p) [Geo-blocked]
 http://hlsliveamdgl8-lh.akamaihd.net/i/hlsdvrlive_1@583030/index_1500_av-b.m3u8
@@ -429,7 +429,7 @@ https://5940924978228.streamlock.net/Directo1_1/smil:Directo1_1.smil/playlist.m3
 https://rtvelivestreamv3.akamaized.net/rtvesec/tdp_bkp_dvr.m3u8
 #EXTINF:-1 tvg-id="Tdp.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/36/Tve_teledeporte.png/800px-Tve_teledeporte.png" group-title="",Teledeporte (1080p) [Geo-blocked]
 https://rtvelivestreamv3.akamaized.net/tdp/tdp_main_dvr.m3u8
-#EXTINF:-1 tvg-id="TeleGilena.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",TeleGilena (324p) [Not 24/7]
+#EXTINF:-1 tvg-id="TeleGilena.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",TeleGilena (360p) [Not 24/7]
 https://5940924978228.streamlock.net/Directo1/Directo1/master.m3u8
 #EXTINF:-1 tvg-id="Telemadrid.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/telemadrid-mediano.png" group-title="",Telemadrid (720p)
 https://telemadridhls2-live-hls.secure2.footprint.net/egress/chandler/telemadrid/telemadrid_1/index.m3u8
@@ -439,9 +439,9 @@ http://37.187.7.106/teleribera/live.m3u8
 https://cloud.streamingconnect.tv:455/teletoledo/teletoledo.m3u8
 #EXTINF:-1 tvg-id="TeleVigo.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",TeleVigo (720p) [Not 24/7]
 https://cloud.streamingconnect.tv:455/televigo/televigo.m3u8
-#EXTINF:-1 tvg-id="TelevisionAranda.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FwIIdKG.png" group-title="Local",Televisión Aranda (720p)
+#EXTINF:-1 tvg-id="TelevisionAranda.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FwIIdKG.png" group-title="Local",Televisión Aranda (720p) [Offline]
 https://cdn01.yowi.tv/BBBBBBBBBB/master.m3u8
-#EXTINF:-1 tvg-id="TENTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="http://tentv.es/wp-content/uploads/2016/05/ten.png" group-title="",TEN TV (720p)
+#EXTINF:-1 tvg-id="TENTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="http://tentv.es/wp-content/uploads/2016/05/ten.png" group-title="",TEN TV (720p) [Timeout]
 http://91.126.141.201:1935/live/smil:ten.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="tevecat.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",teve.cat (1080p)
 https://limited35.todostreaming.es/live/mitjans-livestream.m3u8
@@ -453,16 +453,6 @@ http://212.104.160.156:1935/live/trebujenatv2/master.m3u8
 https://live-edge-bhs-1.cdn.enetres.net/091DB7AFBD77442B9BA2F141DCC182F5021/playlist.m3u8
 #EXTINF:-1 tvg-id="TuyaLaJandaTelevision.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/8lajanda/picture?width=320&height=320" group-title="",Tuya La Janda Televisión (1080p)
 http://185.210.20.13:8080/0.m3u8
-#EXTINF:-1 tvg-id="TV3CAT.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/tv3/picture?width=320&height=320" group-title="",TV3CAT (1080p)
-https://directes-tv-int.ccma.cat/int/ngrp:tv3_web/playlist_DVR.m3u8
-#EXTINF:-1 tvg-id="TV3CAT.es" tvg-country="ES" tvg-language="Catalan" tvg-logo="https://i.imgur.com/QCKNWMJ.jpg" group-title="",TV3CAT (1080p)
-https://directes-tv-int.ccma.cat/int/ngrp:tvi_web/playlist_DVR.m3u8
-#EXTINF:-1 tvg-id="TV3Catalunya.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/QCKNWMJ.jpg" group-title="",TV3 Catalunya (1080p)
-https://directes-tv-int.ccma.cat/int/ngrp:tv3_web/playlist.m3u8
-#EXTINF:-1 tvg-id="TV5Limares.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/1192795318749945858/o-jIBTK-_400x400.jpg" group-title="",TV5 Limares (720p) [Not 24/7]
-https://unlimited1-us.dps.live/tv5/tv5.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TV5Limares.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/1192795318749945858/o-jIBTK-_400x400.jpg" group-title="",TV5 Limares (720p) [Not 24/7]
-https://unlimited6-cl.dps.live/tv5/tv5.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVArtequatre.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",TV Artequatre (576p) [Not 24/7]
 https://streaming01.gestec-video.com/hls/artequatreTVA.m3u8
 #EXTINF:-1 tvg-id="TVCanaria.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/television_canaria-mediano.png" group-title="",TV Canaria (576p) [Offline]
@@ -473,10 +463,16 @@ https://cdn01.yowi.tv/43J82FST7L/master.m3u8
 http://ventdelnord.tv:8080/girona/directe.m3u8
 #EXTINF:-1 tvg-id="TVVegaBaja.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",TV Vega Baja (576p)
 http://185.29.68.24/tvb.m3u8
-#EXTINF:-1 tvg-id="tvG2.es" tvg-country="ES" tvg-language="Galician" tvg-logo="https://i.imgur.com/YAnSTc6.jpg" group-title="Local",tvG2 (720p) [Not 24/7]
-https://events2-crtvg.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="tvG2.es" tvg-country="ES" tvg-language="Galician" tvg-logo="https://i.imgur.com/YAnSTc6.jpg" group-title="Local",tvG2 (720p) [Not 24/7]
-https://events3-crtvg.flumotion.com/playlist.m3u8
+#EXTINF:-1 tvg-id="TV3Catalunya.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/QCKNWMJ.jpg" group-title="",TV3 Catalunya (1080p)
+https://directes-tv-int.ccma.cat/int/ngrp:tv3_web/playlist.m3u8
+#EXTINF:-1 tvg-id="TV3CAT.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/tv3/picture?width=320&height=320" group-title="",TV3CAT (1080p)
+https://directes-tv-int.ccma.cat/int/ngrp:tv3_web/playlist_DVR.m3u8
+#EXTINF:-1 tvg-id="TV3CAT.es" tvg-country="ES" tvg-language="Catalan" tvg-logo="https://i.imgur.com/QCKNWMJ.jpg" group-title="",TV3CAT (1080p)
+https://directes-tv-int.ccma.cat/int/ngrp:tvi_web/playlist_DVR.m3u8
+#EXTINF:-1 tvg-id="TV5Limares.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/1192795318749945858/o-jIBTK-_400x400.jpg" group-title="",TV5 Limares (720p) [Not 24/7]
+https://unlimited1-us.dps.live/tv5/tv5.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="TV5Limares.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/1192795318749945858/o-jIBTK-_400x400.jpg" group-title="",TV5 Limares (720p) [Not 24/7]
+https://unlimited6-cl.dps.live/tv5/tv5.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVGAmerica.es" tvg-country="HISPAM;ES" tvg-language="Galician" tvg-logo="https://i.imgur.com/1Z6svKc.jpg" group-title="General",TVG América (720p)
 https://america-crtvg.flumotion.com/playlist.m3u8
 #EXTINF:-1 tvg-id="TVGCultural.es" tvg-country="ES" tvg-language="Galician" tvg-logo="https://i.imgur.com/KgbNv4G.png" group-title="Local",TVG Cultural (720p)
@@ -493,6 +489,10 @@ https://infantil-crtvg.flumotion.com/playlist.m3u8
 https://momentog-crtvg.flumotion.com/playlist.m3u8
 #EXTINF:-1 tvg-id="TVGMusigal.es" tvg-country="ES" tvg-language="Galician" tvg-logo="https://i.imgur.com/KgbNv4G.png" group-title="Local",TVG Musigal (360p)
 https://musigal-crtvg.flumotion.com/playlist.m3u8
+#EXTINF:-1 tvg-id="tvG2.es" tvg-country="ES" tvg-language="Galician" tvg-logo="https://i.imgur.com/YAnSTc6.jpg" group-title="Local",tvG2 (720p) [Not 24/7]
+https://events2-crtvg.flumotion.com/playlist.m3u8
+#EXTINF:-1 tvg-id="tvG2.es" tvg-country="ES" tvg-language="Galician" tvg-logo="https://i.imgur.com/YAnSTc6.jpg" group-title="Local",tvG2 (720p) [Not 24/7]
+https://events3-crtvg.flumotion.com/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMCordoba.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/TVM.Cordoba/picture?width=320&height=320" group-title="",TVM Córdoba (414p) [Not 24/7]
 http://teledifusion.tv/cordoba/cordobalive/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMCordoba.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/TVM.Cordoba/picture?width=320&height=320" group-title="",TVM Córdoba (414p) [Not 24/7]
@@ -501,13 +501,13 @@ https://5924d3ad0efcf.streamlock.net/cordoba/cordobalive/playlist.m3u8
 https://cdn041.fractalmedia.es/stream/live/udtv/index.m3u8
 #EXTINF:-1 tvg-id="UneVinalopo.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/UneVinalopo/picture?width=320&height=320" group-title="",Une Vinalopó (576p) [Not 24/7]
 http://78.41.83.88:8880/hls/unesd.m3u8
-#EXTINF:-1 tvg-id="VentdelnordTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Ventdelnord TV (404p)
+#EXTINF:-1 tvg-id="VentdelnordTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Ventdelnord TV (720p)
 http://ventdelnord.tv:8080/hls/directe.m3u8
-#EXTINF:-1 tvg-id="Vision6TV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/TB1wMQ7.jpg" group-title="",Visión 6 TV (720p)
+#EXTINF:-1 tvg-id="Vision6TV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/TB1wMQ7.jpg" group-title="",Visión 6 TV (720p) [Not 24/7]
 https://secure3.todostreaming.es/live/visionseis-livestream.m3u8
 #EXTINF:-1 tvg-id="XtraTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/w1Lc150.jpg" group-title="Music",Xtra TV (720p) [Offline]
 https://mccdn-hls-a01-rbx.datah0stn3t.com/live/xtra/index.m3u8
 #EXTINF:-1 tvg-id="XtraTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/w1Lc150.jpg" group-title="Music",Xtra TV (720p) [Offline]
 https://mccdn-hls-a01-rbx.datah0stn3t.com/live/xtra/playlist.m3u8
-#EXTINF:-1 tvg-id="ZafraTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Zafra TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ZafraTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="",Zafra TV (720p) [Not 24/7]
 https://cloud.streamingconnect.tv:455/radiotvzafra/radiotvzafra.m3u8
diff --git a/channels/es_samsung.m3u b/channels/es_samsung.m3u
index 7a358e9f4a..ec6c9580eb 100644
--- a/channels/es_samsung.m3u
+++ b/channels/es_samsung.m3u
@@ -29,7 +29,7 @@ https://rakuten-family-2-es.samsung.wurl.com/manifest/playlist.m3u8
 https://fashiontv-fashiontv-2-es.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="FuelTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/XboGSjX.png" group-title="Sports",Fuel TV (1080p)
 https://fueltv-fueltv-7-es.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="LoveNatureEspanol.us" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/LXpqmgn.jpg" group-title="Outdoor",Love Nature Español [Geo-blocked]
+#EXTINF:-1 tvg-id="LoveNatureEspanol.us" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/LXpqmgn.jpg" group-title="Outdoor",Love Nature Español (1080p) [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00090-blueantmedia-lnrcastilian-samsungspain/playlist.m3u8
 #EXTINF:-1 tvg-id="MMATV.fr" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/MYoNHMg.png" group-title="",MMA TV (720p) [Offline]
 https://alchimie-mmatv-3-es.samsung.wurl.com/manifest/playlist.m3u8
@@ -51,7 +51,7 @@ https://rakuten-spotlight-2-es.samsung.wurl.com/manifest/playlist.m3u8
 https://kedoo-supertoonstv-2-es.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ThePetCollectiveSpain.us" tvg-country="ES" tvg-language="English" tvg-logo="https://i.imgur.com/Mk28uUy.png" group-title="Family",The Pet Collective Spain (720p) [Offline]
 https://the-pet-collective-international-es.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="TraceSportStars.fr" tvg-country="ES" tvg-language="English;Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/co_trace-sports-stars_m.png" group-title="Sports",Trace Sport Stars [Geo-blocked]
+#EXTINF:-1 tvg-id="TraceSportStars.fr" tvg-country="ES" tvg-language="English;Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/co_trace-sports-stars_m.png" group-title="Sports",Trace Sport Stars (1080p) [Geo-blocked]
 http://tracesportstars-samsunges.amagi.tv/hls/amagi_hls_data_samsunguk-tracesport-samsungspain/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="TVShows.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/oMXfdkV.png" group-title="",TV Shows (720p) [Offline]
 https://rakuten-tvshows-2-es.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/fj.m3u b/channels/fj.m3u
index b69b6c3e95..8a97ca6b65 100644
--- a/channels/fj.m3u
+++ b/channels/fj.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="FijiTV.fj" tvg-country="FJ" tvg-language="English" tvg-logo="https://i.imgur.com/z4AuQtX.png" group-title="",Fiji TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="FijiTV.fj" tvg-country="FJ" tvg-language="English" tvg-logo="https://i.imgur.com/z4AuQtX.png" group-title="",Fiji TV (720p) [Not 24/7]
 https://api.new.livestream.com/accounts/19514369/events/6947821/live.m3u8
 #EXTINF:-1 tvg-id="FijiTV.fj" tvg-country="FJ" tvg-language="English" tvg-logo="https://i.imgur.com/z4AuQtX.png" group-title="",Fiji TV (480p) [Not 24/7]
 https://api.new.livestream.com/accounts/19514369/events/fijitvstream/live.m3u8
diff --git a/channels/fo.m3u b/channels/fo.m3u
index 0568236262..6bab26b229 100644
--- a/channels/fo.m3u
+++ b/channels/fo.m3u
@@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="KVFSjonvarp.fo" tvg-country="FO" tvg-language="Faroese" tvg-logo="https://i.imgur.com/Nb93Skv.jpg" group-title="",KVF (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="KVFSjonvarp.fo" tvg-country="FO" tvg-language="Faroese" tvg-logo="https://i.imgur.com/Nb93Skv.jpg" group-title="",KVF (720p) [Not 24/7]
 https://w1.kringvarp.fo/uttanlands/smil:uttanlands.smil/playlist.m3u8
diff --git a/channels/fr.m3u b/channels/fr.m3u
index 7fd29e0d95..e8f1aba615 100644
--- a/channels/fr.m3u
+++ b/channels/fr.m3u
@@ -5,7 +5,7 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
 https://edge10.vedge.infomaniak.com/livecast/ik:adhtv/chunklist.m3u8
 #EXTINF:-1 tvg-id="Alsace20.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/S8TuhyF.png" group-title="Local",Alsace 20 (720p)
 http://live.alsace20.fr/live/alsace20/ngrp:alsace20_all/playlist.m3u8
-#EXTINF:-1 tvg-id="AntenneReunion.fr" tvg-country="FR;MU" tvg-language="French" tvg-logo="https://i.imgur.com/EPIMMaB.png" group-title="Local",Antenne Réunion (360p)
+#EXTINF:-1 tvg-id="AntenneReunion.fr" tvg-country="FR;MU" tvg-language="French" tvg-logo="https://i.imgur.com/EPIMMaB.png" group-title="Local",Antenne Réunion (360p) [Timeout]
 http://41.213.128.196/ANT-REUNION2-HLS/ANT-REUNION2-HLS.m3u8?localization=ZEOP01
 #EXTINF:-1 tvg-id="arte.fr" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="Entertainment",Arte (302p) [Geo-blocked]
 http://stream.tvtap.net:8081/live/fr-arte.stream/playlist.m3u8
@@ -23,7 +23,7 @@ https://live.creacast.com/grandlilletv/smil:grandlilletv.smil/playlist.m3u8
 https://live.creacast.com/grandlittoral/smil:grandlittoral.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="BFMLyon.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.ibb.co/8Y3FB3B/LYON.png" group-title="Local",BFM Lyon (720p)
 https://bfmlyon-lh.akamaihd.net/i/BFMLYON_ESYTLS@797041/index_1100_av-p.m3u8?rebase=on&sd=10
-#EXTINF:-1 tvg-id="BFMLyon.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.ibb.co/8Y3FB3B/LYON.png" group-title="Local",BFM Lyon (720p)
+#EXTINF:-1 tvg-id="BFMLyon.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.ibb.co/8Y3FB3B/LYON.png" group-title="Local",BFM Lyon (480p)
 https://bfmlyon-lh.akamaihd.net/i/BFMLYON_ESYTLS@797041/master.m3u8
 #EXTINF:-1 tvg-id="BFMParis.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/4buTOS3.png" group-title="Local",BFM Paris (480p)
 https://bfmparishdslive-lh.akamaihd.net/i/BFMPARIS_ESYTLS@429747/index_1100_av-p.m3u8?rebase=on&sd=10
@@ -39,7 +39,7 @@ http://biptv.tv/live/biptvstream_orig/index.m3u8
 https://a.jsrdn.com/broadcast/baac3e801e/+0000/c.m3u8
 #EXTINF:-1 tvg-id="CentralTV.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://pbs.twimg.com/profile_images/875664704764608512/L-8xnjNf_400x400.jpg" group-title="",Central TV (720p) [Not 24/7]
 http://cdn2.ujjina.com:1935/iptvcentraltv/livecentraltvtv/playlist.m3u8
-#EXTINF:-1 tvg-id="Cherie25.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/pg8hnPT.png" group-title="Entertainment",Chérie 25 (360p) [Offline]
+#EXTINF:-1 tvg-id="Cherie25.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/pg8hnPT.png" group-title="Entertainment",Chérie 25 (360p) [Timeout]
 https://s6.tntendirect.com/cherie25/live/playlist.m3u8
 #EXTINF:-1 tvg-id="Cnews.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.postimg.cc/vT6GMpCV/cnews.png" group-title="News",Cnews (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x3b68jn
@@ -78,14 +78,14 @@ https://fash2043.cloudycdn.services/slive/ftv_ftv_gmt_-5_qko_43090_default_1225_
 http://fash1043.cloudycdn.services/slive/ftv_paris_adaptive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="FashionTVParisMumbai.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/yvNu4Rm.png" group-title="Lifestyle",Fashion TV Paris-Mumbai (1080p) [Not 24/7]
 https://fash1043.cloudycdn.services/slive/ftv_ftv_asia_gmt_vmf_43163_default_1298_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="FashionTVPG13.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/n6owIqv.png" group-title="Lifestyle",Fashion TV PG13 (1080p)
+#EXTINF:-1 tvg-id="FashionTVPG13.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/n6owIqv.png" group-title="Lifestyle",Fashion TV PG13 (240p)
 https://fash1043.cloudycdn.services/slive/ftv_pg13_adaptive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="FashionTVPG16.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="Lifestyle",Fashion TV PG16 (1080p)
 http://fash1043.cloudycdn.services/slive/ftv_pg16_adaptive.smil/media.m3u8
-#EXTINF:-1 tvg-id="FashionTVRussia.fr" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/fcnRf1f.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148" group-title="Lifestyle",Fashion TV Russia (480p)
+#EXTINF:-1 tvg-id="FashionTVRussia.fr" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/fcnRf1f.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148" group-title="Lifestyle",Fashion TV Russia (480p) [Timeout]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s30/index.m3u8
-#EXTINF:-1 tvg-id="FashionTVSingapore.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/auHH1Ig.png" group-title="Lifestyle",Fashion TV Singapore (1080p)
+#EXTINF:-1 tvg-id="FashionTVSingapore.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/auHH1Ig.png" group-title="Lifestyle",Fashion TV Singapore (240p)
 https://fash2043.cloudycdn.services/slive/ftv_ftv_asia_ada_xiv_42149_default_137_hls.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="FashionTVTokyo.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/auHH1Ig.png" group-title="Lifestyle",Fashion TV Tokyo (PG13) (1080p)
 https://fash1043.cloudycdn.services/slive/ftv_ftv_pg13_zw9_27065_ftv_pg13_196_hls.smil/playlist.m3u8
@@ -95,13 +95,13 @@ https://fash1043.cloudycdn.services/slive/ftv_ftv_pg13_zw9_27065_ftv_pg13_sam_19
 https://fash2043.cloudycdn.services/slive/ftv_ftv_4k_hevc_73d_42080_default_466_hls.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="FashionTVCzechSlovak.fr" tvg-country="CZ" tvg-language="English" tvg-logo="http://www.tvfashion.eu/wp-content/themes/Divi-child/images/logo-tvfashion-piatok.png" group-title="Lifestyle",FashionTV Czech&Slovak (450p)
 http://lb.streaming.sk/fashiontv/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="FashionTVMumbai.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/yvNu4Rm.png" group-title="Lifestyle",FashionTV Mumbai (720p)
+#EXTINF:-1 tvg-id="FashionTVMumbai.fr" tvg-country="FR" tvg-language="English" tvg-logo="https://i.imgur.com/yvNu4Rm.png" group-title="Lifestyle",FashionTV Mumbai (1080p)
 https://fash2043.cloudycdn.services/slive/ftv_ftv_pg13_gmt_ess_43126_default_1262_hls.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="France2.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.postimg.cc/SKxgxTLz/fr2.png" group-title="General",France 2 (720p) [Not 24/7]
 http://edge9.iptvnetwork.net/live/france2/playlist.m3u8
 #EXTINF:-1 tvg-id="France3.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.postimg.cc/JzmT94Gx/fr3.png" group-title="General",France 3 (720p) [Not 24/7]
 http://edge9.iptvnetwork.net/live/france3/playlist.m3u8
-#EXTINF:-1 tvg-id="France4.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.postimg.cc/4x58Zkcg/fr4.png" group-title="Kids",France 4 (720p) [Offline]
+#EXTINF:-1 tvg-id="France4.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.postimg.cc/4x58Zkcg/fr4.png" group-title="Kids",France 4 (720p) [Geo-blocked]
 http://edge9.iptvnetwork.net/live/france4/playlist.m3u8
 #EXTINF:-1 tvg-id="France5.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.postimg.cc/8zjFkLJz/fr5.png" group-title="General",France 5 (720p) [Not 24/7]
 http://edge9.iptvnetwork.net/live/france5/playlist.m3u8
@@ -147,7 +147,7 @@ https://dcunilive47-lh.akamaihd.net/i/dclive_1@739146/master.m3u8
 https://str81.creacast.com/iltv/high/playlist.m3u8
 #EXTINF:-1 tvg-id="KTO.fr" tvg-country="FR;UK;PT;ES;DK;NL;BE;CH" tvg-language="French" tvg-logo="https://i.imgur.com/LvbXFUy.jpg" group-title="",KTO (404p)
 https://livehdkto-lh.akamaihd.net/i/LiveStream_1@178944/master.m3u8
-#EXTINF:-1 tvg-id="LEQUIPE.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/zKWbV0W.png" group-title="",L'EQUIPE (360p) [Offline]
+#EXTINF:-1 tvg-id="LEQUIPE.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/zKWbV0W.png" group-title="",L'EQUIPE (360p) [Timeout]
 https://s6.tntendirect.com/lequipe21/live/playlist.m3u8
 #EXTINF:-1 tvg-id="LaChaineNormande.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/xDLwsbY.png" group-title="Family",La Chaîne normande (LCN) (576p) [Not 24/7]
 http://live.lachainenormande.fr/live/lcn/livestream/playlist.m3u8
@@ -159,7 +159,7 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/vid
 http://flusonic-4.platinum-tv.com/M6/mono.m3u8?token=test
 #EXTINF:-1 tvg-id="M6International.fr" tvg-country="FR;AD;BE;LU;MC;CH" tvg-language="French" tvg-logo="https://static.epg.best/fr/M6.fr.png" group-title="Entertainment",M6 International (1080p)
 https://shls-m6-int-prod-dub.shahid.net/out/v1/587631773e55495a8aa3dd4050318f6e/index.m3u8
-#EXTINF:-1 tvg-id="MCMTop.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://www.zap.co.ao/media/cache/movie_thumb/uploads/ao/channels/5d260d3fab701.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148" group-title="Music",MCM Top (480p)
+#EXTINF:-1 tvg-id="MCMTop.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://www.zap.co.ao/media/cache/movie_thumb/uploads/ao/channels/5d260d3fab701.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148" group-title="Music",MCM Top (480p) [Timeout]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s49/index.m3u8
 #EXTINF:-1 tvg-id="MDL.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/QjjVd1M.jpg" group-title="",MDL (720p)
@@ -169,9 +169,9 @@ http://tv.mondeduloisir.fr:1935/tixtv/smil:web.smil/playlist.m3u8
 http://ott-cdn.ucom.am/s35/index.m3u8
 #EXTINF:-1 tvg-id="NancyWebTV.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/W43rv1R.jpg" group-title="Local",Nancy Web TV (394p) [Offline]
 https://edge4.vedge.infomaniak.com/livecast/ik:nancy-webtv/manifest.m3u8
-#EXTINF:-1 tvg-id="NRJ12.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/FO8XMBS.png" group-title="Entertainment",NRJ12 (720p) [Offline]
+#EXTINF:-1 tvg-id="NRJ12.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/FO8XMBS.png" group-title="Entertainment",NRJ12 (720p) [Timeout]
 https://s6.tntendirect.com/nrj12/live/playlist.m3u8
-#EXTINF:-1 tvg-id="P2MTV.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/xc8EFmb.png" group-title="",P2M TV (360p)
+#EXTINF:-1 tvg-id="P2MTV.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/xc8EFmb.png" group-title="",P2M TV (720p)
 https://panel.streamparis.fr:3743/stream/play.m3u8
 #EXTINF:-1 tvg-id="PersianaBillboard.fr" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Music",Persiana Billboard (720p) [Not 24/7]
 http://51.210.199.10/hls/stream.m3u8
@@ -203,13 +203,13 @@ http://51.210.199.20/hls/stream.m3u8
 http://51.210.199.21/hls/stream.m3u8
 #EXTINF:-1 tvg-id="PersianaSonati.fr" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Music",Persiana Sonati (576p) [Not 24/7]
 http://51.210.199.59/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaVarzesh.fr" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Sports",Persiana Varzesh (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="PersianaVarzesh.fr" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Sports",Persiana Varzesh (720p) [Not 24/7]
 http://51.210.199.16/hls/stream.m3u8
 #EXTINF:-1 tvg-id="PokerTV.fr" tvg-country="IR" tvg-language="English" tvg-logo="https://i.imgur.com/l5fZQ3V.png" group-title="Sports",Poker TV (720p) [Not 24/7]
 http://51.210.199.17/hls/stream.m3u8
 #EXTINF:-1 tvg-id="PublicSenat.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.postimg.cc/rpqnBjbS/public-senat.png" group-title="Legislative",Public Sénat (480p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/xkxbzc
-#EXTINF:-1 tvg-id="RMCDecouverte.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/2pZBr1Y.jpg" group-title="Documentary",RMC Découverte (720p) [Offline]
+#EXTINF:-1 tvg-id="RMCDecouverte.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/2pZBr1Y.jpg" group-title="Documentary",RMC Découverte (720p) [Timeout]
 https://s6.tntendirect.com/rmcdecouverte/live/playlist.m3u8
 #EXTINF:-1 tvg-id="TebeSud.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/WCjP4Wk.jpg" group-title="Local",TébéSud (1080p) [Not 24/7]
 https://edge-live-ger1.ovstream.com/hls/10/source.m3u8
@@ -221,9 +221,9 @@ http://edge9.iptvnetwork.net/live/TF1/playlist.m3u8
 http://stream.tvtap.net:8081/live/fr-tf1.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TF1.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/CJAbJfM.png" group-title="Entertainment",TF1 (720p) [Offline]
 http://stream.suboroiptv.tv/TF1/playlist.m3u8
-#EXTINF:-1 tvg-id="TF1SeriesFilms.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/36wPVaq.jpg" group-title="Series",TF1 Séries Films (360p) [Offline]
+#EXTINF:-1 tvg-id="TF1SeriesFilms.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/36wPVaq.jpg" group-title="Series",TF1 Séries Films (360p) [Timeout]
 https://s6.tntendirect.com/hd1/live/playlist.m3u8
-#EXTINF:-1 tvg-id="TFX.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/psdzDpy.jpg" group-title="Entertainment",TFX (720p) [Offline]
+#EXTINF:-1 tvg-id="TFX.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/psdzDpy.jpg" group-title="Entertainment",TFX (720p) [Timeout]
 https://s6.tntendirect.com/nt1/live/playlist.m3u8
 #EXTINF:-1 tvg-id="Tiji.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://www.zap.co.ao/media/cache/movie_thumb/uploads/ao/channels/587a64ca96e87.png" group-title="Kids",Tiji (1080p) [Offline]
 https://shls-tiji-tv-prod-dub.shahid.net/out/v1/ee05878a88474f408ff04495d44cc249/index.m3u8
@@ -231,7 +231,7 @@ https://shls-tiji-tv-prod-dub.shahid.net/out/v1/ee05878a88474f408ff04495d44cc249
 http://188.40.68.167/russia/tiji/playlist.m3u8
 #EXTINF:-1 tvg-id="TMACaraibes.fr" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="",TMA Caraïbes (1080p) [Not 24/7]
 http://hls.tmacaraibes.com/live/index.m3u8
-#EXTINF:-1 tvg-id="TMC.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/Neh3Yhm.jpg" group-title="",TMC (720p) [Offline]
+#EXTINF:-1 tvg-id="TMC.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/Neh3Yhm.jpg" group-title="",TMC (720p) [Timeout]
 https://s6.tntendirect.com/tmc/live/playlist.m3u8
 #EXTINF:-1 tvg-id="TV5MondeEurope.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/mwHtXya.jpg" group-title="General",TV5 Monde Europe (1080p)
 http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877-b/v3plusinfo247hls/master.m3u8
@@ -240,7 +240,7 @@ http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877/v3plusinfo247hls/master.m
 #EXTINF:-1 tvg-id="TV5MondeFranciaFR.fr" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="General",TV5Monde Francia FR (1080p)
 https://tv5infohls-i.akamaihd.net/hls/live/631613/tv5infohls/index.m3u8
 #EXTINF:-1 tvg-id="TV5MondeInfo.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/AJx5Fy2.png" group-title="General",TV5Monde Info (1080p)
-https://v3plusinfo247hls-i.akamaihd.net/hls/live/218877/v3plusinfo247hls/index.m3u8
+http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877/v3plusinfo247hls/master.m3u8
 #EXTINF:-1 tvg-id="TV7Bordeaux.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.postimg.cc/NMrYcP8v/tv7-bordeaux.png" group-title="Local",TV7 Bordeaux (720p) [Offline]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/watch?v=vGrlJbbfsE4
 #EXTINF:-1 tvg-id="TV7Colmar.fr" tvg-country="FR" tvg-language="French" tvg-logo="http://i0.wp.com/quizho.com/wp-content/uploads/2019/08/t%C3%A9l%C3%A9chargement-42.jpg" group-title="Local",TV7 Colmar (576p)
diff --git a/channels/ge.m3u b/channels/ge.m3u
index 2ee713a2ac..fca8f0391b 100644
--- a/channels/ge.m3u
+++ b/channels/ge.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="1TV.ge" tvg-country="GE" tvg-language="Georgian" tvg-logo="https://i.imgur.com/mX080in.png" group-title="",1TV (240p)
+#EXTINF:-1 tvg-id="1TV.ge" tvg-country="GE" tvg-language="Georgian" tvg-logo="https://i.imgur.com/mX080in.png" group-title="",1TV (240p) [Geo-blocked]
 https://tv.cdn.xsg.ge/gpb-1tv/index.m3u8
 #EXTINF:-1 tvg-id="2TV.ge" tvg-country="GE" tvg-language="Georgian" tvg-logo="https://i.imgur.com/VBmQCH7.png" group-title="",2TV (720p) [Not 24/7]
 https://tv.cdn.xsg.ge/gpb-2tv/index.m3u8
diff --git a/channels/gm.m3u b/channels/gm.m3u
index 7f5505d1ef..7f8177c57e 100644
--- a/channels/gm.m3u
+++ b/channels/gm.m3u
@@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="QTV.gm" tvg-country="GM" tvg-language="English;Mandinka;Fula;Wolof" tvg-logo="https://i.imgur.com/K5tzOq2.png" group-title="",QTV Gambia (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="QTV.gm" tvg-country="GM" tvg-language="English;Mandinka;Wolof" tvg-logo="https://i.imgur.com/K5tzOq2.png" group-title="",QTV Gambia (720p) [Not 24/7]
 https://player.qtv.gm/hls/live.stream.m3u8
diff --git a/channels/gr.m3u b/channels/gr.m3u
index fa929fff71..88506e718b 100644
--- a/channels/gr.m3u
+++ b/channels/gr.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="4E.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014332&amp;t=1544180299920" group-title="",4E (576p)
+#EXTINF:-1 tvg-id="4E.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014332&amp;t=1544180299920" group-title="",4E (720p)
 http://eu2.tv4e.gr:554/live/smil:myStream.sdp.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="34100TV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/Fo1I0dt.jpg" group-title="",34100 TV (720p) [Geo-blocked]
 https://s1.cystream.net/live/34100/playlist.m3u8
@@ -15,11 +15,11 @@ https://www.hellasnet.tv/rest.live.hn/ws.alf/playlist.m3u8
 https://vdo.alphaserver.gr:3989/stream/play.m3u8
 #EXTINF:-1 tvg-id="Alpha.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Alpha (720p) [Offline]
 https://alphalive-i.akamaihd.net/hls/live/682300/live/master.m3u8
-#EXTINF:-1 tvg-id="AlphaBUP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Alpha BUP [Offline]
+#EXTINF:-1 tvg-id="AlphaBUP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Alpha BUP [Timeout]
 http://78.83.87.222:9999/play/a011/index.m3u8
 #EXTINF:-1 tvg-id="ANT1.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://www.worldtvpc.com/onlinevideosites/img/ant1.jpg" group-title="",ANT1 (1080p) [Geo-blocked]
 https://antennaamdnoenc.akamaized.net/ant1_akamai/abr/playlist.m3u8
-#EXTINF:-1 tvg-id="APT.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",APT (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="APT.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",APT (360p) [Not 24/7]
 http://tv3.streampulse.eu:1935/tilesport/movie2/playlist.m3u8
 #EXTINF:-1 tvg-id="ARTTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/ZgKZ5u9.jpg" group-title="",ART TV (720p) [Not 24/7]
 http://176.9.123.140:1935/arttv/arttv/playlist.m3u8
@@ -37,7 +37,7 @@ https://panik.cast-control.eu:1936/Admin_1/Admin_1/playlist.m3u8
 https://live.streams.ovh/netmedia/netmedia/playlist.m3u8
 #EXTINF:-1 tvg-id="BestTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Best TV (720p) [Not 24/7]
 https://stream.net7.gr/hls/best/index.m3u8
-#EXTINF:-1 tvg-id="CameraSmile.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/W5oLUMk.jpg" group-title="",Camera Smile (480p)
+#EXTINF:-1 tvg-id="CameraSmile.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/W5oLUMk.jpg" group-title="",Camera Smile (480p) [Timeout]
 https://nrpus.bozztv.com/36bay2/gusa-camerasmile/index.m3u8
 #EXTINF:-1 tvg-id="CanaliTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/bGIdE9N.png" group-title="",Canali TV (720p) [Geo-blocked]
 http://live.streams.ovh:1935/cannali/cannali/playlist.m3u8
@@ -45,7 +45,7 @@ http://live.streams.ovh:1935/cannali/cannali/playlist.m3u8
 http://176.9.123.140:1935/channel9/channel9/playlist.m3u8
 #EXTINF:-1 tvg-id="Channel9.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/24uaLwh.png" group-title="Local",Channel 9 (720p)
 https://e-e.cyou:8222/channel9/channel9/playlist.m3u8
-#EXTINF:-1 tvg-id="Choice.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/6Yr0Axp.png" group-title="",Choice (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Choice.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/6Yr0Axp.png" group-title="",Choice (846p) [Not 24/7]
 https://vod.streams.ovh:3528/stream/play.m3u8
 #EXTINF:-1 tvg-id="CorfuTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/G7LHkTE.jpg" group-title="",Corfu TV (576p) [Not 24/7]
 https://itv.streams.ovh/corfuchannel/corfuchannel/playlist.m3u8
@@ -59,7 +59,7 @@ https://www.hellasnet.tv/rest.live.hn/diktyo1r/playlist.m3u8
 https://live.cast-control.eu/ekpdipso/ekpdipso/playlist.m3u8
 #EXTINF:-1 tvg-id="EllasTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/rovfMvn.jpg" group-title="",Ellas TV (1080p)
 http://ellastv.gotdns.com:88/freetv/promo/index.m3u8
-#EXTINF:-1 tvg-id="EnaChannel.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014308&amp;t=1544180286744" group-title="Local",Ena Channel (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="EnaChannel.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014308&amp;t=1544180286744" group-title="Local",Ena Channel (576p) [Not 24/7]
 http://176.9.123.140:1935/1c/stream/master.m3u8
 #EXTINF:-1 tvg-id="EpirusTV1.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="Local",Epirus TV1 (576p) [Not 24/7]
 http://176.9.123.140:1935/radioepirus/radioepirus/playlist.m3u8
@@ -95,7 +95,7 @@ https://vdo.alphaserver.gr:3613/stream/play.m3u8
 https://vdo3.alphaserver.gr:3466/live/greektvlondonlive.m3u8
 #EXTINF:-1 tvg-id="GreekTVLondon.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/YhwbcwE.png" group-title="",Greek TV London (720p) [Not 24/7]
 https://vdo3.alphaserver.gr:3466/stream/play.m3u8
-#EXTINF:-1 tvg-id="GroovyTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/0iklNh2.png" group-title="Movies",Groovy TV (532p)
+#EXTINF:-1 tvg-id="GroovyTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/0iklNh2.png" group-title="Movies",Groovy TV (720p)
 http://web.onair-radio.eu:1935/groovytv/groovytv/playlist.m3u8
 #EXTINF:-1 tvg-id="HellenicTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Hellenic TV (360p)
 https://l5.cloudskep.com/hellenictv/htv/playlist.m3u8
@@ -119,11 +119,11 @@ http://flashcloud.mediacdn.com/live/kontratv/.m3u8
 http://live.cretetv.gr:1935/cretetv/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="LiveTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/Dj7YFhH.png" group-title="",Live TV (272p) [Offline]
 https://vod.streams.ovh:3829/stream/play.m3u8
-#EXTINF:-1 tvg-id="MTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/dh22Dj8.png" group-title="Music",M.TV [Offline]
+#EXTINF:-1 tvg-id="MTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/dh22Dj8.png" group-title="Music",M.TV [Timeout]
 http://78.83.87.222:9999/play/a015/index.m3u8
-#EXTINF:-1 tvg-id="MadGreekz.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://ssl2.novago.gr/EPG/jsp/images/universal/film/logo/20190227/000100/XTV100000281/20758b1e-29fd-442c-b1a3-3a37ddf8ea03.png" group-title="Music",Mad Greekζ (240p) [Not 24/7]
+#EXTINF:-1 tvg-id="MadGreekz.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://ssl2.novago.gr/EPG/jsp/images/universal/film/logo/20190227/000100/XTV100000281/20758b1e-29fd-442c-b1a3-3a37ddf8ea03.png" group-title="Music",Mad Greekζ (480p) [Not 24/7]
 http://live.streams.ovh:1935/foxtv/foxtv/playlist.m3u8
-#EXTINF:-1 tvg-id="MagicTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/QZQhg6C.png" group-title="Music",Magic TV (360p)
+#EXTINF:-1 tvg-id="MagicTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/QZQhg6C.png" group-title="Music",Magic TV (480p)
 https://itv.streams.ovh/magictv/magictv/playlist.m3u8
 #EXTINF:-1 tvg-id="MaroussiotikaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/8coUyPX.png" group-title="",Maroussiotika TV (720p) [Not 24/7]
 http://maroussiotika.dynu.com:8000/greektv/FZlHCCdBHL1/359142
@@ -133,27 +133,27 @@ http://176.9.123.140:1935/mesogeiostv/stream/master.m3u8
 https://vod.streams.ovh:3876/stream/play.m3u8
 #EXTINF:-1 tvg-id="MyRadioTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/ZBIyCAl.png" group-title="",My Radio TV (360p) [Offline]
 https://vdo.alphaserver.gr:3305/stream/play.m3u8
-#EXTINF:-1 tvg-id="NeaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014344&amp;t=1544180306377" group-title="",Nea TV (1080p)
+#EXTINF:-1 tvg-id="NeaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014344&amp;t=1544180306377" group-title="",Nea TV (720p)
 https://live.neatv.gr:8888/hls/neatv.m3u8
 #EXTINF:-1 tvg-id="NetmaxTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/Wad6CD4.png" group-title="",Netmax TV (720p) [Not 24/7]
 http://live.netmaxtv.com:8080/live/live/playlist.m3u8
-#EXTINF:-1 tvg-id="NG.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (612p)
+#EXTINF:-1 tvg-id="NG.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (720p)
 http://live.streams.ovh:1935/NGradio/NGradio/playlist.m3u8
 #EXTINF:-1 tvg-id="NG.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (612p)
 https://live.streams.ovh/NGradio/NGradio/playlist.m3u8
-#EXTINF:-1 tvg-id="NotioiTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/dW1bcD2.jpg" group-title="",Notioi TV (720p)
+#EXTINF:-1 tvg-id="NotioiTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/dW1bcD2.jpg" group-title="",Notioi TV (1080p)
 https://live.streams.ovh/YourStreaming/YourStreaming/playlist.m3u8
 #EXTINF:-1 tvg-id="NRG91.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91 (720p)
 http://tv.nrg91.gr:1935/onweb/live/master.m3u8
 #EXTINF:-1 tvg-id="NRGTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG TV (720p)
 https://5c389faa13be3.streamlock.net:9553/onweb/live/playlist.m3u8
-#EXTINF:-1 tvg-id="NSTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/tZnziRp.jpg" group-title="",NS TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="NSTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/tZnziRp.jpg" group-title="",NS TV (480p) [Not 24/7]
 http://176.9.123.140:1935/nstv1/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="OpenTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/M6XG03v.png" group-title="",Open TV (576p) [Not 24/7]
 https://liveopencloud.siliconweb.com/1/ZlRza2R6L2tFRnFJ/eWVLSlQx/hls/live/playlist.m3u8
-#EXTINF:-1 tvg-id="OpenTVBUP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/c9hgL1c.jpg" group-title="",Open TV BUP [Offline]
+#EXTINF:-1 tvg-id="OpenTVBUP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/c9hgL1c.jpg" group-title="",Open TV BUP [Timeout]
 http://78.83.87.222:9999/play/a013/index.m3u8
-#EXTINF:-1 tvg-id="PellaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/9YFieqB.jpg" group-title="",Pella TV (576p)
+#EXTINF:-1 tvg-id="PellaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/9YFieqB.jpg" group-title="",Pella TV (576p) [Not 24/7]
 https://video.streams.ovh:1936/pellatv/pellatv/master.m3u8
 #EXTINF:-1 tvg-id="PlayTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/100uuWA.png" group-title="Music",Play TV (480p)
 http://web.onair-radio.eu:1935/Alpha-Host/Alpha-Host/playlist.m3u8
@@ -161,7 +161,7 @@ http://web.onair-radio.eu:1935/Alpha-Host/Alpha-Host/playlist.m3u8
 https://www.hellasnet.tv/rest.live.hn/ws.plp/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioEpistrofi.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/T0zL9ov.jpg" group-title="",Radio Epistrofi (540p) [Geo-blocked]
 https://s1.cystream.net/live/epistrofi/playlist.m3u8
-#EXTINF:-1 tvg-id="ReloadPlay.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://reloadplay.com/wp-content/uploads/2017/04/logo-foto-tv.jpg" group-title="",Reload Play (536p)
+#EXTINF:-1 tvg-id="ReloadPlay.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://reloadplay.com/wp-content/uploads/2017/04/logo-foto-tv.jpg" group-title="",Reload Play (268p)
 http://web.onair-radio.eu:1935/video/video/playlist.m3u8
 #EXTINF:-1 tvg-id="SamiakiTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Samiaki TV (540p) [Not 24/7]
 http://live.cast-control.eu:1935/samiaki/samiaki/playlist.m3u8
@@ -171,15 +171,15 @@ https://sl2.sigmatv.com/hls/live.m3u8
 https://skai-live-back.siliconweb.com/media/cambria4/index.m3u8
 #EXTINF:-1 tvg-id="Skai.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/xokA84y.png" group-title="",Skai (720p)
 https://skai-live.siliconweb.com/media/cambria4/index.m3u8
-#EXTINF:-1 tvg-id="SkaiBUP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/xokA84y.png" group-title="",Skai BUP [Offline]
+#EXTINF:-1 tvg-id="SkaiBUP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/xokA84y.png" group-title="",Skai BUP [Timeout]
 http://78.83.87.222:9999/play/a016/index.m3u8
 #EXTINF:-1 tvg-id="SmileTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/DOOVBu5.png" group-title="",Smile TV (360p) [Geo-blocked]
 https://s1.cystream.net/live/smile/playlist.m3u8
 #EXTINF:-1 tvg-id="Star.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/4HSJigE.png" group-title="",Star (720p)
 https://livestar.siliconweb.com/media/star1/star1mediumhd.m3u8
-#EXTINF:-1 tvg-id="StarBUP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Star BUP [Offline]
+#EXTINF:-1 tvg-id="StarBUP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Star BUP [Timeout]
 http://78.83.87.222:9999/play/a017/index.m3u8
-#EXTINF:-1 tvg-id="SuperB.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Super B (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SuperB.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Super B (576p) [Not 24/7]
 https://til.pp.ua:3424/live/superblive.m3u8
 #EXTINF:-1 tvg-id="SuperChannel.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Super Channel (300p) [Offline]
 https://vdo.alphaserver.gr:3587/stream/play.m3u8
@@ -187,7 +187,7 @@ https://vdo.alphaserver.gr:3587/stream/play.m3u8
 http://wpso.com:1936/hls/music1.m3u8
 #EXTINF:-1 tvg-id="TV100.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",TV 100 (576p) [Not 24/7]
 https://live.fm100.gr/hls/tv100/index.m3u8
-#EXTINF:-1 tvg-id="TVCreta.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/dUH5Mfw.jpg" group-title="Local",TV Creta (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVCreta.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/dUH5Mfw.jpg" group-title="Local",TV Creta (540p) [Not 24/7]
 https://live.streams.ovh/tvcreta/tvcreta/chunklist.m3u8
 #EXTINF:-1 tvg-id="TVFilopoli.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/GdgekUL.png" group-title="",TV Filopoli (360p) [Not 24/7]
 http://live.streams.ovh:1935/tvfilopoli/tvfilopoli/playlist.m3u8
@@ -197,7 +197,7 @@ https://eco.streams.ovh/notos/notos/playlist.m3u8
 https://video.connect4.gr/live/tvrodopi/playlist.m3u8
 #EXTINF:-1 tvg-id="Wixlar.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/hfia0wN.png" group-title="Movies",Wixlar (720p)
 http://web.onair-radio.eu:1935/wixlar/wixlar/playlist.m3u8
-#EXTINF:-1 tvg-id="XalastraTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/LgQBtTh.jpg" group-title="Music",Xalastra TV (240p)
+#EXTINF:-1 tvg-id="XalastraTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/LgQBtTh.jpg" group-title="Music",Xalastra TV (360p)
 https://live.cast-control.eu/xalastratv/xalastratv/playlist.m3u8
 #EXTINF:-1 tvg-id="Xplore.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/ErFj6rR.png" group-title="",Xplore (714p) [Geo-blocked]
 http://web.onair-radio.eu:1935/explorecy/explorecy/playlist.m3u8
@@ -209,19 +209,19 @@ https://zouglalive-lh.akamaihd.net/i/zouglalive_1@340792/master.m3u8
 https://streamer-cache.grnet.gr/parliament/hls/webtv.m3u8
 #EXTINF:-1 tvg-id="VoyliTileorasi.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση (360p)
 https://streamer-cache.grnet.gr/parliament/parltv.sdp/master.m3u8
-#EXTINF:-1 tvg-id="VoyliTileorasi2.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση 2 (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="VoyliTileorasi2.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση 2 (540p) [Not 24/7]
 https://streamer-cache.grnet.gr/parliament/hls/webtv2.m3u8
 #EXTINF:-1 tvg-id="VoyliTileorasi3.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση 3 (360p)
 https://streamer-cache.grnet.gr/parliament/hls/webtv3.m3u8
 #EXTINF:-1 tvg-id="EgnatiaTileorasi.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/XQyysct.jpg" group-title="",Εγνατία Τηλεόραση (576p)
 https://video.streams.ovh:1936/egnatiatv/egnatiatv/index.m3u8
-#EXTINF:-1 tvg-id="Ekklisia.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/nxoHQqz.png" group-title="",Εκκλησία (720p)
+#EXTINF:-1 tvg-id="Ekklisia.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/nxoHQqz.png" group-title="",Εκκλησία (1080p)
 https://liveopen.siliconweb.com/openTvLive/openEcclessia/playlist.m3u8
 #EXTINF:-1 tvg-id="Ilektra.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Ηλέκτρα TV (1080p) [Not 24/7]
 http://167.86.89.20:5080/LiveApp/streams/064918158666216168224216.m3u8
 #EXTINF:-1 tvg-id="KritiTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/Ldt07Lh.png" group-title="",Κρήτη TV (720p)
 http://live.cretetv.gr:1935/cretetv/myStream/f1tv.m3u8
-#EXTINF:-1 tvg-id="MessatidaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/y3pUxXe.png" group-title="",Μεσσάτιδα TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MessatidaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/y3pUxXe.png" group-title="",Μεσσάτιδα TV (450p) [Not 24/7]
 https://vod.streams.ovh:3037/stream/play.m3u8
 #EXTINF:-1 tvg-id="ΡΙΚSat.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",ΡΙΚ Sat (720p) [Not 24/7]
 http://l3.cloudskep.com/cybcsat/abr/playlist.m3u8
diff --git a/channels/hk.m3u b/channels/hk.m3u
index a42f84ae3b..10c9ab5623 100644
--- a/channels/hk.m3u
+++ b/channels/hk.m3u
@@ -9,7 +9,7 @@ http://210.210.155.35/qwr9ew/s/s33/index.m3u8
 http://al-pull2.hkatv.vip/live/CTV.m3u8
 #EXTINF:-1 tvg-id="HKSTV.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/a1/HKSTV_Logo.jpg" group-title="",HKSTV (香港衛視) (720p) [Not 24/7]
 https://al-pull2.hkatv.vip/live/hktv20210929.m3u8
-#EXTINF:-1 tvg-id="iModeTV.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://atv-cdn.hkatv.vip/images/16092183621189118679.png" group-title="Fashion",iMode TV (1080p)
+#EXTINF:-1 tvg-id="iModeTV.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://atv-cdn.hkatv.vip/images/16092183621189118679.png" group-title="",iMode TV (1080p)
 https://juyunlive.juyun.tv/live/24950198.m3u8
 #EXTINF:-1 tvg-id="Kix.hk" tvg-country="MY" tvg-language="Malay" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/705_300.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Entertainment",Kix (720p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
@@ -22,33 +22,33 @@ https://phoenixtv.hkatv.vip/liveott/PCC.m3u8
 https://phoenixtv.hkatv.vip/liveott/PHK.m3u8
 #EXTINF:-1 tvg-id="PhoenixInfoNewsChannel.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/1/16/Phoenix_InfoNews.svg/1280px-Phoenix_InfoNews.svg.png" group-title="News",Phoenix InfoNews Channel (鳳凰衛視資訊) (1080p) [Not 24/7]
 https://phoenixtv.hkatv.vip/liveott/PIN.m3u8
-#EXTINF:-1 tvg-id="RTHKGangTaiDianShi31.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="http://tv.sason.xyz/logo/rthk31.png" group-title="",RTHK (港台電視31) (1080p) [Offline]
+#EXTINF:-1 tvg-id="RTHKGangTaiDianShi31.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="http://tv.sason.xyz/logo/rthk31.png" group-title="",RTHK (港台電視31) (1080p) [Geo-blocked]
 https://rthklive1-lh.akamaihd.net/i/rthk31_1@167495/master.m3u8
-#EXTINF:-1 tvg-id="RTHKGangTaiDianShi32.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="" group-title="",RTHK (港台電視32) (480p) [Offline]
+#EXTINF:-1 tvg-id="RTHKGangTaiDianShi32.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="" group-title="",RTHK (港台電視32) (480p) [Not 24/7]
 https://rthklive2-lh.akamaihd.net/i/rthk32_1@168450/master.m3u8
 #EXTINF:-1 tvg-id="StarSports.hk" tvg-country="SAS" tvg-language="English" tvg-logo="https://photo.sofun.tw/2013/11/STAR-SPORTS-LOGO.jpg" group-title="Sports",Star Sports [Offline]
 rtmp://ivi.bupt.edu.cn:1935/livetv/starsports
 #EXTINF:-1 tvg-id="Thrill.hk" tvg-country="SAS" tvg-language="English" tvg-logo="http://console.celestialtiger.com/images/upload/1f6e441382a388940977fd9e165178c42fe0c193.png" group-title="Movies",Thrill (480p) [Geo-blocked]
 http://45.126.83.51/qwr9ew/s/s34/index.m3u8
-#EXTINF:-1 tvg-id="Thrill.hk" tvg-country="HK" tvg-language="English" tvg-logo="http://console.celestialtiger.com/images/upload/1f6e441382a388940977fd9e165178c42fe0c193.png" group-title="Movies",Thrill [Geo-blocked]
+#EXTINF:-1 tvg-id="Thrill.hk" tvg-country="HK" tvg-language="English" tvg-logo="http://console.celestialtiger.com/images/upload/1f6e441382a388940977fd9e165178c42fe0c193.png" group-title="Movies",Thrill (360p) [Geo-blocked]
 http://45.126.83.51/qwr9ew/s/s34/02.m3u8
-#EXTINF:-1 tvg-id="TVBJade.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="" group-title="",TVB Jade [Offline]
+#EXTINF:-1 tvg-id="TVBJade.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="" group-title="",TVB Jade [Timeout]
 http://ubaio.chaoniu1995.top:6796/ub/cr/crtv.php?id=30
 #EXTINF:-1 tvg-id="TVBXingHe.hk" tvg-country="MY" tvg-language="Malay" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/1/17/TVB_Xing_He_logo_2017.png/220px-TVB_Xing_He_logo_2017.png" group-title="",TVB Xing He 星河 (720p) [Not 24/7]
 http://50.7.161.82:8278/streams/d/Xinhe/playlist.m3u8
 #EXTINF:-1 tvg-id="ViuTV.hk" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://static.epg.best/hk/ViuTV96.hk.png" group-title="",ViuTV (1080p) [Not 24/7]
 https://cdn.hkdtmb.com/hls/99/index.m3u8
-#EXTINF:-1 tvg-id="ViuTVsix.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a1/ViuTVsix-logo.svg/1280px-ViuTVsix-logo.svg.png" group-title="",ViuTVsix [Offline]
+#EXTINF:-1 tvg-id="ViuTVsix.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a1/ViuTVsix-logo.svg/1280px-ViuTVsix-logo.svg.png" group-title="",ViuTVsix [Timeout]
 http://61.238.6.49:8000/bysid/96
-#EXTINF:-1 tvg-id="YaLuWeiShi.hk" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://i.imgur.com/1wbOhJV.jpg" group-title="Travel",亞旅衛視 [Offline]
+#EXTINF:-1 tvg-id="YaLuWeiShi.hk" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://i.imgur.com/1wbOhJV.jpg" group-title="Travel",亞旅衛視 (720p) [Not 24/7]
 http://hls.jingchangkan.tv/jingchangkan/156722438_0HaM/index.m3u8
 #EXTINF:-1 tvg-id="XingKongWeiShi.hk" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/8/8d/Xing_Kong_Wei_Shi.jpg/250px-Xing_Kong_Wei_Shi.jpg" group-title="General",星空衛視 [Offline]
 rtmp://58.200.131.2:1935/livetv/startv
-#EXTINF:-1 tvg-id="GangTaiDianShi31.hk" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/RTHK_TV_31.svg/1200px-RTHK_TV_31.svg.png" group-title="General",港台電視31 (720p) [Offline]
+#EXTINF:-1 tvg-id="GangTaiDianShi31.hk" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/RTHK_TV_31.svg/1200px-RTHK_TV_31.svg.png" group-title="General",港台電視31 (360p) [Not 24/7]
 https://www.rthk.hk/feeds/dtt/rthktv31_https.m3u8
-#EXTINF:-1 tvg-id="GangTaiDianShi32.hk" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/78/RTHK_TV_32.svg/1200px-RTHK_TV_32.svg.png" group-title="News",港台電視32 (480p) [Offline]
-https://www.rthk.hk/feeds/dtt/rthktv32_https.m3u8
-#EXTINF:-1 tvg-id="FeiCuiTai81.hk" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="http://img.tvb.com/corporate/_fck_/image/Jade_logo_L(1).jpg" group-title="",翡翠台（81） (1080p)
+#EXTINF:-1 tvg-id="GangTaiDianShi32.hk" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/78/RTHK_TV_32.svg/1200px-RTHK_TV_32.svg.png" group-title="News",港台電視32 (360p) [Not 24/7]
+https://rthklive2-lh.akamaihd.net/i/rthk32_1@168450/master.m3u8
+#EXTINF:-1 tvg-id="FeiCuiTai81.hk" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="http://img.tvb.com/corporate/_fck_/image/Jade_logo_L(1).jpg" group-title="",翡翠台（81） (1080p) [Timeout]
 http://61.238.6.49:8000/bysid/1
 #EXTINF:-1 tvg-id="YaoCaiCaiJingTai.hk" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://i.imgur.com/xliVoIt.jpg?1" group-title="Shop",耀才財經台 (576p)
 http://202.69.67.66:443/webcast/bshdlive-pc/playlist.m3u8
@@ -56,9 +56,9 @@ http://202.69.67.66:443/webcast/bshdlive-pc/playlist.m3u8
 http://media.fantv.hk/m3u8/archive/channel2.m3u8
 #EXTINF:-1 tvg-id="XiangGangWeiShi.hk" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://i.imgur.com/wnQPn2d.jpg" group-title="",香港衛視 (576p) [Not 24/7]
 http://zhibo.hkstv.tv/livestream/mutfysrq/playlist.m3u8
-#EXTINF:-1 tvg-id="FengHuangWeiShiZhongWenTai.hk" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://pbs.twimg.com/profile_images/1246604721462239232/QCKNvVux_400x400.jpg" group-title="",鳳凰衛視中文台 [Offline]
+#EXTINF:-1 tvg-id="FengHuangWeiShiZhongWenTai.hk" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://pbs.twimg.com/profile_images/1246604721462239232/QCKNvVux_400x400.jpg" group-title="",鳳凰衛視中文台 [Timeout]
 http://221.179.217.70/PLTV/88888888/224/3221225942/1.m3u8
-#EXTINF:-1 tvg-id="FengHuangZiXun.hk" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/1/16/Phoenix_InfoNews.svg/1200px-Phoenix_InfoNews.svg.png" group-title="News",鳳凰衛視資訊台HD [Offline]
+#EXTINF:-1 tvg-id="FengHuangZiXun.hk" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/1/16/Phoenix_InfoNews.svg/1200px-Phoenix_InfoNews.svg.png" group-title="News",鳳凰衛視資訊台HD (720p) [Not 24/7]
 http://117.169.120.138:8080/live/fhzixun/.m3u8
 #EXTINF:-1 tvg-id="FengHuangWeiShiDianYingTai.hk" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://p1.ifengimg.com/a/2018_43/45a9d426b4ae58c.jpg" group-title="",鳳凰衛視電影台 [Offline]
 rtmp://ivi.bupt.edu.cn:1935/livetv/fhdy
diff --git a/channels/hn.m3u b/channels/hn.m3u
index 5cc9a25bc2..d4112823b2 100644
--- a/channels/hn.m3u
+++ b/channels/hn.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AvivaTV.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="" group-title="",Aviva TV (720p)
+#EXTINF:-1 tvg-id="AvivaTV.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="" group-title="",Aviva TV (1080p)
 https://video.misistemareseller.com/atvhonduras/atvhonduras/playlist.m3u8
 #EXTINF:-1 tvg-id="CampusTV.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="" group-title="",Campus TV (360p) [Not 24/7]
 http://st2.worldkast.com/8004/8004/playlist.m3u8
-#EXTINF:-1 tvg-id="CCIChannel.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://www.ccichannel.tv/wp-content/uploads/2018/01/CCICHANNELlogo.png" group-title="",CCI Channel (720p)
+#EXTINF:-1 tvg-id="CCIChannel.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://www.ccichannel.tv/wp-content/uploads/2018/01/CCICHANNELlogo.png" group-title="",CCI Channel (720p) [Timeout]
 http://stream.innovandote.com:1935/cci/cci/playlist.m3u8
 #EXTINF:-1 tvg-id="CholusatSur36.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://i.imgur.com/qRHwhND.png" group-title="",Cholusat Sur 36 (214p) [Not 24/7]
 http://audiotvserver.net:1935/livemedia/cholusat/playlist.m3u8
@@ -17,15 +17,21 @@ https://panel.dattalive.com/8122/8122/playlist.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x81za5c8
 #EXTINF:-1 tvg-id="JBN.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://i.imgur.com/JrlArKg.png" group-title="",JBN (480p)
 https://emisoras.hn:8081/jbn/index.m3u8
+#EXTINF:-1 tvg-id="LencaTelevision.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="" group-title="",Lenca Television (Canal 40) (720p)
+http://lencatelevision.com:8080/hls/ltv1.m3u8
 #EXTINF:-1 tvg-id="LTV.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://i.imgur.com/dprA1P7.png" group-title="",LTV (720p) [Not 24/7]
 https://5e85d90130e77.streamlock.net/6022/6022/playlist.m3u8
 #EXTINF:-1 tvg-id="MiVinaChannel.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://i.imgur.com/5620HCa.jpg" group-title="",Mi Viña Channel [Not 24/7]
 https://5b50404ec5e4c.streamlock.net/8056/smil:8056.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="QhuboTV.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://i.imgur.com/1MIXANL.jpg" group-title="",Q'hubo TV (410p) [Not 24/7]
 https://5e85d90130e77.streamlock.net/6024/6024/playlist.m3u8
+#EXTINF:-1 tvg-id="RadioIdeal.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="" group-title="",Radio Ideal 104.7 FM (La Esperanza) (720p) [Not 24/7]
+http://lencatelevision.com:8080/hls/ltv3.m3u8
+#EXTINF:-1 tvg-id="RadioImagen.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="" group-title="",Radio Imagen 105.1 FM (La Esperanza) (720p) [Offline]
+http://lencatelevision.com:8080/hls/ltv2.m3u8
 #EXTINF:-1 tvg-id="SercanoTV.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="" group-title="",Sercano TV (720p)
 http://stream.grupoabchn.com:1935/SERCANOHD/SERCANOLive.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Teleceiba.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://i.imgur.com/wIcvdMQ.jpg" group-title="",Teleceiba [Offline]
+#EXTINF:-1 tvg-id="Teleceiba.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://i.imgur.com/wIcvdMQ.jpg" group-title="",Teleceiba [Timeout]
 http://190.11.224.14:8134/liveevent.m3u8
 #EXTINF:-1 tvg-id="TeleProgreso.hn" tvg-country="HN" tvg-language="Spanish" tvg-logo="https://i.imgur.com/NKCF5qs.png" group-title="",TeleProgreso (720p)
 https://stmv1.zcastbr.com/teleprogresohn/teleprogresohn/playlist.m3u8
diff --git a/channels/hr.m3u b/channels/hr.m3u
index 1cf429e81e..63d30050a6 100644
--- a/channels/hr.m3u
+++ b/channels/hr.m3u
@@ -17,13 +17,13 @@ http://195.29.70.67/PLTV/88888888/224/3221226280/index.m3u8
 #EXTINF:-1 tvg-id="HRT4.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/UVFs4zA.png" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="",HRT 4 (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0
 http://195.29.70.67/PLTV/88888888/224/3221226281/index.m3u8
-#EXTINF:-1 tvg-id="HRT4.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/UVFs4zA.png" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="",HRT 4 (528p)
+#EXTINF:-1 tvg-id="HRT4.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/UVFs4zA.png" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="",HRT 4 (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0
 http://195.29.70.89/PLTV/88888888/224/3221226281/index.m3u8
 #EXTINF:-1 tvg-id="MAXtvPromoKanal.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/RApnwWl.jpg" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="",MAXtv Promo Kanal (576p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0
 http://195.29.70.67/PLTV/88888888/224/3221226027/index.m3u8
-#EXTINF:-1 tvg-id="MAXtvPromoKanal.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/RApnwWl.jpg" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="",MAXtv Promo Kanal (576p)
+#EXTINF:-1 tvg-id="MAXtvPromoKanal.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/RApnwWl.jpg" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="",MAXtv Promo Kanal (528p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0
 http://195.29.70.84/PLTV/88888888/224/3221226027/index.m3u8
 #EXTINF:-1 tvg-id="NewsBar.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="News",NewsBar (528p) [Offline]
@@ -33,7 +33,7 @@ http://195.29.70.89/PLTV/88888888/224/3221226407/index.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x654gen
 #EXTINF:-1 tvg-id="RadioTelevizijaBanovina.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/7q3g8AS.png" group-title="",Radio Televizija Banovina (360p) [Not 24/7]
 rtmp://video.radio-banovina.hr/live/myStream
-#EXTINF:-1 tvg-id="RTLHrvatska.de" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/aJGNyQn.png" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="",RTL (528p)
+#EXTINF:-1 tvg-id="RTLHrvatska.de" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://i.imgur.com/aJGNyQn.png" user-agent="Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0" group-title="",RTL (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux i686; rv:90.0) Gecko/20100101 Firefox/90.0
 http://195.29.70.67/PLTV/88888888/224/3221226195/index.m3u8
 #EXTINF:-1 tvg-id="TVJadran.hr" tvg-country="HR" tvg-language="Croatian" tvg-logo="https://tvjadran.hr/wp-content/uploads/2021/02/cropped-tv_jadran_site_icon-192x192.png" group-title="",TV Jadran (720p) [Not 24/7]
diff --git a/channels/ht.m3u b/channels/ht.m3u
index f802c87155..77910655d7 100644
--- a/channels/ht.m3u
+++ b/channels/ht.m3u
@@ -1,33 +1,33 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="HaitiViralNews.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/eaPFJJs.jpg" group-title="",Haiti Viral News (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="HaitiViralNews.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/eaPFJJs.jpg" group-title="",Haiti Viral News (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCcEY2-g-EEefxyYa1gtrk4g/live
-#EXTINF:-1 tvg-id="KajouTV.ht" tvg-country="US;HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/5txJUZx.jpg" group-title="",Kajou TV (720p)
+#EXTINF:-1 tvg-id="KajouTV.ht" tvg-country="US;HT" tvg-language="French" tvg-logo="https://i.imgur.com/5txJUZx.jpg" group-title="",Kajou TV (480p)
 https://video1.getstreamhosting.com:1936/8055/8055/playlist.m3u8
-#EXTINF:-1 tvg-id="NETALKOLETV.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/OJbRkQ6.jpg" group-title="",NETALKOLE TV (180p) [Not 24/7]
+#EXTINF:-1 tvg-id="NETALKOLETV.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/OJbRkQ6.jpg" group-title="",NETALKOLE TV (720p) [Not 24/7]
 https://watch.haitilive.net/stream/netalkole/public/tv/index.m3u8
-#EXTINF:-1 tvg-id="RadioTélé4VEH.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/1wuEyIF.jpg" group-title="Religious",Radio Télé 4VEH (720p)
+#EXTINF:-1 tvg-id="RadioTélé4VEH.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/1wuEyIF.jpg" group-title="Religious",Radio Télé 4VEH (720p)
 https://uni01rtmp.tulix.tv/4vehtv/4vehtv-firetv/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioTélé4VEH.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/1wuEyIF.jpg" group-title="Religious",Radio Télé 4VEH (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioTélé4VEH.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/1wuEyIF.jpg" group-title="Religious",Radio Télé 4VEH (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UClL_aynC_SESNLQEJHqO9MQ/live
-#EXTINF:-1 tvg-id="RadioTeleAmen.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/dJvJGDg.jpg" group-title="Religious",Radio Tele Amen FM (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioTeleAmen.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/dJvJGDg.jpg" group-title="Religious",Radio Tele Amen FM (360p) [Not 24/7]
 http://184.173.179.163:1935/daniel/daniel/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioTéléEclair.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/8ocCyo7.png" group-title="",Radio Télé Eclair (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioTéléEclair.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/8ocCyo7.png" group-title="",Radio Télé Eclair (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCOvGbDh5biuOqjx6G3CdrQg/live
-#EXTINF:-1 tvg-id="RadioTelePititManmanMari.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/QaWwNvo.jpg" group-title="Religious",Radio Télé Pitit Manman Mari (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioTelePititManmanMari.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/QaWwNvo.jpg" group-title="Religious",Radio Télé Pitit Manman Mari (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCLeNHM8XDkZmd2rhV3ZG7Vg/live
-#EXTINF:-1 tvg-id="RadioTelePlanetCompas.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/ddb4lsa.png" group-title="",Radio Tele Planet Compas (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioTelePlanetCompas.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/ddb4lsa.png" group-title="",Radio Tele Planet Compas (720p) [Not 24/7]
 https://5dcab9aed5331.streamlock.net/mrcompas1/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioTeleShalom.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/MSgSKym.png" group-title="",Radio Tele Shalom (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioTeleShalom.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/MSgSKym.png" group-title="",Radio Tele Shalom (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCBJ9zxns1hxblYZw4urBd_w/live
-#EXTINF:-1 tvg-id="RTVC.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/Jp38Rzf.png" group-title="",Radio Télévision Caraïbes (RTVC) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RTVC.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/Jp38Rzf.png" group-title="",Radio Télévision Caraïbes (RTVC) (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x81lgjh
-#EXTINF:-1 tvg-id="RadioTélévisionHirondelle.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/2gVnoSX.jpg" group-title="",Radio Télévision Hirondelle (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioTélévisionHirondelle.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/2gVnoSX.jpg" group-title="",Radio Télévision Hirondelle (480p) [Not 24/7]
 https://watch.haitilive.net/gethb/rtvh16/index.m3u8
-#EXTINF:-1 tvg-id="TCH.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/6LZVA4x.png" group-title="",Télé Conscience Haïtienne (TCH) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TCH.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/6LZVA4x.png" group-title="",Télé Conscience Haïtienne (TCH) (720p) [Not 24/7]
 http://tvlakay.haitilive.net/website/tchhaiti/player/mono.m3u8
-#EXTINF:-1 tvg-id="TeleHaiti.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://www.newsfromhaiti.com/images/TeleHaiti.jpg" group-title="General",Tele Haiti (1088p) [Offline]
+#EXTINF:-1 tvg-id="TeleHaiti.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://www.newsfromhaiti.com/images/TeleHaiti.jpg" group-title="General",Tele Haiti (1088p) [Timeout]
 http://66.175.238.147:1935/live/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="TeleLouange.ht" tvg-country="HT" tvg-language="French;Creole" tvg-logo="https://i.imgur.com/vZmlq9N.jpg" group-title="",Tele Louange (720p)
+#EXTINF:-1 tvg-id="TeleLouange.ht" tvg-country="HT" tvg-language="French" tvg-logo="https://i.imgur.com/vZmlq9N.jpg" group-title="",Tele Louange (720p)
 https://5790d294af2dc.streamlock.net/8124/8124/chunklist.m3u8
 #EXTINF:-1 tvg-id="TVPanou.ht" tvg-country="US;HT" tvg-language="English" tvg-logo="https://i.imgur.com/p5GjWnu.jpg" group-title="",TV Panou (720p) [Not 24/7]
 http://tvpanoucom.srfms.com:1935/tvpanoucom/livestream/playlist.m3u8
diff --git a/channels/hu.m3u b/channels/hu.m3u
index 42fb6fbb4e..7ce7f32f07 100644
--- a/channels/hu.m3u
+++ b/channels/hu.m3u
@@ -71,7 +71,7 @@ https://stream.y5.hu/stream/stream_rtl2/hls0/stream.m3u8
 https://stream.y5.hu/stream/stream_rtlklub/hls1/stream.m3u8
 #EXTINF:-1 tvg-id="RTLKlub.hu" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",RTL Klub (360p) [Not 24/7]
 https://stream.y5.hu/stream/stream_rtlklub/hls0/stream.m3u8
-#EXTINF:-1 tvg-id="RTLPlus.hu" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",RTL+ (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="RTLPlus.hu" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",RTL+ (720p) [Not 24/7]
 https://stream.y5.hu/stream/stream_rtlp/stream.m3u8
 #EXTINF:-1 tvg-id="SorozatPlus.hu" tvg-country="HU" tvg-language="Hungarian" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/hu_sorozat.png" group-title="",Sorozat+ (360p) [Not 24/7]
 https://stream.y5.hu/stream/stream_sorozatp/stream.m3u8
diff --git a/channels/id.m3u b/channels/id.m3u
index f03347ec60..ab54d9a0c7 100644
--- a/channels/id.m3u
+++ b/channels/id.m3u
@@ -7,7 +7,7 @@ http://edge.linknetott.swiftserve.com/live/BsNew/amlst:beritasatunewsbs/playlist
 https://b1news.beritasatumedia.com/Beritasatu/B1News_960x540.m3u8
 #EXTINF:-1 tvg-id="BeritaSatu.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040323.png" group-title="News",BeritaSatu (250p)
 https://b1news.beritasatumedia.com/Beritasatu/B1News_320x240.m3u8
-#EXTINF:-1 tvg-id="BeritaSatuEnglish.id" tvg-country="ID" tvg-language="English" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040323.png" group-title="News",BeritaSatu English (720p)
+#EXTINF:-1 tvg-id="BeritaSatuEnglish.id" tvg-country="ID" tvg-language="English" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040323.png" group-title="News",BeritaSatu English (240p)
 http://edge.linknetott.swiftserve.com/live/BsNew/amlst:bsenglish/playlist.m3u8
 #EXTINF:-1 tvg-id="BeritaSatuWorld.id" tvg-country="ID" tvg-language="Indonesian;English" tvg-logo="https://i.imgur.com/GIGcX5K.png" group-title="News",BeritaSatu World (540p)
 http://edge.linknetott.swiftserve.com/live/BsNew/amlst:bsnew/playlist.m3u8
@@ -17,11 +17,11 @@ https://live.cnbcindonesia.com/livecnbc/smil:cnbctv.smil/master.m3u8
 https://live.cnnindonesia.com/livecnn/smil:cnntv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="GTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://i.postimg.cc/HsqNM8Hc/globaltv.png" group-title="General",GTV (720p)
 https://vcdn2.rctiplus.id/live/eds/gtv_fta/live_fta/gtv_fta.m3u8
-#EXTINF:-1 tvg-id="HIDUPTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040378.png" group-title="",HIDUP TV (568p)
+#EXTINF:-1 tvg-id="HIDUPTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040378.png" group-title="",HIDUP TV (568p) [Timeout]
 http://202.93.133.3:1935/SVR1/ch_hiduptv.stream_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="Hits.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="http://www.rewindnetworks.com/assets/logo_hits.png" group-title="",Hits [Offline]
+#EXTINF:-1 tvg-id="Hits.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="http://www.rewindnetworks.com/assets/logo_hits.png" group-title="",Hits (720p) [Not 24/7]
 https://liveanevia.mncnow.id/live/eds/HITS/sa_dash_vmx/HITS.mpd
-#EXTINF:-1 tvg-id="HitsMovies.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://movies.hitstv.com/img/hits-movies-logo.png" group-title="Movies",Hits Movies [Offline]
+#EXTINF:-1 tvg-id="HitsMovies.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://movies.hitstv.com/img/hits-movies-logo.png" group-title="Movies",Hits Movies (720p) [Not 24/7]
 https://liveanevia.mncnow.id/live/eds/HitsMovies/sa_dash_vmx/HitsMovies.mpd
 #EXTINF:-1 tvg-id="IAMCHANNEL.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040337.png" group-title="Religious",I AM CHANNEL (576p) [Not 24/7]
 http://iamchannel.org:1935/tes/1/playlist.m3u8
@@ -33,7 +33,7 @@ https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio
 https://vcdn2.rctiplus.id/live/eds/inews_fta/live_fta/inews_fta.m3u8
 #EXTINF:-1 tvg-id="KompasTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://www.mncvision.id/userfiles/image/channel/channel_106.png" group-title="News",Kompas TV [Offline]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/874-kompas-tv
-#EXTINF:-1 tvg-id="MetroTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040416.png" group-title="News",Metro TV (720p)
+#EXTINF:-1 tvg-id="MetroTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040416.png" group-title="News",Metro TV (480p)
 http://edge.metrotvnews.com:1935/live-edge/smil:metro.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MNCTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://i.postimg.cc/rw8620qS/20191026-003920.png" group-title="General",MNCTV (720p)
 https://vcdn2.rctiplus.id/live/eds/mnctv_fta/live_fta/mnctv_fta.m3u8
@@ -43,7 +43,7 @@ https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/875-net-tv
 #EXTINF:-1 tvg-id="OChannel.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="Local",O Channel [Offline]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/206-ochannel
-#EXTINF:-1 tvg-id="OneTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://onetvasia.com/sites/onetvasia.com/files/logo-small_0.png" group-title="",One TV [Offline]
+#EXTINF:-1 tvg-id="OneTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://onetvasia.com/sites/onetvasia.com/files/logo-small_0.png" group-title="",One TV (720p) [Not 24/7]
 https://liveanevia.mncnow.id/live/eds/SetOne/sa_dash_vmx/SetOne.mpd
 #EXTINF:-1 tvg-id="Radio51TV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="Logo N/A" group-title="",Radio 51 TV (480p)
 https://59d7d6f47d7fc.streamlock.net/canale51/canale51/playlist.m3u8
@@ -55,19 +55,19 @@ http://edge.linknetott.swiftserve.com/live/BsNew/amlst:reformedch/playlist.m3u8
 http://36.89.47.217:11935/rrinet/live/index.m3u8
 #EXTINF:-1 tvg-id="RTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="General",RTV [Offline]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/1561-rtv
-#EXTINF:-1 tvg-id="SCTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://www.mncvision.id/userfiles/image/channel/channel_89.png" group-title="General",SCTV [Offline]
+#EXTINF:-1 tvg-id="SCTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://www.mncvision.id/userfiles/image/channel/channel_89.png" group-title="General",SCTV (480p) [Not 24/7]
 https://liveanevia.mncnow.id/live/eds/SCTV/sa_dash_vmx/SCTV.mpd
-#EXTINF:-1 tvg-id="Trans7.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040404.png" group-title="General",Trans7 (720p) [Offline]
-https://video.detik.com/trans7/smil:trans7.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TransTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040459.png" group-title="General",Trans TV (720p)
+#EXTINF:-1 tvg-id="TransTV.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040459.png" group-title="General",Trans TV (1080p)
 https://video.detik.com/transtv/smil:transtv.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="Trans7.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040404.png" group-title="General",Trans7 (720p) [Not 24/7]
+https://video.detik.com/trans7/smil:trans7.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVKU.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040332.png" group-title="",TVKU (720p) [Not 24/7]
 http://103.30.1.14:8080/hls/live.m3u8
 #EXTINF:-1 tvg-id="TVRParlemen.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen (720p) [Not 24/7]
 http://103.18.181.69:1935/golive/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="TVRParlemenBadanAnggaran.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Badan Anggaran [Not 24/7]
 http://103.18.181.69:1935/golive/livestreambanggar/playlist.m3u8
-#EXTINF:-1 tvg-id="TVRParlemenBadanLegislatif.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Badan Legislatif (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVRParlemenBadanLegislatif.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Badan Legislatif (720p) [Not 24/7]
 http://103.18.181.69:1935/golive/livestreambaleg/playlist.m3u8
 #EXTINF:-1 tvg-id="TVRParlemenBadanMusyawarah.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Badan Musyawarah [Not 24/7]
 http://103.18.181.69:1935/golive/livestreambamus/playlist.m3u8
@@ -77,7 +77,7 @@ http://103.18.181.69:1935/golive/livestreambakn/playlist.m3u8
 http://103.18.181.69:1935/golive/livestreambksap/playlist.m3u8
 #EXTINF:-1 tvg-id="TVRParlemenKomisiI.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Komisi I (480p) [Not 24/7]
 http://103.18.181.69:1935/golive/livestream1/playlist.m3u8
-#EXTINF:-1 tvg-id="TVRParlemenKomisiII.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Komisi II (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVRParlemenKomisiII.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Komisi II (1080p) [Not 24/7]
 http://103.18.181.69:1935/golive/livestream2/playlist.m3u8
 #EXTINF:-1 tvg-id="TVRParlemenKomisiIII.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Komisi III (480p) [Not 24/7]
 http://103.18.181.69:1935/golive/livestream3/playlist.m3u8
@@ -95,77 +95,77 @@ http://103.18.181.69:1935/golive/livestream7/playlist.m3u8
 http://103.18.181.69:1935/golive/livestream8/playlist.m3u8
 #EXTINF:-1 tvg-id="TVRParlemenKomisiX.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Komisi X (720p) [Not 24/7]
 http://103.18.181.69:1935/golive/livestream10/playlist.m3u8
-#EXTINF:-1 tvg-id="TVRParlemenKomisiXI.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Komisi XI (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVRParlemenKomisiXI.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Komisi XI (720p) [Not 24/7]
 http://103.18.181.69:1935/golive/livestream11/playlist.m3u8
 #EXTINF:-1 tvg-id="TVRI.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="http://1.bp.blogspot.com/-30awn5OxihI/T9VuzQQ5RqI/AAAAAAAADRM/_iPdRJhYiwQ/s1600/logo-lpp-tvri.png" group-title="",TVRI (720p)
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRINasional)/index.m3u8
-#EXTINF:-1 tvg-id="TVRI4.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="http://images2.useetv.com/logo_tvri_big1.png" group-title="",TVRI 4 (480p)
+#EXTINF:-1 tvg-id="TVRI4.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="http://images2.useetv.com/logo_tvri_big1.png" group-title="",TVRI 4 (720p)
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRI4)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIAceh.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Aceh (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVRIAceh.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Aceh (720p) [Not 24/7]
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIACEH)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIAceh.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Aceh (480p) [Not 24/7]
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIACEH)/index.m3u8
+#EXTINF:-1 tvg-id="TVRIBali.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bali (720p)
+http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIBALI)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIBali.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bali (480p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIBALI)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIBali.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bali (480p)
-http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIBALI)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIBangkaBelitung.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bangka Belitung (480p)
+#EXTINF:-1 tvg-id="TVRIBangkaBelitung.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bangka Belitung (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIBABEL)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIBangkaBelitung.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bangka Belitung (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIBABEL)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIBengkulu.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bengkulu (480p)
+#EXTINF:-1 tvg-id="TVRIBengkulu.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bengkulu (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIBENGKULU)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIBengkulu.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Bengkulu (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIBENGKULU)/index.m3u8
+#EXTINF:-1 tvg-id="TVRIDKIJakarta.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI DKI Jakarta (720p) [Not 24/7]
+http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIDKI)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIDKIJakarta.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI DKI Jakarta (480p) [Not 24/7]
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIDKI)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIDKIJakarta.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI DKI Jakarta (480p) [Not 24/7]
-http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIDKI)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIGorontalo.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Gorontalo (480p)
+#EXTINF:-1 tvg-id="TVRIGorontalo.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Gorontalo (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIGORONTALO)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIGorontalo.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Gorontalo (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIGORONTALO)/index.m3u8
+#EXTINF:-1 tvg-id="TVRIJambi.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jambi (720p) [Not 24/7]
+http://118.97.50.107/Content/HLS/Live/Channel(TVRIJAMBI)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIJambi.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jambi (480p) [Not 24/7]
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIJAMBI)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIJambi.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jambi (480p) [Offline]
-http://118.97.50.107/Content/HLS/Live/Channel(TVRIJAMBI)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIJawaBarat.id" tvg-country="ID" tvg-language="Indonesian;Javanese;Sundanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jawa Barat (480p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIJABARBANDUNG)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIJawaBarat.id" tvg-country="ID" tvg-language="Indonesian;Javanese;Sundanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jawa Barat (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIJABARBANDUNG)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIJawaTengah.id" tvg-country="ID" tvg-language="Indonesian;Javanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jawa Tengah (480p)
+#EXTINF:-1 tvg-id="TVRIJawaTengah.id" tvg-country="ID" tvg-language="Indonesian;Javanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jawa Tengah (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIJATENGSEMARANG)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIJawaTengah.id" tvg-country="ID" tvg-language="Indonesian;Javanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jawa Tengah (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIJATENGSEMARANG)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIJawaTimur.id" tvg-country="ID" tvg-language="Indonesian;Javanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jawa Timur (480p)
+#EXTINF:-1 tvg-id="TVRIJawaTimur.id" tvg-country="ID" tvg-language="Indonesian;Javanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jawa Timur (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIJATIMSURABAYA)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIJawaTimur.id" tvg-country="ID" tvg-language="Indonesian;Javanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Jawa Timur (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIJATIMSURABAYA)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIKalimantanBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Barat (480p)
+#EXTINF:-1 tvg-id="TVRIKalimantanBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Barat (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIKALBAR)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIKalimantanBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Barat (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIKALBAR)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIKalimantanSelatan.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Selatan (480p)
+#EXTINF:-1 tvg-id="TVRIKalimantanSelatan.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Selatan (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIKALSELBANJARMSN)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIKalimantanSelatan.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Selatan (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIKALSELBANJARMSN)/index.m3u8
+#EXTINF:-1 tvg-id="TVRIKalimantanTengah.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Tengah (720p)
+http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIKALTENG)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIKalimantanTengah.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Tengah (480p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIKALTENG)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIKalimantanTengah.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Tengah (480p)
-http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIKALTENG)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIKalimantanTimur.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Timur (480p)
+#EXTINF:-1 tvg-id="TVRIKalimantanTimur.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Timur (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIKALTIMSAMARINDA)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIKalimantanTimur.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Kalimantan Timur (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIKALTIMSAMARINDA)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIKanal3.id" tvg-country="ID" tvg-language="Indonesian;English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="General",TVRI Kanal 3 (480p)
+#EXTINF:-1 tvg-id="TVRIKanal3.id" tvg-country="ID" tvg-language="Indonesian;English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="General",TVRI Kanal 3 (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRI3)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIKanal3.id" tvg-country="ID" tvg-language="Indonesian;English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="General",TVRI Kanal 3 (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRI3)/index.m3u8
-#EXTINF:-1 tvg-id="TVRILampung.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Lampung (480p)
+#EXTINF:-1 tvg-id="TVRILampung.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Lampung (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRILAMPUNG)/index.m3u8
 #EXTINF:-1 tvg-id="TVRILampung.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Lampung (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRILAMPUNG)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIMaluku.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Maluku (480p)
+#EXTINF:-1 tvg-id="TVRIMaluku.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Maluku (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIMALUKUAMBON)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIMaluku.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Maluku (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIMALUKUAMBON)/index.m3u8
@@ -175,47 +175,47 @@ http://118.97.50.107/Content/HLS/Live/Channel(TVRINASIONAL)/index.m3u8
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRINASIONAL)/index.m3u8
 #EXTINF:-1 tvg-id="TVRINasional.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="General",TVRI Nasional (480p)
 http://202.80.222.130/000001/2/ch14041511560872104862/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="TVRINusaTenggaraBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Nusa Tenggara Barat (480p)
+#EXTINF:-1 tvg-id="TVRINusaTenggaraBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Nusa Tenggara Barat (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRINTBMATARAM)/index.m3u8
 #EXTINF:-1 tvg-id="TVRINusaTenggaraBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Nusa Tenggara Barat (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRINTBMATARAM)/index.m3u8
-#EXTINF:-1 tvg-id="TVRINusaTenggaraTimur.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Nusa Tenggara Timur (480p)
+#EXTINF:-1 tvg-id="TVRINusaTenggaraTimur.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Nusa Tenggara Timur (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRINTTKUPANG)/index.m3u8
 #EXTINF:-1 tvg-id="TVRINusaTenggaraTimur.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Nusa Tenggara Timur (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRINTTKUPANG)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIPapua.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Papua (480p)
+#EXTINF:-1 tvg-id="TVRIPapua.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Papua (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIPAPUA)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIPapua.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Papua (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIPAPUA)/index.m3u8
-#EXTINF:-1 tvg-id="TVRIRiau.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Riau (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVRIRiau.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Riau (720p) [Not 24/7]
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIriau)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIRiau.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Riau (480p) [Not 24/7]
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIriau)/index.m3u8
+#EXTINF:-1 tvg-id="TVRISportHD.id" tvg-country="ID" tvg-language="Indonesian;English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Sports",TVRI Sport HD (720p)
+http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRI4)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISportHD.id" tvg-country="ID" tvg-language="Indonesian;English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Sports",TVRI Sport HD (480p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRI4)/index.m3u8
-#EXTINF:-1 tvg-id="TVRISportHD.id" tvg-country="ID" tvg-language="Indonesian;English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Sports",TVRI Sport HD (480p)
-http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRI4)/index.m3u8
+#EXTINF:-1 tvg-id="TVRISulawesiBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Barat (720p)
+http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIsulbarmajene)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISulawesiBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Barat (480p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRIsulbarmajene)/index.m3u8
-#EXTINF:-1 tvg-id="TVRISulawesiBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Barat (480p)
-http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRIsulbarmajene)/index.m3u8
-#EXTINF:-1 tvg-id="TVRISulawesiSelatan.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Selatan (480p)
+#EXTINF:-1 tvg-id="TVRISulawesiSelatan.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Selatan (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRISULSELMAKASAR)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISulawesiSelatan.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Selatan (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISULSELMAKASAR)/index.m3u8
-#EXTINF:-1 tvg-id="TVRISulawesiTengah.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Tengah (480p)
+#EXTINF:-1 tvg-id="TVRISulawesiTengah.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Tengah (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRISULTENGPALU)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISulawesiTengah.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Tengah (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISULTENGPALU)/index.m3u8
-#EXTINF:-1 tvg-id="TVRISulawesiTenggara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Tenggara (480p)
+#EXTINF:-1 tvg-id="TVRISulawesiTenggara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Tenggara (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRISULTRA)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISulawesiTenggara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Tenggara (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISULTRA)/index.m3u8
+#EXTINF:-1 tvg-id="TVRISulawesiUtara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Utara (720p)
+http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISULUTMANADO)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISulawesiUtara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Utara (480p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRISULUTMANADO)/index.m3u8
-#EXTINF:-1 tvg-id="TVRISulawesiUtara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sulawesi Utara (480p)
-http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISULUTMANADO)/index.m3u8
-#EXTINF:-1 tvg-id="TVRISumateraBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sumatera Barat (480p)
+#EXTINF:-1 tvg-id="TVRISumateraBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sumatera Barat (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRISUMBARPADANG)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISumateraBarat.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sumatera Barat (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISUMBARPADANG)/index.m3u8
@@ -223,7 +223,7 @@ http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISUMBARPAD
 http://118.97.50.107/Content/HLS/Live/Channel(TVRISUMSEL)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISumateraSelatan.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sumatera Selatan (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISUMSEL)/index.m3u8
-#EXTINF:-1 tvg-id="TVRISumateraUtara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sumatera Utara (480p)
+#EXTINF:-1 tvg-id="TVRISumateraUtara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sumatera Utara (720p)
 http://118.97.50.107/Content/HLS/Live/Channel(TVRISUMUTMEDAN)/index.m3u8
 #EXTINF:-1 tvg-id="TVRISumateraUtara.id" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Sumatera Utara (480p)
 http://wpc.d1627.nucdn.net/80D1627/o-tvri/Content/HLS/Live/Channel(TVRISUMUTMEDAN)/index.m3u8
diff --git a/channels/il.m3u b/channels/il.m3u
index 0bf6d9f318..6fc20856e4 100644
--- a/channels/il.m3u
+++ b/channels/il.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AsaChild.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://i.imgur.com/Vs55QWR.png" group-title="",As a Child (720p)
 https://kanlivep2event-i.akamaihd.net/hls/live/747600/747600/playlist.m3u8
-#EXTINF:-1 tvg-id="ShoppingIL21TV.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://upload.wikimedia.org/wikipedia/he/b/b9/סמליל_ערוץ_הקניות.jpg" group-title="Shop",ch 21 ערוץ הקניות (360p)
+#EXTINF:-1 tvg-id="ShoppingIL21TV.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://upload.wikimedia.org/wikipedia/he/b/b9/סמליל_ערוץ_הקניות.jpg" group-title="Shop",ch 21 ערוץ הקניות (360p) [Timeout]
 http://82.80.192.30/shoppingil_ShoppingIL21TVRepeat/smil:ShoppingIL21TV.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Channel2News.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News (720p)
+#EXTINF:-1 tvg-id="Channel2News.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News (360p)
 https://keshethlslive-lh.akamaihd.net/i/c2n_1@195269/master.m3u8
 #EXTINF:-1 tvg-id="Channel9.il" tvg-country="IL" tvg-language="Russian" tvg-logo="" group-title="",Channel 9 (540p) [Not 24/7]
 http://50.7.231.221:8081/185/index.m3u8?wmsAuthSign=okad
@@ -14,11 +14,11 @@ http://93.152.174.144:4000/play/ch13/index.m3u8
 #EXTINF:-1 tvg-id="Channel24.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://i.imgur.com/2RC8nh6.jpg" group-title="Music",Channel 24 (720p)
 https://keshethlslive-lh.akamaihd.net/i/24live_1@195271/index_2200_av-b.m3u8
 #EXTINF:-1 tvg-id="HalaTV.il" tvg-country="IL" tvg-language="Arabic" tvg-logo="https://i.imgur.com/OzjftEl.png" group-title="",Hala TV (1080p) [Not 24/7]
-https://gstream4.panet.co.il/edge/halaTV/playlist.m3u8
-#EXTINF:-1 tvg-id="HalaTV.il" tvg-country="IL" tvg-language="Arabic" tvg-logo="https://i.imgur.com/OzjftEl.png" group-title="",Hala TV (1080p) [Not 24/7]
 https://live1.panet.co.il/edge_abr/halaTV/playlist.m3u8
 #EXTINF:-1 tvg-id="HalaTV.il" tvg-country="IL" tvg-language="Arabic" tvg-logo="https://i.imgur.com/OzjftEl.png" group-title="",Hala TV (1080p) [Not 24/7]
 https://live2.panet.co.il/edge_abr/halaTV/playlist.m3u8
+#EXTINF:-1 tvg-id="HalaTV.il" tvg-country="IL" tvg-language="Arabic" tvg-logo="https://i.imgur.com/OzjftEl.png" group-title="",Hala TV (720p) [Not 24/7]
+https://gstream4.panet.co.il/edge/halaTV/playlist.m3u8
 #EXTINF:-1 tvg-id="HidabrootChannel.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://i.imgur.com/wKi97Pg.png" group-title="Religious",Hidabroot (576p)
 https://stream5.shidur.net/htvlive2/smil:live2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="HidabrootChannel.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://i.imgur.com/wKi97Pg.png" group-title="Religious",Hidabroot (576p)
@@ -35,9 +35,9 @@ https://kanlivep2event-i.akamaihd.net/hls/live/747610/747610/master.m3u8
 http://93.152.174.144:4000/play/kan11/index.m3u8
 #EXTINF:-1 tvg-id="Keshet12.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="" group-title="",Keshet 12 (720p) [Not 24/7]
 https://iptv--iptv.repl.co/Hebrew/keshet_12
-#EXTINF:-1 tvg-id="KnessetChannel.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnihI34u_uI888nfYeu5QIgZDdyqEGdiQ6gW6PNU3A=s900-c-k-c0x00ffffff-no-rj" group-title="",Knesset Channel (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="KnessetChannel.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnihI34u_uI888nfYeu5QIgZDdyqEGdiQ6gW6PNU3A=s900-c-k-c0x00ffffff-no-rj" group-title="",Knesset Channel (480p) [Not 24/7]
 https://contact.gostreaming.tv/Knesset/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="Makan33.il" tvg-country="IL" tvg-language="Arabic" tvg-logo="https://www.makan.org.il/images/logo_livemenu_34logo_livemenu_33.png" group-title="",Makan 33 [Geo-blocked]
+#EXTINF:-1 tvg-id="Makan33.il" tvg-country="IL" tvg-language="Arabic" tvg-logo="https://www.makan.org.il/images/logo_livemenu_34logo_livemenu_33.png" group-title="",Makan 33 (432p) [Geo-blocked]
 https://kanlivep2event-i.akamaihd.net/hls/live/747613/747613/master.m3u8
 #EXTINF:-1 tvg-id="MusayofIsrael.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="" group-title="",Musayof (Israel) (240p) [Not 24/7]
 http://wowza.media-line.co.il/Musayof-Live/livestream.sdp/playlist.m3u8
@@ -51,5 +51,5 @@ http://93.152.174.144:4000/play/hotsport3/index.m3u8
 http://93.152.174.144:4000/play/hotsport4/index.m3u8
 #EXTINF:-1 tvg-id="SportsChannel.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="" group-title="Sports",Sports Channel (720p) [Not 24/7]
 http://93.152.174.144:4000/play/s5plus/index.m3u8
-#EXTINF:-1 tvg-id="YnetLive.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="" group-title="",Ynet Live (720p)
+#EXTINF:-1 tvg-id="YnetLive.il" tvg-country="IL" tvg-language="Hebrew" tvg-logo="" group-title="",Ynet Live (1080p)
 https://ynet-lh.akamaihd.net/i/ynet_1@123290/master.m3u8
diff --git a/channels/in.m3u b/channels/in.m3u
index 6954fe9618..420699cf4e 100644
--- a/channels/in.m3u
+++ b/channels/in.m3u
@@ -1,14 +1,4 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="3TamilTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/WfAU7pB.png" group-title="Entertainment",3 Tamil TV (720p) [Not 24/7]
-https://6n3yogbnd9ok-hls-live.5centscdn.com/threetamil/d0dbe915091d400bd8ee7f27f0791303.sdp/index.m3u8
-#EXTINF:-1 tvg-id="7SMusic.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/P5EXpPy.jpg" group-title="Music",7S Music (576p) [Offline]
-http://103.199.161.254/Content/7smusic/Live/Channel(7smusic)/index.m3u8
-#EXTINF:-1 tvg-id="9XJalwa.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/6h83JRO.png" group-title="Music",9X Jalwa (576p) [Not 24/7]
-http://14.199.164.20:4001/play/a0nc/index.m3u8
-#EXTINF:-1 tvg-id="9XJhakaas.in" tvg-country="IN" tvg-language="Marathi" tvg-logo="https://i.imgur.com/aZ0f85I.png" group-title="Music",9X Jhakaas (576p) [Not 24/7]
-http://14.199.164.20:4001/play/a0mx/index.m3u8
-#EXTINF:-1 tvg-id="9XM.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/fD7wLka.jpg" group-title="Music",9XM (480p)
-https://d2q8p4pe5spbak.cloudfront.net/bpk-tv/9XM/9XM.isml/index.m3u8
 #EXTINF:-1 tvg-id="AndFlix.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://static.epg.best/in/AndFlix.in.png" group-title="Movies",&Flix (720p) [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-channel_2105335046
 #EXTINF:-1 tvg-id="AndPictures.in" tvg-country="SAS" tvg-language="Pashto" tvg-logo="https://static.epg.best/in/AndPictures.in.png" group-title="Movies",&Pictures (720p) [Geo-blocked]
@@ -17,6 +7,16 @@ https://sneh-z5api.herokuapp.com/?c=0-9-tvpictureshd
 https://sneh-z5api.herokuapp.com/?c=0-9-privéhd
 #EXTINF:-1 tvg-id="AndTVHD.in" tvg-country="SAS" tvg-language="Pashto" tvg-logo="https://static.epg.best/in/AndTV.in.png" group-title="Movies",&TV HD (720p) [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-tvhd_0
+#EXTINF:-1 tvg-id="3TamilTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/WfAU7pB.png" group-title="Entertainment",3 Tamil TV (720p) [Not 24/7]
+https://6n3yogbnd9ok-hls-live.5centscdn.com/threetamil/d0dbe915091d400bd8ee7f27f0791303.sdp/index.m3u8
+#EXTINF:-1 tvg-id="7SMusic.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/P5EXpPy.jpg" group-title="Music",7S Music (576p) [Not 24/7]
+http://103.199.161.254/Content/7smusic/Live/Channel(7smusic)/index.m3u8
+#EXTINF:-1 tvg-id="9XJalwa.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/6h83JRO.png" group-title="Music",9X Jalwa (576p) [Not 24/7]
+http://14.199.164.20:4001/play/a0nc/index.m3u8
+#EXTINF:-1 tvg-id="9XJhakaas.in" tvg-country="IN" tvg-language="Marathi" tvg-logo="https://i.imgur.com/aZ0f85I.png" group-title="Music",9X Jhakaas (576p) [Not 24/7]
+http://14.199.164.20:4001/play/a0mx/index.m3u8
+#EXTINF:-1 tvg-id="9XM.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/fD7wLka.jpg" group-title="Music",9XM (480p)
+https://d2q8p4pe5spbak.cloudfront.net/bpk-tv/9XM/9XM.isml/index.m3u8
 #EXTINF:-1 tvg-id="ANEWSdonsTVBhangraFlava.in" tvg-country="IN" tvg-language="Punjabi" tvg-logo="" group-title="Music",A NEWSDONs TV- SWAG SADDA VAKRAA (720p) [Not 24/7]
 http://newsjatt.camdvr.org:1935/newsjatt/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="AajTak.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/x1Y2P21.png" group-title="News",Aaj Tak (576p) [Geo-blocked]
@@ -52,7 +52,7 @@ http://cdn.asianetmobiletvplus.com/channels/acvutsav_021c9292219a98f899a7b74f0f3
 #EXTINF:-1 tvg-id="ADNGold.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/UzPPjoH.jpg" user-agent="AsianetMobileTVPlus" group-title="",ADN Gold (404p) [Offline]
 #EXTVLCOPT:http-user-agent=AsianetMobileTVPlus
 http://cdn.asianetmobiletvplus.com/channels/adngold_dibbcspwxywdcuwawgrvurjwitwbiksl/playlist.m3u8
-#EXTINF:-1 tvg-id="AkaramKidz.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/hAgaVPa.jpg" group-title="Kids",Akaram Kidz (460p) [Not 24/7]
+#EXTINF:-1 tvg-id="AkaramKidz.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/hAgaVPa.jpg" group-title="Kids",Akaram Kidz (720p) [Not 24/7]
 http://akaram.zecast.net/akaram-live/akaramkidz/index.m3u8
 #EXTINF:-1 tvg-id="AKDCalcuttaNews.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://calcuttanews.tv/images/cnwotag.png" group-title="News",AKD Calcutta News (540p) [Geo-blocked]
 https://d39iawgzv3h0yo.cloudfront.net/out/v1/1ef4344a3b4a41908915d58ac7bd5e23/index.m3u8
@@ -60,7 +60,7 @@ https://d39iawgzv3h0yo.cloudfront.net/out/v1/1ef4344a3b4a41908915d58ac7bd5e23/in
 https://streamcdn.amarujala.com/live/smil:stream1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AmritaTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/xxWaGyn.jpg" group-title="Entertainment",Amrita TV (576p)
 http://103.199.161.254/Content/amrita/Live/Channel(Amrita)/index.m3u8
-#EXTINF:-1 tvg-id="Anjan.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Anjan (720p) [Offline]
+#EXTINF:-1 tvg-id="Anjan.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Anjan (720p) [Not 24/7]
 https://f3.vstream.online:7443/bstb/ngrp:anjan_hdall/playlist.m3u8
 #EXTINF:-1 tvg-id="ApnaPunjab.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Apna Punjab (720p)
 http://cdn5.live247stream.com/apnapunjab/tv/playlist.m3u8
@@ -72,7 +72,7 @@ http://ashrafichannel.livebox.co.in/ashrafivhannelhls/live.m3u8
 http://14.199.164.20:4001/play/a0k6/index.m3u8
 #EXTINF:-1 tvg-id="AsianetNews.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/89LBgkl.png" group-title="News",Asianet News (576p)
 http://103.199.161.254/Content/asianetnews/Live/Channel(Asianetnews)/index.m3u8
-#EXTINF:-1 tvg-id="AsianetNews.in" tvg-country="IN" tvg-language="English" tvg-logo="https://i.imgur.com/89LBgkl.png" group-title="News",Asianet News (404p) [Not 24/7]
+#EXTINF:-1 tvg-id="AsianetNews.in" tvg-country="IN" tvg-language="English" tvg-logo="https://i.imgur.com/89LBgkl.png" group-title="News",Asianet News (720p) [Not 24/7]
 https://vidcdn.vidgyor.com/asianet-origin/liveabr/playlist.m3u8
 #EXTINF:-1 tvg-id="AsianetNewsBangla.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://static.asianetnews.com/v1/images/bangla_logo.png" group-title="News",Asianet News Bangla (360p)
 https://vidcdn.vidgyor.com/rplus-origin/rplusasianetlive/playlist.m3u8
@@ -80,11 +80,11 @@ https://vidcdn.vidgyor.com/rplus-origin/rplusasianetlive/playlist.m3u8
 https://vidcdn.vidgyor.com/suvarna-origin/liveabr/playlist.m3u8
 #EXTINF:-1 tvg-id="AsianetNewsTamil.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://static.asianetnews.com/v1/images/tamil_logo.png" group-title="News",Asianet News Tamil (360p) [Not 24/7]
 https://vidcdn.vidgyor.com/ptm-origin/aslive/playlist.m3u8
-#EXTINF:-1 tvg-id="AssamTalks.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/GmXawATX.png" group-title="",Assam Talks (240p)
+#EXTINF:-1 tvg-id="AssamTalks.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/GmXawATX.png" group-title="",Assam Talks (240p) [Not 24/7]
 http://vidnetcdn.vidgyor.com/assamtalks-origin/liveabr/playlist.m3u8
-#EXTINF:-1 tvg-id="ATNBangla.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",ATN Bangla (1080p) [Offline]
+#EXTINF:-1 tvg-id="ATNBangla.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",ATN Bangla (1080p) [Timeout]
 http://103.81.104.118/hls/stream17.m3u8
-#EXTINF:-1 tvg-id="AyushTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/PWzvp0B.png" group-title="Lifestyle",Ayush TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AyushTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/PWzvp0B.png" group-title="Lifestyle",Ayush TV (360p) [Not 24/7]
 https://95eryw39dwn4-hls-live.wmncdn.net/Ayushu/271ddf829afeece44d8732757fba1a66.sdp/index.m3u8
 #EXTINF:-1 tvg-id="B4UBhojpuri.in" tvg-country="IN" tvg-language="Bhojpuri" tvg-logo="https://i.imgur.com/FizAx6D.png" group-title="Movies",B4U Bhojpuri (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0nq/index.m3u8
@@ -98,7 +98,7 @@ http://14.199.164.20:4001/play/a0wj/index.m3u8
 http://14.199.164.20:4001/play/a0wk/index.m3u8
 #EXTINF:-1 tvg-id="B4UPlus.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/SsooYqR.png" group-title="Movies",B4U Plus (720p) [Not 24/7]
 http://14.199.164.20:4001/play/a0wi/index.m3u8
-#EXTINF:-1 tvg-id="BflixMovies.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/z3ALZQQ.jpg" group-title="Movies",Bflix Movies (480p)
+#EXTINF:-1 tvg-id="BflixMovies.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/z3ALZQQ.jpg" group-title="Movies",Bflix Movies (360p)
 https://m-c036-j2apps.s.llnwi.net/hls/5045.BFlixMovies.in.m3u8
 #EXTINF:-1 tvg-id="BhojpuriCinema.in" tvg-country="IN" tvg-language="Bhojpuri" tvg-logo="https://i.imgur.com/ABxIO7r.jpg" group-title="Movies",Bhojpuri Cinema (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0rj/index.m3u8
@@ -110,7 +110,7 @@ http://telekomtv-ro.akamaized.net/shls/LIVE$BollywoodClassic/6.m3u8/Level(167772
 http://telekomtv-ro.akamaized.net/shls/LIVE$BollywoodHD/247.m3u8/Level(3670016)?end=END&start=LIVE
 #EXTINF:-1 tvg-id="BoogleBollywood.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://booglebollywood.com/wp-content/uploads/2018/02/boogle-bollywood-final_2-300x96.png" group-title="",Boogle Bollywood [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-165
-#EXTINF:-1 tvg-id="BoogleBollywood.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://booglebollywood.com/wp-content/uploads/2018/02/boogle-bollywood-final_2-300x96.png" group-title="",Boogle Bollywood (400p) [Not 24/7]
+#EXTINF:-1 tvg-id="BoogleBollywood.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://booglebollywood.com/wp-content/uploads/2018/02/boogle-bollywood-final_2-300x96.png" group-title="",Boogle Bollywood (1080p) [Not 24/7]
 http://live.agmediachandigarh.com/booglebollywood/774e3ea9f3fa9bcdac47f445b83b6653.sdp/index.m3u8
 #EXTINF:-1 tvg-id="BoxCinema.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/LGJlmtp.png" group-title="Movies",Box Cinema (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0su/index.m3u8
@@ -157,7 +157,7 @@ https://hls.media.nic.in/live/ddpunjabi1/index.m3u8
 http://103.199.161.254/Content/ddsports/Live/Channel(DDSPORTS)/index.m3u8
 #EXTINF:-1 tvg-id="DesiBeatsHD.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Desi Beats HD (720p)
 http://cdn7.live247stream.com/desibeats/tv/playlist.m3u8
-#EXTINF:-1 tvg-id="DesiChannel.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Desi Channel (400p)
+#EXTINF:-1 tvg-id="DesiChannel.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Desi Channel (720p)
 https://live.wmncdn.net/desichannel/7e2dd0aed46b70a5c77f4affdb702e4b.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="DesiPlus.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Desi Plus (720p)
 http://cdn2.live247stream.com/desiplus/tv/playlist.m3u8
@@ -169,7 +169,7 @@ http://14.199.164.20:4001/play/a0o5/index.m3u8
 http://14.199.164.20:4001/play/a0tm/index.m3u8
 #EXTINF:-1 tvg-id="DighvijayNews24x7.in" tvg-country="IN" tvg-language="Kannada" tvg-logo="https://i.imgur.com/wdE7gxU.png" group-title="News",Dighvijay (240p) [Not 24/7]
 https://vidcdn.vidgyor.com/dighvijay-origin/liveabr/playlist.m3u8
-#EXTINF:-1 tvg-id="DilSe.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Dil Se (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="DilSe.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Dil Se (360p) [Not 24/7]
 https://live.hungama.com/linear/dil-se/playlist.m3u8
 #EXTINF:-1 tvg-id="DishaTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Disha TV (360p) [Not 24/7]
 http://xlbor3aadvaj-hls-live.wmncdn.net/disha/stream.stream/playlist.m3u8
@@ -183,21 +183,21 @@ https://sneh-z5api.herokuapp.com/?c=0-9-divyatv
 https://docubayvh.s.llnwi.net/526a07ab-6ae7-4b6c-84a1-159791416484_1000004372_HLS/manifest.m3u8
 #EXTINF:-1 tvg-id="DreamTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/VdcG0i6.png" group-title="Entertainment",Dream TV (720p) [Not 24/7]
 https://cloudflare-cdn301.ottpro.in/dream_media/reedeem/playlist.m3u8
-#EXTINF:-1 tvg-id="DreamzTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/yXHmKtT.png" group-title="Entertainment",Dreamz TV (768p) [Not 24/7]
+#EXTINF:-1 tvg-id="DreamzTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/yXHmKtT.png" group-title="Entertainment",Dreamz TV (576p) [Not 24/7]
 http://198.144.149.82:8080/NOTV/DREAMHD/index.m3u8?token=GTR
 #EXTINF:-1 tvg-id="DumTVKannada.in" tvg-country="IN" tvg-language="Kannada" tvg-logo="https://i.imgur.com/e43ysdo.png" group-title="Entertainment",Dum TV Kannada (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0sq/index.m3u8
 #EXTINF:-1 tvg-id="E24.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/VBu7r0A.png" group-title="Entertainment",E24 (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0pc/index.m3u8
-#EXTINF:-1 tvg-id="EETTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/f7J37yv.png" group-title="Entertainment",EET TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="EETTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/f7J37yv.png" group-title="Entertainment",EET TV (1080p) [Not 24/7]
 https://live.streamjo.com/eetlive/eettv.m3u8
-#EXTINF:-1 tvg-id="Enter10Bangla.in" tvg-country="IN" tvg-language="Bangla" tvg-logo="https://i.imgur.com/fkOxQtS.png" group-title="Entertainment",Enter10 Bangla (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="Enter10Bangla.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/fkOxQtS.png" group-title="Entertainment",Enter10 Bangla (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0j5/index.m3u8
 #EXTINF:-1 tvg-id="Enter10Rangeela.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/419CJW8.png" group-title="Entertainment",Enter10 Rangeela (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0tp/index.m3u8
 #EXTINF:-1 tvg-id="EpicTV.in" tvg-country="IN" tvg-language="English" tvg-logo="https://i.imgur.com/XsRrnc5.png" group-title="",Epic TV [Geo-blocked]
 https://m-c03-j2apps.s.llnwi.net/hls/2639.Epic.in.m3u8
-#EXTINF:-1 tvg-id="ETNow.in" tvg-country="IN" tvg-language="English" tvg-logo="https://i.imgur.com/rhkI95a.png" group-title="Business",ET Now (720p)
+#EXTINF:-1 tvg-id="ETNow.in" tvg-country="IN" tvg-language="English" tvg-logo="https://i.imgur.com/rhkI95a.png" group-title="Business",ET Now (360p)
 https://etnowweblive-lh.akamaihd.net/i/ETN_1@348070/master.m3u8
 #EXTINF:-1 tvg-id="ETVAndhraPradesh.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/FfiMH8z.jpg" group-title="News",ETV Andhra Pradesh (480p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCSbwShxZsBiqqWwtUidmS6g/live
@@ -219,7 +219,7 @@ https://a.jsrdn.com/broadcast/7ef91d3d7a/+0000/c.m3u8
 http://103.199.161.254/Content/flowers/Live/Channel(Flowers)/index.m3u8
 #EXTINF:-1 tvg-id="FoodFood.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/J930pA1.png" group-title="Entertainment",Food Food (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0qx/index.m3u8
-#EXTINF:-1 tvg-id="GabruuTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/k9kHJv9.jpg" group-title="Music",Gabruu TV [Offline]
+#EXTINF:-1 tvg-id="GabruuTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/k9kHJv9.jpg" group-title="Music",Gabruu TV [Timeout]
 http://104.237.60.234/live/gabruutv.m3u8
 #EXTINF:-1 tvg-id="GaundaPunjabTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/J74dCx6.png" group-title="",Gaunda Punjab TV (720p) [Not 24/7]
 http://start.agmediachandigarh.com/gaundapunjab/tv/playlist.m3u8
@@ -235,7 +235,7 @@ http://14.199.164.20:4001/play/a0rg/index.m3u8
 http://cdncities.com/8012/8012/playlist.m3u8
 #EXTINF:-1 tvg-id="HulchulTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Hulchul TV (720p) [Not 24/7]
 http://cdn12.henico.net:8080/live/jbani/index.m3u8
-#EXTINF:-1 tvg-id="HungamaTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/ctjMaOW.png" group-title="Kids",Hungama TV (576p) [Offline]
+#EXTINF:-1 tvg-id="HungamaTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/ctjMaOW.png" group-title="Kids",Hungama TV (576p) [Timeout]
 http://103.153.39.34:8000/play/a04l/index.m3u8
 #EXTINF:-1 tvg-id="ILove.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/u191zfh.png" group-title="Music",I Love (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0p3/index.m3u8
@@ -255,7 +255,7 @@ http://103.199.161.254/Content/isaiaruvi/Live/Channel(IsaiAruvi)/index.m3u8
 http://103.199.161.254/Content/jaihind/Live/Channel(Jaihind)/index.m3u8
 #EXTINF:-1 tvg-id="JanTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/0qNJuVP.jpg" group-title="News",Jan TV (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=http://www.youtube.com/channel/UCjmnq35TvJ1J8JZS49OPg-Q/live
-#EXTINF:-1 tvg-id="JanTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/0qNJuVP.jpg" group-title="News",Jan TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="JanTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/0qNJuVP.jpg" group-title="News",Jan TV (360p) [Not 24/7]
 http://jantvstream.in:1935/edge1/sc1jantv.stream_aac/playlist.m3u8
 #EXTINF:-1 tvg-id="JanamTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/LWUpmDm.png" group-title="News",Janam TV (720p)
 https://vidcdn.vidgyor.com/janamtv-origin/liveabr/playlist.m3u8
@@ -267,19 +267,19 @@ http://14.199.164.20:4001/play/a0ja/index.m3u8
 https://jio.instream.ml/jio.php?c=Janapriyam_News&e=.m3u8&q=400
 #EXTINF:-1 tvg-id="JanataaTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Janataa TV [Not 24/7]
 http://mydreams.livebox.co.in/Janataatvhls/Janataatv.m3u8
-#EXTINF:-1 tvg-id="JantaTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Janta TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="JantaTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Janta TV (360p) [Not 24/7]
 https://live.wmncdn.net/jantatv/live.stream/index.m3u8
 #EXTINF:-1 tvg-id="JayaPlus.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/7/7b/Jaya_Plus.jpeg/revision/latest/scale-to-width-down/250?cb=20191224113458" group-title="News",Jaya Plus (1080p) [Offline]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/watch?v=eWNFGCYl7Y8
 #EXTINF:-1 tvg-id="JeevanTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/PYs1W1Y.png" group-title="",Jeevan TV (576p)
 http://103.199.161.254/Content/jeevan/Live/Channel(Jeevan)/index.m3u8
-#EXTINF:-1 tvg-id="JhanjarMusic.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/gIYOu4i.jpg" group-title="Music",Jhanjar Music (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="JhanjarMusic.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/gIYOu4i.jpg" group-title="Music",Jhanjar Music (1080p) [Not 24/7]
 http://159.203.9.134/hls/jhanjar_music/jhanjar_music.m3u8
 #EXTINF:-1 tvg-id="JonackTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Jonack TV (360p) [Not 24/7]
 https://cdn.smartstream.video/smartstream-us/jonakk/jonakk/playlist.m3u8
-#EXTINF:-1 tvg-id="KadakHits.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Kadak Hits (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="KadakHits.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Kadak Hits (360p) [Not 24/7]
 https://live.hungama.com/linear/kadak-hits/playlist.m3u8
-#EXTINF:-1 tvg-id="KairaliArabia.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/dp6BvWJ.png" group-title="Entertainment",Kairali Arabia (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="KairaliArabia.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/dp6BvWJ.png" group-title="Entertainment",Kairali Arabia (480p) [Not 24/7]
 https://idvd.multitvsolution.com/idvo/kairaliarabia_540p/index.m3u8
 #EXTINF:-1 tvg-id="KairaliNews.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/hXsVrIh.jpg" group-title="News",Kairali News (576p)
 http://103.199.161.254/Content/people/Live/Channel(People)/index.m3u8
@@ -303,7 +303,7 @@ http://103.199.161.254/Content/kalaignarsirippoli/Live/Channel(Kalaignarsirippol
 https://live.mycast.in/kalingatv/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="KanakNews.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/4ZNf4dH3.png" group-title="News",Kanak News (720p) [Not 24/7]
 https://live.kanaknews.com:4443/live/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="KannurOne.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/hytRL90.png" group-title="",Kannur One (1024p) [Not 24/7]
+#EXTINF:-1 tvg-id="KannurOne.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/hytRL90.png" group-title="",Kannur One (720p) [Not 24/7]
 https://bnwdplewrp3a-hls-live.wmncdn.net/kannur1/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="KannurVision.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/Zo6TFvK.png" group-title="",Kannur Vision (360p) [Not 24/7]
 https://stream.ufworldind.in/live/kvision/playlist.m3u8
@@ -315,7 +315,7 @@ http://103.199.161.254/Content/kasthuritv/Live/Channel(KasthuriTV)/index.m3u8
 https://live.wmncdn.net/kaumuditv1/live.stream/index.m3u8
 #EXTINF:-1 tvg-id="KCLTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/bkp9dIm.png" group-title="Entertainment",KCL TV (720p) [Not 24/7]
 http://kcltv.livebox.co.in/kclhls/live.m3u8
-#EXTINF:-1 tvg-id="KCV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/9YD8u4H.png" group-title="Entertainment",KCV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="KCV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/9YD8u4H.png" group-title="Entertainment",KCV (576p) [Not 24/7]
 http://198.144.149.82:8080/NOTV/KCVTV/index.m3u8?token=GTR
 #EXTINF:-1 tvg-id="KCVMovies.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/NY94lnZ.png" group-title="Movies",KCV Movies (720p) [Not 24/7]
 http://198.144.149.82:8080/NOTV/KCVMOVIE/index.m3u8?token=GTR
@@ -345,7 +345,7 @@ http://14.199.164.20:4001/play/a0q7/index.m3u8
 https://sneh-z5api.herokuapp.com/?c=0-9-makkaltv
 #EXTINF:-1 tvg-id="MakkalTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/Sv4bLGX.png" group-title="General",Makkal TV (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0l1/index.m3u8
-#EXTINF:-1 tvg-id="MalabarNews.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/yJWfyfM.png" group-title="News",Malabar News (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="MalabarNews.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/yJWfyfM.png" group-title="News",Malabar News (720p) [Not 24/7]
 http://cloud.logicwebs.in:1935/live/malabarnews/playlist.m3u8
 #EXTINF:-1 tvg-id="Malaimurasu.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/uFiHtQX.png" group-title="News",Malaimurasu (480p) [Not 24/7]
 https://malaimurasucdn.purplestream.com/malaimurasu/49992ade0624eda468a31e137996d044.sdp/playlist.m3u8
@@ -355,7 +355,7 @@ http://103.78.18.137:1935/live/mlpchannel/chunklist.m3u8
 http://103.199.160.85/Content/mangalam/Live/Channel(Mangalam)/index.m3u8
 #EXTINF:-1 tvg-id="ManoramaNews.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/QWHbIYt.png" group-title="News",Manorama News (576p)
 http://103.199.161.254/Content/manoramanews/Live/Channel(ManoramaNews)/index.m3u8
-#EXTINF:-1 tvg-id="ManoranjanGrand.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/2BSvBGG.png" group-title="Movies",Manoranjan Grand (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ManoranjanGrand.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/2BSvBGG.png" group-title="Movies",Manoranjan Grand (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0m2/index.m3u8
 #EXTINF:-1 tvg-id="ManoranjanMovies.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/F7uHOyA.png" group-title="Movies",Manoranjan Movies (480p)
 https://m-c036-j2apps.s.llnwi.net/hls/2172.ManoranjanMovies.in.m3u8
@@ -382,7 +382,7 @@ http://103.199.161.254/Content/mediaone/Live/Channel(MediaOne)/index.m3u8
 http://rtmp.smartstream.video:1935/mhonemusic/mhonemusic/playlist.m3u8
 #EXTINF:-1 tvg-id="MH1Prime.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/UdoA8f7.png" group-title="",MH1 Prime (360p) [Not 24/7]
 http://rtmp.smartstream.video:1935/mhonenews/mhonenews/playlist.m3u8
-#EXTINF:-1 tvg-id="MirrorNow.in" tvg-country="IN" tvg-language="English" tvg-logo="https://yt3.ggpht.com/-XmvqPl571Ak/AAAAAAAAAAI/AAAAAAAAAAA/mMm0Tpd90kU/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",Mirror Now (576p)
+#EXTINF:-1 tvg-id="MirrorNow.in" tvg-country="IN" tvg-language="English" tvg-logo="https://yt3.ggpht.com/-XmvqPl571Ak/AAAAAAAAAAI/AAAAAAAAAAA/mMm0Tpd90kU/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",Mirror Now (360p)
 https://mbnowweb-lh.akamaihd.net/i/MRN_1@346545/master.m3u8
 #EXTINF:-1 tvg-id="MKSix.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/FAytBoW.png" group-title="",MK Six (576p) [Not 24/7]
 http://103.199.160.85/Content/mktv6/Live/Channel(MKTV6)/index.m3u8
@@ -406,11 +406,11 @@ https://namdhari.tv/live/sbs1.m3u8
 https://live.mycast.in/ngtv/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="NaxtraNews.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",Naxtra News (720p) [Not 24/7]
 http://wearelive.livebox.co.in/naxatratvhls/Naxatratv.m3u8
-#EXTINF:-1 tvg-id="Nazrana.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Nazrana (1080p)
+#EXTINF:-1 tvg-id="Nazrana.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Nazrana (480p)
 https://live.hungama.com/linear/nazrana/playlist.m3u8
-#EXTINF:-1 tvg-id="NDTV24X7.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://jiotv.catchup.cdn.jio.com/dare_images/images/NDTV_24x7.png" group-title="News",NDTV 24X7 (480p) [Offline]
+#EXTINF:-1 tvg-id="NDTV24X7.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://jiotv.catchup.cdn.jio.com/dare_images/images/NDTV_24x7.png" group-title="News",NDTV 24X7 (480p) [Not 24/7]
 https://ndtv24x7elemarchana.akamaized.net/hls/live/2003678/ndtv24x7/master.m3u8
-#EXTINF:-1 tvg-id="NDTVIndia.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/tcLeUEuX.png" group-title="",NDTV India (480p) [Offline]
+#EXTINF:-1 tvg-id="NDTVIndia.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/tcLeUEuX.png" group-title="",NDTV India (480p) [Not 24/7]
 https://ndtvindiaelemarchana.akamaized.net/hls/live/2003679/ndtvindia/master.m3u8
 #EXTINF:-1 tvg-id="NDTVProfit.in" tvg-country="IN" tvg-language="English" tvg-logo="http://bsmedia.business-standard.com/_media/bs/img/article/2017-06/01/full/1496330873-5363.jpg" group-title="Business",NDTV Profit (480p)
 https://ndtvprofitelemarchana.akamaized.net/hls/live/2003680-b/ndtvprofit/master.m3u8
@@ -418,7 +418,7 @@ https://ndtvprofitelemarchana.akamaized.net/hls/live/2003680-b/ndtvprofit/master
 https://ndtv.live-s.cdn.bitgravity.com/cdn-live/_definst_/ndtv/live/ndtv_profit.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="NDTVProfit.in" tvg-country="IN" tvg-language="English" tvg-logo="http://jiotv.catchup.cdn.jio.com/dare_images/images/NDTV_Profit.png" group-title="Business",NDTV Profit (480p) [Not 24/7]
 https://ndtvprofitelemarchana.akamaized.net/hls/live/2003680/ndtvprofit/master.m3u8
-#EXTINF:-1 tvg-id="NeeCinema.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/vYme2fs.png" group-title="Movies",Nee Cinema (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="NeeCinema.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/vYme2fs.png" group-title="Movies",Nee Cinema (576p) [Not 24/7]
 https://live.neestream.com/neestream_01/nee_cinema/playlist.m3u8
 #EXTINF:-1 tvg-id="NethraTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://srilankanews.wpengine.netdna-cdn.com/wp-content/uploads/2015/09/nethra.png" group-title="News",Nethra TV (480p) [Not 24/7]
 https://dammikartmp.tulix.tv/slrc3/slrc3/playlist.m3u8
@@ -426,12 +426,8 @@ https://dammikartmp.tulix.tv/slrc3/slrc3/playlist.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC2f4w_ppqHplvjiNaoTAK9w/live
 #EXTINF:-1 tvg-id="News7Tamil.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/oBjgUTc.png" group-title="News",News 7 Tamil (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0kp/index.m3u8
-#EXTINF:-1 tvg-id="News18Assam.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",News18 Assam (504p) [Not 24/7]
-https://news18assam-lh.akamaihd.net/i/n18assamne_1@526575/index_5_av-p.m3u8
 #EXTINF:-1 tvg-id="News18Assam.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",News 18 Assam (360p) [Not 24/7]
 https://news18assam-lh.akamaihd.net/i/n18assamne_1@526575/index_4_av-p.m3u8?rebase=on&sd=10
-#EXTINF:-1 tvg-id="News18Bangla.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",News18 Bangla (360p) [Not 24/7]
-https://news18bangla-lh.akamaihd.net/i/n18bangla_1@2289/index_4_av-p.m3u8
 #EXTINF:-1 tvg-id="News18Bengali.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/ApY5STle.png" group-title="News",News 18 Bengali (360p) [Not 24/7]
 https://news18bangla-lh.akamaihd.net/i/n18bangla_1@2289/index_4_av-p.m3u8?rebase=on&sd=10
 #EXTINF:-1 tvg-id="News18Chhattisgarh.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",News 18 Chhattisgarh (360p)
@@ -440,8 +436,6 @@ https://news18mp-lh.akamaihd.net/i/n18mpcg_1@175737/index_4_av-p.m3u8?rebase=on&
 https://news18gujarati-lh.akamaihd.net/i/n18gujarat_1@370955/index_4_av-p.m3u8?rebase=on&sd=10
 #EXTINF:-1 tvg-id="News18Hindi.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",News 18 Hindi (360p)
 https://news18india-lh.akamaihd.net/i/news18india_1@174951/index_4_av-p.m3u8?rebase=on&sd=10
-#EXTINF:-1 tvg-id="News18India.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/hqclXeVK.png" group-title="News",News18 India (504p)
-https://news18india-lh.akamaihd.net/i/news18india_1@174951/index_5_av-p.m3u8
 #EXTINF:-1 tvg-id="News18Jharkhand.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",News 18 Jharkhand (360p)
 https://news18bihar-lh.akamaihd.net/i/n18biharjh_1@175736/index_4_av-p.m3u8?rebase=on&sd=10
 #EXTINF:-1 tvg-id="News18Kannada.in" tvg-country="IN" tvg-language="Kannada" tvg-logo="https://static.kannada.news18.com/kannada/uploads/2020/03/Kannada1.png" group-title="News",News 18 Kannada (360p)
@@ -470,6 +464,12 @@ https://vidcdn.vidgyor.com/news24-origin/liveabr/news24-origin/live1/playlist.m3
 https://vidcdn.vidgyor.com/news24-origin/liveabr/news24-origin/live2/playlist.m3u8
 #EXTINF:-1 tvg-id="NewsJ.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/7/7e/News_J.jpeg/revision/latest?cb=20191226093118" group-title="News",News J (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/watch?v=QH4zszwdIKE
+#EXTINF:-1 tvg-id="News18Assam.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",News18 Assam (504p) [Not 24/7]
+https://news18assam-lh.akamaihd.net/i/n18assamne_1@526575/index_5_av-p.m3u8
+#EXTINF:-1 tvg-id="News18Bangla.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="News",News18 Bangla (360p) [Not 24/7]
+https://news18bangla-lh.akamaihd.net/i/n18bangla_1@2289/index_4_av-p.m3u8
+#EXTINF:-1 tvg-id="News18India.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/hqclXeVK.png" group-title="News",News18 India (504p)
+https://news18india-lh.akamaihd.net/i/news18india_1@174951/index_5_av-p.m3u8
 #EXTINF:-1 tvg-id="NextTVMalabar.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://cdn.statically.io/img/nexttv.in/f=auto,w=160/assets/images/toplogo-2.png?v=1" group-title="Local",Next TV Malabar (720p) [Not 24/7]
 https://6zklxbgpdw9b-hls-live.5centscdn.com/next/c9a1fdac6e082dd89e7173244f34d7b3.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="OdishaTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/8ZmnDAS3.png" group-title="",Odisha TV (480p) [Not 24/7]
@@ -487,7 +487,7 @@ http://14.199.164.20:4001/play/a0lg/index.m3u8
 #EXTINF:-1 tvg-id="PolimerTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/FeLT0mK.jpg" user-agent="AsianetMobileTVPlus" group-title="Entertainment",Polimer TV (404p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=AsianetMobileTVPlus
 http://cdn.asianetmobiletvplus.com/channels/polimertv_rpvpvdefkpxbafsouzockpitjldtogrr/chunks.m3u8
-#EXTINF:-1 tvg-id="PopPataka.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Pop Pataka (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="PopPataka.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Music",Pop Pataka (720p) [Not 24/7]
 https://live.hungama.com/linear/pop-pataka/playlist.m3u8
 #EXTINF:-1 tvg-id="PopularScience.in" tvg-country="IN" tvg-language="English" tvg-logo="" group-title="Science",Popular Science (720p) [Offline]
 https://a.jsrdn.com/broadcast/447912f76b/+0000/c.m3u8
@@ -511,7 +511,7 @@ https://royalstarindia.co.in/pularitv_hls/pularitv.m3u8
 http://158.69.124.9:1935/5aabtv/5aabtv/playlist.m3u8
 #EXTINF:-1 tvg-id="PunjabiZindabad.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Punjabi Zindabad (360p)
 http://stream.pztv.online/pztv/playlist.m3u8
-#EXTINF:-1 tvg-id="PuthiyaThalaimurai.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/f/f3/Puthiya_Thalaimurai.jpeg/revision/latest?cb=20191224103436" group-title="News",Puthiya Thalaimurai (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PuthiyaThalaimurai.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/f/f3/Puthiya_Thalaimurai.jpeg/revision/latest?cb=20191224103436" group-title="News",Puthiya Thalaimurai (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCmyKnNRH0wH-r8I-ceP-dsg/live
 #EXTINF:-1 tvg-id="PuthuyugamTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/1q1LQQ9.png" group-title="",Puthuyugam TV (576p) [Not 24/7]
 http://103.199.160.85/Content/puthuyugam/Live/Channel(Puthuyugam)/index.m3u8
@@ -525,7 +525,7 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/watch?v
 https://bk7l298nyx53-hls-live.5centscdn.com/realnews/e7dee419f91aa9e65939d3677fb9c4f5.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="RealTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="http://expressott.in/uploads/tv_image/real-tv.jpg" group-title="Music",Real TV (1080p) [Not 24/7]
 http://cloud.logicwebs.in:1935/realtv/realtv1/playlist.m3u8
-#EXTINF:-1 tvg-id="RelaxTV" tvg-country="IN" tvg-language="Tamil" tvg-logo="http://expressott.in/uploads/tv_image/relax-tv.png" group-title="Music",Relax TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RelaxTV" tvg-country="IN" tvg-language="Tamil" tvg-logo="http://expressott.in/uploads/tv_image/relax-tv.png" group-title="Music",Relax TV (576p) [Not 24/7]
 http://198.144.149.82:8080/NOTV/RELAXTV/index.m3u8?token=GTR
 #EXTINF:-1 tvg-id="ReporterTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/a80vdrp.jpg" group-title="News",Reporter TV (576p)
 http://103.199.161.254/Content/reporter/Live/Channel(Reporter)/index.m3u8
@@ -574,7 +574,7 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
 http://14.199.164.20:4001/play/a0ok/index.m3u8
 #EXTINF:-1 tvg-id="ShemarooTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/UNNcOef.png" group-title="Entertainment",Shemaroo TV (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0nh/index.m3u8
-#EXTINF:-1 tvg-id="ShirdiLive.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Shirdi Live (720p)
+#EXTINF:-1 tvg-id="ShirdiLive.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Shirdi Live (720p) [Offline]
 https://cam.live-s.cdn.bitgravity.com/cdn-live/_definst_/cam/live/secure/saibaba/playlist.m3u8?e=0&h=2598445340a35f63eb211f81940d2525
 #EXTINF:-1 tvg-id="ShowBox.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/m9UFtTM.png" group-title="Music",Show Box (576p) [Not 24/7]
 http://14.199.164.20:4001/play/a0o8/index.m3u8
@@ -584,7 +584,7 @@ http://rtmp.smartstream.video:1935/mhoneshradha/mhoneshradha/playlist.m3u8
 https://6284rn2xr7xv-hls-live.wmncdn.net/shubhsandeshtv1/live123.stream/index.m3u8
 #EXTINF:-1 tvg-id="SikhChannel.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/3TZPKGL.png" group-title="",Sikh Channel (576p) [Offline]
 http://fastway.ddns.net:6421/fastway/live8/index.m3u8?token=fastwaytvstreams
-#EXTINF:-1 tvg-id="SonyBBCEarthHD.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/cmRNiA3.png" group-title="",Sony BBC Earth HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="SonyBBCEarthHD.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/cmRNiA3.png" group-title="",Sony BBC Earth HD (1080p) [Timeout]
 http://103.81.104.118/hls/stream5.m3u8
 #EXTINF:-1 tvg-id="SonyMAX2.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Sony MAX 2 [Offline]
 http://208.115.215.42/Sony_Max_HD_02/playlist.m3u8
@@ -597,7 +597,7 @@ http://indo51.gcdn.co/hindi-SONYSABHD/playlist.m3u8
 http://208.115.215.42/Sony_Sab_HD/playlist.m3u8
 #EXTINF:-1 tvg-id="SonySix.in" tvg-country="IN" tvg-language="English" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/tJzfDMRk.png" group-title="",Sony Six (1080p) [Not 24/7]
 http://137.59.155.77:8088/hls/05sonysix.m3u8
-#EXTINF:-1 tvg-id="SonySixHD.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" user-agent="stream" group-title="",Sony Six HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="SonySixHD.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" user-agent="stream" group-title="",Sony Six HD (1080p) [Timeout]
 #EXTVLCOPT:http-user-agent=stream
 http://103.81.104.118/hls/stream10.m3u8
 #EXTINF:-1 tvg-id="SonyWAH.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Sony WAH (404p) [Offline]
@@ -605,12 +605,12 @@ https://d2gowxuvx77j6q.cloudfront.net/WAH.m3u8
 #EXTINF:-1 tvg-id="SonyYAY.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/aoOD9XQ.jpg" group-title="Kids",Sony YAY (404p) [Offline]
 https://d20fdzcwhk7szz.cloudfront.net/SONY_YAY.m3u8
 #EXTINF:-1 tvg-id="SriSankara.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Religious",Sri Sankara (360p)
-https://8noro432dm6g-hls-live.wmncdn.net/Sri/a5518065f47332dad6b509920c827474.sdp/index.m3u8
+https://8noro432dm6g-hls-live.wmncdn.net/Sri/a5518065f47332dad6b509920c827474.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="StarCinema.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Movies",Star Cinema (576p)
 http://c0.cdn.trinity-tv.net/stream/nh9u54a7sfnc2hwzxr2zwykwkqm43bgyyzsm68ybbbnjei8kytwcgs3zm5gnw5c6efa5gr3fadzqe686w8gj2eaehrj89wvujvqza3kez78dtknwbbmnqf79yygmqqg7e9pnc3i3bpywjkiqrwke94yf.m3u8
 #EXTINF:-1 tvg-id="StarFamily.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="Family",Star Family (576p)
 http://c0.cdn.trinity-tv.net/stream/zfmjgma9zn46fa797ez9fgkw7msh9mj4tppspg23gey6mmx5fqiy7ky3jqx4uhgsfsrd8r76si8ykb2anw9442g4qkq5fzpdvwdqf5te24ixu9zrx3aesm9fzt59q5y2s8qwgbqhvf6d3z5bjy3qb2t4.m3u8
-#EXTINF:-1 tvg-id="StarGoldHD.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" user-agent="stream" group-title="",Star Gold HD (1080p) [Offline]
+#EXTINF:-1 tvg-id="StarGoldHD.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" user-agent="stream" group-title="",Star Gold HD (1080p) [Timeout]
 #EXTVLCOPT:http-user-agent=stream
 http://103.81.104.118/hls/stream19.m3u8
 #EXTINF:-1 tvg-id="StarMaa.in" tvg-country="IN" tvg-language="Telugu" tvg-logo="https://i.imgur.com/oBXBjk6.png" group-title="Entertainment",Star Maa [Geo-blocked]
@@ -632,7 +632,7 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
 http://14.199.164.20:4001/play/a0sr/index.m3u8
 #EXTINF:-1 tvg-id="SunNews.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/mQWpBdv.png" group-title="News",Sun News (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/watch?v=_fR9xWEOa7Q
-#EXTINF:-1 tvg-id="SunTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/U30x7Y4.jpg" user-agent="stream" group-title="",Sun TV (720p)
+#EXTINF:-1 tvg-id="SunTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/U30x7Y4.jpg" user-agent="stream" group-title="",Sun TV (720p) [Offline]
 #EXTVLCOPT:http-user-agent=stream
 http://uk4.zecast.com:1935/star-live/suntv.stream/index.m3u8
 #EXTINF:-1 tvg-id="SuryaMusic.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/jsC8FC7.png" group-title="Music",Surya Music (480p) [Not 24/7]
@@ -649,9 +649,9 @@ http://live.tamilvision.tv:8081/TVI/SD/playlist.m3u8
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/tehelkatv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="ThanthiTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://images-eu.ssl-images-amazon.com/images/I/71QprgRT4rL.png" group-title="News",Thanthi TV (720p)
 https://vidcdn.vidgyor.com/thanthi-origin/liveabr/playlist.m3u8
-#EXTINF:-1 tvg-id="ThanthiTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://images-eu.ssl-images-amazon.com/images/I/71QprgRT4rL.png" group-title="News",Thanthi TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ThanthiTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://images-eu.ssl-images-amazon.com/images/I/71QprgRT4rL.png" group-title="News",Thanthi TV (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/watch?v=wc3Y6vI-poI
-#EXTINF:-1 tvg-id="TimeTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/K5rlUey.png" group-title="News",Time TV (360p) [Offline]
+#EXTINF:-1 tvg-id="TimeTV.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/K5rlUey.png" group-title="News",Time TV (360p) [Timeout]
 https://cloudflare-cdn301.ottpro.in/live/timetv/playlist.m3u8
 #EXTINF:-1 tvg-id="TimeVisionNews.in" tvg-country="IN" tvg-language="Malayalam" tvg-logo="https://i.imgur.com/YSQVbIm.png" group-title="News",Time Vision News (720p) [Not 24/7]
 http://cloud.logicwebs.in:1935/timevision/timevision/playlist.m3u8
@@ -675,7 +675,7 @@ http://208.115.215.42/Utsav_Gold_HD/index.m3u8
 http://14.199.164.20:4001/play/a0nx/index.m3u8
 #EXTINF:-1 tvg-id="VasanthTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="" group-title="Entertainment",Vasanth TV [Offline]
 http://vasanth.live.cdn.bitgravity.com/vasanth/secure/live/feed03?bgsecuredir=1&e=0&h=a9be0836bc39f96d0a9a958a659dfc1d
-#EXTINF:-1 tvg-id="VathanamTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="" group-title="",Vathanam TV [Offline]
+#EXTINF:-1 tvg-id="VathanamTV.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="" group-title="",Vathanam TV [Timeout]
 http://95.216.167.183:5080/LiveApp/streams/443106610169904881506470.m3u8
 #EXTINF:-1 tvg-id="Velicham.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/YeR3mm9.png" group-title="Entertainment",Velicham (360p) [Not 24/7]
 https://rtmp.smartstream.video/velichamtv/velichamtv/playlist.m3u8
@@ -688,21 +688,13 @@ http://cdn18.live247stream.com/ndachannel/tv/playlist.m3u8
 #EXTINF:-1 tvg-id="YuppThirai.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="https://i.imgur.com/6E8SbCf.png" group-title="Movies",Yupp Thirai (270p)
 http://119.81.82.28/encoded/yuppthirai_800/playlist.m3u8
 #EXTINF:-1 tvg-id="ZLivingUSA.in" tvg-country="US;IN" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/ZLiving_512x512.png?raw=true" group-title="",Z Living USA (720p) [Geo-blocked]
-https://f8e7y4c6.ssl.hwcdn.net/zlivingusa_r/index.m3u8
-#EXTINF:-1 tvg-id="ZLivingUSA.in" tvg-country="US;IN" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/ZLiving_512x512.png?raw=true" group-title="",Z Living USA (720p) [Geo-blocked]
 https://f8e7y4c6.ssl.hwcdn.net/zlivingusa_r_prod/playlist.m3u8
 #EXTINF:-1 tvg-id="ZLivingUSA.in" tvg-country="US;IN" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/ZLiving_512x512.png?raw=true" group-title="",Z Living USA (720p) [Geo-blocked]
-https://y5w8j4a9.ssl.hwcdn.net/zlivingusa_r/index.m3u8
+https://f8e7y4c6.ssl.hwcdn.net/zlivingusa_r/index.m3u8
 #EXTINF:-1 tvg-id="ZLivingUSA.in" tvg-country="US;IN" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/ZLiving_512x512.png?raw=true" group-title="",Z Living USA (720p) [Geo-blocked]
 https://y5w8j4a9.ssl.hwcdn.net/zlivingusa_r_prod/playlist.m3u8
-#EXTINF:-1 tvg-id="Zee5Originals.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee5 Originals (1080p) [Geo-blocked]
-https://f8e7y4c6.ssl.hwcdn.net/zee5_originals/playlist.m3u8
-#EXTINF:-1 tvg-id="Zee5Originals.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee5 Originals (1080p) [Geo-blocked]
-https://y5w8j4a9.ssl.hwcdn.net/zee5_originals/playlist.m3u8
-#EXTINF:-1 tvg-id="Zee5Romance.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee5 Romance (1080p) [Geo-blocked]
-https://f8e7y4c6.ssl.hwcdn.net/zee5_romance/playlist.m3u8
-#EXTINF:-1 tvg-id="Zee5Romance.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee5 Romance (1080p) [Geo-blocked]
-https://y5w8j4a9.ssl.hwcdn.net/zee5_romance/playlist.m3u8
+#EXTINF:-1 tvg-id="ZLivingUSA.in" tvg-country="US;IN" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/ZLiving_512x512.png?raw=true" group-title="",Z Living USA (720p) [Geo-blocked]
+https://y5w8j4a9.ssl.hwcdn.net/zlivingusa_r/index.m3u8
 #EXTINF:-1 tvg-id="Zee24.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee 24 (576p) [Geo-blocked]
 https://f8e7y4c6.ssl.hwcdn.net/kalak/playlist.m3u8
 #EXTINF:-1 tvg-id="Zee24.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee 24 (576p) [Geo-blocked]
@@ -721,15 +713,15 @@ https://y5w8j4a9.ssl.hwcdn.net/action/playlist.m3u8
 https://f8e7y4c6.ssl.hwcdn.net/zanmolcnm/playlist.m3u8
 #EXTINF:-1 tvg-id="ZeeAnmolCinema.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/oRDt6fY8.png" group-title="",Zee Anmol Cinema (576p) [Geo-blocked]
 https://y5w8j4a9.ssl.hwcdn.net/zanmolcnm/playlist.m3u8
-#EXTINF:-1 tvg-id="ZeeBangla.in" tvg-country="IN" tvg-language="Bangla" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/USKY2MD6.png" group-title="Movies",Zee Bangla (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="ZeeBangla.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/USKY2MD6.png" group-title="Movies",Zee Bangla (720p) [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-zeebangla
-#EXTINF:-1 tvg-id="ZeeBanglaCinema.in" tvg-country="IN" tvg-language="Bangla" tvg-logo="https://i.imgur.com/QFqJax5.png" group-title="Movies",Zee Bangla Cinema (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="ZeeBanglaCinema.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/QFqJax5.png" group-title="Movies",Zee Bangla Cinema (720p) [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-zeebanglacinema
 #EXTINF:-1 tvg-id="ZeeBiharJharkhand.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/JdOC9ieM.png" group-title="",Zee Bihar Jharkhand (576p) [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-zeebiharjharkhand
 #EXTINF:-1 tvg-id="ZeeBioskop.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/CdXieB6.png" group-title="",Zee Bioskop (360p) [Geo-blocked]
 http://210.210.155.35/qwr9ew/s/s32/index.m3u8
-#EXTINF:-1 tvg-id="ZeeBollywood.in" tvg-country="IN" tvg-language="Bangla" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/gq8mpPvf.png" group-title="Movies",Zee Bollywood (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="ZeeBollywood.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/gq8mpPvf.png" group-title="Movies",Zee Bollywood (720p) [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-zeeclassic
 #EXTINF:-1 tvg-id="ZeeBusiness.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/vExrDK9r.png" group-title="Business",Zee Business [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-zeebusiness
@@ -797,7 +789,7 @@ https://y5w8j4a9.ssl.hwcdn.net/smileusa/playlist.m3u8
 https://sneh-z5api.herokuapp.com/?c=0-9-zeetalkies
 #EXTINF:-1 tvg-id="ZeeTamil.in" tvg-country="IN" tvg-language="Tamil" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/HgMdBRk5.png" group-title="",Zee Tamil (720p) [Geo-blocked]
 https://sneh-z5api.herokuapp.com/?c=0-9-zeetamil
-#EXTINF:-1 tvg-id="ZeeTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee TV (480p)
+#EXTINF:-1 tvg-id="ZeeTV.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee TV (480p) [Timeout]
 https://d2q8p4pe5spbak.cloudfront.net/bpk-tv/ZEETV/ZEETV.isml/index.m3u8
 #EXTINF:-1 tvg-id="ZeeTVAPAC.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee TV APAC (576p) [Geo-blocked]
 https://f8e7y4c6.ssl.hwcdn.net/apacsea/playlist.m3u8
@@ -825,9 +817,17 @@ https://sneh-z5api.herokuapp.com/?c=0-9-353
 https://f8e7y4c6.ssl.hwcdn.net/world/playlist.m3u8
 #EXTINF:-1 tvg-id="ZeeWorld.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://rndcdn.dstv.com/dstvcms/2017/11/07/DStv_ZeeWorld_4-3_001_xlrg.png" group-title="",Zee World (576p) [Geo-blocked]
 https://y5w8j4a9.ssl.hwcdn.net/world/playlist.m3u8
+#EXTINF:-1 tvg-id="Zee5Originals.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee5 Originals (1080p) [Geo-blocked]
+https://f8e7y4c6.ssl.hwcdn.net/zee5_originals/playlist.m3u8
+#EXTINF:-1 tvg-id="Zee5Originals.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee5 Originals (1080p) [Geo-blocked]
+https://y5w8j4a9.ssl.hwcdn.net/zee5_originals/playlist.m3u8
+#EXTINF:-1 tvg-id="Zee5Romance.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee5 Romance (1080p) [Geo-blocked]
+https://f8e7y4c6.ssl.hwcdn.net/zee5_romance/playlist.m3u8
+#EXTINF:-1 tvg-id="Zee5Romance.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Zee5 Romance (1080p) [Geo-blocked]
+https://y5w8j4a9.ssl.hwcdn.net/zee5_romance/playlist.m3u8
 #EXTINF:-1 tvg-id="Zing.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/SUWblss.png" group-title="",Zing (576p) [Geo-blocked]
 https://f8e7y4c6.ssl.hwcdn.net/zing/playlist.m3u8
 #EXTINF:-1 tvg-id="Zing.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/SUWblss.png" group-title="",Zing (576p) [Geo-blocked]
 https://y5w8j4a9.ssl.hwcdn.net/zing/playlist.m3u8
-#EXTINF:-1 tvg-id="Zoom.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/rjKh2jqQ.png" group-title="",Zoom (1080p) [Offline]
+#EXTINF:-1 tvg-id="Zoom.in" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/rjKh2jqQ.png" group-title="",Zoom (1080p) [Timeout]
 http://103.81.104.118/hls/stream8.m3u8
diff --git a/channels/iq.m3u b/channels/iq.m3u
index 9d787ca523..f6ad88443d 100644
--- a/channels/iq.m3u
+++ b/channels/iq.m3u
@@ -23,15 +23,15 @@ http://ns8.indexforce.com:1935/home/mystream/playlist.m3u8
 http://ns8.indexforce.com:1935/alsharqiyalive/mystream/playlist.m3u8
 #EXTINF:-1 tvg-id="AlSumaria.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://www.alsumaria.tv/uploadImages/ProgramsImages/Channels-LW-1-636916940695846700.png" group-title="General",Al Sumaria (1080p) [Not 24/7]
 http://iptv.repl.co/Arabic/Al_summaria
-#EXTINF:-1 tvg-id="AlEtejah.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/jFKKRjP.png" group-title="News",Al-Etejah (576p) [Offline]
+#EXTINF:-1 tvg-id="AlEtejah.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/jFKKRjP.png" group-title="News",Al-Etejah (576p) [Not 24/7]
 https://streaming.aletejahtv.iq:1937/etejah-live/smil:etejah.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AlJawadain.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/tLekUZU.png" group-title="Religious",Al-Jawadain TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlJawadain.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/tLekUZU.png" group-title="Religious",Al-Jawadain TV (1080p) [Not 24/7]
 https://live.aljawadain.org/live/aljawadaintv/playlist.m3u8
 #EXTINF:-1 tvg-id="AlGhadeer.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/U1TEfvn.png" group-title="News",AlGhadeer (720p) [Not 24/7]
 https://asdiuhiu12.myvodu.app:3356/live/Alghadeer/index.m3u8
-#EXTINF:-1 tvg-id="AlkafeelBetweenthetwoholyshrines.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://alkafeel.net/src/svg/logo_stripped.svg" group-title="Religious",Alkafeel: Between the two holy shrines (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlkafeelBetweenthetwoholyshrines.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://alkafeel.net/src/svg/logo_stripped.svg" group-title="Religious",Alkafeel: Between the two holy shrines (720p) [Not 24/7]
 https://stream.alkafeel.net/live/alkafeel/rAa5PGot4/manifest.m3u8
-#EXTINF:-1 tvg-id="AlkafeelTheentranceoftheholysanctuary.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://alkafeel.net/src/svg/logo_stripped.svg" group-title="Religious",Alkafeel: The entrance of the holy sanctuary (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlkafeelTheentranceoftheholysanctuary.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://alkafeel.net/src/svg/logo_stripped.svg" group-title="Religious",Alkafeel: The entrance of the holy sanctuary (720p) [Not 24/7]
 https://stream.alkafeel.net/live/alkafeel/rAa5PGot3/manifest.m3u8
 #EXTINF:-1 tvg-id="AlkafeelTheHolyTomb.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://alkafeel.net/src/svg/logo_stripped.svg" group-title="Religious",Alkafeel: The Holy Tomb (360p) [Not 24/7]
 https://stream.alkafeel.net/live/alkafeel/rAa5PGot2/manifest.m3u8
@@ -43,11 +43,11 @@ https://media.streambrothers.com:1936/8250/8250/playlist.m3u8
 https://597f64b67707a.streamlock.net/anbsat.com/anb2/playlist.m3u8
 #EXTINF:-1 tvg-id="AvaEntertainment.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/me5igxY.jpg" group-title="",Ava Entertainment (720p) [Not 24/7]
 https://wowzaprod219-i.akamaihd.net/hls/live/1003949/c9aa559e/playlist.m3u8
-#EXTINF:-1 tvg-id="BabylonTV.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://babylontv.net/wp-content/themes/babylontv/images/logo.png" group-title="General",Babylon TV (720p)
+#EXTINF:-1 tvg-id="BabylonTV.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://babylontv.net/wp-content/themes/babylontv/images/logo.png" group-title="General",Babylon TV (720p) [Timeout]
 https://iqlivestream.com/live/babylontv.flv
 #EXTINF:-1 tvg-id="CihanTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/FoDSbvF.png" group-title="General",Cihan TV (720p) [Not 24/7]
 http://cdn.liveshell.net:1935/live/cihann/playlist.m3u8
-#EXTINF:-1 tvg-id="Dijlah.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://www.dijlah.tv/templates/default-2/live-page/images/logo-new1.png" group-title="News",Dijlah (576p)
+#EXTINF:-1 tvg-id="Dijlah.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://www.dijlah.tv/templates/default-2/live-page/images/logo-new1.png" group-title="News",Dijlah (720p)
 http://91.134.145.75:10001/Dijlah/index.m3u8
 #EXTINF:-1 tvg-id="Dijlah.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://www.dijlah.tv/templates/default-2/live-page/images/logo-new1.png" group-title="News",Dijlah (576p)
 https://ghaasiflu.online/Dijlah/index.m3u8
@@ -55,15 +55,15 @@ https://ghaasiflu.online/Dijlah/index.m3u8
 https://ghaasiflu.online/tarab/index.m3u8
 #EXTINF:-1 tvg-id="DuaTV.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/nntvc3o.png" group-title="Religious",Dua TV (720p) [Not 24/7]
 https://live.ishiacloud.com/W67H7ddMzVHyXPrG.m3u8
-#EXTINF:-1 tvg-id="GaliKurdistan.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/t2qyVmX.png" group-title="",Gali Kurdistan [Not 24/7]
+#EXTINF:-1 tvg-id="GaliKurdistan.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/t2qyVmX.png" group-title="",Gali Kurdistan (720p) [Not 24/7]
 http://51.75.66.91:8080/gksat.mp4
-#EXTINF:-1 tvg-id="ImamHusseinTV1Farsi.iq" tvg-country="IQ" tvg-language="Persian" tvg-logo="https://ihttps://www.dijlah.tv/templates/default-2/images/dlogo.png.imgur.com/ocyh4DD.jpg" group-title="Religious",Imam Hussein TV 1 Farsi (720p)
+#EXTINF:-1 tvg-id="ImamHusseinTV1Farsi.iq" tvg-country="IQ" tvg-language="Persian" tvg-logo="https://ihttps://www.dijlah.tv/templates/default-2/images/dlogo.png.imgur.com/ocyh4DD.jpg" group-title="Religious",Imam Hussein TV 1 Farsi (360p)
 https://live.imamhossaintv.com/live/ih1.m3u8
-#EXTINF:-1 tvg-id="ImamHusseinTV2Arabic.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/ocyh4DD.jpg" group-title="Religious",Imam Hussein TV 2 Arabic (720p)
-https://live.imamhossaintv.com/live/ih2.m3u8
 #EXTINF:-1 tvg-id="ImamHusseinTV2Arabic.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/ocyh4DD.jpg" group-title="Religious",Imam Hussein TV 2 Arabic (360p)
 https://ar.imamhusseintv.com/live/ih201/index.m3u8
-#EXTINF:-1 tvg-id="ImamHusseinTV3English.iq" tvg-country="IQ" tvg-language="English" tvg-logo="https://i.imgur.com/ocyh4DD.jpg" group-title="Religious",Imam Hussein TV 3 English (720p)
+#EXTINF:-1 tvg-id="ImamHusseinTV2Arabic.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://i.imgur.com/ocyh4DD.jpg" group-title="Religious",Imam Hussein TV 2 Arabic (360p)
+https://live.imamhossaintv.com/live/ih2.m3u8
+#EXTINF:-1 tvg-id="ImamHusseinTV3English.iq" tvg-country="IQ" tvg-language="English" tvg-logo="https://i.imgur.com/ocyh4DD.jpg" group-title="Religious",Imam Hussein TV 3 English (360p)
 https://live.imamhossaintv.com/live/ih3.m3u8
 #EXTINF:-1 tvg-id="ImamHusseinTV4Urdu.iq" tvg-country="IQ" tvg-language="Urdu" tvg-logo="https://i.imgur.com/ocyh4DD.jpg" group-title="Religious",Imam Hussein TV 4 Urdu (720p)
 https://live.imamhossaintv.com/live/ih4.m3u8
@@ -89,9 +89,9 @@ https://d1x82nydcxndze.cloudfront.net/live/index.m3u8
 https://5a3ed7a72ed4b.streamlock.net/live/SMIL:myStream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="KurdMaxSorani.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://kurdmaxcms.com/asset/image/footer_logo/%D9%A1_1.png" group-title="",KurdMax (1080p) [Not 24/7]
 https://5aa8c7549bfa9.streamlock.net/liveTrans/ngrp:myStream_all/playlist.m3u8
-#EXTINF:-1 tvg-id="KurdMaxMusic.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://kurdmaxcms.com/asset/image/footer_logo/music_2.png" group-title="Music",KurdMax Music (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="KurdMaxMusic.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://kurdmaxcms.com/asset/image/footer_logo/music_2.png" group-title="Music",KurdMax Music (720p) [Not 24/7]
 https://5aa8c7549bfa9.streamlock.net/music/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="KurdMaxShow.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://kurdmaxcms.com/asset/image/footer_logo/show_2.png" group-title="",KurdMax Show (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="KurdMaxShow.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://kurdmaxcms.com/asset/image/footer_logo/show_2.png" group-title="",KurdMax Show (720p) [Not 24/7]
 https://5aa8c7549bfa9.streamlock.net/liveTrans/ngrp:SHOW1_all/playlist.m3u8
 #EXTINF:-1 tvg-id="KurdMaxKurmanci.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://kurdmaxcms.com/asset/image/footer_logo/%D9%A1_1.png" group-title="",KurdMax Sorani (1080p) [Not 24/7]
 https://5aa8c7549bfa9.streamlock.net/liveTrans/ngrp:myStream2_all/playlist.m3u8
@@ -103,11 +103,11 @@ http://ikomg2.s.llnwi.net/kurdsatnewshd/playlist.m3u8
 https://ikomg2.mmdlive.lldns.net/ikomg2/107b7df8f5444d778f349100739a09cd/manifest.m3u8
 #EXTINF:-1 tvg-id="NetTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/CKY1SD8.png" group-title="",Net TV (1080p) [Not 24/7]
 http://nettvstreampaid.flashmediacast.com:1935/nettvstreampaid/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="NetTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/CKY1SD8.png" group-title="",Net TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="NetTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/CKY1SD8.png" group-title="",Net TV (1080p) [Not 24/7]
 https://live.karwan.tv/karwan.tv/net-tv/playlist.m3u8
-#EXTINF:-1 tvg-id="NRTTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/4li5hRA.png" group-title="",NRT TV (614p) [Not 24/7]
+#EXTINF:-1 tvg-id="NRTTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/4li5hRA.png" group-title="",NRT TV (720p) [Not 24/7]
 https://media.streambrothers.com:1936/8226/8226/playlist.m3u8
-#EXTINF:-1 tvg-id="PayamTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="" group-title="",Payam TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="PayamTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="" group-title="",Payam TV (720p) [Not 24/7]
 https://5ab29cc78f681.streamlock.net/PayamTV/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="RudawTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/5ZQ4GTu.jpg" group-title="News",Rudaw TV (1080p)
 https://svs.itworkscdn.net/rudawlive/rudawlive.smil/playlist.m3u8
@@ -115,7 +115,7 @@ https://svs.itworkscdn.net/rudawlive/rudawlive.smil/playlist.m3u8
 http://liveshell.net:1935/live/speda084k/playlist.m3u8
 #EXTINF:-1 tvg-id="SterkTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/IbvZcPc.png" group-title="",SterkTV (720p)
 https://602ccc850c9bb.streamlock.net/sterktv/smil:sterk.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="WAARTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/ebX8IFk.png" group-title="General",WAAR TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="WAARTV.iq" tvg-country="IQ" tvg-language="Kurdish" tvg-logo="https://i.imgur.com/ebX8IFk.png" group-title="General",WAAR TV (720p) [Not 24/7]
 https://live.karwan.tv/karwan.tv/waar-tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Zagros.iq" tvg-country="IQ" tvg-language="Arabic" tvg-logo="https://www.zagrosnews.net/sites/default/files/zagros-logo-01_1.png" group-title="General",Zagros (720p) [Not 24/7]
 https://5a3ed7a72ed4b.streamlock.net/zagrostv/SMIL:myStream.smil/playlist.m3u8
diff --git a/channels/ir.m3u b/channels/ir.m3u
index d071296c6b..486dfa86b9 100644
--- a/channels/ir.m3u
+++ b/channels/ir.m3u
@@ -7,7 +7,7 @@ http://116.202.255.113:1935/4utv/livehd/playlist.m3u8
 http://116.202.255.113:1935/4utv/livesd/playlist.m3u8
 #EXTINF:-1 tvg-id="AFNTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Entertainment",AFN TV (720p) [Not 24/7]
 https://bozztv.com/1gbw5/tintv2/tintv2/playlist.m3u8
-#EXTINF:-1 tvg-id="AlAlam.ir" tvg-country="IR" tvg-language="Arabic" tvg-logo="https://i.imgur.com/jY1u1zz.png" group-title="News",Al Alam (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlAlam.ir" tvg-country="IR" tvg-language="Arabic" tvg-logo="https://i.imgur.com/jY1u1zz.png" group-title="News",Al Alam (360p) [Not 24/7]
 https://live2.alalam.ir/alalam.m3u8
 #EXTINF:-1 tvg-id="AlKawtharTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",Al Kawthar TV (360p) [Not 24/7]
 http://178.252.143.156:1935/live/myStream/playlist.m3u8
@@ -20,7 +20,7 @@ http://51.210.199.5/hls/stream.m3u8
 #EXTINF:-1 tvg-id="AVASeries.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Series",AVA Series (720p)
 http://51.210.199.4/hls/stream.m3u8
 #EXTINF:-1 tvg-id="AyenehTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.ayeneh.org/wp-content/uploads/2016/04/Ayeneh-TV-April-16-400x223.png" group-title="",Ayeneh TV (720p) [Not 24/7]
-https://livestream.5centscdn.com/cls040318/b0d2763968fd0bdd2dc0d44ba2abf9ce.sdp/playlist.m3u8
+https://livestream.5centscdn.com/cls040318/b0d2763968fd0bdd2dc0d44ba2abf9ce.sdp/index.m3u8
 #EXTINF:-1 tvg-id="BeitolAbbasTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Religious",BeitolAbbas TV (720p) [Not 24/7]
 http://live.beitolabbas.tv/live/beitolabbastv.m3u8
 #EXTINF:-1 tvg-id="CaltexTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Music",Caltex TV (720p) [Not 24/7]
@@ -41,7 +41,7 @@ http://159.69.58.154/ekran/ekrantv.m3u8
 https://faraztv.net/hls/stream.m3u8
 #EXTINF:-1 tvg-id="FARS.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",FARS (240p)
 http://cdn1.live.irib.ir:1935/epg-live/smil:fars/playlist.m3u8
-#EXTINF:-1 tvg-id="Film1.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Movies",Film 1 (720p)
+#EXTINF:-1 tvg-id="Film1.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Movies",Film 1 (720p) [Offline]
 http://159.69.58.154/film1/film1tv.m3u8
 #EXTINF:-1 tvg-id="GEM24b.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/24b.png" group-title="Music",GEM 24b (1080p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=24b
@@ -64,14 +64,14 @@ http://216.66.42.47:7777/GemComedy_HD.m3u8
 #EXTINF:-1 tvg-id="GEMCrypto.ir" tvg-country="IR" tvg-language="English" tvg-logo="https://i.imgur.com/Pt59QNN.png" group-title="",GEM Crypto (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_crypto
 https://stream-cdn.gemonline.tv/live/gemcrypto/index.m3u8
-#EXTINF:-1 tvg-id="GEMDrama.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemdrama.png" group-title="Movies",GEM Drama (576p)
+#EXTINF:-1 tvg-id="GEMDrama.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemdrama.png" group-title="Movies",GEM Drama (360p)
 http://65.21.196.79/gem_drama/master.m3u8
 #EXTINF:-1 tvg-id="GEMFilm.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_film.png?14" group-title="Movies",GEM Film (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_film
 https://stream-cdn.gemonline.tv/live/gemfilm/index.m3u8
 #EXTINF:-1 tvg-id="GEMFit.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.net/Assets/channels-box/gem_fit.png?14" group-title="Sports",GEM Fit (360p)
 http://65.21.196.79/30tv/master.m3u8
-#EXTINF:-1 tvg-id="GEMFood.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_food.png?14" group-title="Cooking",GEM Food (576p)
+#EXTINF:-1 tvg-id="GEMFood.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_food.png?14" group-title="Cooking",GEM Food (360p)
 http://65.21.196.79/gem_food/master.m3u8
 #EXTINF:-1 tvg-id="GEMJunior.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemjunior.png" group-title="Kids",GEM Junior (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gemjunior
@@ -88,12 +88,12 @@ https://stream-cdn.gemonline.tv/live/gemlife/index.m3u8
 #EXTINF:-1 tvg-id="GEMMaxx.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/maxx.png?14" group-title="Entertainment",GEM Maxx (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=maxx
 https://stream-cdn.gemonline.tv/live/gemmaxx/index.m3u8
-#EXTINF:-1 tvg-id="GEMMifa.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/mifa.png" group-title="Music",GEM Mifa (1080p)
+#EXTINF:-1 tvg-id="GEMMifa.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/mifa.png" group-title="Music",GEM Mifa (360p)
 http://65.21.196.79/mifa/master.m3u8
 #EXTINF:-1 tvg-id="GEMModernEconomy.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/modern_economy.png" group-title="Documentary",GEM Modern Economy (540p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=modern_economy
 https://d2e40kvaojifd6.cloudfront.net/stream/modern_economy/playlist.m3u8
-#EXTINF:-1 tvg-id="GEMNature.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_nature.png" group-title="Entertainment",GEM Nature (540p)
+#EXTINF:-1 tvg-id="GEMNature.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_nature.png" group-title="Entertainment",GEM Nature (360p)
 http://65.21.196.79/gem_nature/master.m3u8
 #EXTINF:-1 tvg-id="GEMOnyx.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/onyx.png" group-title="Movies",GEM Onyx (1080p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=onyx
@@ -101,18 +101,18 @@ https://d2e40kvaojifd6.cloudfront.net/stream/onyx/playlist.m3u8
 #EXTINF:-1 tvg-id="GEMProperty.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_property.png?14" group-title="",GEM Property (540p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_property
 https://d2e40kvaojifd6.cloudfront.net/stream/gem_property/playlist.m3u8
-#EXTINF:-1 tvg-id="GEMRiver.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/river.png?14" group-title="Entertainment",GEM River (576p)
+#EXTINF:-1 tvg-id="GEMRiver.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/river.png?14" group-title="Entertainment",GEM River (360p)
 http://65.21.196.79/gem_river/master.m3u8
 #EXTINF:-1 tvg-id="GEMRubix.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/rubix.png?14" group-title="Movies",GEM Rubix (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=rubix
 https://stream-cdn.gemonline.tv/live/rubix/index.m3u8
-#EXTINF:-1 tvg-id="GEMSeries.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemseries.png" group-title="Movies",GEM Series (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="GEMSeries.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemseries.png" group-title="Movies",GEM Series (360p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gemseries
 http://65.21.196.79/gem_series/master.m3u8
 #EXTINF:-1 tvg-id="GEMTravel.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_travel.png" group-title="Entertainment",GEM Travel (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_travel
 https://stream-cdn.gemonline.tv/live/gemtravel/index.m3u8
-#EXTINF:-1 tvg-id="GEMTv.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemtv.png" group-title="Movies",GEM Tv (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="GEMTv.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemtv.png" group-title="Movies",GEM Tv (360p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gemtv
 http://65.21.196.79/gem_tv/master.m3u8
 #EXTINF:-1 tvg-id="GOLESTAN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",GOLESTAN (240p)
@@ -120,9 +120,9 @@ http://cdn1.live.irib.ir:1935/epg-live/smil:golestan/playlist.m3u8
 #EXTINF:-1 tvg-id="HastiTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",Hasti TV (1080p)
 https://live.hastitv.com/hls/livetv.m3u8
 #EXTINF:-1 tvg-id="Hispantv.ir" tvg-country="IR;ES;HISPAM" tvg-language="Spanish" tvg-logo="https://en.wikipedia.org/wiki/File:HispanTv_logo.svg" group-title="News",HispanTV (480p)
-https://live1.presstv.ir/live/hispan.m3u8
-#EXTINF:-1 tvg-id="Hispantv.ir" tvg-country="IR;ES;HISPAM" tvg-language="Spanish" tvg-logo="https://en.wikipedia.org/wiki/File:HispanTv_logo.svg" group-title="News",HispanTV (480p)
 https://live.presstv.ir/live/smil:live.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="Hispantv.ir" tvg-country="IR;ES;HISPAM" tvg-language="Spanish" tvg-logo="https://en.wikipedia.org/wiki/File:HispanTv_logo.svg" group-title="News",HispanTV (480p)
+https://live1.presstv.ir/live/hispan.m3u8
 #EXTINF:-1 tvg-id="HodHodTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/TMxCgX1.jpg" group-title="",HodHod TV (720p)
 http://51.210.199.12/hls/stream.m3u8
 #EXTINF:-1 tvg-id="IcnetTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Religious",Icnet TV (720p) [Not 24/7]
@@ -131,9 +131,9 @@ http://51.210.199.7/hls/stream.m3u8
 https://live.presstv.ir/ifilmlive/smil:ifilmtv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="iFILMArabic.ir" tvg-country="IR" tvg-language="Arabic" tvg-logo="https://i.imgur.com/RPwKZUD.jpg" group-title="Movies",iFILM Arabic (720p)
 https://live.presstv.ir/ifilmlive/smil:ifilmar.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="iFILMEnglish.ir" tvg-country="IR" tvg-language="English" tvg-logo="https://i.imgur.com/GgmXZRU.png" group-title="Movies",iFILM English [Geo-blocked]
+#EXTINF:-1 tvg-id="iFILMEnglish.ir" tvg-country="IR" tvg-language="English" tvg-logo="https://i.imgur.com/GgmXZRU.png" group-title="Movies",iFILM English (480p) [Geo-blocked]
 https://live1.presstv.ir/live/ifilmen.m3u8
-#EXTINF:-1 tvg-id="iFILMPersian2.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://fa2.ifilmtv.com/img/test-final02.png" group-title="Movies",iFILM Persian 2 [Not 24/7]
+#EXTINF:-1 tvg-id="iFILMPersian2.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://fa2.ifilmtv.com/img/test-final02.png" group-title="Movies",iFILM Persian 2 (480p) [Not 24/7]
 https://live1.presstv.ir/live/ifilm2.m3u8
 #EXTINF:-1 tvg-id="ImamHusseinTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/FPfq4O5.png" group-title="Religious",Imam Hussein TV (720p)
 https://fa.imamhusseintv.com/live/ih1.m3u8
@@ -147,7 +147,7 @@ http://51.210.199.57/hls/stream.m3u8
 http://159.69.58.154/irane_arya/irane_arya.m3u8
 #EXTINF:-1 tvg-id="ITN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Entertainment",ITN (720p) [Not 24/7]
 http://51.210.199.31/hls/stream.m3u8
-#EXTINF:-1 tvg-id="iToon.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/2HoOHwF.png" group-title="Kids",iToon (480p)
+#EXTINF:-1 tvg-id="iToon.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/2HoOHwF.png" group-title="Kids",iToon (360p)
 http://159.69.58.154/itoon/master.m3u8
 #EXTINF:-1 tvg-id="JAHANBIN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",JAHANBIN (240p)
 http://cdn1.live.irib.ir:1935/epg-live/smil:jahanbin/playlist.m3u8
@@ -179,7 +179,7 @@ http://51.210.199.38/hls/stream.m3u8
 http://51.210.199.36/hls/stream.m3u8
 #EXTINF:-1 tvg-id="ParnianTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://live-tv-channels.org/pt-data/uploads/logo/ca-parnian-tv-9509.jpg" group-title="",Parnian TV (1080p) [Not 24/7]
 https://live2.parnian.tv/hls/live/play.m3u8
-#EXTINF:-1 tvg-id="ParsTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/EKS7sPr.png" group-title="",Pars TV (240p) [Not 24/7]
+#EXTINF:-1 tvg-id="ParsTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/EKS7sPr.png" group-title="",Pars TV (720p) [Not 24/7]
 https://livestream.5centscdn.com/cls032817/18e2bf34e2035dbabf48ee2db66405ce.sdp/index.m3u8
 #EXTINF:-1 tvg-id="Parsiland.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="Movies",Parsiland (540p) [Not 24/7]
 http://vps.parsiland.net/hls/ParsiLand.m3u8
@@ -205,13 +205,13 @@ https://live1.presstv.ir/live/presstvfr/index.m3u8
 http://cdn1.live.irib.ir:1935/epg-live/smil:qazvin/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioFarda.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/NqTGH0Q.png" group-title="",Radio Farda (576p) [Not 24/7]
 https://rfe-lh.akamaihd.net/i/rfe_tvmc1@383622/master.m3u8
-#EXTINF:-1 tvg-id="RadioJavanTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/4XTyMST.jpg" group-title="Music",Radio Javan TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioJavanTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/4XTyMST.jpg" group-title="Music",Radio Javan TV (1080p) [Not 24/7]
 https://stream.rjtv.stream/live/smil:rjtv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RangarangTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/s5yF9aU.jpg" group-title="",Rangarang TV (720p) [Not 24/7]
 https://iptv.rangarang.us/live/playlist.m3u8
 #EXTINF:-1 tvg-id="SAHAND.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",SAHAND (240p)
 http://cdn1.live.irib.ir:1935/epg-live/smil:sahand/playlist.m3u8
-#EXTINF:-1 tvg-id="Sahar.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",Sahar (240p)
+#EXTINF:-1 tvg-id="Sahar.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",Sahar (480p)
 http://cdnlive.irib.ir/live-channels/smil:sahar3/playlist.m3u8
 #EXTINF:-1 tvg-id="SAHARKURDI.ir" tvg-country="IR" tvg-language="Kurdish" tvg-logo="" group-title="",SAHAR KURDI (576p) [Not 24/7]
 http://163.172.39.215:25461/line/C4@!a3a1@!w72A/56
@@ -223,7 +223,7 @@ http://51.210.199.30/hls/stream.m3u8
 http://51.210.199.3/hls/stream.m3u8
 #EXTINF:-1 tvg-id="SL2.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/BVuUx5R.jpg" group-title="Movies",SL 2 (720p)
 http://51.210.199.2/hls/stream.m3u8
-#EXTINF:-1 tvg-id="SNN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/80/SNN_Logo.svg/320px-SNN_Logo.svg.png" group-title="Entertainment",SNN TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SNN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/80/SNN_Logo.svg/320px-SNN_Logo.svg.png" group-title="Entertainment",SNN TV (720p) [Not 24/7]
 https://live.snn.ir/hls/snn/index.m3u8
 #EXTINF:-1 tvg-id="T2TV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/BwyQR6n.png" group-title="Music",T2 TV (720p) [Not 24/7]
 http://208.113.204.104:8123/live/tapesh-live-stream/index.m3u8
diff --git a/channels/ir_telewebion.m3u b/channels/ir_telewebion.m3u
index 0679392253..98094d0009 100644
--- a/channels/ir_telewebion.m3u
+++ b/channels/ir_telewebion.m3u
@@ -65,7 +65,7 @@ https://sdm.telewebion.com/live/irankala/playlist.m3u8
 https://sdw.telewebion.com/live/irankala/playlist.m3u8
 #EXTINF:-1 tvg-id="IRINN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://s3.ott.tva.tv/rosing-tva-production/44d0105b6c9ec94b5c3e_512x512c.png" group-title="",IRINN (720p)
 https://sdw.telewebion.com/live/irinn/playlist.m3u8
-#EXTINF:-1 tvg-id="IRINN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://s3.ott.tva.tv/rosing-tva-production/44d0105b6c9ec94b5c3e_512x512c.png" group-title="",IRINN (720p) [Offline]
+#EXTINF:-1 tvg-id="IRINN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://s3.ott.tva.tv/rosing-tva-production/44d0105b6c9ec94b5c3e_512x512c.png" group-title="",IRINN (1080p) [Not 24/7]
 https://sdm.telewebion.com/live/irinn/playlist.m3u8
 #EXTINF:-1 tvg-id="JAHANBIN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",JAHANBIN (576p)
 https://sdm.telewebion.com/live/jahanbin/playlist.m3u8
@@ -80,9 +80,9 @@ https://sdm.telewebion.com/live/zagros/playlist.m3u8
 #EXTINF:-1 tvg-id="KERMANSHAH.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",KERMANSHAH (576p)
 https://sdw.telewebion.com/live/zagros/playlist.m3u8
 #EXTINF:-1 tvg-id="KHJONOOBI.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",KH.JONOOBI (576p)
-https://sdm.telewebion.com/live/khavaran/playlist.m3u8
-#EXTINF:-1 tvg-id="KHJONOOBI.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",KH.JONOOBI (576p)
 https://sdw.telewebion.com/live/khavaran/playlist.m3u8
+#EXTINF:-1 tvg-id="KHJONOOBI.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",KH.JONOOBI (240p)
+https://sdm.telewebion.com/live/khavaran/playlist.m3u8
 #EXTINF:-1 tvg-id="KHRAZAVI.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",KH.RAZAVI (576p)
 https://sdm.telewebion.com/live/khorasanrazavi/playlist.m3u8
 #EXTINF:-1 tvg-id="KHRAZAVI.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",KH.RAZAVI (576p)
@@ -117,13 +117,13 @@ https://sdm.telewebion.com/live/tabarestan/playlist.m3u8
 https://sdw.telewebion.com/live/tabarestan/playlist.m3u8
 #EXTINF:-1 tvg-id="MOSTANAD.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",MOSTANAD (720p)
 https://sdm.telewebion.com/live/mostanad/playlist.m3u8
-#EXTINF:-1 tvg-id="MOSTANAD.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",MOSTANAD (720p)
+#EXTINF:-1 tvg-id="MOSTANAD.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",MOSTANAD (240p)
 https://sdw.telewebion.com/live/mostanad/playlist.m3u8
-#EXTINF:-1 tvg-id="NAMAYESH.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",NAMAYESH (720p)
+#EXTINF:-1 tvg-id="NAMAYESH.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",NAMAYESH (1080p)
 https://sdm.telewebion.com/live/namayesh/playlist.m3u8
 #EXTINF:-1 tvg-id="NAMAYESH.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",NAMAYESH (720p)
 https://sdw.telewebion.com/live/namayesh/playlist.m3u8
-#EXTINF:-1 tvg-id="NASIM.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",NASIM (720p)
+#EXTINF:-1 tvg-id="NASIM.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",NASIM (1080p)
 https://sdm.telewebion.com/live/nasim/playlist.m3u8
 #EXTINF:-1 tvg-id="NASIM.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",NASIM (720p)
 https://sdw.telewebion.com/live/nasim/playlist.m3u8
@@ -136,13 +136,13 @@ https://sdm.telewebion.com/live/ofogh/playlist.m3u8
 #EXTINF:-1 tvg-id="OFOGH.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",OFOGH (720p) [Not 24/7]
 https://sdw.telewebion.com/live/ofogh/playlist.m3u8
 #EXTINF:-1 tvg-id="OMID.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",OMID (576p)
-https://sdm.telewebion.com/live/omid/playlist.m3u8
-#EXTINF:-1 tvg-id="OMID.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",OMID (576p)
 https://sdw.telewebion.com/live/omid/playlist.m3u8
+#EXTINF:-1 tvg-id="OMID.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",OMID (576p) [Timeout]
+https://sdm.telewebion.com/live/omid/playlist.m3u8
+#EXTINF:-1 tvg-id="POUYA.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",POUYA (1080p)
+https://sdw.telewebion.com/live/pooya/playlist.m3u8
 #EXTINF:-1 tvg-id="POUYA.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",POUYA (720p)
 https://sdm.telewebion.com/live/pooya/playlist.m3u8
-#EXTINF:-1 tvg-id="POUYA.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",POUYA (720p)
-https://sdw.telewebion.com/live/pooya/playlist.m3u8
 #EXTINF:-1 tvg-id="QAZVIN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",QAZVIN (576p)
 https://sdm.telewebion.com/live/qazvin/playlist.m3u8
 #EXTINF:-1 tvg-id="QAZVIN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",QAZVIN (576p)
@@ -151,11 +151,11 @@ https://sdw.telewebion.com/live/qazvin/playlist.m3u8
 https://sdm.telewebion.com/live/quran/playlist.m3u8
 #EXTINF:-1 tvg-id="QURAN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",QURAN (576p)
 https://sdw.telewebion.com/live/quran/playlist.m3u8
-#EXTINF:-1 tvg-id="SABALAN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",SABALAN (576p)
+#EXTINF:-1 tvg-id="SABALAN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",SABALAN (576p) [Timeout]
 https://sdm.telewebion.com/live/sabalan/playlist.m3u8
 #EXTINF:-1 tvg-id="SAHAND.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",SAHAND (576p)
 https://sdm.telewebion.com/live/sahand/playlist.m3u8
-#EXTINF:-1 tvg-id="SAHAND.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",SAHAND (576p)
+#EXTINF:-1 tvg-id="SAHAND.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",SAHAND (240p)
 https://sdw.telewebion.com/live/sahand/playlist.m3u8
 #EXTINF:-1 tvg-id="SALAMAT.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",SALAMAT (576p)
 https://sdm.telewebion.com/live/salamat/playlist.m3u8
@@ -173,11 +173,11 @@ https://sdw.telewebion.com/live/sepehr/playlist.m3u8
 https://sdm.telewebion.com/live/shoma/playlist.m3u8
 #EXTINF:-1 tvg-id="SHOMA.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",SHOMA (576p)
 https://sdw.telewebion.com/live/shoma/playlist.m3u8
-#EXTINF:-1 tvg-id="TAMASHA.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TAMASHA (720p)
+#EXTINF:-1 tvg-id="TAMASHA.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TAMASHA (1080p)
 https://sdm.telewebion.com/live/hdtest/playlist.m3u8
 #EXTINF:-1 tvg-id="TAMASHA.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TAMASHA (720p)
 https://sdw.telewebion.com/live/hdtest/playlist.m3u8
-#EXTINF:-1 tvg-id="TV1.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TV1 (720p)
+#EXTINF:-1 tvg-id="TV1.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TV1 (1080p)
 https://sdw.telewebion.com/live/tv1/playlist.m3u8
 #EXTINF:-1 tvg-id="TV1.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TV1 (720p) [Offline]
 https://sdm.telewebion.com/live/tv1/playlist.m3u8
@@ -185,7 +185,7 @@ https://sdm.telewebion.com/live/tv1/playlist.m3u8
 https://sdm.telewebion.com/live/tv2/playlist.m3u8
 #EXTINF:-1 tvg-id="TV2.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TV2 (576p)
 https://sdw.telewebion.com/live/tv2/playlist.m3u8
-#EXTINF:-1 tvg-id="TV3.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TV3 (480p) [Offline]
+#EXTINF:-1 tvg-id="TV3.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TV3 (240p) [Not 24/7]
 https://sdm.telewebion.com/live/tv3/playlist.m3u8
 #EXTINF:-1 tvg-id="TV3.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",TV3 (480p) [Offline]
 https://sdw.telewebion.com/live/tv3/playlist.m3u8
@@ -199,7 +199,7 @@ https://sdm.telewebion.com/live/tehran/playlist.m3u8
 https://sdw.telewebion.com/live/tehran/playlist.m3u8
 #EXTINF:-1 tvg-id="VARZESH.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",VARZESH (720p)
 https://sdm.telewebion.com/live/varzesh/playlist.m3u8
-#EXTINF:-1 tvg-id="VARZESH.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",VARZESH (720p) [Offline]
+#EXTINF:-1 tvg-id="VARZESH.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",VARZESH (1080p) [Not 24/7]
 https://sdw.telewebion.com/live/varzesh/playlist.m3u8
 #EXTINF:-1 tvg-id="YAZD.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",YAZD (576p)
 https://sdm.telewebion.com/live/taban/playlist.m3u8
diff --git a/channels/it.m3u b/channels/it.m3u
index 89c6db2dcc..152b759ef8 100644
--- a/channels/it.m3u
+++ b/channels/it.m3u
@@ -11,7 +11,7 @@ https://stream.sen-gt.com/A2itv/myStream/playlist.m3u8
 https://tsw.streamingwebtv24.it:1936/abchanneltv/abchanneltv/playlist.m3u8
 #EXTINF:-1 tvg-id="ABChannel.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/it/d/d4/Ab_channel_i_logo.png" group-title="",AB Channel (768p) [Offline]
 https://59ef7ad665d1d.streamlock.net:1443/abchannel/abchannel/playlist.m3u8
-#EXTINF:-1 tvg-id="AlmaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Gfy3pb1.jpg" group-title="",Alma TV (576p)
+#EXTINF:-1 tvg-id="AlmaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Gfy3pb1.jpg" group-title="",Alma TV (576p) [Timeout]
 http://151.0.207.99:1935/AlmaTv/AlmaTv/playlist.m3u8
 #EXTINF:-1 tvg-id="AltoAdigeTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Alto Adige TV (720p)
 https://5f204aff97bee.streamlock.net/AltoAdigeTV/livestream/playlist.m3u8
@@ -21,7 +21,7 @@ https://59d8c0cee6f3d.streamlock.net/antennatreveneto/antennatreveneto.stream/pl
 https://59d7d6f47d7fc.streamlock.net/auroraarte/auroraarte/playlist.m3u8
 #EXTINF:-1 tvg-id="AzzurraTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://www.vcoazzurratv.it/images/1_tg_loghi/logo_vcoazzurratv_old_03.png" group-title="",Azzurra TV (576p) [Not 24/7]
 https://sb.top-ix.org/avtvlive/streaming/playlist.m3u8
-#EXTINF:-1 tvg-id="Bike.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/wZh7aI8.png" group-title="",Bike (720p) [Offline]
+#EXTINF:-1 tvg-id="Bike.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/wZh7aI8.png" group-title="",Bike (720p) [Timeout]
 http://backup.superstreaming.inaria.me/BikeSmartMobilityDTT/playlist.m3u8
 #EXTINF:-1 tvg-id="BoingFrance.it" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/mIbmYs1.png" group-title="Kids",Boing France (720p) [Not 24/7]
 http://flusonic-1.platinum-tv.com/boing/index.m3u8?token=test
@@ -69,7 +69,7 @@ https://5929b138b139d.streamlock.net/CompanyTV/smil:CompanyTV.smil/master.m3u8
 https://stream9.xdevel.com/video0s975363-691/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="DeeJayTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/it/thumb/9/93/Logo_Deejay.svg/1024px-Logo_Deejay.svg.png" group-title="Music",DeeJay TV (360p)
 https://deejay_tv-lh.akamaihd.net/i/DeejayTv_1@129866/master.m3u8
-#EXTINF:-1 tvg-id="DonnaShopping.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="Shop",Donna Shopping (360p)
+#EXTINF:-1 tvg-id="DonnaShopping.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="Shop",Donna Shopping (1080p)
 https://media.streambrothers.com:1936/8038/8038/playlist.m3u8
 #EXTINF:-1 tvg-id="EliveTVBrescia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.elivebrescia.tv/wp-content/uploads/2018/09/Logo_nuovo_CLAIM.png" group-title="",Elive TV Brescia (720p) [Not 24/7]
 https://59d7d6f47d7fc.streamlock.net/elivebresciatv/elivebresciatv/playlist.m3u8
@@ -89,9 +89,9 @@ https://stream7.xdevel.com/video0s975817-411/stream/playlist.m3u8
 https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(fu)/index.m3u8
 #EXTINF:-1 tvg-id="Gold78.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Gold 78 (1080p)
 https://stream2.xdevel.com/video1s86-22/stream/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="GoldTVItalia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/7/7a/LOGO-GOLD-TV.png" group-title="",Gold TV Italia (576p)
+#EXTINF:-1 tvg-id="GoldTVItalia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/7/7a/LOGO-GOLD-TV.png" group-title="",Gold TV Italia (576p) [Timeout]
 http://151.0.207.99:1935/GoldTV/GOLD_17/playlist.m3u8
-#EXTINF:-1 tvg-id="HalowKidsHD.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Halow Kids HD (480p) [Offline]
+#EXTINF:-1 tvg-id="HalowKidsHD.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Halow Kids HD (480p) [Timeout]
 http://halowtv.online:8080/HalowTV/FSyzHfEhvb/139
 #EXTINF:-1 tvg-id="HilandoFino.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Hilando Fino (720p) [Not 24/7]
 http://4k-server-mia.2cdn.eu/HilandoFinoTV/ngrp:HilandoFinoTV_all/playlist.m3u8
@@ -109,13 +109,13 @@ https://59d7d6f47d7fc.streamlock.net/italia2/italia2/playlist.m3u8
 https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(i2)/index.m3u8
 #EXTINF:-1 tvg-id="Italia2TV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/TDSgG28.png" group-title="",Italia 2 TV (480p) [Geo-blocked]
 http://wms.shared.streamshow.it/italia2/mp4:italia2/playlist.m3u8
-#EXTINF:-1 tvg-id="Italia7.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/PIeNjOA.jpg" group-title="",Italia 7 (576p)
+#EXTINF:-1 tvg-id="Italia7.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/PIeNjOA.jpg" group-title="",Italia 7 (576p) [Timeout]
 http://151.0.207.99:1935/italia7/italia7/playlist.m3u8
 #EXTINF:-1 tvg-id="IuniorTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/FBOJnfT.png" group-title="",Iunior TV (720p) [Not 24/7]
 https://5f22d76e220e1.streamlock.net/iuniortv/iuniortv/playlist.m3u8
 #EXTINF:-1 tvg-id="JuweloItalia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Juwelo Italia (480p)
 https://sdn-global-live-streaming-packager-cache.3qsdn.com/7841/7841_264_live.m3u8
-#EXTINF:-1 tvg-id="KissKissNapoliTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Qawc6g8.jpg" group-title="",Kiss Kiss Napoli TV (380p)
+#EXTINF:-1 tvg-id="KissKissNapoliTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Qawc6g8.jpg" group-title="",Kiss Kiss Napoli TV (1080p)
 https://58f12ffd2447a.streamlock.net/KKTVNapoli/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="KissKissTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/pETXOU7.jpg" group-title="",Kiss Kiss TV (1080p)
 https://58f12ffd2447a.streamlock.net/KKMulti/livestream/playlist.m3u8
@@ -133,13 +133,13 @@ http://streamcdnc3.mainstreaming.tv/cdn/live/100197/SOrBDPy/playlist.m3u8
 https://59ef7ad665d1d.streamlock.net:1443/eslife/eslife/playlist.m3u8
 #EXTINF:-1 tvg-id="LaTR3Marsala.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/IFPpG7X.png" group-title="",La TR3 Marsala (720p)
 https://tsw.streamingwebtv24.it:1936/eslife1/eslife1/playlist.m3u8
-#EXTINF:-1 tvg-id="LazioTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/CaKRuRT.png" group-title="",Lazio TV (576p)
+#EXTINF:-1 tvg-id="LazioTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/CaKRuRT.png" group-title="",Lazio TV (576p) [Timeout]
 http://151.0.207.99:1935/live/LAZIOTV12/playlist.m3u8
 #EXTINF:-1 tvg-id="LiraTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/sC9ELuY.jpg" group-title="",Lira TV (720p) [Not 24/7]
 https://5d79ae45bc63b.streamlock.net/Liratv/Liratv/playlist.m3u8
 #EXTINF:-1 tvg-id="LucaniaChannel.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/4RKmGcr.png" group-title="",Lucania Channel (480p) [Not 24/7]
 http://wms.shared.streamshow.it/lucaniatv/mp4:lucaniatv/playlist.m3u8
-#EXTINF:-1 tvg-id="m2oTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/34/Radio_m2o_-_Logo_2019.svg/936px-Radio_m2o_-_Logo_2019.svg.png" group-title="Music",m2o TV (360p)
+#EXTINF:-1 tvg-id="m2oTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/34/Radio_m2o_-_Logo_2019.svg/936px-Radio_m2o_-_Logo_2019.svg.png" group-title="Music",m2o TV (224p)
 https://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/master.m3u8
 #EXTINF:-1 tvg-id="MediasetExtra.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/mediasetextra.png" group-title="",Mediaset Extra [Geo-blocked]
 https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(kq)/index.m3u8
@@ -161,23 +161,23 @@ https://5db313b643fd8.streamlock.net/Paroledivita/Paroledivita/playlist.m3u8
 https://celinel.akamaized.net/hls/live/2032089/2032089/primativvu/primativvu/playlist.m3u8
 #EXTINF:-1 tvg-id="Primocanale.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/ltoMTJV.png" group-title="",Primocanale (1080p) [Not 24/7]
 https://msh0203.stream.seeweb.it/live/flv:stream2.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="R101.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e9/R101_-_Logo_2015.svg/1010px-R101_-_Logo_2015.svg.png" group-title="",R101 (576p)
-https://live3-radio-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(er)/index.m3u8
-#EXTINF:-1 tvg-id="R101ItaliaIT.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",R 101 Italia IT (576p)
+#EXTINF:-1 tvg-id="R101ItaliaIT.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",R 101 Italia IT (576p) [Offline]
 https://live3-radio-mediaset-it.akamaized.net/content/hls_h0_clr_vos/live/channel(er)/index.m3u8
+#EXTINF:-1 tvg-id="R101.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e9/R101_-_Logo_2015.svg/1010px-R101_-_Logo_2015.svg.png" group-title="",R101 (576p) [Offline]
+https://live3-radio-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(er)/index.m3u8
 #EXTINF:-1 tvg-id="Radio24.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Radio 24 (1080p) [Not 24/7]
 http://radio24-lh.akamaihd.net/i/radio24video_1@379914/master.m3u8
 #EXTINF:-1 tvg-id="Radio51.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://mytuner.global.ssl.fastly.net/media/tvos_radios/dr4z3umuxbjr.png" group-title="",Radio 51 (480p)
 https://59d7d6f47d7fc.streamlock.net/canale51/canale51/playlist.m3u8
 #EXTINF:-1 tvg-id="Radio51TV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Radio 51 TV (480p)
 http://178.32.140.155/canale51/canale51/playlist.m3u8
-#EXTINF:-1 tvg-id="Radio101.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.105.net/images/logos/3/logo_colored.jpg" group-title="",Radio 101 (576p)
+#EXTINF:-1 tvg-id="Radio101.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.105.net/images/logos/3/logo_colored.jpg" group-title="",Radio 101 (576p) [Offline]
 https://live3-radio-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(ER)/index.m3u8
-#EXTINF:-1 tvg-id="Radio105.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.105.net/images/logos/3/logo_colored.jpg" group-title="",Radio 105 (576p)
+#EXTINF:-1 tvg-id="Radio105.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.105.net/images/logos/3/logo_colored.jpg" group-title="",Radio 105 (576p) [Offline]
 https://live3-radio-mediaset-it.akamaized.net/content/hls_h0_clr_vos/live/channel(EC)/index.m3u8
 #EXTINF:-1 tvg-id="Radio105TV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/it/0/01/105.png" group-title="",Radio 105 TV (576p)
 https://live3-radio-mediaset-it.akamaized.net/content/hls_h0_clr_vos/live/channel(ec)/index.m3u8
-#EXTINF:-1 tvg-id="Radio105TV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/it/0/01/105.png" group-title="",Radio 105 TV (576p)
+#EXTINF:-1 tvg-id="Radio105TV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/it/0/01/105.png" group-title="",Radio 105 TV (576p) [Offline]
 https://live3-radio-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(ec)/index.m3u8
 #EXTINF:-1 tvg-id="RadioBirikinaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/kzvsNo2.png" group-title="",Radio Birikina TV (720p) [Not 24/7]
 https://56b50ada2d659.streamlock.net/RadioBirikinaTV/livestream/playlist.m3u8
@@ -187,37 +187,37 @@ http://capital-live-tv-01-hls.akamai.media.kataweb.it/i/CapitalTv_1@183098/maste
 https://capital_tv-lh.akamaihd.net/i/CapitalTv_1@183098/master.m3u8
 #EXTINF:-1 tvg-id="RADIOFRECCIA.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/O8ByUjT.png" group-title="",RADIO FRECCIA (432p)
 https://rtl-video2-stream.thron.com/live-video/video2/ngrp:video2/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioIbizaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/sH8FGqv.png" group-title="",Radio Ibiza TV (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioIbizaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/sH8FGqv.png" group-title="",Radio Ibiza TV (720p) [Not 24/7]
 https://5929b138b139d.streamlock.net/RadioIbizaTV/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioIglesias.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://static.radio.net/images/broadcasts/3e/ec/29681/c175.png" group-title="",Radio Iglesias (576p) [Geo-blocked]
 http://wms.shared.streamshow.it/visualradio/mp4:visualradio/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioIglesiasSardegna.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/KDtVpLl.png" group-title="",Radio Iglesias Sardegna (576p) [Geo-blocked]
 https://59d7d6f47d7fc.streamlock.net/visualradio/visualradio/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioItaliaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://api.superguidatv.it/v1/channels/165/logo?width=120&theme=light" group-title="Music",Radio Italia TV (480p)
+#EXTINF:-1 tvg-id="RadioItaliaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://api.superguidatv.it/v1/channels/165/logo?width=120&theme=light" group-title="Music",Radio Italia TV (256p)
 https://radioitaliatv-lh.akamaihd.net/i/radioitaliatv_1@329645/master.m3u8
 #EXTINF:-1 tvg-id="RadioLombardiaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://www.nododigordio.org/assets/uploads/2018/10/RL_06-300x168.png" group-title="",Radio Lombardia TV (720p)
 https://flash7.xdevel.com/radiolombardiatv/radiolombardiatv/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioMontecarlo.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.radiomontecarlo.net/images/logos/1/logo_white.jpg" group-title="",Radio Montecarlo (576p)
+#EXTINF:-1 tvg-id="RadioMontecarlo.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.radiomontecarlo.net/images/logos/1/logo_white.jpg" group-title="",Radio Montecarlo (576p) [Offline]
 https://live3-radio-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(bb)/index.m3u8
 #EXTINF:-1 tvg-id="RadioNumberOne.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/8cpuaG5.png" group-title="",Radio Number One (720p)
 https://56b50ada2d659.streamlock.net/RN1TV/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioPiterPanTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/DfugVgy.png" group-title="Music",Radio Piter Pan TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioPiterPanTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/DfugVgy.png" group-title="Music",Radio Piter Pan TV (576p) [Not 24/7]
 https://58d921499d3d3.streamlock.net/RadioPiterpanTV/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioRadicaleTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Radio Radicale TV (240p) [Not 24/7]
 https://video-ar.radioradicale.it/diretta/padtv2/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioRadioTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Radio Radio TV (720p)
 http://api.new.livestream.com/accounts/11463451/events/3679884/live.m3u8
-#EXTINF:-1 tvg-id="RadioStudioDeltaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/ISk4odR.jpg" group-title="",Radio Studio Delta TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="RadioStudioDeltaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/ISk4odR.jpg" group-title="",Radio Studio Delta TV (1080p) [Not 24/7]
 https://5ce9406b73c33.streamlock.net/RSD/ngrp:livestream_all/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioTaorminaSicilia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/SrhtocV.png" group-title="",Radio Taormina Sicilia (720p)
 https://stream2.xdevel.com/video1s3-7/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioZeta.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c4/Radio_Zeta_-_Logo_2020.svg/1024px-Radio_Zeta_-_Logo_2020.svg.png" group-title="",Radio Zeta (432p)
 https://rtl-video3-stream.thron.com/live-video/video3/ngrp:video3/playlist.m3u8
-#EXTINF:-1 tvg-id="RadionorbaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://guidatv.sky.it/app/guidatv/images/epgimages/channels/home/25780_home.png" group-title="Music",Radionorba TV (404p)
-http://flash2.xdevel.com/norbatv/smil:norbatv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="radionorbaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",radionorba TV (404p) [Offline]
 http://46.165.210.112/radionorbatv/norbatv_source.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RadionorbaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://guidatv.sky.it/app/guidatv/images/epgimages/channels/home/25780_home.png" group-title="Music",Radionorba TV (404p) [Offline]
+http://flash2.xdevel.com/norbatv/smil:norbatv.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="RadionorbaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://guidatv.sky.it/app/guidatv/images/epgimages/channels/home/25780_home.png" group-title="Music",Radionorba TV (404p) [Offline]
 http://flash5.streaming.xdevel.com/radionorbatv/smil:radionorbatv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioZeta.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c4/Radio_Zeta_-_Logo_2020.svg/1024px-Radio_Zeta_-_Logo_2020.svg.png" group-title="",RadioZeta (480p)
 https://unlimited1-cl.dps.live/radioztv/radioztv.smil/radioztv/livestream2/chunks.m3u8
@@ -230,14 +230,14 @@ http://stream.tvtap.net:8081/live/it-rai1.stream/playlist.m3u8
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=2606803
 #EXTINF:-1 tvg-id="Rai1Geo.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Rai 1 (Geo) (576p)
 http://mediapolisevent.rai.it/relinker/relinkerServlet.htm?cont=2606803
+#EXTINF:-1 tvg-id="Rai2.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.ipko.com/epg/logo/rai2.png" group-title="",Rai 2 (576p) [Geo-blocked]
+https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=308718
 #EXTINF:-1 tvg-id="Rai2.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.ipko.com/epg/logo/rai2.png" group-title="",Rai 2 (302p) [Geo-blocked]
 http://stream.tvtap.net:8081/live/it-rai2.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="Rai2.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.ipko.com/epg/logo/rai2.png" group-title="",Rai 2 [Geo-blocked]
-https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=308718
+#EXTINF:-1 tvg-id="Rai3.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/Rai_3_-_Logo_2016.svg/1280px-Rai_3_-_Logo_2016.svg.png" group-title="",Rai 3 (576p) [Geo-blocked]
+https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=308709
 #EXTINF:-1 tvg-id="Rai3.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/Rai_3_-_Logo_2016.svg/1280px-Rai_3_-_Logo_2016.svg.png" group-title="",Rai 3 (432p) [Geo-blocked]
 http://stream.tvtap.net:8081/live/it-rai3.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="Rai3.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/Rai_3_-_Logo_2016.svg/1280px-Rai_3_-_Logo_2016.svg.png" group-title="",Rai 3 [Geo-blocked]
-https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=308709
 #EXTINF:-1 tvg-id="Rai3.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/Rai_3_-_Logo_2016.svg/1280px-Rai_3_-_Logo_2016.svg.png" group-title="",Rai 3 (720p) [Not 24/7]
 http://wzstreaming.rai.it/TVlive/liveStream/chunklist_w823540263.m3u8
 #EXTINF:-1 tvg-id="Rai3.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/Rai_3_-_Logo_2016.svg/1280px-Rai_3_-_Logo_2016.svg.png" group-title="",Rai 3 (576p) [Not 24/7]
@@ -254,13 +254,13 @@ http://stream.tvtap.net:8081/live/it-rai5.stream/playlist.m3u8
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=395276
 #EXTINF:-1 tvg-id="RaiGulp.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/anMBVB2.png" group-title="",Rai Gulp (576p)
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=746953
-#EXTINF:-1 tvg-id="RaiMovie.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/raimovie.png" group-title="",Rai Movie [Geo-blocked]
+#EXTINF:-1 tvg-id="RaiMovie.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/raimovie.png" group-title="",Rai Movie (576p) [Geo-blocked]
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=747002
 #EXTINF:-1 tvg-id="RaiNews24.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/Rai_News_24.svg/1920px-Rai_News_24.svg.png" group-title="News",Rai News 24 (720p)
 https://rainews1-live.akamaized.net/hls/live/598326/rainews1/rainews1/playlist.m3u8
-#EXTINF:-1 tvg-id="RaiPremium.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/raipremium.png" group-title="",Rai Premium [Geo-blocked]
+#EXTINF:-1 tvg-id="RaiPremium.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/raipremium.png" group-title="",Rai Premium (576p) [Geo-blocked]
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=746992
-#EXTINF:-1 tvg-id="RaiScuola.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/rovwgYW.png" group-title="",Rai Scuola [Geo-blocked]
+#EXTINF:-1 tvg-id="RaiScuola.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/rovwgYW.png" group-title="",Rai Scuola (576p) [Geo-blocked]
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=747011
 #EXTINF:-1 tvg-id="RaiSport.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Lqtz4tS.jpg" group-title="",Rai Sport [Geo-blocked]
 http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=179975
@@ -270,9 +270,9 @@ https://everyrai-lh.akamaihd.net/i/raisportjolly1_1@177967/master.m3u8
 http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4145
 #EXTINF:-1 tvg-id="RaiSportPlus.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Rai Sport+ [Geo-blocked]
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=358025
-#EXTINF:-1 tvg-id="RaiStoria.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/xKt2SJw.png" group-title="",Rai Storia [Geo-blocked]
+#EXTINF:-1 tvg-id="RaiStoria.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/xKt2SJw.png" group-title="",Rai Storia (576p) [Geo-blocked]
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=746990
-#EXTINF:-1 tvg-id="RaiYoYo.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Elw5ZtU.png" group-title="",Rai YoYo [Geo-blocked]
+#EXTINF:-1 tvg-id="RaiYoYo.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Elw5ZtU.png" group-title="",Rai YoYo (576p) [Geo-blocked]
 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=746899
 #EXTINF:-1 tvg-id="RDSSocialTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://image.winudf.com/v2/image/aXQucmRzLnR2LnJkc3NvY2lhbHR2X3NjcmVlbl8wXzE1MjU0MzE0MzlfMDY2/screen-0.jpg?h=355&fakeurl=1&type=.jpg" group-title="",RDS Social TV (720p)
 https://stream.rdstv.radio/out/v1/ec85f72b87f04555aa41d616d5be41dc/index.m3u8
@@ -296,17 +296,17 @@ http://5c389faa13be3.streamlock.net:1935/8058/8058/playlist.m3u8
 https://59d7d6f47d7fc.streamlock.net/reteveneta/reteveneta/playlist.m3u8
 #EXTINF:-1 tvg-id="RMKTVSciacca.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Pk5flAT.png" group-title="",RMK TV Sciacca (720p) [Not 24/7]
 http://vod1.kronopress.com:1935/tmk_live/5123-CA5C-9EBE-428A/playlist.m3u8
+#EXTINF:-1 tvg-id="RTCTelecalabria.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/IZtIFM2.png" group-title="",RTC Telecalabria (720p) [Not 24/7]
+https://w1.mediastreaming.it/calabriachannel/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="RTCTelecalabria.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://www.telecalabria.it/logoRTCnew.jpg" group-title="",RTC Telecalabria (576p) [Not 24/7]
 http://fl1.mediastreaming.it:1935/calabriachannel/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="RTCTelecalabria.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/IZtIFM2.png" group-title="",RTC Telecalabria (576p) [Not 24/7]
-https://w1.mediastreaming.it/calabriachannel/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="RTL1025.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/7Ep1zt8.jpg" group-title="Music",RTL 102.5 (432p)
 https://rtl-video1-stream.thron.com/live-video/video1/ngrp:video1/playlist.m3u8
 #EXTINF:-1 tvg-id="RTL1025BEST.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/E4G6PiA.png" group-title="",RTL 102.5 BEST (432p)
 https://rtl-video4-stream.thron.com/live-video/video4/ngrp:video4/playlist.m3u8
 #EXTINF:-1 tvg-id="RTP.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/it/thumb/8/86/Logo_Radio_Televisione_Peloritana.svg/1200px-Logo_Radio_Televisione_Peloritana.svg.png" group-title="",RTP (404p)
 https://flash2.xdevel.com/rtptv/rtptv/playlist.m3u8
-#EXTINF:-1 tvg-id="RTTRTrento.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/9houwTS.png" group-title="",RTTR Trento (404p)
+#EXTINF:-1 tvg-id="RTTRTrento.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/9houwTS.png" group-title="",RTTR Trento (720p)
 https://5f204aff97bee.streamlock.net/RTTRlive/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="SardegnaUno.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://www.sardegna1.tv/wp-content/uploads/2015/07/logo.png" group-title="",Sardegna Uno (480p) [Not 24/7]
 https://59d7d6f47d7fc.streamlock.net/sardegnauno/sardegnauno/playlist.m3u8
@@ -328,7 +328,7 @@ https://stream1.aswifi.it/stereo5/live/index.m3u8
 http://wms.shared.streamshow.it:1935/studio100ta/studio100ta/playlist.m3u8
 #EXTINF:-1 tvg-id="Super.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/Generic_Live-TV_Blue.png?raw=true" group-title="",Super (480p) [Not 24/7]
 https://viacomitalytest-lh.akamaihd.net/i/sbshdlive_1@357018/master.m3u8
-#EXTINF:-1 tvg-id="SuperJTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Super J TV (720p)
+#EXTINF:-1 tvg-id="SuperJTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Super J TV (720p) [Timeout]
 https://54627d4fc5996.streamlock.net/SuperJtv/SuperJtv/playlist.m3u8
 #EXTINF:-1 tvg-id="SuperJTVTeramo.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/H3uItqg.png" group-title="",Super J TV Teramo (720p) [Not 24/7]
 http://uk4.streamingpulse.com:1935/SuperJtv/SuperJtv/playlist.m3u8
@@ -356,15 +356,15 @@ http://wms.shared.streamshow.it/telequattro/telequattro/playlist.m3u8
 http://5cbd3bc28341f.streamlock.net:1935/trs_live/teleradiosciacca-tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleSondrioNews.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="News",Tele Sondrio News (480p)
 https://59d8c0cee6f3d.streamlock.net/tsn/tsn_mobile/playlist.m3u8
-#EXTINF:-1 tvg-id="TeleArena.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TeleArena (576p)
+#EXTINF:-1 tvg-id="TeleArena.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TeleArena (480p)
 http://5ce9406b73c33.streamlock.net/TeleArena/TeleArena.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="Telebelluno.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Telebelluno (400p)
+#EXTINF:-1 tvg-id="Telebelluno.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Telebelluno (720p)
 https://live.mariatvcdn.com/telebelluno/a3b80388da9801906adf885282e73bc3.sdp/mono.m3u8
-#EXTINF:-1 tvg-id="TeleBoario.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TeleBoario (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="TeleBoario.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TeleBoario (720p) [Not 24/7]
 http://flash7.streaming.xdevel.com/teleboario/teleboario/playlist.m3u8
 #EXTINF:-1 tvg-id="Telechiara.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Telechiara (720p)
 http://fms.tvavicenza.it:1935/telechiara/diretta/playlist.m3u8
-#EXTINF:-1 tvg-id="TelecolorLombardia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.postimg.cc/G2s6Zncv/telecolor.png" group-title="",Telecolor Lombardia (1080p) [Offline]
+#EXTINF:-1 tvg-id="TelecolorLombardia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.postimg.cc/G2s6Zncv/telecolor.png" group-title="",Telecolor Lombardia (1080p) [Not 24/7]
 https://1aadf145546f475282c5b4e658c0ac4b.msvdn.net/live/324149/hlbAWtl/playlist.m3u8
 #EXTINF:-1 tvg-id="Telecupole.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Telecupole (540p)
 https://live.livevideosolution.it/telecupole/dd6d85e5b7452f7b85a099509292b421.sdp/playlist.m3u8
@@ -380,7 +380,7 @@ https://streamtechglobal.akamaized.net/hls/live/2024685/telefriuli/Group01/playl
 https://5db313b643fd8.streamlock.net/Telegenova/Telegenova/playlist.m3u8
 #EXTINF:-1 tvg-id="Telegranda.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Telegranda (720p) [Not 24/7]
 http://live.sloode.com:1935/telegranda_live/C2AD-0664-DC75-4744/playlist.m3u8
-#EXTINF:-1 tvg-id="Teleliberta.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Teleliberta (486p) [Not 24/7]
+#EXTINF:-1 tvg-id="Teleliberta.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Teleliberta (720p) [Not 24/7]
 http://api.new.livestream.com/accounts/17114188/events/4902226/live.m3u8
 #EXTINF:-1 tvg-id="TeleMia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="http://1.bp.blogspot.com/-8gAN3pOqt7M/UK8We1rH1yI/AAAAAAAADjU/bya6H2ZbcJk/s1600/logo-telemia.png" group-title="",TeleMia (576p)
 https://playerssl.telemia.tv/fileadmin/hls/TelemiaHD/telemia85_mediachunks.m3u8
@@ -401,10 +401,10 @@ https://59d7d6f47d7fc.streamlock.net/telenord/telenord/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleNordest.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/Woq6TJo.png" group-title="",TeleNordest (480p) [Offline]
 https://wms.shared.streamshow.it/telenord/telenord/playlist.m3u8
 #EXTINF:-1 tvg-id="telePAVIA.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/66/LOGO_telePAVIA.png" group-title="",telePAVIA (720p)
-http://wms.shared.streamshow.it/telepavia/mp4:telepavia/playlist.m3u8
-#EXTINF:-1 tvg-id="telePAVIA.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/66/LOGO_telePAVIA.png" group-title="",telePAVIA (720p)
 http://wms.shared.streamshow.it:1935/telepavia/telepavia/live.m3u8
-#EXTINF:-1 tvg-id="TeleRent7Gold.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TeleRent 7Gold (720p)
+#EXTINF:-1 tvg-id="telePAVIA.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/66/LOGO_telePAVIA.png" group-title="",telePAVIA (720p)
+http://wms.shared.streamshow.it/telepavia/mp4:telepavia/playlist.m3u8
+#EXTINF:-1 tvg-id="TeleRent7Gold.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TeleRent 7Gold (720p) [Offline]
 https://stream2.xdevel.com/video0s86-21/stream/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="TelesudTrapani.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Telesud Trapani (720p) [Not 24/7]
 http://5cbd3bc28341f.streamlock.net:1935/telesud/live/playlist.m3u8
@@ -416,7 +416,7 @@ https://diretta.teleterni.it/live/stream_src.m3u8
 https://59d7d6f47d7fc.streamlock.net/rs2/rs2/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleTusciaSabina2000.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/K6tTjJC.png" group-title="",TeleTusciaSabina 2000 (576p) [Not 24/7]
 http://ts2000tv.streaming.nextware.it:8081/ts2000tv/ts2000tv/playlist.m3u8
-#EXTINF:-1 tvg-id="TeleVenezia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/RG4o4Ni.png" group-title="",TeleVenezia (480p)
+#EXTINF:-1 tvg-id="TeleVenezia.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/RG4o4Ni.png" group-title="",TeleVenezia (576p)
 https://59d8c0cee6f3d.streamlock.net/televenezia/televenezia/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleVideoAgrigento.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/crMQmn4.png" group-title="",TeleVideo Agrigento (480p)
 https://59d7d6f47d7fc.streamlock.net/tva/tva/playlist.m3u8
@@ -440,14 +440,6 @@ https://5e73cf528f404.streamlock.net/TrentinoTV/livestream/playlist.m3u8
 http://w1.streamingmedia.it:1935/trmh24/live/playlist.m3u8
 #EXTINF:-1 tvg-id="TSNTeleSondrioNews.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="News",TSN Tele Sondrio News (480p) [Not 24/7]
 http://wms.shared.streamshow.it/tsn/tsn_mobile/playlist.m3u8
-#EXTINF:-1 tvg-id="TV7Azzurra.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TV7 Azzurra (270p)
-http://217.61.26.46:8080/hls/azzurra.m3u8
-#EXTINF:-1 tvg-id="TV7Benevento.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.neikos.it/wp-content/uploads/2014/04/logo_tvsette.png" group-title="",TV7 Benevento (288p) [Not 24/7]
-http://streaming.senecadot.com/live/flv:tv7.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="TV7News.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="News",TV7 News (270p)
-http://217.61.26.46:8080/hls/news.m3u8
-#EXTINF:-1 tvg-id="TV7Triveneta.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/ndFoo4V.png" group-title="",TV7 Triveneta (270p) [Not 24/7]
-http://217.61.26.46:8080/hls/triveneta.m3u8
 #EXTINF:-1 tvg-id="TV2000.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TV 2000 (720p) [Offline]
 http://cld04wz.tv2000.it/tv2000_main.m3u8
 #EXTINF:-1 tvg-id="TV2000.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TV 2000 (540p) [Offline]
@@ -460,6 +452,14 @@ http://185.202.128.1:1935/Tv6Stream/tv6TV.stream/playlist.m3u8
 http://185.202.128.1:1935/Tv6Stream/tv6TV.stream_tlm/playlist.m3u8
 #EXTINF:-1 tvg-id="TVUNO.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TV UNO (240p)
 http://ftp.tiscali.it/francescovernata/TVUNO/monoscopioTvUNOint-1.wmv
+#EXTINF:-1 tvg-id="TV7Azzurra.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",TV7 Azzurra (270p)
+http://217.61.26.46:8080/hls/azzurra.m3u8
+#EXTINF:-1 tvg-id="TV7Benevento.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.neikos.it/wp-content/uploads/2014/04/logo_tvsette.png" group-title="",TV7 Benevento (288p) [Not 24/7]
+http://streaming.senecadot.com/live/flv:tv7.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="TV7News.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="News",TV7 News (270p)
+http://217.61.26.46:8080/hls/news.m3u8
+#EXTINF:-1 tvg-id="TV7Triveneta.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/ndFoo4V.png" group-title="",TV7 Triveneta (270p) [Not 24/7]
+http://217.61.26.46:8080/hls/triveneta.m3u8
 #EXTINF:-1 tvg-id="TVAVicenza.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://upload.wikimedia.org/wikipedia/it/thumb/0/0f/TVA_Vicenza_-_Logo_2018.svg/675px-TVA_Vicenza_-_Logo_2018.svg.png" group-title="",TVA (Vicenza) (720p)
 http://fms.tvavicenza.it:1935/live/diretta_1/playlist.m3u8
 #EXTINF:-1 tvg-id="TVL.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://www.tvl.it/photos/big-thumbs/logo-tvl.png" group-title="",TVL (720p) [Not 24/7]
@@ -468,9 +468,9 @@ https://live.mariatvcdn.com/mariatvcdn/70564e1c6884c007c76f0c128d679eed.sdp/play
 http://wms.shared.streamshow.it:1935/tvrs/tvrs/live.m3u8
 #EXTINF:-1 tvg-id="UmbriaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Umbria TV (576p) [Not 24/7]
 https://umbriatv.stream.rubidia.it:8083/live/umbriatv/playlist.m3u8
-#EXTINF:-1 tvg-id="VeraTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Vera TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="VeraTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Vera TV (1080p) [Not 24/7]
 http://wms.shared.streamshow.it/veratv/mp4:veratv/playlist.m3u8
-#EXTINF:-1 tvg-id="VeraTVMarche.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/kXDdx0h.png" group-title="",Vera TV (Marche) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="VeraTVMarche.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/kXDdx0h.png" group-title="",Vera TV (Marche) (1080p) [Not 24/7]
 http://wms.shared.streamshow.it/veratv/veratv/playlist.m3u8
 #EXTINF:-1 tvg-id="VideoBresciaTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Video Brescia TV (720p) [Not 24/7]
 http://wms.shared.streamshow.it/videobrescia/videobrescia/playlist.m3u8
@@ -484,7 +484,7 @@ http://livestreaming.videolina.it/live/Videolina/playlist.m3u8
 https://sb.top-ix.org/avtv04/streaming/playlist.m3u8
 #EXTINF:-1 tvg-id="VideostarCanale193.it" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/kuisqG7.jpg" group-title="",Videostar Canale 193 (576p) [Not 24/7]
 https://5cbd3bc28341f.streamlock.net:444/videostar_live/videostar/playlist.m3u8
-#EXTINF:-1 tvg-id="VirginRadioTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Virgin Radio TV (576p)
+#EXTINF:-1 tvg-id="VirginRadioTV.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Virgin Radio TV (576p) [Offline]
 https://live2-radio-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(ew)/index.m3u8
 #EXTINF:-1 tvg-id="VisualRadio.it" tvg-country="IT" tvg-language="Italian" tvg-logo="" group-title="",Visual Radio (576p) [Not 24/7]
 http://wms.shared.streamshow.it:1935/visualradio/visualradio/live.m3u8
diff --git a/channels/jm.m3u b/channels/jm.m3u
index cd74af45f1..8651d3b720 100644
--- a/channels/jm.m3u
+++ b/channels/jm.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="JamaicaTV.jm" tvg-country="JM" tvg-language="English" tvg-logo="" group-title="",Jamaica Online TV (1080p)
 https://vse2-sa-all4.secdn.net/tvstartup11-channel/live/mp4:jotvedge/playlist.m3u8
-#EXTINF:-1 tvg-id="SportsMax.jm" tvg-country="JM" tvg-language="English" tvg-logo="https://zap2it.tmsimg.com/h3/NowShowing/49559/s49559_h3_aa.png" group-title="Sports",SportsMax (720p) [Offline]
+#EXTINF:-1 tvg-id="SportsMax.jm" tvg-country="JM" tvg-language="English" tvg-logo="https://zap2it.tmsimg.com/h3/NowShowing/49559/s49559_h3_aa.png" group-title="Sports",SportsMax (720p) [Timeout]
 http://cdn.tvmatic.net/sport.m3u8
diff --git a/channels/jp.m3u b/channels/jp.m3u
index 67ac9cd75d..cce2f3579d 100644
--- a/channels/jp.m3u
+++ b/channels/jp.m3u
@@ -12,7 +12,7 @@ http://27.254.130.62/feed/LC38/playlist.m3u8
 #EXTINF:-1 tvg-id="AnimaxJapan.jp" tvg-country="JP" tvg-language="Japanese;Vietnamese" tvg-logo="https://i.imgur.com/zpi6mQ3.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Animation",Animax Japan (Vietnamese Subs) (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://livecdn.fptplay.net/hda3/animaxport_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="ATX.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://www.at-x.com/favicon_android.png" group-title="Animation",AT-X (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ATX.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://www.at-x.com/favicon_android.png" group-title="Animation",AT-X (720p) [Not 24/7]
 https://sub2.neetball.net/live/neet.m3u8
 #EXTINF:-1 tvg-id="BS12.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",BS 12 (404p)
 http://211.21.12.236:11935/live/bs13.stream/playlist.m3u8
@@ -68,6 +68,14 @@ http://211.21.12.236:11935/live/bs14.stream/playlist.m3u8
 https://nhkw-zh-hlscomp.akamaized.net/8thz5iufork8wjip/playlist.m3u8
 #EXTINF:-1 tvg-id="NHKChineseVision.jp" tvg-country="JP" tvg-language="Chinese" tvg-logo="https://i.imgur.com/4yRulEZ.png" group-title="News",NHK Chinese Vision (720p)
 https://nhkw-zh-hlscomp.akamaized.net/ixxemlzk1vqvy44o/playlist.m3u8
+#EXTINF:-1 tvg-id="NHKEOsaka.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK E Osaka (404p)
+http://211.21.12.236:11935/live/gx02.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="NHKETokyo.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK E Tokyo (404p)
+http://211.21.12.236:11935/live/gd02.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="NHKGOsaka.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK G Osaka (404p)
+http://211.21.12.236:11935/live/gx01.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="NHKGTokyo.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK G Tokyo (404p)
+http://211.21.12.236:11935/live/gd01.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="NHKGeneralTV.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK General TV (540p) [Not 24/7]
 https://nhk1.mov3.co/hls/nhk.m3u8
 #EXTINF:-1 tvg-id="NHKWorld.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://www3.nhk.or.jp/nhkworld/common/site_images/nw_webapp_1500x1500.png" group-title="",NHK World (720p)
@@ -76,14 +84,6 @@ https://nhkworld.webcdn.stream.ne.jp/www11/nhkworld-tv/sycc-live/zh/playlist.m3u
 https://nhkwlive-ojp.akamaized.net/hls/live/2003459/nhkwlive-ojp-en/index.m3u8
 #EXTINF:-1 tvg-id="NHKWorldJapan.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/SQISXoD.jpg" group-title="News",NHK World Japan (720p) [Not 24/7]
 https://b-nhkwlive-xjp.webcdn.stream.ne.jp/hls/live/2003458-b/nhkwlive-xjp-en/index.m3u8
-#EXTINF:-1 tvg-id="NHKEOsaka.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK-E Osaka (404p)
-http://211.21.12.236:11935/live/gx02.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="NHKETokyo.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK-E Tokyo (404p)
-http://211.21.12.236:11935/live/gd02.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="NHKGOsaka.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK-G Osaka (404p)
-http://211.21.12.236:11935/live/gx01.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="NHKGTokyo.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK-G Tokyo (404p)
-http://211.21.12.236:11935/live/gd01.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="NHKHuaYuShiJie.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="http://www.tvyan.com/uploads/dianshi/nhkhuayu.jpg" group-title="",NHK华语视界 (720p)
 https://nhkworld.webcdn.stream.ne.jp/www11/nhkworld-tv/zh/725580/livecom_zh.m3u8
 #EXTINF:-1 tvg-id="NipponTV.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/202.png" group-title="",Nippon TV (404p)
@@ -94,7 +94,7 @@ https://ntv1.mov3.co/hls/ntv.m3u8
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36
 https://redlabmcdn.s.llnwi.net/nv02/ryowa3/index.mpd
 #EXTINF:-1 tvg-id="NTVNews24.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/Ya4yHpC.jpg" group-title="News",NTV News24 (480p)
-https://www.news24.jp/livestream/index.m3u8
+https://n24-cdn-live.ntv.co.jp/ch01/index.m3u8
 #EXTINF:-1 tvg-id="ShopChannel.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/3K36JEA.jpg" group-title="Shop",Shop Channel (720p) [Not 24/7]
 https://stream3.shopch.jp/HLS/master.m3u8
 #EXTINF:-1 tvg-id="Star1.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Star 1 (404p)
@@ -118,7 +118,7 @@ http://211.21.12.236:11935/live/gd08.stream/playlist.m3u8
 https://movie.mcas.jp/mcas/mx1_2/master.m3u8
 #EXTINF:-1 tvg-id="TokyoMX1.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Tokyo_metropolitan_television_logo_%28rainbow%29.svg/800px-Tokyo_metropolitan_television_logo_%28rainbow%29.svg.png" group-title="Local",Tokyo MX1 (360p)
 https://movie.mcas.jp/mcas/smil:mx1_prod.smil/master.m3u8
-#EXTINF:-1 tvg-id="TokyoMX2.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Tokyo_metropolitan_television_logo_%28rainbow%29.svg/800px-Tokyo_metropolitan_television_logo_%28rainbow%29.svg.png" group-title="Local",Tokyo MX2 (360p)
+#EXTINF:-1 tvg-id="TokyoMX2.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Tokyo_metropolitan_television_logo_%28rainbow%29.svg/800px-Tokyo_metropolitan_television_logo_%28rainbow%29.svg.png" group-title="Local",Tokyo MX2 (720p)
 https://movie.mcas.jp/mcas/mx2_2/master.m3u8
 #EXTINF:-1 tvg-id="TokyoMX2.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Tokyo_metropolitan_television_logo_%28rainbow%29.svg/800px-Tokyo_metropolitan_television_logo_%28rainbow%29.svg.png" group-title="Local",Tokyo MX2 (360p)
 https://movie.mcas.jp/mcas/smil:mx2_prod.smil/master.m3u8
diff --git a/channels/ke.m3u b/channels/ke.m3u
index 2a3bb9fec8..39e0ce5d92 100644
--- a/channels/ke.m3u
+++ b/channels/ke.m3u
@@ -5,7 +5,7 @@ https://iptv--iptv.repl.co/streamlink?url=https://www.youtube.com/user/kenyaciti
 https://tvsn-i.akamaihd.net/hls/live/261837/tvsn/tvsn_750.m3u8
 #EXTINF:-1 tvg-id="GBSTV.ke" tvg-country="KE" tvg-language="English" tvg-logo="https://kenyatv.tech/wp-content/uploads/2021/04/GBS-TV-1.jpg" group-title="General",GBS TV (720p) [Not 24/7]
 https://goliveafrica.media:9998/live/6045ccbac3484/index.m3u8
-#EXTINF:-1 tvg-id="K24.ke" tvg-country="KE" tvg-language="English" tvg-logo="https://kenyatv.tech/wp-content/uploads/2021/04/K24-1.jpg" group-title="General",K24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="K24.ke" tvg-country="KE" tvg-language="English" tvg-logo="https://kenyatv.tech/wp-content/uploads/2021/04/K24-1.jpg" group-title="General",K24 (480p) [Not 24/7]
 https://5f4db0f94b000.streamlock.net/k24/myStream/chunklist_w333466763.m3u8
 #EXTINF:-1 tvg-id="KamemeTV.ke" tvg-country="KE" tvg-language="English" tvg-logo="https://kenyatv.tech/wp-content/uploads/2020/11/ke-kameme-tv-1383.jpg" group-title="General",Kameme TV (720p) [Not 24/7]
 https://iptv--iptv.repl.co/streamlink?url=https://dai.ly/x6ol8sj
diff --git a/channels/kh.m3u b/channels/kh.m3u
index 6d03812b9b..53eed884ea 100644
--- a/channels/kh.m3u
+++ b/channels/kh.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="BayonTV.kh" tvg-country="KH" tvg-language="Khmer" tvg-logo="https://i.imgur.com/2jbulL2.jpg" group-title="News",Bayon TV (360p) [Not 24/7]
-http://203.176.130.123:8989/live/bayontv1_480k.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="BayonTV.kh" tvg-country="KH" tvg-language="Khmer" tvg-logo="https://i.imgur.com/2jbulL2.jpg" group-title="News",Bayon TV (360p) [Not 24/7]
 http://203.176.130.123:8989/live/bayontv_480k.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="BayonTV.kh" tvg-country="KH" tvg-language="Khmer" tvg-logo="https://i.imgur.com/2jbulL2.jpg" group-title="News",Bayon TV (360p) [Not 24/7]
+http://203.176.130.123:8989/live/bayontv1_480k.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="FreshNews.kh" tvg-country="KH" tvg-language="Khmer" tvg-logo="" group-title="News",Fresh News (720p)
 http://167.99.65.12:1935/live/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="FreshNewsTV.kh" tvg-country="KH" tvg-language="Khmer" tvg-logo="https://i.imgur.com/6p0TK7e.png" group-title="News",Fresh News TV (720p)
+#EXTINF:-1 tvg-id="FreshNewsTV.kh" tvg-country="KH" tvg-language="Khmer" tvg-logo="https://i.imgur.com/6p0TK7e.png" group-title="News",Fresh News TV (480p)
 http://167.99.65.12:1935/live/ngrp:myStream_all/playlist.m3u8
 #EXTINF:-1 tvg-id="PNN.kh" tvg-country="KH" tvg-language="Khmer" tvg-logo="https://i.imgur.com/1xZmAvQ.jpg" group-title="",PNN (360p) [Not 24/7]
 http://203.176.130.123:8989/live/pnn_480k.stream/playlist.m3u8
diff --git a/channels/kr.m3u b/channels/kr.m3u
index 1be07a37ee..bd80d1294d 100644
--- a/channels/kr.m3u
+++ b/channels/kr.m3u
@@ -3,7 +3,7 @@
 http://210.210.155.35/dr9445/h/h02/01.m3u8
 #EXTINF:-1 tvg-id="Arirang.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92706/14090001.png" group-title="",Arirang (1080p)
 http://amdlive-ch01.ctnd.com.edgesuite.net/arirang_1ch/smil:arirang_1ch.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Arirang.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92706/14090001.png" group-title="",Arirang (1080p)
+#EXTINF:-1 tvg-id="Arirang.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92706/14090001.png" group-title="",Arirang (720p)
 http://amdlive.ctnd.com.edgesuite.net/arirang_1ch/smil:arirang_1ch.smil/.m3u8
 #EXTINF:-1 tvg-id="Arirang.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92706/14090001.png" group-title="",Arirang (576p) [Geo-blocked]
 http://cdn-01.bonus-tv.ru:8080/arirang_edge/index.m3u8
@@ -15,12 +15,12 @@ http://amdlive-ch03.ctnd.com.edgesuite.net/arirang_3ch/smil:arirang_3ch.smil/chu
 http://amdlive.ctnd.com.edgesuite.net/arirang_3ch/smil:arirang_3ch.smil/.m3u8
 #EXTINF:-1 tvg-id="BBSBuddhistBroadcasting.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/i7uUG2m.png" group-title="",BBS Buddhist Broadcasting (1080p) [Not 24/7]
 http://bbstv.clouducs.com:1935/bbstv-live/livestream/playlist.m3u8
+#EXTINF:-1 tvg-id="CBS.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92706/14090022.png" group-title="General",CBS (1080p)
+http://cbs-live.gscdn.com:1935/cbs-live/cbs-live.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="CBS.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/Iy0yBaM.jpg" group-title="General",CBS (1080p)
 http://cbs-live.gscdn.com/cbs-live/cbs-live.stream/hasbahca.m3u8
 #EXTINF:-1 tvg-id="CBS.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/Iy0yBaM.jpg" group-title="General",CBS (1080p)
 http://cbs-live.gscdn.com/cbs-live/cbs-live.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="CBS.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92706/14090022.png" group-title="General",CBS (1080p)
-http://cbs-live.gscdn.com:1935/cbs-live/cbs-live.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="CGNTV.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/SQI9PAz.png" group-title="Religious",CGNTV (720p)
 http://cgntv-glive.ofsdelivery.net/live/_definst_/cgntv_kr02/chunklist.m3u8
 #EXTINF:-1 tvg-id="Channel67.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="" group-title="",Channel 67 (1080p)
@@ -29,10 +29,10 @@ http://cbs-live.gscdn.com/cbs-live/cbs-live.stream/iptvm3uplaylists.m3u8
 http://1.222.207.80:1935/live/cjbtv/playlist.m3u8
 #EXTINF:-1 tvg-id="CTSgidoggyoTV.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="http://www.bbsi.co.kr/HOME/img/common/imgLogo.png" group-title="",CTS기독교TV (720p)
 https://d34t5yjz1ooymj.cloudfront.net/out/v1/875039d5eba0478fa8375a06b3aa5a37/index.m3u8
-#EXTINF:-1 tvg-id="EBS1.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/s1y2zoe.png" group-title="",EBS 1 (400p)
-http://ebsonair.ebs.co.kr/groundwavefamilypc/familypc1m/chunklist_w1960240276.m3u8
 #EXTINF:-1 tvg-id="EBS1.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://global.ebs.co.kr/global/img/sub/Channels_ebs1.png" group-title="",EBS 1 (400p)
 http://ebsonair.ebs.co.kr:1935/ebs1familypc/familypc1m/playlist.m3u8
+#EXTINF:-1 tvg-id="EBS1.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/s1y2zoe.png" group-title="",EBS 1 (400p)
+http://ebsonair.ebs.co.kr/groundwavefamilypc/familypc1m/chunklist_w1960240276.m3u8
 #EXTINF:-1 tvg-id="EBS2.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/7K7zmoE.png" group-title="",EBS 2 (400p)
 http://ebsonair.ebs.co.kr:1935/ebs2familypc/familypc1m/playlist.m3u8
 #EXTINF:-1 tvg-id="EBSe.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/7K7zmoE.png" group-title="",EBS e (400p)
@@ -69,23 +69,23 @@ http://119.200.131.11:1935/KBCTV/tv/playlist.m3u8
 http://51.81.66.195:1935/krtv/kbs1_540/playlist.m3u8
 #EXTINF:-1 tvg-id="KBS1.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/KBS_1_logo.svg/langfr-220px-KBS_1_logo.svg.png" group-title="",KBS 1 (1080p) [Not 24/7]
 http://121.130.210.101:9981/stream/channelid/637185705
-#EXTINF:-1 tvg-id="KBS2.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://img.pooq.co.kr/BMS/Channelimage30/image/KBS-2TV-2.png" group-title="",KBS2 (540p) [Geo-blocked]
-http://51.81.66.195:1935/krtv/kbs2_540/playlist.m3u8
 #EXTINF:-1 tvg-id="KBSLiveCamDokDo.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/b7uMB9T.png" group-title="",KBS LiveCam DokDo (540p)
 http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="KBSWorld.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/KBS.png" group-title="",KBS World (576p)
+#EXTINF:-1 tvg-id="KBSWorld.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/KBS.png" group-title="",KBS World (720p)
 https://livecdn.fptplay.net/sdb/kbs_hls.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="KBS2.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://img.pooq.co.kr/BMS/Channelimage30/image/KBS-2TV-2.png" group-title="",KBS2 (540p) [Geo-blocked]
+http://51.81.66.195:1935/krtv/kbs2_540/playlist.m3u8
 #EXTINF:-1 tvg-id="KCTVgwangjuCH05.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://www.kctv.co.kr/img/index/top_logo.png" group-title="",KCTV 광주 CH05 (720p) [Not 24/7]
 http://119.77.96.184:1935/chn05/chn05/chunklist_w644291506.m3u8
 #EXTINF:-1 tvg-id="KTV.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/pANf9i7.png" group-title="",KTV [Offline]
 rtmp://218.38.152.31:1935/klive/klive.stream
 #EXTINF:-1 tvg-id="MaeilBusinessNewspaper.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/AmalRpB.png" group-title="Business",Maeil Business Newspaper (720p) [Offline]
 rtmp://origin.flive.skcdn.com/mbn-auth1/1000k
-#EXTINF:-1 tvg-id="MBC.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/672.png" group-title="",MBC (540p)
-http://123.254.72.24:1935/tvlive/livestream2/playlist.m3u8
 #EXTINF:-1 tvg-id="MBC.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/672.png" group-title="",MBC (540p) [Geo-blocked]
 http://51.81.66.195:1935/krtv/mbc_540/playlist.m3u8
-#EXTINF:-1 tvg-id="MBCYeosu.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/672.png" group-title="",MBC Yeosu (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="MBC.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/672.png" group-title="",MBC (540p) [Timeout]
+http://123.254.72.24:1935/tvlive/livestream2/playlist.m3u8
+#EXTINF:-1 tvg-id="MBCYeosu.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/672.png" group-title="",MBC Yeosu (720p) [Not 24/7]
 https://5c3639aa99149.streamlock.net/live_TV/TV/playlist.m3u8
 #EXTINF:-1 tvg-id="Mnet.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00579.png" group-title="",Mnet (576p) [Geo-blocked]
 http://51.81.66.195:1935/krtv/mnet_540/playlist.m3u8
@@ -109,7 +109,7 @@ https://streaming-a-802.cdn.nextologies.com/SBS_18/playlist.m3u8
 http://221.157.125.239:1935/live/psike/playlist.m3u8
 #EXTINF:-1 tvg-id="TBS.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/wqlTcbI.png" group-title="",TBS (720p)
 https://tbs.hscdn.com/tbstvweb/tbstv/playlist.m3u8
-#EXTINF:-1 tvg-id="TBS.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="http://www.tbs.seoul.kr/common/images/gnb/logo.png" group-title="",TBS (540p)
+#EXTINF:-1 tvg-id="TBS.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="http://www.tbs.seoul.kr/common/images/gnb/logo.png" group-title="",TBS (540p) [Offline]
 http://tbs.hscdn.com/tbstvweb/tbstv/chunklist_w1331473189.m3u8
 #EXTINF:-1 tvg-id="TJBdaejeonbangsongSBSDaTian.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://upload.wikimedia.org/wikipedia/ko/8/8b/TJB_Logo.jpg" group-title="",TJB 대전방송 (SBS 大田) (720p) [Not 24/7]
 http://1.245.74.5:1935/live/tv/.m3u8
@@ -117,7 +117,7 @@ http://1.245.74.5:1935/live/tv/.m3u8
 http://live.worktv.or.kr:1935/live/wowtvlive1.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="YTN.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://static.epg.best/kr/YTN.kr.png" group-title="",YTN (720p)
 http://slive.ytn.co.kr/ytn/_definst_/ytn_stream_20190306/playlist.m3u8
-#EXTINF:-1 tvg-id="YTNDMB.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/fdFQonN.jpg" group-title="",YTN DMB (270p)
+#EXTINF:-1 tvg-id="YTNDMB.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/fdFQonN.jpg" group-title="",YTN DMB (270p) [Offline]
 http://slive.ytn.co.kr:1935/dmb/ydlive_20140419_1/playlist.m3u8
 #EXTINF:-1 tvg-id="YTNSCIENCE.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/FIzME5L.jpg" group-title="Science",YTN SCIENCE (270p)
 http://slive.sciencetv.kr:1935/science/yslive_20140419_1/chunklist_w2065795695.m3u8
@@ -131,7 +131,7 @@ http://gayotv.net:1935/live/gayotv/playlist.m3u8
 http://mgugaklive.nowcdn.co.kr/gugakvideo/gugakvideo.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="daeguMBCMBCDaegu.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://dg.cdn.a04f922e9e85c8d25ebfeae3dfd22a67.com/2019/12/0df66e127a9d1c68d0d56dd7567a5b52943a71122c8fc5aecf792ff11fba3d93bb1cd98f1d1c9e2fd83a294d26e2d5f270b705711cc20b5bdaf39ed2188c5075.png" group-title="",대구 MBC (MBC Daegu) (480p) [Not 24/7]
 https://5e04aba713813.streamlock.net/live/livetv/playlist.m3u8
-#EXTINF:-1 tvg-id="daejeonMBCMBCDaejeon.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://busan.cdn.a04f922e9e85c8d25ebfeae3dfd22a67.com/2018/12/6e1a8d912bd32dca479bbf74667f7caf0716dd4e358e61136cecb8ca29b5b99a46b47b1d42b4a487d582c6ad6132929ff20a4cb41b344da26694ca115f5ee90a.png" group-title="",대전MBC (MBC Daejeon) (720p) [Offline]
+#EXTINF:-1 tvg-id="daejeonMBCMBCDaejeon.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://busan.cdn.a04f922e9e85c8d25ebfeae3dfd22a67.com/2018/12/6e1a8d912bd32dca479bbf74667f7caf0716dd4e358e61136cecb8ca29b5b99a46b47b1d42b4a487d582c6ad6132929ff20a4cb41b344da26694ca115f5ee90a.png" group-title="",대전MBC (MBC Daejeon) (720p) [Not 24/7]
 https://5c482867a8b63.streamlock.net/live/myStream.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="jejuMBCMBCJeju.kr" tvg-country="KR" tvg-language="Korean" tvg-logo="https://jeju.cdn.a04f922e9e85c8d25ebfeae3dfd22a67.com/2019/06/2a42c0e8f353c0d091bd145d7384670af46a6cdf647b0d0be45f76a8faccf7ad0b144cbb6fe11b0ff81bd830478e8e5e8dc43ec1ce76bfead41eac377fcfbdc0.png" group-title="",제주 MBC (MBC Jeju) (352p) [Not 24/7]
 https://5cf58a556f9b2.streamlock.net/live/tv_jejumbc/playlist.m3u8
diff --git a/channels/kw.m3u b/channels/kw.m3u
index 68eaaf713a..fd4b2c4a93 100644
--- a/channels/kw.m3u
+++ b/channels/kw.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AlMaaliTV.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="https://i.imgur.com/l7zer94.png" group-title="Religious",Al Maali TV (360p)
+#EXTINF:-1 tvg-id="AlMaaliTV.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="https://i.imgur.com/l7zer94.png" group-title="Religious",Al Maali TV (1080p)
 https://video1.getstreamhosting.com:1936/8484_1/8484_1/playlist.m3u8
 #EXTINF:-1 tvg-id="AlMaaref.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://almaaref.ch/wp-content/uploads/2018/10/almaaref-logo-2.png" group-title="Religious",Al Maaref (350p)
 http://38.96.175.40:1935/liveTrans/ngrp:channel23_all/playlist.m3u8
@@ -25,7 +25,7 @@ https://dcunilive93-lh.akamaihd.net/i/dclive_1@835787/master.m3u8
 https://gulfsat.cdn.easybroadcast.fr/live/FunoonHd_abr/playlist.m3u8
 #EXTINF:-1 tvg-id="KTV1.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://www.freeetv.com/images/03_logo/KTV1_Kuwait.jpg" group-title="",KTV 1 (1080p) [Not 24/7]
 https://hiplayer.hibridcdn.net/t/kwmedia-kwtv1.m3u8
-#EXTINF:-1 tvg-id="KTV2.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://www.freeetv.com/images/03_logo/ktv2_Kuwait.jpg" group-title="",KTV 2 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="KTV2.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://www.freeetv.com/images/03_logo/ktv2_Kuwait.jpg" group-title="",KTV 2 (240p) [Not 24/7]
 https://hiplayer.hibridcdn.net/t/kwmedia-kwtv2.m3u8
 #EXTINF:-1 tvg-id="KTVAlMajlis.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://i4.yhk0.net/cha/kw/almajlis-95x41.gif" group-title="",KTV Al Majlis (1080p) [Not 24/7]
 https://hiplayer.hibridcdn.net/t/kwmedia-kwtvmajlis.m3u8
@@ -33,7 +33,7 @@ https://hiplayer.hibridcdn.net/t/kwmedia-kwtvmajlis.m3u8
 https://hiplayer.hibridcdn.net/t/kwmedia-kwtvqurain.m3u8
 #EXTINF:-1 tvg-id="KTVArabe.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://content.osn.com/bob/745x419/KTA.jpg" group-title="",KTV Arabe (1080p) [Not 24/7]
 https://hiplayer.hibridcdn.net/t/kwmedia-kwtvarabi.m3u8
-#EXTINF:-1 tvg-id="KTVEthraa.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="KTVEthraa.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa (240p) [Not 24/7]
 https://hiplayer.hibridcdn.net/t/kwmedia-kwtvethraa.m3u8
 #EXTINF:-1 tvg-id="KTVKhallikBilbait.kw" tvg-country="KW" tvg-language="Arabic" tvg-logo="https://i5.satexpat.com/cha/kw/khallikBilbait-95x73.gif" group-title="",KTV Khallik Bilbait (1080p) [Not 24/7]
 https://hiplayer.hibridcdn.net/t/kwmedia-kwtvkids.m3u8
diff --git a/channels/kz.m3u b/channels/kz.m3u
index b76003dfaa..39fbfc3cd8 100644
--- a/channels/kz.m3u
+++ b/channels/kz.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="7kanal.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",7 канал (432p) [Not 24/7]
+#EXTINF:-1 tvg-id="7kanal.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",7 канал (576p) [Not 24/7]
 https://sc.id-tv.kz/7_kanal.m3u8
-#EXTINF:-1 tvg-id="31kanal.kz" tvg-country="KZ" tvg-language="Russian" tvg-logo="" group-title="",31 канал (576p) [Offline]
+#EXTINF:-1 tvg-id="31kanal.kz" tvg-country="KZ" tvg-language="Russian" tvg-logo="" group-title="",31 канал (576p) [Not 24/7]
 https://sc.id-tv.kz/31Kanal.m3u8
 #EXTINF:-1 tvg-id="AsylArnaAsylarna.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",Asyl Arna (Асыл арна) (432p) [Not 24/7]
 https://sc.id-tv.kz/AsylArna.m3u8
-#EXTINF:-1 tvg-id="AtamekenBusiness.kz" tvg-country="KZ" tvg-language="Kazakh;Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a000001662eb7cce159eda2661b206fb448/z" group-title="Business",Atameken Business (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AtamekenBusiness.kz" tvg-country="KZ" tvg-language="Kazakh;Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a000001662eb7cce159eda2661b206fb448/z" group-title="Business",Atameken Business (1080p) [Not 24/7]
 http://live-atameken.cdnvideo.ru/atameken/atameken.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="AtamekenBusiness.kz" tvg-country="KZ" tvg-language="Kazakh;Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a000001662eb7cce159eda2661b206fb448/z" group-title="Business",Atameken Business (576p) [Not 24/7]
 https://sc.id-tv.kz/Atameken.m3u8
@@ -15,27 +15,27 @@ https://sc.id-tv.kz/CaspianNews.m3u8
 https://sc.id-tv.kz/Dombyra.m3u8
 #EXTINF:-1 tvg-id="Gakku.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",Gakku (576p) [Not 24/7]
 https://sc.id-tv.kz/Gakku.m3u8
-#EXTINF:-1 tvg-id="HitTV.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",Hit TV (512p) [Not 24/7]
+#EXTINF:-1 tvg-id="HitTV.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",Hit TV (576p) [Not 24/7]
 https://sc.id-tv.kz/HitTV.m3u8
 #EXTINF:-1 tvg-id="Almaty.kz" tvg-country="KZ" tvg-language="Kazakh;Russian" tvg-logo="https://i.imgur.com/GXlYCXz.jpg" group-title="",Алматы (720p) [Not 24/7]
 http://live-almatytv.cdnvideo.ru/almatytv/almatytv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Almaty.kz" tvg-country="KZ" tvg-language="Kazakh;Russian" tvg-logo="https://i.imgur.com/GXlYCXz.jpg" group-title="",Алматы (432p) [Not 24/7]
 https://sc.id-tv.kz/Almaty.m3u8
-#EXTINF:-1 tvg-id="Astana.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",Астана (432p) [Not 24/7]
+#EXTINF:-1 tvg-id="Astana.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",Астана (576p) [Not 24/7]
 https://sc.id-tv.kz/Astana.m3u8
-#EXTINF:-1 tvg-id="ElArna.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="Movies",Ел Арна [Not 24/7]
+#EXTINF:-1 tvg-id="ElArna.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="Movies",Ел Арна (576p) [Not 24/7]
 https://sc.id-tv.kz/ElArna.m3u8
 #EXTINF:-1 tvg-id="KMA.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="" group-title="",КМА (1080p) [Not 24/7]
 https://sc.id-tv.kz/KMA.m3u8
 #EXTINF:-1 tvg-id="KTK.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="https://i.imgur.com/BGy7EMr.png" group-title="",КТК (360p)
 http://89.218.30.37/ktklive/live.hq/playlist.m3u8
-#EXTINF:-1 tvg-id="KTK.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="https://i.imgur.com/BGy7EMr.png" group-title="",КТК [Not 24/7]
+#EXTINF:-1 tvg-id="KTK.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="https://i.imgur.com/BGy7EMr.png" group-title="",КТК (576p) [Not 24/7]
 https://sc.id-tv.kz/KTK.m3u8
-#EXTINF:-1 tvg-id="MTRK.kz" tvg-country="KZ" tvg-language="Russian" tvg-logo="https://i.imgur.com/XMyRwDk.png" group-title="",МТРК (576p) [Offline]
+#EXTINF:-1 tvg-id="MTRK.kz" tvg-country="KZ" tvg-language="Russian" tvg-logo="https://i.imgur.com/XMyRwDk.png" group-title="",МТРК (576p) [Not 24/7]
 https://tvcdn01.oktv.kz/tv/mtrk/playlist.m3u8
 #EXTINF:-1 tvg-id="Novoetelevidenie.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="https://i.imgur.com/HLiv5Hq.jpg" group-title="",Новое телевидение (576p) [Not 24/7]
 http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="STV.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="https://avatars.mds.yandex.net/get-tv-shows/30293/2a0000015185958d1c16e063f32ce0de9e49/orig" group-title="",СТВ [Not 24/7]
+#EXTINF:-1 tvg-id="STV.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="https://avatars.mds.yandex.net/get-tv-shows/30293/2a0000015185958d1c16e063f32ce0de9e49/orig" group-title="",СТВ (576p) [Not 24/7]
 https://sc.id-tv.kz/STV.m3u8
 #EXTINF:-1 tvg-id="Habar24.kz" tvg-country="KZ" tvg-language="Kazakh" tvg-logo="https://i.imgur.com/tEH4vmX.png" group-title="",Хабар 24 (1080p) [Not 24/7]
 http://serv30.vintera.tv:8081/habar/habar24/playlist.m3u8
diff --git a/channels/la.m3u b/channels/la.m3u
index eb516ab6fb..644f9b0117 100644
--- a/channels/la.m3u
+++ b/channels/la.m3u
@@ -3,7 +3,7 @@
 https://livefta.malimarcdn.com/ftaedge00/airtv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="BrianTV.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",Brian TV (720p) [Not 24/7]
 https://livefta.malimarcdn.com/ftaedge00/briantv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="DaoLaneXang.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",Dao Lane Xang (360p)
+#EXTINF:-1 tvg-id="DaoLaneXang.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",Dao Lane Xang (720p)
 https://livefta.malimarcdn.com/ftaedge00/khaomwungmai.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="DhammasaphaTV.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",Dhammasapha TV (1080p)
 https://livefta.malimarcdn.com/ftaedge00/dhammasapha.stream/playlist.m3u8
@@ -11,11 +11,11 @@ https://livefta.malimarcdn.com/ftaedge00/dhammasapha.stream/playlist.m3u8
 https://livefta.malimarcdn.com/ftaedge00/gooditv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="HmongStarTV.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",Hmong Star TV (720p)
 https://livefta.malimarcdn.com/ftaedge00/hmongstartv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="HmongUSATV.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",HmongUSA TV (720p)
+#EXTINF:-1 tvg-id="HmongUSATV.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",HmongUSA TV (360p)
 https://livefta.malimarcdn.com/ftaedge00/hmongusatv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="HoungFa.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",Houng Fa (720p)
 https://livefta.malimarcdn.com/ftaedge00/houngfa.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="ISTV.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",ISTV (720p)
+#EXTINF:-1 tvg-id="ISTV.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",ISTV (480p)
 https://livefta.malimarcdn.com/ftaedge00/ichannel.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="KhomsanhTV.la" tvg-country="LA" tvg-language="Vietnamese" tvg-logo="" group-title="",Khomsanh TV (720p)
 https://livefta.malimarcdn.com/ftaedge00/lstv2.sdp/playlist.m3u8
diff --git a/channels/lb.m3u b/channels/lb.m3u
index 2fb667f831..1e38455283 100644
--- a/channels/lb.m3u
+++ b/channels/lb.m3u
@@ -11,7 +11,7 @@ https://manar.live/iptv/playlist.m3u8
 https://manar.live/x.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlMayadeen.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://media.almayadeen.tv/uploads/archive/web-logo.png" group-title="News",Al Mayadeen (576p)
 https://lmdstrm.cdn.octivid.com/mayadeen-live/smil:mayadeen.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AlhayatTV.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://www.alhayat.tv/images/logo/main.34f5c635.png" group-title="General",Alhayat TV (720p) [Offline]
+#EXTINF:-1 tvg-id="AlhayatTV.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://www.alhayat.tv/images/logo/main.34f5c635.png" group-title="General",Alhayat TV (720p) [Not 24/7]
 https://wowzaprod140-i.akamaihd.net/hls/live/750788/7552102e/playlist.m3u8
 #EXTINF:-1 tvg-id="AlimanTV.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/817xRPg.png" group-title="Religious",Aliman TV (240p) [Not 24/7]
 https://svs.itworkscdn.net/alimanlive/imantv.smil/playlist.m3u8
@@ -29,11 +29,11 @@ https://shls-lbci-prod-dub.shahid.net/out/v1/d8cce30036e743318a7f338539689968/in
 http://31.14.40.237:1935/live/Nabaa/playlist.m3u8
 #EXTINF:-1 tvg-id="NabaaTV.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://nabaa.tv/wp-content/uploads/2018/07/nabaa-logo-66x116.png" group-title="News",Nabaa TV (720p) [Not 24/7]
 http://31.14.40.238:1935/live/Nabaa/playlist.m3u8
-#EXTINF:-1 tvg-id="NabaaTV.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://nabaa.tv/wp-content/uploads/2018/07/nabaa-logo-66x116.png" group-title="News",Nabaa TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="NabaaTV.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://nabaa.tv/wp-content/uploads/2018/07/nabaa-logo-66x116.png" group-title="News",Nabaa TV (720p) [Not 24/7]
 https://5dc7d824154d0.streamlock.net/live/Nabaa/playlist.m3u8
 #EXTINF:-1 tvg-id="NBN.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="" group-title="",NBN (720p) [Not 24/7]
 https://nbntv.me:8443/nbntv/index.m3u8
-#EXTINF:-1 tvg-id="Newvision.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://www.newvision.tv/wp-content/uploads/2020/05/Logo.jpg" group-title="News",Newvision (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="Newvision.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://www.newvision.tv/wp-content/uploads/2020/05/Logo.jpg" group-title="News",Newvision (480p) [Not 24/7]
 https://master.starmena-cloud.com/hls/newv.m3u8
 #EXTINF:-1 tvg-id="NourAlKoddas.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/5VvPLEl.jpg" group-title="Religious",Nour Al Koddas (406p) [Not 24/7]
 https://svs.itworkscdn.net/nour1satlive/livestream/playlist.m3u8
@@ -55,7 +55,7 @@ http://teledunet.com:8080/live/azrotv/azrotv2021/10015.m3u8
 https://svs.itworkscdn.net/madalive/mada/playlist.m3u8
 #EXTINF:-1 tvg-id="TahaTV.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://tahatv.com/images/menue%20bar/77_46.png" group-title="Kids",Taha TV (360p) [Not 24/7]
 https://media2.livaat.com/TAHA-TV/index.m3u8
-#EXTINF:-1 tvg-id="TeleLiban.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://www.teleliban.com.lb/images/telelogo.png" group-title="General",Tele Liban (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="TeleLiban.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://www.teleliban.com.lb/images/telelogo.png" group-title="General",Tele Liban (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://www.teleliban.com.lb/live
 https://cdn.catiacast.video/abr/ed8f807e2548db4507d2a6f4ba0c4a06/playlist.m3u8
 #EXTINF:-1 tvg-id="TVSeventeen.lb" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://www.tvseventeen.com/img/logo.png" group-title="News",TV Seventeen (720p)
diff --git a/channels/lk.m3u b/channels/lk.m3u
index cecdd274ca..982f904928 100644
--- a/channels/lk.m3u
+++ b/channels/lk.m3u
@@ -13,9 +13,9 @@ http://dammikartmp.tulix.tv/slrc1/slrc1/playlist.m3u8
 http://rtmp.santhoratv.zecast.net/santhora/santhorashortfilm/playlist.m3u8
 #EXTINF:-1 tvg-id="SanthoraTV.lk" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/yJs9KYP.png" group-title="",Santhora TV (720p)
 http://rtmp.santhoratv.zecast.net/santhoratv/santhoratv/playlist.m3u8
-#EXTINF:-1 tvg-id="SooriyanTV.lk" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/nqAvA6W.png" group-title="",Sooriyan TV (864p) [Not 24/7]
+#EXTINF:-1 tvg-id="SooriyanTV.lk" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/nqAvA6W.png" group-title="",Sooriyan TV (1080p) [Not 24/7]
 https://59d39900ebfb8.streamlock.net/Sooriyantv/Sooriyantv/playlist.m3u8
 #EXTINF:-1 tvg-id="SriSankaraTV.lk" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/1QrwZKp.png" group-title="",Sri Sankara TV (360p)
 https://8noro432dm6g-hls-live.wmncdn.net/Sri/a5518065f47332dad6b509920c827474.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="VerbumTV.com" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/BzaJlR9.jpg" group-title="",VerbumTV (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="VerbumTV.com" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/BzaJlR9.jpg" group-title="",VerbumTV (414p) [Not 24/7]
 https://verbumtv.livebox.co.in/verbumtvhls/live.m3u8
diff --git a/channels/lu.m3u b/channels/lu.m3u
index 90f735d33a..6b759f6fd5 100644
--- a/channels/lu.m3u
+++ b/channels/lu.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="ChamberTV.lu" tvg-country="LU" tvg-language="Luxembourgish" tvg-logo="https://i.imgur.com/YldMnap.jpg" group-title="",Chamber TV (1080p)
 https://media02.webtvlive.eu/chd-edge/smil:chamber_tv_hd.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="eldoTV.lu" tvg-country="LU" tvg-language="Luxembourgish" tvg-logo="https://i.imgur.com/4ntor8S.png" group-title="",eldo.TV (720p)
+#EXTINF:-1 tvg-id="eldoTV.lu" tvg-country="LU" tvg-language="Luxembourgish" tvg-logo="https://i.imgur.com/4ntor8S.png" group-title="",eldo.TV (1080p)
 https://eldo-streaming.eldo.lu/eldotv/smil:eldotv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="JasminTV.lu" tvg-country="LU" tvg-language="English" tvg-logo="https://www.parsatv.com/index_files/channels/jasmintv.png" group-title="XXX",Jasmin TV (720p)
 http://109.71.162.112/live/hd.jasminchannel.stream/playlist.m3u8
diff --git a/channels/lv.m3u b/channels/lv.m3u
index 90529e4553..052f7653f9 100644
--- a/channels/lv.m3u
+++ b/channels/lv.m3u
@@ -3,9 +3,9 @@
 https://video.chaula.tv/hls/live/high/playlist_high.m3u8
 #EXTINF:-1 tvg-id="LatvijasRadio1.lv" tvg-country="LV" tvg-language="Latvian" tvg-logo="https://i.imgur.com/hsspORI.png" group-title="",Latvijas Radio 1 (360p)
 https://5a44e5b800a41.streamlock.net/liveVLR1/mp4:LR1/playlist.m3u8
-#EXTINF:-1 tvg-id="LatvijasRadio2.lv" tvg-country="LV" tvg-language="Latvian" tvg-logo="https://i.imgur.com/hsspORI.png" group-title="",Latvijas Radio 2 (360p)
+#EXTINF:-1 tvg-id="LatvijasRadio2.lv" tvg-country="LV" tvg-language="Latvian" tvg-logo="https://i.imgur.com/hsspORI.png" group-title="",Latvijas Radio 2 (240p)
 https://5a44e5b800a41.streamlock.net/liveVLR2/mp4:LR2/playlist.m3u8
 #EXTINF:-1 tvg-id="LatvijasRadio3Klasika.lv" tvg-country="LV" tvg-language="Latvian" tvg-logo="https://i.imgur.com/4npOpPj.png" group-title="",Latvijas Radio 3 Klasika (240p)
 https://5a44e5b800a41.streamlock.net/liveVLR3/mp4:Klasika/playlist.m3u8
-#EXTINF:-1 tvg-id="TVNET.lv" tvg-country="LV" tvg-language="Latvian" tvg-logo="https://i.imgur.com/r4rlHUt.png" group-title="",TVNET (480p)
+#EXTINF:-1 tvg-id="TVNET.lv" tvg-country="LV" tvg-language="Latvian" tvg-logo="https://i.imgur.com/r4rlHUt.png" group-title="",TVNET (360p)
 https://player.tvnet.lv/stream/amlst:61659/playlist.m3u8
diff --git a/channels/md.m3u b/channels/md.m3u
index af68e05b29..3a683e4b23 100644
--- a/channels/md.m3u
+++ b/channels/md.m3u
@@ -7,7 +7,7 @@ http://77.89.199.174:8000/play/1024/index.m3u8
 https://canalregional.md/tv/live/canalregional.m3u8
 #EXTINF:-1 tvg-id="Drochia.md" tvg-country="MD" tvg-language="Romanian" tvg-logo="" group-title="",Drochia (576p) [Not 24/7]
 https://hls.drochia.tv/tv/web.m3u8
-#EXTINF:-1 tvg-id="ElitaTV.md" tvg-country="MD" tvg-language="Romanian" tvg-logo="https://i.imgur.com/Z27Eyqv.jpg" group-title="",Elita TV (576p)
+#EXTINF:-1 tvg-id="ElitaTV.md" tvg-country="MD" tvg-language="Romanian" tvg-logo="https://i.imgur.com/Z27Eyqv.jpg" group-title="",Elita TV (576p) [Timeout]
 http://46.55.111.242:8080/Rezina.m3u8
 #EXTINF:-1 tvg-id="Moldova1.md" tvg-country="MD" tvg-language="Romanian" tvg-logo="" group-title="",Moldova1 (1080p) [Offline]
 rtsp://212.0.209.209:1935/live/_definst_/mp4:MoldovaUnu1
diff --git a/channels/me.m3u b/channels/me.m3u
index 7f50d1ee8d..792abf4b0c 100644
--- a/channels/me.m3u
+++ b/channels/me.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="TelevizijaTV7.me" tvg-country="ME" tvg-language="Serbian" tvg-logo="https://i.imgur.com/vAzXsBM.jpg" group-title="",Televizija TV7 (480p)
 http://109.123.70.27:1935/tehnikatv777/tehnikatv777/index.m3u8
-#EXTINF:-1 tvg-id="TelevizijaTV7.me" tvg-country="ME" tvg-language="Serbian" tvg-logo="https://i.imgur.com/IKlrt7F.jpg" group-title="",Televizija TV7 (480p)
+#EXTINF:-1 tvg-id="TelevizijaTV7.me" tvg-country="ME" tvg-language="Serbian" tvg-logo="https://i.imgur.com/IKlrt7F.jpg" group-title="",Televizija TV7 (480p) [Timeout]
 http://109.123.70.27:1935/tehnikatv777/tehnikatv777/playlist.m3u8
 #EXTINF:-1 tvg-id="TVCG1.me" tvg-country="ME" tvg-language="Serbian" tvg-logo="" group-title="",TVCG 1 (720p)
 http://cdn3.bcdn.rs:1935/cg1/smil:cg1.smil/playlist.m3u8
diff --git a/channels/mk.m3u b/channels/mk.m3u
index aecee022c7..5645d637dc 100644
--- a/channels/mk.m3u
+++ b/channels/mk.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="KohaTV.mk" tvg-country="MK" tvg-language="Macedonian" tvg-logo="https://i.imgur.com/AJ472ot.png" group-title="",Koha TV (720p)
+#EXTINF:-1 tvg-id="KohaTV.mk" tvg-country="MK" tvg-language="Macedonian" tvg-logo="https://i.imgur.com/AJ472ot.png" group-title="",Koha TV (720p) [Offline]
 rtmp://live.tvkoha.tv:1935/live/koha/livestream
 #EXTINF:-1 tvg-id="LiveTVHD.mk" tvg-country="MK" tvg-language="Macedonian" tvg-logo="" group-title="Music",LiveTV HD [Offline]
 rtmp://live.livetvhd.cf/live/livetvhd
@@ -7,5 +7,5 @@ rtmp://live.livetvhd.cf/live/livetvhd
 https://eu.live.skyfolk.mk/live.m3u8
 #EXTINF:-1 tvg-id="SkyFolkTV.mk" tvg-country="MK" tvg-language="Macedonian" tvg-logo="https://i.imgur.com/8JY3Tcj.jpg" group-title="Music",Sky Folk TV (720p) [Not 24/7]
 https://skyfolk.mk/live.m3u8
-#EXTINF:-1 tvg-id="TVPlus.mk" tvg-country="MK" tvg-language="Macedonian" tvg-logo="https://i.imgur.com/C67vLVL.jpg" group-title="",TVPlus [Offline]
+#EXTINF:-1 tvg-id="TVPlus.mk" tvg-country="MK" tvg-language="Macedonian" tvg-logo="https://i.imgur.com/C67vLVL.jpg" group-title="",TVPlus [Timeout]
 http://141.136.14.18/kanal1/kanal1.m3u8
diff --git a/channels/mv.m3u b/channels/mv.m3u
index 8e691f21ed..fa3868dc25 100644
--- a/channels/mv.m3u
+++ b/channels/mv.m3u
@@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="VTV.mv" tvg-country="MV" tvg-language="Dhivehi" tvg-logo="" group-title="",VTV (720p)
+#EXTINF:-1 tvg-id="VTV.mv" tvg-country="MV" tvg-language="Dhivehi" tvg-logo="" group-title="",VTV (1080p)
 http://vtvstreaming.myvnc.com:1935/vtvlive/vmedia/chunklist.m3u8
diff --git a/channels/mx.m3u b/channels/mx.m3u
index db88f36561..c700daaace 100644
--- a/channels/mx.m3u
+++ b/channels/mx.m3u
@@ -33,7 +33,7 @@ http://38.131.11.9:1080/play/a032
 http://vcp1.myplaytv.com:1935/mundomas/mundomas/playlist.m3u8
 #EXTINF:-1 tvg-id="Capital21.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/P1pHy3j.jpg" group-title="Local",Capital 21 (720p) [Not 24/7]
 https://video.cdmx.gob.mx/livestream/stream.m3u8
-#EXTINF:-1 tvg-id="ClaroSports.mx" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="" group-title="Sports",Claro Sports
+#EXTINF:-1 tvg-id="ClaroSports.mx" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="" group-title="Sports",Claro Sports (480p)
 http://45.179.140.242:8000/play/a0ht
 #EXTINF:-1 tvg-id="ConectaTV.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/9TGQZzk.png" group-title="Music",Conecta TV (720p)
 http://204.12.211.210:1935/conectatv/conectatv/playlist.m3u8
@@ -55,21 +55,21 @@ https://5ca9af4645e15.streamlock.net/canal11/videocanal11/playlist.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UClqo4ZAAZ01HQdCTlovCgkA/live
 #EXTINF:-1 tvg-id="ImagenRadio.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/SINYy29.png" group-title="",Imagen Radio (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCB0BUmdBOrH9mYU2ebs1eWA/live
-#EXTINF:-1 tvg-id="Imagentv.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/mRGetOJ.png" group-title="",Imagen TV (720p) [Offline]
+#EXTINF:-1 tvg-id="Imagentv.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/mRGetOJ.png" group-title="",Imagen TV (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x82z4if
-#EXTINF:-1 tvg-id="JaliscoTV.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/N4meE8I.png" group-title="",Jalisco TV (1080p)
+#EXTINF:-1 tvg-id="JaliscoTV.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/N4meE8I.png" group-title="",Jalisco TV (720p)
 https://5fa5de1a545ae.streamlock.net/sisjalisciense/sisjalisciense/playlist.m3u8
 #EXTINF:-1 tvg-id="LaOctava.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/qQjenrC.png" group-title="",La Octava TV (720p)
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x80mow9
 #EXTINF:-1 tvg-id="MariaVisionMexico.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/bLSCeSB.png" group-title="Religious",María Visión Mexico (1080p) [Not 24/7]
 https://1601580044.rsc.cdn77.org/live/_jcn_/amlst:Mariavision/master.m3u8
-#EXTINF:-1 tvg-id="MexicoTravelChannel.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/TnHaCDB.png" group-title="",México Travel Channel (477p)
+#EXTINF:-1 tvg-id="MexicoTravelChannel.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/TnHaCDB.png" group-title="",México Travel Channel (480p)
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x7v76vf
 #EXTINF:-1 tvg-id="MexiquenseTV.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/IjE1ORI.png" group-title="",Mexiquense TV (720p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/mexiquense/videomexiquense/playlist.m3u8
 #EXTINF:-1 tvg-id="Milenio.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d4/Milenio_Television.png" group-title="",Milenio Televisión (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCFxHplbcoJK9m70c4VyTIxg/live
-#EXTINF:-1 tvg-id="MonteMaria.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/OzVUVoX.jpg" group-title="Religious",Monte Maria (720p) [Offline]
+#EXTINF:-1 tvg-id="MonteMaria.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/OzVUVoX.jpg" group-title="Religious",Monte Maria (720p) [Timeout]
 https://rbaca.livestreamingcdn.com/envivo3/smil:live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MultimediosGuadalajara.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/0bznKvP.jpg" group-title="",Multimedios Guadalajara (720p) [Geo-blocked]
 https://mdstrm.com/live-stream-playlist/5c54d38ca392a5119bb0aa0d.m3u8
@@ -77,7 +77,7 @@ https://mdstrm.com/live-stream-playlist/5c54d38ca392a5119bb0aa0d.m3u8
 https://mdstrm.com/live-stream-playlist/57bf686a61ff39e1085d43e1.m3u8
 #EXTINF:-1 tvg-id="MultimediosMonterrey.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/7OHMuRl.png" group-title="",Multimedios Monterrey (720p) [Geo-blocked]
 https://mdstrm.com/live-stream-playlist/57b4dbf5dbbfc8f16bb63ce1.m3u8
-#EXTINF:-1 tvg-id="Multipremier.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="" group-title="Movies",Multipremier (480p)
+#EXTINF:-1 tvg-id="Multipremier.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="" group-title="Movies",Multipremier (480p) [Timeout]
 http://201.168.205.12:8000/play/a0cp/index.m3u8
 #EXTINF:-1 tvg-id="MVMNoticias.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/AdP9s9a.png" group-title="News",MVM Noticias (Oaxaca) (400p) [Not 24/7]
 https://dcunilive21-lh.akamaihd.net/i/dclive_1@59479/master.m3u8
@@ -91,7 +91,7 @@ https://live2.canaloncelive.tv/livepkgr3/cepro/playlist.m3u8
 http://live.canaloncelive.tv/livepkgr/smil:nacional.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="XHTJBTDT.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://media.localbtv.com/images/sandiegobtv/logos/20551-80512.png" group-title="Local",Once Niñas y Niños (XHTJB-TDT) (432p) [Offline]
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/xhtjb-tdt2.m3u8
-#EXTINF:-1 tvg-id="XHTJBTDT.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://media.localbtv.com/images/sandiegobtv/logos/20551-48379.png" group-title="Local",Once TV (XHTJB-TDT) (1080p) [Offline]
+#EXTINF:-1 tvg-id="XHTJBTDT.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://media.localbtv.com/images/sandiegobtv/logos/20551-48379.png" group-title="Local",Once TV (XHTJB-TDT) (1080p) [Timeout]
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/xhtjb-tdt.m3u8
 #EXTINF:-1 tvg-id="POPTV.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcShLhiaq_qKJnVjmogg7QWaHm1cOyXpuo8Y2A&usqp=CAU" group-title="",POP TV (542p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/gpacifico3/smil:obregon.smil/playlist.m3u8
@@ -113,9 +113,9 @@ http://wms.tecnoxia.com:1935/rytqrolive/rytqrolive/master.m3u8
 http://189.240.210.28:1935/envivo/puecom/playlist.m3u8
 #EXTINF:-1 tvg-id="SetPuebla.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/osgOMAu.png" group-title="Local",SET Televisión Canal 26.2 (720p) [Not 24/7]
 http://189.240.210.28:1935/live/setpuebla/playlist.m3u8
-#EXTINF:-1 tvg-id="sintesistv.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FJPDf2K.png" group-title="General",SintesisTV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="sintesistv.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FJPDf2K.png" group-title="General",SintesisTV (480p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/sintesistv
-#EXTINF:-1 tvg-id="TELESISTEMACANAL9.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="http://mastelevisioncr.com/wp-content/uploads/2020/08/WhatsApp-Image-2020-08-02-at-12.42.47-300x300.jpeg" group-title="",TELE SISTEMA CANAL 9 (720p)
+#EXTINF:-1 tvg-id="TELESISTEMACANAL9.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="http://mastelevisioncr.com/wp-content/uploads/2020/08/WhatsApp-Image-2020-08-02-at-12.42.47-300x300.jpeg" group-title="",TELE SISTEMA CANAL 9 (486p)
 http://k4.usastreams.com/ARBtv/ARBtv/playlist.m3u8
 #EXTINF:-1 tvg-id="Teleformula.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/aH9uKk0.jpg" group-title="",Telefórmula (720p)
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x7u0spq
@@ -133,7 +133,7 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCot4t8PVKz8TT5xVM8Eb00w/live
 #EXTINF:-1 tvg-id="TelevisaDelBajio" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/LkeCdc5.png" group-title="Local",Televisa Del Bajio [Offline]
 http://viptv-query/?streaming-ip=https://www.youtube.com/channel/UC-uYy4_jIvDoJ4wigEv1S5A/live
-#EXTINF:-1 tvg-id="TelevisaDelGolfo.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/35fsRTS.jpg" group-title="Local",Televisa Del Golfo [Offline]
+#EXTINF:-1 tvg-id="TelevisaDelGolfo.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/35fsRTS.jpg" group-title="Local",Televisa Del Golfo [Timeout]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCQ08tNTPiBn44c975S81ftg/live
 #EXTINF:-1 tvg-id="TelevisaEstado.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/gyZCypH.png" group-title="Local",Televisa Estado (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC9DH82HVSf4katwMeUpY80w
@@ -145,9 +145,9 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC_mwCcsKDJLSWjply5s0h8w/live
 #EXTINF:-1 tvg-id="TelevisaMexicali.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/NIEWc2s.jpg" group-title="Local",Televisa Mexicali (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCcmuFsMIIIHO3LBqeBVfm8Q/live
-#EXTINF:-1 tvg-id="TelevisaMonterrey.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/ierlYM1.jpg" group-title="Local",Televisa Monterrey (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TelevisaMonterrey.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/ierlYM1.jpg" group-title="Local",Televisa Monterrey (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCGDJLLphnP0zQQaE3kgo5Wg/live
-#EXTINF:-1 tvg-id="TelevisaMorelos.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/QiJoBVs.png" group-title="Local",Televisa Morelos [Offline]
+#EXTINF:-1 tvg-id="TelevisaMorelos.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/QiJoBVs.png" group-title="Local",Televisa Morelos [Timeout]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCcC9ykApQrgl4UxbKg2U4zw/live
 #EXTINF:-1 tvg-id="TelevisaNewsMexico.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/KVc1hqI.png" group-title="News",Televisa News Mexico (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCUsm-fannqOY02PNN67C0KA/live
@@ -155,13 +155,13 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC752DYv5vPlTSMrvEjfZXcw/live
 #EXTINF:-1 tvg-id="TelevisaPiedrasNegras.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/fEtvxpz.jpg" group-title="Local",Televisa Piedras Negras (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCxK8C1E8UZ5RipNXIBYEvTA/live
-#EXTINF:-1 tvg-id="TelevisaPuebla.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2dqF5S8.jpg" group-title="Local",Televisa Puebla [Offline]
+#EXTINF:-1 tvg-id="TelevisaPuebla.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2dqF5S8.jpg" group-title="Local",Televisa Puebla [Timeout]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC-HNztluSQSffhIWJTL-LUw/live
-#EXTINF:-1 tvg-id="TelevisaQueretaro.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/47c1AIS.png" group-title="Local",Televisa Queretaro [Offline]
+#EXTINF:-1 tvg-id="TelevisaQueretaro.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/47c1AIS.png" group-title="Local",Televisa Queretaro [Timeout]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC9QNz6VS3gGz55dzxAQtgtA/live
 #EXTINF:-1 tvg-id="TelevisaSanLuisPotosí.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/oxt91dr.jpg" group-title="Local",Televisa San Luis Potosí (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCaRuyaHshLdq462E9_pLzdA/live
-#EXTINF:-1 tvg-id="TelevisaSinaloa.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/nZ9HE94.png" group-title="Local",Televisa Sinaloa [Offline]
+#EXTINF:-1 tvg-id="TelevisaSinaloa.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/nZ9HE94.png" group-title="Local",Televisa Sinaloa [Timeout]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCtm1LvYEIQ_NrfOUVJ08YhQ/live
 #EXTINF:-1 tvg-id="TelevisaSonora.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/3FjHKAC.jpg" group-title="Local",Televisa Sonora (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCyzWMHGS7bs0sot6KZk5EZg/live
@@ -171,15 +171,15 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCQb3i7gu9J8A4zzQU7j6C1Q/live
 #EXTINF:-1 tvg-id="TlaxcalaTelevisión.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/6YKFW2G.png" group-title="",Tlaxcala Televisión (360p) [Not 24/7]
 https://vid.mega00.com:5443/LiveApp/streams/928111829917388844551988/928111829917388844551988.m3u8?token=null
-#EXTINF:-1 tvg-id="TransmediaTelevisionMorelia.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/kpffqTI.png" group-title="",Transmedia Televisión Morelia (500p) [Not 24/7]
+#EXTINF:-1 tvg-id="TransmediaTelevisionMorelia.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/kpffqTI.png" group-title="",Transmedia Televisión Morelia (614p) [Not 24/7]
 http://streamingcws20.com:1935/tmtv/videotmtv/playlist.m3u8
 #EXTINF:-1 tvg-id="TransmediaTelevisionMorelia.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/kpffqTI.png" group-title="",Transmedia Televisión Morelia (500p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/tmtv/videotmtv/playlist.m3u8
-#EXTINF:-1 tvg-id="TVLobo.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/XZ8GmZW.png" group-title="",TV Lobo (404p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVLobo.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/XZ8GmZW.png" group-title="",TV Lobo (720p) [Not 24/7]
 http://streamingcws20.com:1935/lobodurango/videolobodurango/playlist.m3u8
 #EXTINF:-1 tvg-id="TV.Unam.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/OxxROZI.png" group-title="",TV Unam (720p)
 https://5ca3e84a76d30.streamlock.net/tvunam/videotvunam/playlist.m3u8?DVR=
-#EXTINF:-1 tvg-id="XHGVTDT.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/15kcNRb.png" group-title="",TVMÁS (XHGV-TDT) (360p)
+#EXTINF:-1 tvg-id="XHGVTDT.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/15kcNRb.png" group-title="",TVMÁS (XHGV-TDT) (720p)
 https://5ca9af4645e15.streamlock.net/rtv/videortv/playlist.m3u8
 #EXTINF:-1 tvg-id="TVP.mx" tvg-country="MX" tvg-language="Spanish" tvg-logo="https://i.imgur.com/mw4992J.png" group-title="",TVP (720p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/gpacifico4/smil:mazatlan.smil/playlist.m3u8
diff --git a/channels/my.m3u b/channels/my.m3u
index 150c43515d..a2d3592054 100644
--- a/channels/my.m3u
+++ b/channels/my.m3u
@@ -3,13 +3,13 @@
 http://194.233.86.5:5080/WebRTCApp/streams/arena.m3u8
 #EXTINF:-1 tvg-id="AstroArena2.my" tvg-country="MY" tvg-language="English;Malay" tvg-logo="" group-title="Sports",Astro Arena 2 (720p) [Not 24/7]
 http://194.233.86.5:5080/WebRTCApp/streams/arena2.m3u8
-#EXTINF:-1 tvg-id="AstroAwani.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani (1080p)
+#EXTINF:-1 tvg-id="AstroAwani.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani (720p) [Not 24/7]
 https://awanitv.akamaized.net/hls/live/2017836/LiveTV1/index.m3u8
 #EXTINF:-1 tvg-id="AstroCeria.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://divign0fdw3sv.cloudfront.net/Images/ChannelLogo/contenthub/386_144.png" group-title="",Astro Ceria (720p) [Not 24/7]
 http://194.233.86.5:5080/WebRTCApp/streams/ceria.m3u8
-#EXTINF:-1 tvg-id="AstroCitra.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://divign0fdw3sv.cloudfront.net/Images/ChannelLogo/contenthub/301_144.png" group-title="",Astro Citra (720p) [Offline]
+#EXTINF:-1 tvg-id="AstroCitra.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://divign0fdw3sv.cloudfront.net/Images/ChannelLogo/contenthub/301_144.png" group-title="",Astro Citra (720p) [Timeout]
 http://194.233.86.5:5080/WebRTCApp/streams/citra.m3u8
-#EXTINF:-1 tvg-id="AstroOasis.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://divign0fdw3sv.cloudfront.net/Images/ChannelLogo/contenthub/70_144.png" group-title="",Astro Oasis (720p) [Offline]
+#EXTINF:-1 tvg-id="AstroOasis.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://divign0fdw3sv.cloudfront.net/Images/ChannelLogo/contenthub/70_144.png" group-title="",Astro Oasis (720p) [Timeout]
 http://194.233.86.5:5080/WebRTCApp/streams/oasis.m3u8
 #EXTINF:-1 tvg-id="AstroShuangXing.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/7/76/Astro%E9%9B%99%E6%98%9F.png/200px-Astro%E9%9B%99%E6%98%9F.png" group-title="",Astro Shuang Xing (720p) [Offline]
 http://50.7.161.82:8278/streams/d/Shuangxing/playlist.m3u8
@@ -26,9 +26,9 @@ http://50.7.161.82:8278/streams/d/Bernama/playlist.m3u8
 http://194.233.86.5:5080/WebRTCApp/streams/booo.m3u8
 #EXTINF:-1 tvg-id="CinemaWorld.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/gHCOcuF.png" group-title="",CinemaWorld (576p) [Geo-blocked]
 http://210.210.155.35/uq2663/h/h04/index.m3u8
-#EXTINF:-1 tvg-id="DidikTV.my" tvg-country="MY" tvg-language="Malay" tvg-logo="" group-title="",DidikTV (576p) [Offline]
+#EXTINF:-1 tvg-id="DidikTV.my" tvg-country="MY" tvg-language="Malay" tvg-logo="" group-title="",DidikTV (576p) [Timeout]
 http://194.233.86.5:5080/WebRTCApp/streams/didiktv.m3u8
-#EXTINF:-1 tvg-id="DramaSangsat.my" tvg-country="MY" tvg-language="Malay" tvg-logo="" group-title="",Drama Sangsat (720p) [Offline]
+#EXTINF:-1 tvg-id="DramaSangsat.my" tvg-country="MY" tvg-language="Malay" tvg-logo="" group-title="",Drama Sangsat (720p) [Timeout]
 http://194.233.86.5:5080/WebRTCApp/streams/dsangat.m3u8
 #EXTINF:-1 tvg-id="Hello.my" tvg-country="MY" tvg-language="English" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/702_300.png" group-title="",Hello [Geo-blocked]
 https://agsplayback01.astro.com.my/CH1/master_HELLOGOSHOP6.m3u8
@@ -44,7 +44,9 @@ https://rtmlive02.secureswiftcontent.com/rtmchannel/02-manifest.m3u8
 #EXTINF:-1 tvg-id="SukanRTM.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://myklikstatic.secureswiftcontent.com/image/tvSUKANlogo_NEW.jpg" group-title="",Sukan RTM (1080p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://rtmklik.rtm.gov.my
 https://rtmlive06.secureswiftcontent.com/rtmchannel/06-manifest.m3u8
-#EXTINF:-1 tvg-id="TV1.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://myklikstatic.secureswiftcontent.com/image/Logo-TV1-May21-JPG.jpg" group-title="",TV1 (720p)
+#EXTINF:-1 tvg-id="TVAlhijrah.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://divign0fdw3sv.cloudfront.net/Images/ChannelLogo/contenthub/149_144.png" group-title="",TV Alhijrah (480p) [Offline]
+http://50.7.161.82:8278/streams/d/Alhijrah/playlist.m3u8
+#EXTINF:-1 tvg-id="TV1.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://myklikstatic.secureswiftcontent.com/image/Logo-TV1-May21-JPG.jpg" group-title="",TV1 (1080p)
 #EXTVLCOPT:http-referrer=https://rtmklik.rtm.gov.my/
 https://rtmlive01.secureswiftcontent.com/rtmchannel/01-manifest.m3u8
 #EXTINF:-1 tvg-id="TV2.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://tv2.rtm.gov.my/assets/img/TV2.png" group-title="",TV2 (1080p)
@@ -53,18 +55,16 @@ https://rtmlive05.secureswiftcontent.com/rtmchannel/05-manifest.m3u8
 #EXTINF:-1 tvg-id="TV2.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://tv2.rtm.gov.my/assets/img/TV2.png" group-title="",TV2 (1080p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://rtmklik.rtm.gov.my/
 https://rtm1.secureswiftcontent.com/Origin01/ngrp:RTM1/playlist.m3u8
-#EXTINF:-1 tvg-id="TV3.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/tv3.png" group-title="",TV3 (720p) [Offline]
+#EXTINF:-1 tvg-id="TV3.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/tv3.png" group-title="",TV3 (720p) [Timeout]
 http://194.233.86.5:5080/WebRTCApp/streams/tv33.m3u8
 #EXTINF:-1 tvg-id="TV6.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://myklikstatic.secureswiftcontent.com/image/TV6-PlayerLogo-JPG.jpg" group-title="",TV6 (1080p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://rtmklik.rtm.gov.my/
 https://rtmlive07.secureswiftcontent.com/rtmchannel/07-manifest.m3u8
-#EXTINF:-1 tvg-id="TV8.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/tv8.png" group-title="",TV8 (720p) [Offline]
+#EXTINF:-1 tvg-id="TV8.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/tv8.png" group-title="",TV8 (720p) [Timeout]
 http://194.233.86.5:5080/WebRTCApp/streams/tv88.m3u8
 #EXTINF:-1 tvg-id="TV9.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/tv9.png" group-title="",TV9 (720p) [Not 24/7]
 http://194.233.86.5:5080/WebRTCApp/streams/tv99.m3u8
-#EXTINF:-1 tvg-id="TVAlhijrah.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://divign0fdw3sv.cloudfront.net/Images/ChannelLogo/contenthub/149_144.png" group-title="",TV Alhijrah (480p) [Offline]
-http://50.7.161.82:8278/streams/d/Alhijrah/playlist.m3u8
-#EXTINF:-1 tvg-id="TVIKIM.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TVIKIM (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVIKIM.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TVIKIM (1080p) [Not 24/7]
 http://edge.vediostream.com/abr/tvikim/playlist.m3u8
 #EXTINF:-1 tvg-id="TVS.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://divign0fdw3sv.cloudfront.net/Images/ChannelLogo/contenthub/429_144.png" group-title="",TVS (576p) [Geo-blocked]
 https://agsplayback01.astro.com.my/CH1/master_AGS_TVS.m3u8
diff --git a/channels/mz.m3u b/channels/mz.m3u
index 2d8b27251c..c9980c50e8 100644
--- a/channels/mz.m3u
+++ b/channels/mz.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="TVManaMocambique.mz" tvg-country="MZ" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/5UIy5tD.png" group-title="Religious",TV Maná Moçambique (574p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVManaMocambique.mz" tvg-country="MZ" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/5UIy5tD.png" group-title="Religious",TV Maná Moçambique (576p) [Not 24/7]
 http://c3.manasat.com:1935/tvmz/tvmz3/playlist.m3u8
 #EXTINF:-1 tvg-id="TVM.mz" tvg-country="MZ" tvg-language="Portuguese" tvg-logo="http://online.tvm.co.mz/site/public/images/flat_5.png" group-title="General",TVM (480p)
 http://196.28.226.121:1935/live/smil:Channel1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVM.mz" tvg-country="MZ" tvg-language="Portuguese" tvg-logo="http://online.tvm.co.mz/site/public/images/flat_5.png" group-title="General",TVM (480p)
 http://online.tvm.co.mz:1935/live/smil:Channel1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TVMInternacional.mz" tvg-country="MZ" tvg-language="Portuguese" tvg-logo="http://online.tvm.co.mz/site/public/images/flat_1.png" group-title="General",TVM Internacional (480p) [Offline]
+#EXTINF:-1 tvg-id="TVMInternacional.mz" tvg-country="MZ" tvg-language="Portuguese" tvg-logo="http://online.tvm.co.mz/site/public/images/flat_1.png" group-title="General",TVM Internacional (480p) [Not 24/7]
 http://online.tvm.co.mz:1935/live/smil:Channel2.smil/playlist.m3u8
diff --git a/channels/ng.m3u b/channels/ng.m3u
index 8e304d4945..fd655704d1 100644
--- a/channels/ng.m3u
+++ b/channels/ng.m3u
@@ -13,7 +13,7 @@ http://93.152.174.144:4000/play/comedych/index.m3u8
 http://93.152.174.144:4000/play/kingsword/index.m3u8
 #EXTINF:-1 tvg-id="EmmanuelTV.ng" tvg-country="NG" tvg-language="English" tvg-logo="https://i.imgur.com/pjoBzRS.jpg" group-title="",Emmanuel TV (1080p) [Not 24/7]
 https://api.new.livestream.com/accounts/23202872/events/7200883/live.m3u8
-#EXTINF:-1 tvg-id="LagosTelevision.ng" tvg-country="NG" tvg-language="English" tvg-logo="https://i.imgur.com/rjLxSfx.png" group-title="",Lagos Television (180p) [Not 24/7]
+#EXTINF:-1 tvg-id="LagosTelevision.ng" tvg-country="NG" tvg-language="English" tvg-logo="https://i.imgur.com/rjLxSfx.png" group-title="",Lagos Television (360p) [Not 24/7]
 http://185.105.4.193:1935/ltv/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="NTAInternational.ng" tvg-country="NG" tvg-language="English" tvg-logo="https://i.imgur.com/FlqaUpt.png" group-title="",NTA International (576p)
 https://api.visionip.tv/live/ASHTTP/visiontvuk-entertainment-ntai-hsslive-25f-4x3-MB/playlist.m3u8
diff --git a/channels/ni.m3u b/channels/ni.m3u
index 770394f5fa..5ac7e625a3 100644
--- a/channels/ni.m3u
+++ b/channels/ni.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="Canal6.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ac/Canal_6_Nicaraguense.png" group-title="Local",Canal 6 (720p)
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/canal6nicaraguaoficial
-#EXTINF:-1 tvg-id="Canal9.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/1/1f/Canal_9_Nicaragua_nuevo.png" group-title="Local",Canal 9 (480p) [Offline]
+#EXTINF:-1 tvg-id="Canal9.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/1/1f/Canal_9_Nicaragua_nuevo.png" group-title="Local",Canal 9 (480p) [Timeout]
 https://cootv.cootel.com.ni/streams/d/SSLCH09-HD-CVS/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal10.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/4/4f/Canal_10_Nicaragua.png" group-title="Local",Canal 10 (576p) [Offline]
+#EXTINF:-1 tvg-id="Canal10.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/4/4f/Canal_10_Nicaragua.png" group-title="Local",Canal 10 (576p) [Timeout]
 https://cootv.cootel.com.ni/streams/d/SSLCH10-SD-ZUK/playlist.m3u8
 #EXTINF:-1 tvg-id="jbn.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://www.jbn39.com/wp-content/uploads/2019/02/logo-01-1.png" group-title="Religious",JBN (720p)
 https://inliveserver.com:1936/17510/17510/playlist.m3u8
@@ -11,13 +11,13 @@ https://inliveserver.com:1936/17510/17510/playlist.m3u8
 https://5ca9af4645e15.streamlock.net/canal12/videocanal12/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal8.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/e/e0/Tn8_logotipo_2021.png" group-title="Local",Telenica Canal 8 (tn8) (720p)
 https://60417ddeaf0d9.streamlock.net/tn8/videotn8/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal2.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/2/28/Canal_2_%28Nicaragua%29_logo.png" group-title="Local",Televicentro Canal 2 (480p) [Offline]
+#EXTINF:-1 tvg-id="Canal2.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/2/28/Canal_2_%28Nicaragua%29_logo.png" group-title="Local",Televicentro Canal 2 (480p) [Timeout]
 https://cootv.cootel.com.ni/streams/d/SSLCH02-HD-YON/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal11.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/b/b4/Canal_11_Nicaragua_2010_3.png" group-title="Local",TV RED Canal 11 (480p) [Offline]
+#EXTINF:-1 tvg-id="Canal11.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/b/b4/Canal_11_Nicaragua_2010_3.png" group-title="Local",TV RED Canal 11 (480p) [Timeout]
 https://cootv.cootel.com.ni/streams/d/SSLCH11-SD-GZN/playlist.m3u8
-#EXTINF:-1 tvg-id="VivaNicaraguaCanal13.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/9/97/VivaCanal13current.png" group-title="Local",Viva Nicaragua Canal 13 (720p)
+#EXTINF:-1 tvg-id="VivaNicaraguaCanal13.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/9/97/VivaCanal13current.png" group-title="Local",Viva Nicaragua Canal 13 (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/vivanicaragua13
-#EXTINF:-1 tvg-id="vostv.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/8/86/VosTV_2010.png" group-title="local",Vos Tv (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="vostv.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/8/86/VosTV_2010.png" group-title="Local",Vos Tv (720p) [Not 24/7]
 http://ott.streann.com:8080/loadbalancer/services/public/channels/59e60c4997381ef50d15c041/playlist.m3u8
 #EXTINF:-1 tvg-id="wtv.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://wmediosnicaragua.com/img/LOGO-CANAL.png" group-title="Entertainment",WTV Canal 20 (720p)
 https://cloudvideo.servers10.com:8081/8130/index.m3u8
diff --git a/channels/nl.m3u b/channels/nl.m3u
index cc3bd188a8..522cd4b6e5 100644
--- a/channels/nl.m3u
+++ b/channels/nl.m3u
@@ -75,7 +75,7 @@ https://web.omroepgelderland.nl/live/livetv.m3u8
 https://stream.iconbroadcastgroup.com:1443/OH-Playout/smil:OH-Playout.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="OmroepOnsWestBrabant.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="" group-title="",Omroep Ons West Brabant (480p)
 https://ms2.mx-cd.net/tv/177-710139/Ons_West_Brabant_TV.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="OmroepPM.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/1uxxeWX.png" group-title="",Omroep P&M (480p)
+#EXTINF:-1 tvg-id="OmroepPM.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/1uxxeWX.png" group-title="",Omroep P&M (480p) [Offline]
 https://ms7.mx-cd.net/tv/153-840564/Omroep_Peel_en_Maas_TV.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="OmroepPMTV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://www.omroeppenm.nl/views/peelmaas/images/logo.png" group-title="Local",Omroep P&M TV (1080p)
 https://ms7.mx-cd.net/dtv-10/153-840564/Omroep_Peel_en_Maas_TV.smil/playlist.m3u8
@@ -119,12 +119,12 @@ http://streaming.rn7.nl/rn7tv/live_576/playlist.m3u8
 https://talparadiohls-i.akamaihd.net/hls/live/585615/VR-Veronica-1/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioVOSFM.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="" group-title="",Radio VOS FM (720p) [Not 24/7]
 http://593aed234297b.streamlock.net:1935/henrymeeuws/henrymeeuws/playlist.m3u8
-#EXTINF:-1 tvg-id="Regio8TV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/Regio%208%20TV.svg" group-title="Local",Regio8 TV (480p)
+#EXTINF:-1 tvg-id="RegioTVNieuws.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/PIUI2zZ.png" group-title="",Regio TV Nieuws (1080p) [Not 24/7]
+http://highvolume04.streampartner.nl/regiomedia/regiomedia/playlist.m3u8
+#EXTINF:-1 tvg-id="Regio8TV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/Regio%208%20TV.svg" group-title="Local",Regio8 TV (1080p)
 https://ms7.mx-cd.net/tv/71-475821/Regio8TV.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Regio90TV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/regio90tv.svg" group-title="Local",Regio90 TV (480p)
 https://ms7.mx-cd.net/MC-Monitoring/260-2403096/90TV.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="RegioTVNieuws.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/PIUI2zZ.png" group-title="",Regio TV Nieuws (1080p) [Not 24/7]
-http://highvolume04.streampartner.nl/regiomedia/regiomedia/playlist.m3u8
 #EXTINF:-1 tvg-id="RN7TV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/1/17/RN7_Logo.jpg/32px-RN7_Logo.jpg" group-title="",RN 7 TV (1080p) [Geo-blocked]
 https://streaming.rn7.nl/rn7live_abr/tv/playlist.m3u8
 #EXTINF:-1 tvg-id="RTVAmstelveen.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://d3kle7qwymxpcy.cloudfront.net/images/broadcasts/51/71/17115/1/c175.png" group-title="",RTV Amstelveen (720p) [Not 24/7]
@@ -161,9 +161,9 @@ https://mediacdn.rtvoost.nl/live/rtvoost/tv-oost/index.m3u8
 https://ms2.mx-cd.net/dtv-10/268-2641474/RTV_Purmerend_TV.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RTVRijnmond.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/TYsLlr0.png" group-title="",RTV Rijnmond (1080p)
 https://d3r4bk4fg0k2xi.cloudfront.net/rijnmondTv/index.m3u8
-#EXTINF:-1 tvg-id="RTVRijnstreekTV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/RTV%20Rijnstreek%20TV.svg" group-title="Local",RTV Rijnstreek TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="RTVRijnstreekTV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/RTV%20Rijnstreek%20TV.svg" group-title="Local",RTV Rijnstreek TV (720p) [Not 24/7]
 https://vdo.verrips.email:3789/live/televisielive.m3u8
-#EXTINF:-1 tvg-id="RTVSlingeland.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/slingelandtv.svg" group-title="",RTV Slingeland (480p)
+#EXTINF:-1 tvg-id="RTVSlingeland.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/slingelandtv.svg" group-title="",RTV Slingeland (1080p)
 https://ms7.mx-cd.net/dtv-10/105-475831/RTV_Slingeland.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RTVUtrecht.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/5cVkPR3.png" group-title="",RTV Utrecht (1080p)
 https://d18rwjdhpr8dcw.cloudfront.net/live/rtvutrecht/rtvutrecht/index.m3u8
@@ -213,5 +213,5 @@ https://ms2.mx-cd.net/tv/226-1855782/XITE_NL.smil/playlist.m3u8
 https://ms7.mx-cd.net/tv/226-1855782/XITE_NL.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ZO34.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/KrEBHLw.jpg" group-title="",ZO!34 (720p) [Offline]
 https://streams.uitzending.tv/zo34/zo34/playlist.m3u8
-#EXTINF:-1 tvg-id="ZuidWestTV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="hhttps://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/Zuidwesttv.svg" group-title="Local",ZuidWest TV (720p)
+#EXTINF:-1 tvg-id="ZuidWestTV.nl" tvg-country="NL" tvg-language="Dutch" tvg-logo="hhttps://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/channel/delta/Zuidwesttv.svg" group-title="Local",ZuidWest TV (1080p)
 https://live.zuidwesttv.nl/live/zwtv.m3u8
diff --git a/channels/no.m3u b/channels/no.m3u
index e3b842969b..3461e0571d 100644
--- a/channels/no.m3u
+++ b/channels/no.m3u
@@ -33,11 +33,11 @@ http://flash0.19333-live0.dna.qbrick.com:1935/19333-live0/push-stortinget_1/play
 https://bf75c7afaa4f8698042ab38336a843a0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-stortinget_1/chunklist_b1264000_DVR_t64MTI2NCBrYnBz.m3u8
 #EXTINF:-1 tvg-id="StortingetStortingssalen.no" tvg-country="NO" tvg-language="Norwegian" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget Stortingssalen (576p)
 https://bf75c7afaa4f8698042ab38336a843a0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-stortinget_1/playlist.m3u8?dvr=
-#EXTINF:-1 tvg-id="TV2 Nyhetsstrommen.no" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/horCLMX.jpg" group-title="",TV2 Nyhetsstrømmen (720p)
-https://ws15-hls-live.akamaized.net/out/u/1153546.m3u8
 #EXTINF:-1 tvg-id="TV2Sporten.no" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/SCeh3KR.png" group-title="Sports",TV 2 Sporten (720p)
 https://ws31-hls-live.akamaized.net/out/u/1416253.m3u8
 #EXTINF:-1 tvg-id="TVHaugaland.no" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/lHDz1bm.png" group-title="",TV Haugaland (720p) [Not 24/7]
 https://900c544ac47302fffd7d3f12b4c745fd-httpcache0-90216-cachelive0.dna.ip-only.net/90216-cachelive0/smil:APPLETV/playlist.m3u8
 #EXTINF:-1 tvg-id="TVHaugaland.no" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/lHDz1bm.png" group-title="",TV Haugaland (720p) [Not 24/7]
 https://900c544ac47302fffd7d3f12b4c745fd-httpcache0-90216-cachelive0.dna.qbrick.com/90216-cachelive0/smil:APPLETV/playlist.m3u8
+#EXTINF:-1 tvg-id="TV2 Nyhetsstrommen.no" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/horCLMX.jpg" group-title="",TV2 Nyhetsstrømmen (720p)
+https://ws15-hls-live.akamaized.net/out/u/1153546.m3u8
diff --git a/channels/np.m3u b/channels/np.m3u
index 705456f90e..4c884ef79d 100644
--- a/channels/np.m3u
+++ b/channels/np.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AvenuesKhabar.np" tvg-country="NP" tvg-language="Nepali" tvg-logo="https://i.imgur.com/GDetViR.jpg" group-title="News",Avenues Khabar (720p) [Not 24/7]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UCMDzPE_7fcZSRJgpwIVor_A/live
-#EXTINF:-1 tvg-id="KantipurTV.np" tvg-country="NP" tvg-language="Nepali" tvg-logo="http://jcss-cdn.ekantipur.com//kantipur-tv/images/ktv-hd.png" group-title="Entertainment",Kantipur TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="KantipurTV.np" tvg-country="NP" tvg-language="Nepali" tvg-logo="http://jcss-cdn.ekantipur.com//kantipur-tv/images/ktv-hd.png" group-title="Entertainment",Kantipur TV (1080p) [Timeout]
 https://ktvhdnpicc.ekantipur.com/ktv_desktop_02347834/hd/kantipurtv/hd_1080/chunks.m3u8
diff --git a/channels/pa.m3u b/channels/pa.m3u
index 784e5ec137..9a6a8ee1ae 100644
--- a/channels/pa.m3u
+++ b/channels/pa.m3u
@@ -11,13 +11,13 @@ https://mdstrm.com/live-stream-playlist/5d97ca5673de440761ff194e.m3u8
 https://stmv3.voxtvhd.com.br/reikotv/reikotv/playlist.m3u8
 #EXTINF:-1 tvg-id="HosannaVision.pa" tvg-country="PA" tvg-language="Spanish" tvg-logo="https://i.imgur.com/tUHkolc.png" group-title="Religious",Hosanna Vision (480p) [Not 24/7]
 https://1206618505.rsc.cdn77.org/LS-ATL-59020-1/playlist.m3u8
-#EXTINF:-1 tvg-id="NexTV.pa" tvg-country="PA" tvg-language="Spanish" tvg-logo="" group-title="",Nex TV (Canal 21) [Offline]
+#EXTINF:-1 tvg-id="NexTV.pa" tvg-country="PA" tvg-language="Spanish" tvg-logo="" group-title="",Nex TV (Canal 21) [Timeout]
 http://209.91.213.10:8088/play/a01o
 #EXTINF:-1 tvg-id="OyeTV.pa" tvg-country="PA" tvg-language="Spanish" tvg-logo="https://i.imgur.com/IqLT2CC.png" group-title="Music",Oye TV (480p) [Geo-blocked]
 https://mdstrm.com/live-stream-playlist/5d88df173853e7072f3f953f.m3u8
 #EXTINF:-1 tvg-id="RPC.pa" tvg-country="PA" tvg-language="Spanish" tvg-logo="https://forounivers.com/uploads/monthly_2017_01/RPC_(2010).png.4630b569f7c275038611229447482050.png" group-title="",RPC (720p) [Geo-blocked]
 https://mdstrm.com/live-stream-playlist/5d88d659120a717cf93ce620.m3u8
-#EXTINF:-1 tvg-id="Teleclásicos.pa" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/109037038122033/picture?width=320&height=320" group-title="",Teleclásicos (320p)
+#EXTINF:-1 tvg-id="Teleclásicos.pa" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/109037038122033/picture?width=320&height=320" group-title="",Teleclásicos (482p) [Not 24/7]
 https://tvdatta.com:3484/stream/play.m3u8
 #EXTINF:-1 tvg-id="Telemetro.pa" tvg-country="PA" tvg-language="Spanish" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/e/e0/Telemetro_2010_logo.png/revision/latest?cb=20181013042937&path-prefix=es" group-title="",Telemetro (480p)
 http://209.91.213.10:8088/play/a00h
diff --git a/channels/pe.m3u b/channels/pe.m3u
index a747f1a810..59cefd1f4f 100644
--- a/channels/pe.m3u
+++ b/channels/pe.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AndesTelevisión.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/CsW4Op8.png" group-title="Local",Andes Televisión (Sicusani) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AndesTelevisión.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/CsW4Op8.png" group-title="Local",Andes Televisión (Sicusani) (360p) [Not 24/7]
 https://stmv1.voxhdnet.com/tvsicuani/tvsicuani/playlist.m3u8
 #EXTINF:-1 tvg-id="AntaresTelevision.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/antaresTvRadioOficial/picture?width=320&height=320" group-title="Local",Antares Televisión (720p) [Not 24/7]
 https://5c3fb01839654.streamlock.net:554/iptvantares/liveantarestv/playlist.m3u8
@@ -21,7 +21,7 @@ https://tv.siete.us/mascumbiatvonline/mascumbiatvonline/index.m3u8
 https://tv.siete.us/bestcablemusic/bestcablemusic/index.m3u8
 #EXTINF:-1 tvg-id="BestCablePeru.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/BestCableTvCanal3/picture?width=320&height=320" group-title="General",Best Cable Perú (720p) [Not 24/7]
 https://tv.siete.us/bestcable/bestcable/index.m3u8
-#EXTINF:-1 tvg-id="BestCableSportsPeru.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/BestCableSportsCanal6/picture?width=320&height=320" group-title="Sports",Best Cable Sports Perú (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="BestCableSportsPeru.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/BestCableSportsCanal6/picture?width=320&height=320" group-title="Sports",Best Cable Sports Perú (360p) [Not 24/7]
 https://tv.siete.us/bestcablesports/bestcablesports/index.m3u8
 #EXTINF:-1 tvg-id="BeXtremeTVLima.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/d9n0sOZ.png" group-title="Local",BeXtreme TV (Lima) (1080p) [Geo-blocked]
 https://video1.getstreamhosting.com:1936/8106/8106/playlist.m3u8
@@ -45,7 +45,7 @@ https://media2.cdnlayer.biz:8081/8014/index.m3u8
 https://srv1.mediastreamperu.com:8081/8006/index.m3u8
 #EXTINF:-1 tvg-id="CanalEvelyn.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/cableEvelynsac/picture?width=320&height=320" group-title="Local",Canal E (Evelyn) (Nororiente) (720p) [Not 24/7]
 https://srv1.mediastreamperu.com:8081/8004/index.m3u8
-#EXTINF:-1 tvg-id="CANALIPE.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/2/28/Identidad_Peruana_ipe_2020.png/1200px-Identidad_Peruana_ipe_2020.png" group-title="Family",CANAL IPE (460p) [Not 24/7]
+#EXTINF:-1 tvg-id="CANALIPE.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/2/28/Identidad_Peruana_ipe_2020.png/1200px-Identidad_Peruana_ipe_2020.png" group-title="Family",CANAL IPE (1080p) [Not 24/7]
 https://cdnh8.iblups.com/hls/OVJNKV4pSr.m3u8
 #EXTINF:-1 tvg-id="CanalB.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://canalb.pe/assets/uploads/images/digital-tv-mundo-vivo.svg" group-title="News",CanalB (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/alfonsobaella/live
@@ -55,11 +55,11 @@ https://query-streamlink-us.herokuapp.com/iptv-query?streaming-ip=https://www.yo
 http://191.97.56.183:1935/caribetv/caribetv/playlist.m3u8
 #EXTINF:-1 tvg-id="CentralTVChosica.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/CentralTVperuLima/picture?width=320&height=320" group-title="Local",Central TV (Chosica) (720p) [Not 24/7]
 https://5c3fb01839654.streamlock.net:1963/iptvcentraltv/livecentraltvtv/playlist.m3u8
-#EXTINF:-1 tvg-id="ChicosIPe.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FI1Hd4E.png" group-title="Family",Chicos IPe (460p) [Not 24/7]
+#EXTINF:-1 tvg-id="ChicosIPe.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FI1Hd4E.png" group-title="Family",Chicos IPe (1080p) [Not 24/7]
 http://cdnh4.iblups.com/hls/OVJNKV4pSr.m3u8
 #EXTINF:-1 tvg-id="ClipsTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/clipstv/picture?width=320&height=320" group-title="Local",ClipsTV (Ica) (360p) [Not 24/7]
 https://7.innovatestream.pe:19360/clipstv/clipstv.m3u8
-#EXTINF:-1 tvg-id="CNCDigital.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/cnc.digital.pe/picture?width=320&height=320" group-title="Local",CNC Digital (Iquitos) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="CNCDigital.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/cnc.digital.pe/picture?width=320&height=320" group-title="Local",CNC Digital (Iquitos) (720p) [Not 24/7]
 https://cloudvideo.servers10.com:8081/8150/index.m3u8
 #EXTINF:-1 tvg-id="Conecta2TV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/RadioConecta2/picture?width=320&height=320" group-title="Local",Conecta2TV (Lima) (720p) [Not 24/7]
 https://mediastreamm.com:3528/live/conect2tvlive.m3u8
@@ -71,7 +71,7 @@ https://live.obslivestream.com/cdeportivomux/index.m3u8
 https://live.obslivestream.com/crtvmux/index.m3u8
 #EXTINF:-1 tvg-id="CreoTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/CanalCreoTv/picture?width=320&height=320" group-title="Local",CreoTV (Cajamarca) (720p) [Not 24/7]
 https://srv1.mediastreamperu.com:8081/creotv/index.m3u8
-#EXTINF:-1 tvg-id="Cultura24tv.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2mSwwpH.png" group-title="Culture",Cultura 24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Cultura24tv.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2mSwwpH.png" group-title="Culture",Cultura 24 (360p) [Not 24/7]
 https://vs8.live.opencaster.com/cultura24/smil:cultura24/playlist.m3u8
 #EXTINF:-1 tvg-id="CVMTelevision.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/174810627418446/picture?width=320&height=320" group-title="Music",CVM TV Digital (720p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/cvmtv/cvmtv/playlist.m3u8
@@ -107,15 +107,15 @@ https://tv.siete.us/bestcablehatuntv/bestcablehatuntv/index.m3u8
 https://tv.portalexpress.es:3124/live/hchoperutvlive.m3u8
 #EXTINF:-1 tvg-id="HuantaTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/HuantaTV/picture?width=320&height=320" group-title="Local",Huanta TV (480p) [Not 24/7]
 https://inliveserver.com:1936/19002/19002/playlist.m3u8
-#EXTINF:-1 tvg-id="HuanucoenVivo.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/huanucoenvivo/picture?width=320&height=320" group-title="Local",Huánuco en Vivo (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="HuanucoenVivo.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/huanucoenvivo/picture?width=320&height=320" group-title="Local",Huánuco en Vivo (480p) [Not 24/7]
 https://cp.sradiotv.com:1936/8006/8006/playlist.m3u8
 #EXTINF:-1 tvg-id="IdentidadTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/IDENTIDADTVOFICIAL/picture?width=320&height=320" group-title="News",Identidad TV (720p) [Not 24/7]
 https://5c3fb01839654.streamlock.net:1963/iptvrci/livercitv/playlist.m3u8
 #EXTINF:-1 tvg-id="ImagenTelevisionRioja.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/104338684346756/picture?width=320&height=320" group-title="Local",Imagen Televisión (Rioja) (720p) [Not 24/7]
 http://191.97.56.183:1935/imagentv/imagentv/playlist.m3u8
-#EXTINF:-1 tvg-id="ImpactoTelevision.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/WWW.RADIOIMPACTODECAJAMARCA.COM.PE/picture?width=320&height=320" group-title="Local",Impacto Televisión (Cajamarca) (720p)
+#EXTINF:-1 tvg-id="ImpactoTelevision.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/WWW.RADIOIMPACTODECAJAMARCA.COM.PE/picture?width=320&height=320" group-title="Local",Impacto Televisión (Cajamarca) (562p)
 https://eu1.servers10.com:8081/impactotv/index.m3u8
-#EXTINF:-1 tvg-id="ImperialTelevision.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/radioimperialtv/picture?width=320&height=320" group-title="Local",Imperial Televisión (Huancayo) (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="ImperialTelevision.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/radioimperialtv/picture?width=320&height=320" group-title="Local",Imperial Televisión (Huancayo) (720p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/imperu/imperu/playlist.m3u8
 #EXTINF:-1 tvg-id="Inkavision.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Inkavisionoficial/picture?width=320&height=320" group-title="Local",Inkavisión (Cuzco) [Not 24/7]
 https://7.innovatestream.pe:19360/inkavision/inkavision.m3u8
@@ -133,6 +133,8 @@ https://cdnhd.iblups.com/hls/YGpW43RUOD.m3u8
 https://inliveserver.com:1936/18016/18016/playlist.m3u8
 #EXTINF:-1 tvg-id="KoraTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/JJRODRIGUEZKORARTV/picture?width=320&height=320" group-title="Entertainment",Kora TV (360p) [Not 24/7]
 https://megastreamm.com:3362/live/koratvlive.m3u8
+#EXTINF:-1 tvg-id="LaAbeja.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/laabeja.pe/picture?width=320&height=320" group-title="News",La Abeja (720p) [Not 24/7]
+http://cdnhd.iblups.com/hls/F87ppt1YAT.m3u8
 #EXTINF:-1 tvg-id="LaLuzTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/LaLuzTv/picture?width=320&height=320" group-title="Religious",La Luz TV (720p) [Not 24/7]
 http://ott.streann.com:8080/loadbalancer/services/public/channels/59ce7f292cdc7ba015a93b82/playlist.m3u8
 #EXTINF:-1 tvg-id="RTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/larepublicape/picture?width=320&height=320" group-title="News",La República TV (RTV) [Not 24/7]
@@ -157,7 +159,7 @@ https://tv.portalexpress.es:3399/hybrid/play.m3u8
 https://tv.portalexpress.es:3870/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="MetropolitanadelCuzco.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/113907773339257/picture?width=320&height=320" group-title="Music",Metropolitana del Cuzco (CCTVRadio) [Not 24/7]
 https://video1.earthcam.com/myearthcam/075ff02f78c35af55564cf3af3b3f750.flv/playlist.m3u8
-#EXTINF:-1 tvg-id="Millenium49TVPucallpa.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/zYpMHhQ.png" group-title="Local",Millenium 49 TV (Pucallpa) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Millenium49TVPucallpa.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/zYpMHhQ.png" group-title="Local",Millenium 49 TV (Pucallpa) (480p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/milleniuntv/milleniuntv/playlist.m3u8
 #EXTINF:-1 tvg-id="Millenium109FM.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/milleniumradiotv/picture?width=320&height=320" group-title="Local",Millenium 109 FM (Lamas) (720p) [Not 24/7]
 https://5ee0faac3bbae.streamlock.net/millenium/millenium/playlist.m3u8
@@ -179,7 +181,7 @@ https://www.opencaster.com/resources/hls_stream/hipodromojcp2.m3u8
 https://ed1ov.live.opencaster.com/jcpstream_mid/index.m3u8
 #EXTINF:-1 tvg-id="MTVMasAncash.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/MtvMasTelevision/picture?width=320&height=320" group-title="Local",MTV Más (Ancash) (720p) [Not 24/7]
 https://mediacp.hostradios.com.ar:19360/8044/8044.m3u8
-#EXTINF:-1 tvg-id="NacionalTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/NacionalTVComunicaciones/picture?width=320&height=320" group-title="General",NacionalTV (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="NacionalTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/NacionalTVComunicaciones/picture?width=320&height=320" group-title="General",NacionalTV (720p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/nacionaltv/nacionaltv/playlist.m3u8
 #EXTINF:-1 tvg-id="NazarenasTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/nazarenastv/picture?width=320&height=320" group-title="Religious",Nazarenas TV (720p) [Not 24/7]
 https://5c3fb01839654.streamlock.net:1963/iptvnazarenas/livenazarenastv/playlist.m3u8
@@ -217,7 +219,7 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UCgR0st4ZLABi-LQcWNu3wnQ/live
 #EXTINF:-1 tvg-id="PeruMagico.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/263.png" group-title="General",Peru Magico [Offline]
 http://38.131.11.9:1080/play/a0dh
-#EXTINF:-1 tvg-id="PeruvianRadioTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://peruvianradiotv.pe/wp-content/uploads/2021/03/Logo-Peruvian-6.png" group-title="Local",PeruvianRadio TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PeruvianRadioTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://peruvianradiotv.pe/wp-content/uploads/2021/03/Logo-Peruvian-6.png" group-title="Local",PeruvianRadio TV (360p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/peruviantv/peruviantv/playlist.m3u8
 #EXTINF:-1 tvg-id="PlanetaTVBagua.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/planeatvperu/picture?width=320&height=320" group-title="Local",Planeta TV Bagua (720p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/planeatv/planeatv/playlist.m3u8
@@ -271,12 +273,14 @@ https://query-streamlink-us.herokuapp.com/iptv-query?streaming-ip=https://www.yo
 https://tv.portalexpress.es:3090/stream/play.m3u8
 #EXTINF:-1 tvg-id="RadioyTvFiladelfia.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/iglesiafiladelfialadp/picture?width=320&height=320" group-title="Religious",Radio y Tv Filadelfia (720p) [Not 24/7]
 https://streamlive7.hearthis.at/hls/9355343.m3u8
-#EXTINF:-1 tvg-id="RadioInka.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/104110050971073/picture?width=320&height=320" group-title="Local",RadioInka (Abancay) (272p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioInka.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/104110050971073/picture?width=320&height=320" group-title="Local",RadioInka (Abancay) (720p) [Not 24/7]
 https://tv.portalexpress.es:3175/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="RadioTVOrienteYurimaguas.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/www.roriente.org/picture?width=320&height=320" group-title="Local",RadioTV Oriente (Yurimaguas) (1080p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/orientetv/orientetv/playlist.m3u8
 #EXTINF:-1 tvg-id="RCR.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/rcrradiotv/picture?width=320&height=320" group-title="Local",Red de Comunicación Regional (RCR) (720p) [Not 24/7]
 https://5c3fb01839654.streamlock.net:1963/iptvrcrperu/livercrperutv/playlist.m3u8
+#EXTINF:-1 tvg-id="RegionTVCallao.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/regiontv/picture?width=320&height=320" group-title="Local",Región TV (Callao) [Not 24/7]
+https://mediastreamm.com:3757/live/regiontvlive.m3u8
 #EXTINF:-1 tvg-id="RiberenaTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/lariberenabellavista/picture?width=320&height=320" group-title="Local",Ribereña TV (Bellavista) (480p) [Not 24/7]
 https://7.innovatestream.pe:19360/riberenatv/riberenatv.m3u8
 #EXTINF:-1 tvg-id="RNTelevisionYurimaguas.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/rnyurimaguas/picture?width=320&height=320" group-title="Local",RN Televisión (Yurimaguas) (720p) [Not 24/7]
@@ -301,7 +305,7 @@ https://7.innovatestream.pe:19360/satel/satel.m3u8
 https://inliveserver.com:1936/18022/18022/playlist.m3u8
 #EXTINF:-1 tvg-id="Sistema1.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/sistema1tv/picture?width=320&height=320" group-title="Local",Sistema 1 (Huaraz) (720p) [Not 24/7]
 https://tv.portalexpress.es:3839/live/sistema1tvlive.m3u8
-#EXTINF:-1 tvg-id="SolStereoTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/solstereotvcasma/picture?width=320&height=320" group-title="Local",Sol Stereo TV (Casma) (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="SolStereoTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/solstereotvcasma/picture?width=320&height=320" group-title="Local",Sol Stereo TV (Casma) (276p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/solstereotv/solstereotv/playlist.m3u8
 #EXTINF:-1 tvg-id="SoriTVPicota.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/2290376027898746/picture?width=320&height=320" group-title="Local",SoriTV (Picota) (720p) [Not 24/7]
 https://lamasremixes.com/hls/cadenasurrtv/index.m3u8
@@ -335,14 +339,12 @@ https://tvdatta.com:3084/live/toptvaguaytialive.m3u8
 https://5cefcbf58ba2e.streamlock.net/tltvweb/tvweb.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TPTO.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/TPTOCHANNEL/picture?width=320&height=320" group-title="Local",TPTO TV (Tarapoto) (720p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/tptotv/tptotv/playlist.m3u8
-#EXTINF:-1 tvg-id="TropicalTVPuertoMaldonado.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/radiotropical105.7fm/picture?width=320&height=320" group-title="Local",Tropical TV (Puerto Maldonado) (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="TropicalTVPuertoMaldonado.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/radiotropical105.7fm/picture?width=320&height=320" group-title="Local",Tropical TV (Puerto Maldonado) (480p) [Not 24/7]
 https://tv.oyotunstream.com:1936/tropicaltv/tropicaltv/playlist.m3u8
 #EXTINF:-1 tvg-id="TumpisTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/tumpisperu/picture?width=320&height=320" group-title="Local",Tumpis TV (Tumbes) (720p) [Not 24/7]
 https://mediastreamm.com:3531/live/tumpistvlive.m3u8
-#EXTINF:-1 tvg-id="TurboMixRadioTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/235129376518344/picture?width=320&height=320" group-title="Music",Turbo Mix Radio TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TurboMixRadioTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/235129376518344/picture?width=320&height=320" group-title="Music",Turbo Mix Radio TV (360p) [Not 24/7]
 https://7.innovatestream.pe:19360/turbomixoficial/turbomixoficial.m3u8
-#EXTINF:-1 tvg-id="TV5.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/499987990368435/picture?width=320&height=320" group-title="Local",TV5 Soritor (720p) [Not 24/7]
-https://stmv.panel.grupolimalive.com/tv5/tv5/playlist.m3u8
 #EXTINF:-1 tvg-id="TVAndahuaylas.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/panoramanoticiasandahuaylas/picture?width=320&height=320" group-title="Local",TV Andahuaylas [Not 24/7]
 https://pe-lim01-live-us01.cdnlayer.biz/panoramatv/index.m3u8
 #EXTINF:-1 tvg-id="TVCosmos.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://tvcosmos.pe/includes/iso-cosmos.png" group-title="General",TV Cosmos (720p) [Not 24/7]
@@ -367,18 +369,20 @@ http://k4.usastreams.com/TVperuanisima/TVperuanisima/playlist.m3u8
 https://tv.siete.us/tvsensacion/tvsensacion/index.m3u8
 #EXTINF:-1 tvg-id="TVSistemasCuzco.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/TVSISTEMASCUSCOPERU/picture?width=320&height=320" group-title="Local",TV Sistemas Cuzco (Cuzco) (360p) [Not 24/7]
 https://panel.streamingtv-mediacp.online:1936/kdlrqjcp/kdlrqjcp/playlist.m3u8
+#EXTINF:-1 tvg-id="TV5.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/499987990368435/picture?width=320&height=320" group-title="Local",TV5 Soritor (720p) [Not 24/7]
+https://stmv.panel.grupolimalive.com/tv5/tv5/playlist.m3u8
 #EXTINF:-1 tvg-id="TVenLinea.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/TVenLineaCanalDigital/picture?width=320&height=320" group-title="Local",TVenLinea (Cuzco) (720p) [Not 24/7]
 https://s1.tvdatta.com:3883/live/tvenlinealive.m3u8
-#EXTINF:-1 tvg-id="TvfacesOnline.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/110490054146572/picture?width=320&height=320" group-title="Entertainment",Tvfaces Online (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="TvfacesOnline.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/110490054146572/picture?width=320&height=320" group-title="Entertainment",Tvfaces Online (346p) [Not 24/7]
 https://tvdatta.com:3211/stream/play.m3u8
-#EXTINF:-1 tvg-id="UCI.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/uncanalinteligente/picture?width=320&height=320" group-title="General",UCI (1080p)
+#EXTINF:-1 tvg-id="UCI.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/uncanalinteligente/picture?width=320&height=320" group-title="General",UCI (720p)
 http://170.79.102.223/UCI/index.m3u8
 #EXTINF:-1 tvg-id="Unitel.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Unitelperu/picture?width=320&height=320" group-title="Local",Unitel (Huancayo) (480p) [Not 24/7]
 https://cp.sradiotv.com:1936/8078/8078/playlist.m3u8
 #EXTINF:-1 tvg-id="UniversitariaTVChanchamayo.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/universitariatvchanchamayo/picture?width=320&height=320" group-title="Local",Universitaria TV (Chanchamayo) (480p) [Not 24/7]
 https://tvdatta.com:3670/live/universitariatvlive.m3u8
-#EXTINF:-1 tvg-id="UranioTVYurimaguas.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/uraniotv/picture?width=320&height=320" group-title="Local",Uranio TV (Yurimaguas) (720p) [Geo-blocked]
-https://tv.portalexpress.es:3259/live/uraniotvlive.m3u8
+#EXTINF:-1 tvg-id="UranioTVYurimaguas.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/uraniotv/picture?width=320&height=320" group-title="Local",Uranio TV (Yurimaguas) (720p) [Not 24/7]
+https://live.obslivestream.com/uraniomux/index.m3u8
 #EXTINF:-1 tvg-id="USILTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/usiltv/picture?width=320&height=320" group-title="General",USIL TV (720p) [Not 24/7]
 https://media3.cdnlayer.biz:19360/redes/redes.m3u8
 #EXTINF:-1 tvg-id="USMPTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/USMPTV/picture?width=320&height=320" group-title="Culture",USMPTV (720p) [Not 24/7]
diff --git a/channels/ph.m3u b/channels/ph.m3u
index aaf9987bc4..f5cb473727 100644
--- a/channels/ph.m3u
+++ b/channels/ph.m3u
@@ -9,7 +9,7 @@ https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtu
 http://4ce5e2d62ee2c10e43c709f9b87c44d5.streamhost.cc/m3u8/Philippines/cd1b220644affbb.m3u8
 #EXTINF:-1 tvg-id="GreatCommissionTVGCTV.ph" tvg-country="PH" tvg-language="English" tvg-logo="" group-title="",Great Commission TV (GCTV) (360p) [Not 24/7]
 http://45.32.115.103/live/livestream/index.m3u8
-#EXTINF:-1 tvg-id="INCTV.ph" tvg-country="PH" tvg-language="English" tvg-logo="https://i.imgur.com/FcLAaMT.png" group-title="",INC TV (1080p)
+#EXTINF:-1 tvg-id="INCTV.ph" tvg-country="PH" tvg-language="English" tvg-logo="https://i.imgur.com/FcLAaMT.png" group-title="",INC TV (720p)
 http://churchrus2-lh.akamaihd.net/i/coctesting_1@57550/master.m3u8
 #EXTINF:-1 tvg-id="KapamilyaChannel.ph" tvg-country="PH" tvg-language="Tagalog" tvg-logo="" group-title="",Kapamilya Channel [Offline]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UCstEtN0pgOmCf02EdXsGChw/live
diff --git a/channels/pk.m3u b/channels/pk.m3u
index 527cf9cb4a..71fb139dc1 100644
--- a/channels/pk.m3u
+++ b/channels/pk.m3u
@@ -31,9 +31,9 @@ https://jk3lz82elw79-hls-live.5centscdn.com/Geo/eae835e83c0494a376229f254f7d3392
 https://dcunilive36-lh.akamaihd.net/i/dclive_1@662109/index_150_av-p.m3u8
 #EXTINF:-1 tvg-id="Kay2TV.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/Hw94SaM.jpg" group-title="",Kay2 TV (404p) [Not 24/7]
 https://dcunilive36-lh.akamaihd.net/i/dclive_1@662109/master.m3u8
-#EXTINF:-1 tvg-id="KhyberMiddleEastTV.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/mqFWpXX.png" group-title="",Khyber Middle East TV (414p) [Not 24/7]
+#EXTINF:-1 tvg-id="KhyberMiddleEastTV.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/mqFWpXX.png" group-title="",Khyber Middle East TV (720p) [Not 24/7]
 https://dcunilive83-lh.akamaihd.net/i/dclive_1@16122/master.m3u8
-#EXTINF:-1 tvg-id="KhyberNewsTV.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/NL1cqS2.png" group-title="News",Khyber News TV (414p) [Not 24/7]
+#EXTINF:-1 tvg-id="KhyberNewsTV.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/NL1cqS2.png" group-title="News",Khyber News TV (404p) [Not 24/7]
 https://dcunilive38-lh.akamaihd.net/i/dclive_1@692677/master.m3u8
 #EXTINF:-1 tvg-id="LahoreNews.pk" tvg-country="PK" tvg-language="English" tvg-logo="" group-title="News",Lahore News (720p)
 http://mlive.lahorenews.tv/lahorelive/lnews_1/chunklist_DVR.m3u8
@@ -41,7 +41,7 @@ http://mlive.lahorenews.tv/lahorelive/lnews_1/chunklist_DVR.m3u8
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/madanitvbangla.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="MadaniChannelBangla.pk" tvg-country="PK" tvg-language="Bengali" tvg-logo="https://madanichannel.tv/img/madani-channel-logo.png" group-title="Religious",Madani Channel Bangla (1080p) [Offline]
 https://madnitv.vdn.dstreamone.net/madnitvbangla/madnibanglaabr/playlist.m3u8
-#EXTINF:-1 tvg-id="MadaniChannelEnglish.pk" tvg-country="PK" tvg-language="English" tvg-logo="https://madanichannel.tv/img/madani-channel-logo.png" group-title="Religious",Madani Channel English (1080p)
+#EXTINF:-1 tvg-id="MadaniChannelEnglish.pk" tvg-country="PK" tvg-language="English" tvg-logo="https://madanichannel.tv/img/madani-channel-logo.png" group-title="Religious",Madani Channel English (1080p) [Offline]
 https://madnitv.vdn.dstreamone.net/madnitvenglish/madnienglishabr/playlist.m3u8
 #EXTINF:-1 tvg-id="MadaniChannelUrdu.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://madanichannel.tv/img/madani-channel-logo.png" group-title="Religious",Madani Channel Urdu (1080p) [Geo-blocked]
 https://madnitv.vdn.dstreamone.net/madnitvurdu/madniurduabr/playlist.m3u8
@@ -51,11 +51,11 @@ http://162.250.201.58:6211/pk/ONEGOLF/index.m3u8
 https://live.ptv.com.pk/live/stream/ptvhome/playlist.m3u8
 #EXTINF:-1 tvg-id="PTVNews.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/LyqGxwv.jpg" group-title="News",PTV News (1080p) [Not 24/7]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UC5RvV_LtR1dxPCVFGw6dxXA/live
-#EXTINF:-1 tvg-id="PTVSports.pk" tvg-country="PK" tvg-language="English" tvg-logo="https://i.imgur.com/MWm7yEa.png" group-title="Sport",PTV Sports (1080p) [Offline]
+#EXTINF:-1 tvg-id="PTVSports.pk" tvg-country="PK" tvg-language="English" tvg-logo="https://i.imgur.com/MWm7yEa.png" group-title="",PTV Sports (1080p) [Timeout]
 http://103.81.104.118/hls/stream11.m3u8
 #EXTINF:-1 tvg-id="PTVWorld.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/eeDFRgN.png" group-title="",PTV World (360p) [Not 24/7]
 https://live.ptv.com.pk/live/ptvworld/playlist.m3u8
 #EXTINF:-1 tvg-id="SuchTV.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/WlxWJm1.png" group-title="News",Such TV (720p) [Not 24/7]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.dailymotion.com/video/x72hrde
-#EXTINF:-1 tvg-id="ZindagiTV.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/RtHeRwp.png" group-title="",Zindagi TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="ZindagiTV.pk" tvg-country="PK" tvg-language="Urdu" tvg-logo="https://i.imgur.com/RtHeRwp.png" group-title="",Zindagi TV (360p) [Not 24/7]
 https://5ad386ff92705.streamlock.net/live_transcoder/ngrp:zindagitv.stream_all/chunklist.m3u8
diff --git a/channels/pl.m3u b/channels/pl.m3u
index d803788778..d6e8fbbece 100644
--- a/channels/pl.m3u
+++ b/channels/pl.m3u
@@ -31,8 +31,6 @@ http://188.47.212.71/jupiter/o1-cl1/live/tvrepublika/live.m3u8
 http://217.173.176.107:1935/live/tvk.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TVTrwam.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/k6zdLLu.jpg" group-title="",TV Trwam (480p)
 https://trwamtv.live.e59-po.insyscd.net/cl01/out/u/trwam_3.m3u8
-#EXTINF:-1 tvg-id="TVN24BiSHD.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="" group-title="",TVN24 BiS HD (1080p) [Not 24/7]
-http://89.160.178.236:8080/play/a03y/index.m3u8
 #EXTINF:-1 tvg-id="TVP1.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/TVP1.png" group-title="",TVP 1 (720p) [Offline]
 http://207.110.52.61:8080/s/hls/5/9584/tvp1_276/1/1/index.m3u8
 #EXTINF:-1 tvg-id="TVP3Bialystok.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/zPSpvss.jpg" group-title="",TVP 3 Białystok (404p)
@@ -69,13 +67,13 @@ http://hbbtvlive.v3.tvp.pl/hbbtvlive/livestream.php?app_id=tvpwarszawa
 http://hbbtvlive.v3.tvp.pl/hbbtvlive/livestream.php?app_id=tvpwroclaw
 #EXTINF:-1 tvg-id="TVPInfo.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/idt6Zz3.jpg" group-title="",TVP Info (404p)
 http://hbbtvlive.v3.tvp.pl/hbbtvlive/livestream.php?app_id=tvpinfo
-#EXTINF:-1 tvg-id="TVPParlament1.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/CpgzCZq.jpg" group-title="",TVP Parlament (kanał 1) (404p)
+#EXTINF:-1 tvg-id="TVPParlament1.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/CpgzCZq.jpg" group-title="",TVP Parlament (kanał 1) (404p) [Timeout]
 http://hbbtvlive3.v3.tvp.pl/hbbtvlive/livestream.php?app_id=kanal1
-#EXTINF:-1 tvg-id="TVPParlament2.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/CpgzCZq.jpg" group-title="",TVP Parlament (kanał 2) (404p) [Offline]
+#EXTINF:-1 tvg-id="TVPParlament2.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/CpgzCZq.jpg" group-title="",TVP Parlament (kanał 2) (404p) [Timeout]
 http://hbbtvlive3.v3.tvp.pl/hbbtvlive/livestream.php?app_id=kanal2
-#EXTINF:-1 tvg-id="TVPSejm.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/CpgzCZq.jpg" group-title="",TVP Sejm (404p)
+#EXTINF:-1 tvg-id="TVPSejm.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/CpgzCZq.jpg" group-title="",TVP Sejm (404p) [Timeout]
 http://hbbtvlive3.v3.tvp.pl/hbbtvlive/livestream.php?app_id=sejm
-#EXTINF:-1 tvg-id="TVPSenat.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/CpgzCZq.jpg" group-title="",TVP Senat (404p)
+#EXTINF:-1 tvg-id="TVPSenat.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="https://i.imgur.com/CpgzCZq.jpg" group-title="",TVP Senat (404p) [Timeout]
 http://hbbtvlive3.v3.tvp.pl/hbbtvlive/livestream.php?app_id=senat
 #EXTINF:-1 tvg-id="TVT.pl" tvg-country="PL" tvg-language="Polish" tvg-logo="" group-title="",TVT (410p) [Not 24/7]
 http://176.107.129.219/media/tvt/index.m3u8
diff --git a/channels/pr.m3u b/channels/pr.m3u
index 24c939454e..bd1958bed5 100644
--- a/channels/pr.m3u
+++ b/channels/pr.m3u
@@ -1,19 +1,13 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="CANAL13.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="https://directtvlatam-aem65-prod.adobecqms.net/content/dam/public-sites/channels/puerto-rico/v2/pr/183.png" group-title="",CANAL 13 (720p) [Offline]
-https://5983a4e15f07f.streamlock.net:8443/worocanal13pr/worocanal13pr/chunklist_w1959254102.m3u8
 #EXTINF:-1 tvg-id="CDMInternational.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/KlJnXF3.jpg" group-title="",CDM International (480p) [Not 24/7]
 https://59825a54e4454.streamlock.net:8443/marcos536/marcos536/playlist.m3u8
 #EXTINF:-1 tvg-id="CDMTV.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="" group-title="",CDM TV (480p) [Not 24/7]
 http://205.164.56.130:1935/marcos536/marcos536/playlist.m3u8
 #EXTINF:-1 tvg-id="CTNiChristianTelevisionNetworkInternational.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2018/07/CTNi.png" group-title="Religious",CTNi (Christian Television Network International) (480p) [Not 24/7]
-https://584097344c1f0.streamlock.net/48/_definst_/smil:48.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="NotiUnoPuertoRico.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="" group-title="",Noti Uno Puerto Rico (404p) [Not 24/7]
-https://59514edd5dd8e.streamlock.net/unoradio/unoradio1/chunklist_w782728706.m3u8
-#EXTINF:-1 tvg-id="PuraPalabra.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="https://i1.wp.com/unored.tv/wp-content/uploads/2016/03/Pura-Palabra-TV.jpg" group-title="",Pura Palabra (720p) [Not 24/7]
-https://59825a54e4454.streamlock.net:8443/william233/william233/playlist.m3u8
-#EXTINF:-1 tvg-id="WoroCanal13PuertoRico.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="" group-title="",Woro Canal 13 (Puerto Rico) (720p) [Offline]
-https://5983a4e15f07f.streamlock.net:8443/worocanal13pr/worocanal13pr/chunklist_w1874302818.m3u8
-#EXTINF:-1 tvg-id="WORODT.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="https://i0.wp.com/unored.tv/wp-content/uploads/2015/08/WORO.jpg" group-title="",WORO-DT (720p) [Offline]
-https://5983a4e15f07f.streamlock.net:8443/worocanal13pr/worocanal13pr/playlist.m3u8
-#EXTINF:-1 tvg-id="WUNONotiUnoMetro.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="https://bloximages.newyork1.vip.townnews.com/notiuno.com/content/tncms/custom/image/1910fac6-b6a6-11e8-bedc-73fa7469f5d8.png" group-title="Local",WUNO (Noti Uno Metro) (480p) [Not 24/7]
+https://584097344c1f0.streamlock.net/48/smil:48.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="MasTV.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="" group-title="",Mas TV (1080p)
+https://video1.getstreamhosting.com:1936/8212/8212/playlist.m3u8
+#EXTINF:-1 tvg-id="NotiUnoPuertoRico.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="" group-title="",Noti Uno Puerto Rico (854p) [Not 24/7]
 https://59514edd5dd8e.streamlock.net/unoradio/unoradio1/playlist.m3u8
+#EXTINF:-1 tvg-id="PuraPalabra.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="https://i1.wp.com/unored.tv/wp-content/uploads/2016/03/Pura-Palabra-TV.jpg" group-title="",Pura Palabra (718p) [Not 24/7]
+https://59825a54e4454.streamlock.net:8443/william233/william233/playlist.m3u8
diff --git a/channels/ps.m3u b/channels/ps.m3u
index 714dd73993..d024d121b9 100644
--- a/channels/ps.m3u
+++ b/channels/ps.m3u
@@ -7,13 +7,13 @@ http://htvajyal.mada.ps:8888/ajyal/index.m3u8
 http://htvmada.mada.ps:8888/ajyal/index.m3u8
 #EXTINF:-1 tvg-id="AlAqsaChannel.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="http://aqsatv.ps/style/atyaf/assets/images/logo-footer.png" group-title="Religious",Al Aqsa Channel (480p) [Not 24/7]
 https://live-1.linuxway.info/aqsatv/live/tv/playlist.m3u8
-#EXTINF:-1 tvg-id="AlfajerTV1.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="https://i.imgur.com/H8SaZXN.png" group-title="General",Alfajer TV 1 (720p) [Not 24/7]
-https://www.elahmad.com/tv/m3u8/online_live_2_tv.m3u8?id=alfajertv
+#EXTINF:-1 tvg-id="AlfajerTV1.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="https://i.imgur.com/H8SaZXN.png" group-title="General",Alfajer TV 1 (304p) [Not 24/7]
+https://www.elahmad.com/tv/m3u8/online_live_2_tv.m3u8?id=alkass5
 #EXTINF:-1 tvg-id="AlfajerTV2.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="https://i.imgur.com/H8SaZXN.png" group-title="General",Alfajer TV 2 (720p)
 http://two.alfajertv.com:8081/AlfajertvHDTwo_web/web/playlist.m3u8
 #EXTINF:-1 tvg-id="Audeh.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",Audeh (480p)
 http://htvpalsat.mada.ps:8888/audeh/index.m3u8
-#EXTINF:-1 tvg-id="Falastini.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="http://www.falastini.tv/wp-content/uploads/2018/10/logo.png" group-title="Music",Falastini (1080p)
+#EXTINF:-1 tvg-id="Falastini.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="http://www.falastini.tv/wp-content/uploads/2018/10/logo.png" group-title="Music",Falastini (720p)
 http://51.255.84.28:8081/palestiniantv_source/live/playlist.m3u8
 #EXTINF:-1 tvg-id="HebronTV.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",Hebron TV (720p) [Not 24/7]
 https://streaming.zaytonatube.com:8081/newhebron/newheb/playlist.m3u8
@@ -45,5 +45,5 @@ https://mn-nl.mncdn.com/palabroad/live/playlist.m3u8
 https://streaming.zaytonatube.com:8081/ShababFM/shabab/index.m3u8
 #EXTINF:-1 tvg-id="WatarTV.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",Watar TV (720p) [Not 24/7]
 http://htvint.mada.ps:8889/orient/index.m3u8
-#EXTINF:-1 tvg-id="WattanTV.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",Wattan TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="WattanTV.ps" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",Wattan TV (576p) [Not 24/7]
 http://htvmada.mada.ps:8888/wattan/index.m3u8
diff --git a/channels/pt.m3u b/channels/pt.m3u
index 0374ff4978..2b09f1382d 100644
--- a/channels/pt.m3u
+++ b/channels/pt.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="Canal11.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn.one.accedo.tv/files/5da5efcea0e845000ed0e5d4?sessionKey=01FNEJ1BS1DAS4AGH38M9E3DZ01A65B14752.png" group-title="Sports",Canal 11 (480p)
+#EXTINF:-1 tvg-id="Canal11.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn.one.accedo.tv/files/5da5efcea0e845000ed0e5d4?sessionKey=01FNEJ1BS1DAS4AGH38M9E3DZ01A65B14752.png" group-title="Sports",Canal 11 (720p)
 https://d2ve4fchffi4n1.cloudfront.net/out/v1/df356edd16f3434ab417f2c48cb1d516/index.m3u8
 #EXTINF:-1 tvg-id="CanalParlamento.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://canal.parlamento.pt/images/ARTV_Logo.png" group-title="Legislative",Canal Parlamento (432p)
 https://playout175.livextend.cloud/livenlin4/2liveartvpub/playlist.m3u8
@@ -21,14 +21,6 @@ https://streamer-a01.videos.sapo.pt/live/portocanal/playlist.m3u8
 https://streamer-b02.videos.sapo.pt/live/portocanal/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioClubeTV.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/2TO0u6Z.png" group-title="General",Radio Clube TV (720p) [Not 24/7]
 https://stmv1.srvsite.com/clubefmradio/clubefmradio/playlist.m3u8
-#EXTINF:-1 tvg-id="RTP1.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/5-563718101410.png" group-title="General",RTP1 (480p)
-http://162.212.178.69:41042/bysid/608
-#EXTINF:-1 tvg-id="RTP2.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/3-363718101410.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0" group-title="General",RTP2 (504p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0
-https://streaming-live.rtp.pt/liverepeater/smil:rtp2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="RTP3.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/64-393818101410.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0" group-title="News",RTP3 (504p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0
-https://streaming-live.rtp.pt/livetvhlsDVR/rtpndvr.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RTPAcores.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/106-563419141305.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0" group-title="General",RTP Açores (504p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0
 https://streaming-live.rtp.pt/liverepeater/smil:rtpacores.smil/playlist.m3u8
@@ -43,6 +35,14 @@ http://210.210.155.35/qwr9ew/s/s38/index.m3u8
 #EXTINF:-1 tvg-id="RTPMadeira.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/107-443519141305.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64)" group-title="General",RTP Madeira (504p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64)
 https://streaming-live.rtp.pt/liverepeater/smil:rtpmadeira.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="RTP1.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/5-563718101410.png" group-title="General",RTP1 (480p) [Timeout]
+http://162.212.178.69:41042/bysid/608
+#EXTINF:-1 tvg-id="RTP2.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/3-363718101410.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0" group-title="General",RTP2 (504p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0
+https://streaming-live.rtp.pt/liverepeater/smil:rtp2.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="RTP3.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/64-393818101410.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0" group-title="News",RTP3 (504p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0
+https://streaming-live.rtp.pt/livetvhlsDVR/rtpndvr.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="SICInternacional.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://cdn.mitvstatic.com/channels/br_sic_m.png" group-title="General",SIC Internacional (720p)
 http://live.impresa.pt/live/sicint/sicint.m3u8
 #EXTINF:-1 tvg-id="SICNoticias.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/a/ab/SN_300x130-escuro.png" group-title="News",SIC Noticias [Geo-blocked]
@@ -51,28 +51,24 @@ http://live.impresa.pt/live/sicnot/sicnot.m3u8
 http://213.13.26.11:1935/live/sobrenaturaltv/livestream.m3u8
 #EXTINF:-1 tvg-id="SobrenaturalTV.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/VgzVZto.png" group-title="Religious",Sobrenatural TV (720p) [Not 24/7]
 http://livestreamcdn.net:1935/SobrenaturalTV/SobrenaturalTV/playlist.m3u8
-#EXTINF:-1 tvg-id="SportTV1.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/sport-tv1.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",Sport TV 1 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://sport.livedoomovie.com/02_SPORTTV_1_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="SportTV2.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/sport-tv2.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",Sport TV 2 (576p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://sport.livedoomovie.com/02_SPORTTV_2_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="SportTV3.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/sport-tv3.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",Sport TV 3 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://sport.livedoomovie.com/02_SPORTTV_3_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="SportTV4.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/sport-tv4.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",Sport TV 4 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://sport.livedoomovie.com/02_SPORTTV_4_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="STVNoticias.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="" group-title="News",STV Noticias (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="SportTV1.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/sport-tv1.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",Sport TV 1 (720p)
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_SPORTTV_1_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="SportTV2.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/sport-tv2.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",Sport TV 2 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_SPORTTV_2_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="SportTV3.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/sport-tv3.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",Sport TV 3 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_SPORTTV_3_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="SportTV4.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/sport-tv4.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",Sport TV 4 (576p)
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_SPORTTV_4_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="STVNoticias.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="" group-title="News",STV Noticias (240p) [Not 24/7]
 http://dcunilive36-lh.akamaihd.net/i/dclive_1@668002/master.m3u8
 #EXTINF:-1 tvg-id="TVFatima.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/hCFVc5S.jpg" group-title="Religious",TV Fátima (1080p)
 http://213.13.26.11:1935/live/santuario.stream/livestream.m3u8
 #EXTINF:-1 tvg-id="TVFatima.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/hCFVc5S.jpg" group-title="Religious",TV Fátima (1080p) [Not 24/7]
 https://streamer-b02.videos.sapo.pt/live/santuario.stream/livestream.m3u8
-#EXTINF:-1 tvg-id="TVMana1BRA.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.tvmana1.com/wp-content/uploads/2020/04/logo_tv_mana_1.png" group-title="Religious",TV Maná 1 (320p) [Not 24/7]
-http://195.22.11.11:1935/tvmana/tvmana1/playlist.m3u8
-#EXTINF:-1 tvg-id="TVMana2BRA.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.tvmana1.com/wp-content/uploads/2020/04/logo_tv_mana_1.png" group-title="Religious",TV Maná 2 (720p) [Not 24/7]
-http://195.22.11.11:1935/tvmana/tvmana2/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMANAENG.pt" tvg-country="PT" tvg-language="English" tvg-logo="http://igrejamana.com/int/imagens/mana_logo_novo_lrg.png" group-title="Religious",TV MANA (ENG) (484p)
 http://c2.manasat.com:1935/church-online/ingles3/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMANAESP.pt" tvg-country="PT" tvg-language="Spanish" tvg-logo="http://igrejamana.com/int/imagens/mana_logo_novo_lrg.png" group-title="Religious",TV MANA (ESP) (488p)
@@ -81,9 +77,13 @@ http://c2.manasat.com:1935/iglesia-online/espanhol3/playlist.m3u8
 http://c2.manasat.com:1935/eglise-online/frances3/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMANARU.pt" tvg-country="PT" tvg-language="Russian" tvg-logo="http://igrejamana.com/int/imagens/mana_logo_novo_lrg.png" group-title="Religious",TV MANA (RU) (486p)
 http://c2.manasat.com:1935/tserkov-online/russo3/playlist.m3u8
+#EXTINF:-1 tvg-id="TVMana1BRA.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.tvmana1.com/wp-content/uploads/2020/04/logo_tv_mana_1.png" group-title="Religious",TV Maná 1 (320p) [Not 24/7]
+http://195.22.11.11:1935/tvmana/tvmana1/playlist.m3u8
+#EXTINF:-1 tvg-id="TVMana2BRA.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.tvmana1.com/wp-content/uploads/2020/04/logo_tv_mana_1.png" group-title="Religious",TV Maná 2 (576p) [Not 24/7]
+http://195.22.11.11:1935/tvmana/tvmana2/playlist.m3u8
 #EXTINF:-1 tvg-id="TVManaCordoba.pt" tvg-country="PT" tvg-language="Spanish" tvg-logo="http://igrejamana.com/int/imagens/mana_logo_novo_lrg.png" group-title="Religious",TV Maná Córdoba (576p) [Not 24/7]
 http://csvl03.manasat.com:1935/tvar/tvmanaar2/playlist.m3u8
-#EXTINF:-1 tvg-id="TVMANAMAPUTO.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="http://igrejamana.com/int/imagens/mana_logo_novo_lrg.png" group-title="Religious",TV MANA MAPUTO (574p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVMANAMAPUTO.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="http://igrejamana.com/int/imagens/mana_logo_novo_lrg.png" group-title="Religious",TV MANA MAPUTO (576p) [Not 24/7]
 http://csvl03.manasat.com:1935/tvmz/tvmz3/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMANAMAPUTO.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="http://igrejamana.com/int/imagens/mana_logo_novo_lrg.png" group-title="Religious",TV MANA MAPUTO (574p) [Not 24/7]
 http://streamspub.manasat.com:1935/tvmz/tvmz2/playlist.m3u8
@@ -91,7 +91,7 @@ http://streamspub.manasat.com:1935/tvmz/tvmz2/playlist.m3u8
 http://csvl04.manasat.com:1935/tvmana/tvmana3/playlist.m3u8
 #EXTINF:-1 tvg-id="TVI.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://www.meo.pt/PublishingImages/canais/tvi.png" group-title="General",TVI (480p)
 https://video-auth2.iol.pt/live_edge/tvi_abr/edge_servers/tvi-480p/chunks.m3u8
-#EXTINF:-1 tvg-id="TVI24.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/5/50/Tvi_24.png" group-title="News",TVI24 (480p)
-https://video-auth2.iol.pt/live_edge/tvi24_abr/edge_servers/tvi24-480p/chunks.m3u8
 #EXTINF:-1 tvg-id="TVIReality.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="" group-title="",TVI Reality (480p)
 https://video-auth2.iol.pt/live_tvi_direct/live_tvi_direct/edge_servers/tvireality-480p/chunks.m3u8
+#EXTINF:-1 tvg-id="TVI24.pt" tvg-country="PT" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/5/50/Tvi_24.png" group-title="News",TVI24 (480p)
+https://video-auth2.iol.pt/live_edge/tvi24_abr/edge_servers/tvi24-480p/chunks.m3u8
diff --git a/channels/py.m3u b/channels/py.m3u
index 6b8a8ae3d5..79e357eaba 100644
--- a/channels/py.m3u
+++ b/channels/py.m3u
@@ -1,12 +1,14 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="ABCTV.py" tvg-country="PY" tvg-language="Spanish" tvg-logo="https://i.imgur.com/tBdgllD.png" group-title="",ABC TV (720p)
 https://d2e809bgs49c6y.cloudfront.net/live/d87c2b7b-9ecf-4e6e-b63b-b32772bd7851/live.isml/d87c2b7b-9ecf-4e6e-b63b-b32772bd7851.m3u8
-#EXTINF:-1 tvg-id="FarraPlay.py" tvg-country="PY" tvg-language="Spanish" tvg-logo="" group-title="",Farra Play (238p) [Not 24/7]
+#EXTINF:-1 tvg-id="FarraPlay.py" tvg-country="PY" tvg-language="Spanish" tvg-logo="" group-title="",Farra Play (720p) [Not 24/7]
 http://159.203.148.226/live/farra.m3u8
 #EXTINF:-1 tvg-id="GEN.py" tvg-country="PY" tvg-language="Spanish" tvg-logo="https://lanacionpy.nyc3.cdn.digitaloceanspaces.com/img/logo-gen.svg" group-title="",GEN (480p) [Not 24/7]
 https://iptv-all.lanesh4d0w.repl.co/paraguay/gentv
 #EXTINF:-1 tvg-id="LIMTV.py" tvg-country="PY" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/limtvok/picture?width=300&height=300" group-title="",LIM TV (720p) [Not 24/7]
 https://live.admefy.com/live/default/ashamed_crimson_3360d.m3u8
+#EXTINF:-1 tvg-id="MasTV.py" tvg-country="PY" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/mastvok/picture?width=300&height=300" group-title="",Más TV (1080p)
+http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/mastvonline
 #EXTINF:-1 tvg-id="RadioUniverso.py" tvg-country="PY" tvg-language="Spanish" tvg-logo="https://lanacionpy.nyc3.cdn.digitaloceanspaces.com/img/logo-universo.svg" group-title="",Radio Universo (480p) [Not 24/7]
 https://iptv-all.lanesh4d0w.repl.co/paraguay/universo
 #EXTINF:-1 tvg-id="SURTVItapua.py" tvg-country="PY" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/804016687108521985/L4G3JMvc_400x400.jpg" group-title="",SUR TV Itapúa [Offline]
diff --git a/channels/qa.m3u b/channels/qa.m3u
index f312e5d2cf..a84c20631e 100644
--- a/channels/qa.m3u
+++ b/channels/qa.m3u
@@ -18,7 +18,7 @@ https://live-hls-web-aje.getaj.net/AJE/index.m3u8
 http://ott-cdn.ucom.am/s23/index.m3u8
 #EXTINF:-1 tvg-id="AlJazeeraMubasher.qa" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/xx6uOhZ.png" group-title="Legislative",Al Jazeera Mubasher (1080p)
 https://live-hls-web-ajm.getaj.net/AJM/index.m3u8
-#EXTINF:-1 tvg-id="AlKassFive.qa" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",Al Kass Five (576p)
+#EXTINF:-1 tvg-id="AlKassFive.qa" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",Al Kass Five (304p)
 https://www.elahmad.com/tv/m3u8/online_live_2_tv.m3u8?id=alkass5
 #EXTINF:-1 tvg-id="AlRassoul.qa" tvg-country="QA" tvg-language="Arabic" tvg-logo="https://i.postimg.cc/pTmN1X9T/al-rassoul.png" group-title="Religious",Al Rassoul (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/user/AlRassoulChannel/live
@@ -26,7 +26,7 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/user/Al
 https://svs.itworkscdn.net/alrayyanlive/alrayyan.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlRayyanAlQadeem.qa" tvg-country="QA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/mVwHGbc.png" group-title="Classic",Al Rayyan Al Qadeem (1080p)
 https://svs.itworkscdn.net/alrayyanqadeemlive/alrayyanqadeem.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="QatarTV.qa" tvg-country="QA" tvg-language="Arabic" tvg-logo="http://www.qtv.qa/assets/images/logos/qtv.png" group-title="General",Qatar TV (720p)
+#EXTINF:-1 tvg-id="QatarTV.qa" tvg-country="QA" tvg-language="Arabic" tvg-logo="http://www.qtv.qa/assets/images/logos/qtv.png" group-title="General",Qatar TV (576p)
 https://qatartv.akamaized.net/hls/live/2026573/qtv1/master.m3u8
 #EXTINF:-1 tvg-id="QatarTV2.qa" tvg-country="QA" tvg-language="Arabic" tvg-logo="http://www.qtv.qa/assets/images/logos/qtvTwo2.png" group-title="General",Qatar TV 2 (720p)
 https://qatartv.akamaized.net/hls/live/2026574/qtv2/master.m3u8
diff --git a/channels/ro.m3u b/channels/ro.m3u
index c44875dde7..836b96c96c 100644
--- a/channels/ro.m3u
+++ b/channels/ro.m3u
@@ -17,7 +17,7 @@ https://iptv-all.lanesh4d0w.repl.co/romania/a3
 http://stream1.antenaplay.ro/live/smil:ComedyPlay.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AntenaInternational.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/3/34/Antena_Interna%C8%9Bional_%282016%29.png" group-title="General",Antena International (576p) [Offline]
 https://iptv-all.lanesh4d0w.repl.co/romania/ai
-#EXTINF:-1 tvg-id="AntenaMonden.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="",Antena Monden (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AntenaMonden.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="",Antena Monden (480p) [Not 24/7]
 http://stream1.antenaplay.ro/live/smil:AntenaMonden.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AntenaStars.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/UnkDhbr.png" group-title="Lifestyle",Antena Stars (720p) [Offline]
 https://iptv-all.lanesh4d0w.repl.co/romania/astars
@@ -27,11 +27,11 @@ https://stream1.antenaplay.ro/dfs/farasecrete5/playlist.m3u8
 https://stream.adunity.com/b1/b1.m3u8
 #EXTINF:-1 tvg-id="BucovinaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/7QHdiTO.png" group-title="",Bucovina TV (480p)
 http://46.4.14.12:9999/btvsvlive/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal33.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/BxUibFh.png" group-title="Business",Canal33 (480p)
+#EXTINF:-1 tvg-id="Canal33.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/BxUibFh.png" group-title="Business",Canal33 (480p) [Offline]
 https://fms-https1.mediadirect.ro/live3/canal33.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ColumnaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/Tyrzwr2.png" group-title="Local",Columna TV (576p) [Not 24/7]
 rtmp://columna1.arya.ro/live/columnatv1
-#EXTINF:-1 tvg-id="CooknPlay.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/0/08/Cook%26Play.png" group-title="Cooking",Cook&Play (480p/720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CooknPlay.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/0/08/Cook%26Play.png" group-title="Cooking",Cook&Play (480p/720p) (480p) [Not 24/7]
 https://stream1.antenaplay.ro/live/smil:CookPlay.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CorneaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/cn89fLa.jpg" group-title="",Cornea TV (720p) [Not 24/7]
 http://89.149.30.158:1935/CorneaTV/myStream/playlist.m3u8
@@ -40,9 +40,9 @@ http://cdn.credonet.tv:1935/ctv/smil:livecredo.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Digi24.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.cinemagia.ro/img/tv_station/digi-24.jpg" user-agent="iPhone" group-title="",Digi 24 (720p) [Offline]
 #EXTVLCOPT:http-user-agent=iPhone
 https://iptv-all.lanesh4d0w.repl.co/romania/digi24
-#EXTINF:-1 tvg-id="ElitaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/Lmbmx3y.png" group-title="",Elita TV (576p)
+#EXTINF:-1 tvg-id="ElitaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/Lmbmx3y.png" group-title="",Elita TV (576p) [Timeout]
 http://46.55.111.242:8080/Rezina.m3u8
-#EXTINF:-1 tvg-id="EstTVNeamt.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/kQJ10r8/est-tv-ro.png" group-title="Local",Est TV (Neamt) (576p) [Offline]
+#EXTINF:-1 tvg-id="EstTVNeamt.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/kQJ10r8/est-tv-ro.png" group-title="Local",Est TV (Neamt) (576p) [Not 24/7]
 http://89.38.8.130:39435
 #EXTINF:-1 tvg-id="GTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/bJVG9HX/GTV.jpg" group-title="Local",GTV (576p) [Not 24/7]
 rtmp://gtv1.arya.ro:1935/live/gtv1.flv
@@ -66,7 +66,7 @@ https://rtmp.digitalbroadcast.ro/moozdance/moozdance.m3u8
 #EXTINF:-1 tvg-id="MoozHits.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://mooz.tv/site/img/mooz-hits.jpg" group-title="Music",MoozHits (576p)
 #EXTVLCOPT:http-referrer=https://mooz.tv/
 https://rtmp.digitalbroadcast.ro/moozhits/moozhits.m3u8
-#EXTINF:-1 tvg-id="MoozRo.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://mooz.tv/site/img/mooz-ro1.png" group-title="Music",MoozRo
+#EXTINF:-1 tvg-id="MoozRo.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://mooz.tv/site/img/mooz-ro1.png" group-title="Music",MoozRo (576p)
 #EXTVLCOPT:http-referrer=https://mooz.tv/
 https://rtmp.digitalbroadcast.ro/moozro/moozro.m3u8
 #EXTINF:-1 tvg-id="MusicChannelRomania.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/PRgvj4c.png" group-title="Music",Music Channel Romania (576p) [Offline]
@@ -83,7 +83,7 @@ https://stream1.1616.ro:1945/prima/livestream/playlist.m3u8?wowzatokenhash=hOdIz
 https://stream1.1616.ro:1945/profit/livestream/playlist.m3u8?wowzatokenhash=hOdIznDoakApEuQ8FaFI3yrJuBMZHqCB7B3cWTmRWsc=
 #EXTINF:-1 tvg-id="Profitro.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="",Profit.ro (404p)
 https://stream1.profit.ro:1945/profit/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="RapsodiaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/TH1T2Y2/Rapsodia-TV.png" group-title="",Rapsodia TV (576p)
+#EXTINF:-1 tvg-id="RapsodiaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/TH1T2Y2/Rapsodia-TV.png" group-title="",Rapsodia TV (576p) [Offline]
 rtmp://rapsodia1.arya.ro/live/rapsodiatv1
 #EXTINF:-1 tvg-id="RealitateaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/L0Givzu.png" group-title="",Realitatea FM (Studio) (576p) [Not 24/7]
 https://live.realitatea.net/livertmp/plus/playlist.m3u8
@@ -96,18 +96,18 @@ http://s2.streamnet.ro:8035/stream.flv
 #EXTINF:-1 tvg-id="SomaxTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/3LdXQxm.png" group-title="",Somax TV [Offline]
 http://webmobile.xdev.ro:81/tv12/playlist.m3u8
 #EXTINF:-1 tvg-id="SperantaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="",Speranta TV (720p)
-http://us200.streamkit.tv/edge/sperantatv_1200/playlist.m3u8
-#EXTINF:-1 tvg-id="SperantaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="",Speranta TV (596p)
 http://play.streamkit.tv/content/channel/sperantatv/live/sperantatv.player.m3u8
-#EXTINF:-1 tvg-id="SuperTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="",SuperTV [Offline]
+#EXTINF:-1 tvg-id="SperantaTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="",Speranta TV (720p)
+http://us200.streamkit.tv/edge/sperantatv_1200/playlist.m3u8
+#EXTINF:-1 tvg-id="SuperTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="",SuperTV (1080p) [Not 24/7]
 http://live.supertv.ro:1935/live/smil:hls.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Telestar1.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/qSd8DTI.png" group-title="",Telestar1 (480p)
 http://193.34.109.10:8090
 #EXTINF:-1 tvg-id="Telestar1.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/qSd8DTI.png" group-title="",Telestar1 (480p) [Not 24/7]
 http://s1.streamnet.ro:8053/stream.flv
-#EXTINF:-1 tvg-id="TravelMix.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.cinemagia.ro/img/tv_station/travel-mix.jpg" group-title="Travel",Travel Mix (576p) [Offline]
+#EXTINF:-1 tvg-id="TravelMix.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.cinemagia.ro/img/tv_station/travel-mix.jpg" group-title="Travel",Travel Mix (1080p) [Not 24/7]
 http://89.38.8.131:39520
-#EXTINF:-1 tvg-id="TVSE.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/9/9c/TV_Sud_Est_%282017%29.png" group-title="",TV SE (576p) [Offline]
+#EXTINF:-1 tvg-id="TVSE.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/9/9c/TV_Sud_Est_%282017%29.png" group-title="",TV SE (576p) [Not 24/7]
 http://89.38.8.130:39419
 #EXTINF:-1 tvg-id="TVPlusSuceava.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.imgur.com/6T7w975.png" group-title="",TVPlus Suceava (576p)
 http://85.186.146.34:8080
@@ -131,12 +131,12 @@ https://mn-nl.mncdn.com/tvrmoldova_new/smil:tvrmoldova_new.smil/index.m3u8
 https://mn-nl.mncdn.com/tvrtgmures_new/smil:tvrtgmures_new.smil/index.m3u8
 #EXTINF:-1 tvg-id="TVRTimisoara.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/0/0e/TVR_Timi%C8%99oara.png" group-title="General",TVR Timișoara (720p) [Geo-blocked]
 https://mn-nl.mncdn.com/tvrtimisoara_new/smil:tvrtimisoara_new.smil/index.m3u8
-#EXTINF:-1 tvg-id="TVSat.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/PFqmmSp/TVSat-RO.png" group-title="",TVSat (576p) [Offline]
+#EXTINF:-1 tvg-id="TVSat.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/PFqmmSp/TVSat-RO.png" group-title="",TVSat (576p) [Not 24/7]
 http://89.38.8.130:39443
 #EXTINF:-1 tvg-id="UTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://static.cinemagia.ro/img/tv_station/utv.jpg" user-agent="iPhone" group-title="Music",UTV (576p) [Offline]
 #EXTVLCOPT:http-user-agent=iPhone
 https://iptv-all.lanesh4d0w.repl.co/romania/utv
-#EXTINF:-1 tvg-id="VPTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/Rb2ff23/VPTV-RO.png" group-title="",VP TV (576p) [Offline]
+#EXTINF:-1 tvg-id="VPTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="https://i.ibb.co/Rb2ff23/VPTV-RO.png" group-title="",VP TV (576p) [Not 24/7]
 http://89.38.8.130:39437
 #EXTINF:-1 tvg-id="ZURadioTV.ro" tvg-country="RO" tvg-language="Romanian" tvg-logo="" group-title="Music",ZU Radio TV (720p) [Offline]
 https://iptv-all.lanesh4d0w.repl.co/romania/zuradiotv
diff --git a/channels/rs.m3u b/channels/rs.m3u
index e8252fe2ae..47aff6a422 100644
--- a/channels/rs.m3u
+++ b/channels/rs.m3u
@@ -41,7 +41,7 @@ https://live.rednet.rs/providus/redtv_multi.m3u8
 mmsh://212.200.255.151/rtv1
 #EXTINF:-1 tvg-id="rtv.rs" tvg-country="RS" tvg-language="Serbian" tvg-logo="https://static.rtv.rs/assets/repository/2017/img/header/logo-rtv_sr_ci.png" group-title="",RTV 2 (576p)
 mmsh://212.200.255.151/rtv2
-#EXTINF:-1 tvg-id="http://rtvas.rs/" tvg-country="RS" tvg-language="Serbian" tvg-logo="https://i.imgur.com/wcXNcP6.png" group-title="",RTV AS (576p)
+#EXTINF:-1 tvg-id="http://rtvas.rs/" tvg-country="RS" tvg-language="Serbian" tvg-logo="https://i.imgur.com/wcXNcP6.png" group-title="",RTV AS (576p) [Timeout]
 https://srv1.adriatelekom.com/TVAS/index.m3u8
 #EXTINF:-1 tvg-id="rtvcityub.rs" tvg-country="RS" tvg-language="Serbian" tvg-logo="https://i.imgur.com/Sz4G9ns.png" group-title="",RTV City Ub (576p) [Not 24/7]
 http://167.172.39.13/hls/tvcityub.m3u8
diff --git a/channels/ru.m3u b/channels/ru.m3u
index bd65fa26fb..14e9937d1b 100644
--- a/channels/ru.m3u
+++ b/channels/ru.m3u
@@ -31,7 +31,7 @@ http://ott-cdn.ucom.am/s45/index.m3u8
 http://ott-cdn.ucom.am/s33/index.m3u8
 #EXTINF:-1 tvg-id="A2.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/GwQgT6X.png" group-title="Series",A2 (576p) [Not 24/7]
 https://sc.id-tv.kz/A2.m3u8
-#EXTINF:-1 tvg-id="AkudjiTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Akudji TV (720p)
+#EXTINF:-1 tvg-id="AkudjiTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Akudji TV (720p) [Offline]
 https://hls.goodgame.ru/hls/5346.m3u8
 #EXTINF:-1 tvg-id="AmediaHit.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a0000016653697bea0c072bf5c5bc1c11ec/260x160" group-title="Movies",Amedia Hit (1080p) [Not 24/7]
 https://sc.id-tv.kz/amedia_hit_hd.m3u8
@@ -44,7 +44,7 @@ http://live.atameken.cdnvideo.ru/atameken/atameken.sdp/playlist.m3u8
 http://stream.backustv.ru/live/btv/index.m3u8
 #EXTINF:-1 tvg-id="BackusTVStrashnoe.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/GGX4vDW.png" group-title="Movies",Backus TV Страшное (1080p)
 http://stream.backustv.ru/live/btv2/index.m3u8
-#EXTINF:-1 tvg-id="BollywoodHD.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://ocdn.eu/ptv2-images-transforms/1/MU_kr5sb2dvLW1pZ3JhdGVkL2JvbGx5d29vZC1oZC5qcGeSlQJkAMLDlQIAKMLD" group-title="Movies",Bollywood HD [Not 24/7]
+#EXTINF:-1 tvg-id="BollywoodHD.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://ocdn.eu/ptv2-images-transforms/1/MU_kr5sb2dvLW1pZ3JhdGVkL2JvbGx5d29vZC1oZC5qcGeSlQJkAMLDlQIAKMLD" group-title="Movies",Bollywood HD (1080p) [Not 24/7]
 https://sc.id-tv.kz/bollywood_hd.m3u8
 #EXTINF:-1 tvg-id="BridgeTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/L71iY9t.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Music",Bridge TV (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
@@ -52,21 +52,21 @@ http://ott-cdn.ucom.am/s34/index.m3u8
 #EXTINF:-1 tvg-id="BridgeTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/L71iY9t.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Music",Bridge TV (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s78/index.m3u8
-#EXTINF:-1 tvg-id="Cinema.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://www.magticom.ge/images/channels/MjAxOC8wOS8xMC84YTkyNTgwNC00NDUzLTQ0YTYtYmI4NS1jYzkwZTIzNGQwZGMuanBn.jpg" group-title="Movies",Cinema [Not 24/7]
+#EXTINF:-1 tvg-id="Cinema.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://www.magticom.ge/images/channels/MjAxOC8wOS8xMC84YTkyNTgwNC00NDUzLTQ0YTYtYmI4NS1jYzkwZTIzNGQwZGMuanBn.jpg" group-title="Movies",Cinema (576p) [Not 24/7]
 https://sc.id-tv.kz/Cinema.m3u8
 #EXTINF:-1 tvg-id="FAN.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Animation",FAN (576p) [Not 24/7]
 http://194.9.27.164:8103/play/FAN/index.m3u8
 #EXTINF:-1 tvg-id="FreshTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/Ju3mLgq.png" group-title="Music",FreshTV (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/fresh/fresh0.m3u8
-#EXTINF:-1 tvg-id="GlobalStarTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/BJJN5Zp.jpg" group-title="",Global Star TV (720p)
+#EXTINF:-1 tvg-id="GlobalStarTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/BJJN5Zp.jpg" group-title="",Global Star TV (720p) [Timeout]
 http://stream2.hardlife.tv:8134/hls-live/hlsGS/_definst_/liveevent/gs.m3u8
 #EXTINF:-1 tvg-id="HDlife.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",HD life (1080p) [Not 24/7]
 http://37.193.6.155:34040/udp/239.1.9.2:1234
 #EXTINF:-1 tvg-id="HDMedia.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/hd-media.png" group-title="Entertainment",HD Медиа (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/hdmedia/hdmedia0.m3u8
-#EXTINF:-1 tvg-id="HDL.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/54380/2a00000165a45450d78511a9a90be1b893e7/160x160" group-title="Documentary",HDL [Not 24/7]
+#EXTINF:-1 tvg-id="HDL.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/54380/2a00000165a45450d78511a9a90be1b893e7/160x160" group-title="Documentary",HDL (404p) [Not 24/7]
 https://sc.id-tv.kz/hdl.m3u8
-#EXTINF:-1 tvg-id="HITV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a0000015a657a4a9a5bdf7861005eb28a46/z" group-title="Music",HITV (1080p)
+#EXTINF:-1 tvg-id="HITV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a0000015a657a4a9a5bdf7861005eb28a46/z" group-title="Music",HITV (1080p) [Offline]
 https://strm.yandex.ru/kal/hittv/hittv0.m3u8
 #EXTINF:-1 tvg-id="Leomax24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Shop",Leomax 24 (576p)
 https://tvshops.bonus-tv.ru/cdn/shop24/playlist.m3u8
@@ -82,9 +82,9 @@ http://tv1.mmg.ooo/live/sd.stream/playlist.m3u8
 http://retj.educom.ru/mosobrtv/tv1/index.m3u8
 #EXTINF:-1 tvg-id="MOSOBRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/WInGwXw.png" group-title="",MOSOBR.TV (720p) [Not 24/7]
 http://retc.educom.ru/mosobrtv/tv1/index.m3u8
-#EXTINF:-1 tvg-id="MTVmix.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",MTVmix (Уфа) (384p)
+#EXTINF:-1 tvg-id="MTVmix.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",MTVmix (Уфа) (384p) [Timeout]
 http://81.30.182.82:18092/hls/live.m3u8
-#EXTINF:-1 tvg-id="MusicBoxRussia.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/russian_musicbox.jpg" group-title="Music",Music Box Russia (1080p)
+#EXTINF:-1 tvg-id="MusicBoxRussia.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/russian_musicbox.jpg" group-title="Music",Music Box Russia (1080p) [Offline]
 https://strm.yandex.ru/kal/rmbox/rmbox0.m3u8
 #EXTINF:-1 tvg-id="Olala.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="XXX",O-la-la (576p) [Not 24/7]
 http://194.9.27.164:8103/play/O_la_la/index.m3u8
@@ -93,7 +93,7 @@ http://91.192.168.242:9091
 #EXTINF:-1 tvg-id="PortalFoxMixTV.ru" tvg-country="INT" tvg-language="Russian" tvg-logo="" group-title="",Portal FoxMix TV (288p) [Not 24/7]
 http://tv.portalfoxmix.club:1935/portalfoxmix/portalfoxmix/playlist.m3u8
 #EXTINF:-1 tvg-id="Prosveshenie.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Prosveshenie (540p) [Geo-blocked]
-http://cdn-01.bonus-tv.ru:8080/prosveschenie_edge/index.m3u8
+http://cdn-01.bonus-tv.ru:8080/prosveschenie_edge/playlist.m3u8
 #EXTINF:-1 tvg-id="RadostMoya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/38123/2a000001704427a91257203d4045e4fd2f2e/170x100" group-title="Kids",Radost Moya (576p) [Geo-blocked]
 http://cdn-01.bonus-tv.ru:8080/radostmoya_edge/index.m3u8
 #EXTINF:-1 tvg-id="RTAmerica.ru" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/tyXIHlj.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="News",RT America (480p)
@@ -191,9 +191,9 @@ https://streaming.astrakhan.ru/astrakhan24/playlist.m3u8
 https://strm.yandex.ru/kal/astrahan24/astrahan240.m3u8
 #EXTINF:-1 tvg-id="Astrahan24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Астрахань 24 (720p) [Not 24/7]
 http://83.234.104.142/astrakhan24hd/playlist.m3u8
-#EXTINF:-1 tvg-id="AstrahanRuSport.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Sports",Астрахань.Ru Sport (1080p)
+#EXTINF:-1 tvg-id="AstrahanRuSport.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Sports",Астрахань.Ru Sport (360p)
 https://streaming.astrakhan.ru/astrakhanrusporthd/playlist.m3u8
-#EXTINF:-1 tvg-id="AstrahanRuTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Астрахань.Ru TV (1080p)
+#EXTINF:-1 tvg-id="AstrahanRuTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Астрахань.Ru TV (720p)
 https://streaming.astrakhan.ru/astrakhanrulivehd/playlist.m3u8
 #EXTINF:-1 tvg-id="Afontovo.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Афонтово (Красноярск) (768p) [Geo-blocked]
 http://xstream.afontovo.ru/afontovo_ya.m3u8
@@ -201,11 +201,11 @@ http://xstream.afontovo.ru/afontovo_ya.m3u8
 http://live.gtrk.tv/hls/b24-hls.m3u8
 #EXTINF:-1 tvg-id="Bashkortostan24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Башкортостан 24 (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/bashkortostan24/bashkortostan240.m3u8
-#EXTINF:-1 tvg-id="Belgorod24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Белгород 24 (720p)
+#EXTINF:-1 tvg-id="Belgorod24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Белгород 24 (1080p)
 http://belnovosti.cdn.easyhoster.ru:8080/stream.m3u8
 #EXTINF:-1 tvg-id="BelRos.ru" tvg-country="BY;RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/Emss0Lk.png" group-title="",БелРос (576p)
 http://live2.mediacdn.ru/sr1/tro/playlist.m3u8
-#EXTINF:-1 tvg-id="Bober.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/70787/2a000001760a042565fb0b5528e2362a8c08/184x140" group-title="",Бобер (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Bober.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/70787/2a000001760a042565fb0b5528e2362a8c08/184x140" group-title="",Бобер (576p) [Not 24/7]
 https://sc.id-tv.kz/bober.m3u8
 #EXTINF:-1 tvg-id="BolshayaAziya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/bolshaya-azia.png" group-title="",Большая Азия (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/bigasia/bigasia0.m3u8
@@ -227,7 +227,7 @@ http://uiptv.do.am/1ufc/118056781/playlist.m3u8
 http://213.234.30.38/Live/1000k/stream.m3u8
 #EXTINF:-1 tvg-id="Volgograd1.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Волгоград 1 (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/volgograd1/volgograd10.m3u8
-#EXTINF:-1 tvg-id="Vremya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a000001760a065ea1993452925ecf9814b5/184x140" group-title="",Время
+#EXTINF:-1 tvg-id="Vremya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a000001760a065ea1993452925ecf9814b5/184x140" group-title="",Время (576p)
 http://91.185.3.218:4000/play/607
 #EXTINF:-1 tvg-id="VTVPlyusHerson.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",ВТВ Плюс (Херсон) (576p)
 http://193.107.128.8:8552/play/a007
@@ -237,23 +237,23 @@ http://iptv.rubintele.com:8552/play/a007
 http://watcher-node5.apsny.camera/tv_gal_tv_hd_online/index.m3u8
 #EXTINF:-1 tvg-id="GorodskoytelekanalYaroslavl.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Городской телеканал (Ярославль) (576p)
 http://www.gtk.tv/hls/gtyar.m3u8
-#EXTINF:-1 tvg-id="Guberniya33.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Губерния 33 (Владимир) (360p)
-https://live-trc33.cdnvideo.ru/trc33/trc33.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="GuberniyaSamara.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://www.guberniatv.ru/img/logo.png" group-title="",Губерния (Самара) (576p)
 http://live.guberniatv.cdnvideo.ru/guberniatv/guberniatv.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="Guberniya33.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Губерния 33 (Владимир) (360p)
+https://live-trc33.cdnvideo.ru/trc33/trc33.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Dagestan.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Дагестан (1080p)
 https://dagestan.mediacdn.ru/cdn/dagestan/playlist.m3u8
 #EXTINF:-1 tvg-id="DayvingTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Outdoor",Дайвинг.TV (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/diving/diving0.m3u8
-#EXTINF:-1 tvg-id="Dialogiorybalke.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Диалоги о рыбалке (1080p)
+#EXTINF:-1 tvg-id="Dialogiorybalke.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Диалоги о рыбалке (1080p) [Offline]
 http://strm.yandex.ru/kal/dialogi/dialogi0.m3u8
 #EXTINF:-1 tvg-id="Dozhd.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/28884/2a0000017b735a0205a0c9947555ae175d64/340x200" group-title="",Дождь (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/tvrain/tvrain0.m3u8
 #EXTINF:-1 tvg-id="Doktor.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Доктор (720p) [Not 24/7]
 http://88b9da48.kazmazpaz.ru/iptv/D7M94NBVB5DLFS/512/index.m3u8
-#EXTINF:-1 tvg-id="Domkino.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Дом кино (1080p)
+#EXTINF:-1 tvg-id="Domkino.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Дом кино (576p)
 http://91.185.3.218:4000/play/606
-#EXTINF:-1 tvg-id="DomKinoPremium.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://www.domkino-premium.tv/im/logo3d.png" group-title="Movies",Дом Кино Премиум [Not 24/7]
+#EXTINF:-1 tvg-id="DomKinoPremium.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://www.domkino-premium.tv/im/logo3d.png" group-title="Movies",Дом Кино Премиум (1080p) [Not 24/7]
 https://sc.id-tv.kz/domkino_hd.m3u8
 #EXTINF:-1 tvg-id="DomkinoPremium.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://www.domkino-premium.tv/im/logo3d.png" group-title="Movies",Дом кино Премиум (1080p) [Offline]
 http://87.247.44.26/btv/SWM/Dom_kino_Prem/Dom_kino_Prem.m3u8
@@ -265,7 +265,7 @@ http://ott-cdn.ucom.am/s88/index.m3u8
 #EXTINF:-1 tvg-id="Dorama.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/lHn6OlM.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Movies",Дорама (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s95/index.m3u8
-#EXTINF:-1 tvg-id="Dorama.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/lHn6OlM.png" group-title="Movies",Дорама [Not 24/7]
+#EXTINF:-1 tvg-id="Dorama.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/lHn6OlM.png" group-title="Movies",Дорама (1080p) [Not 24/7]
 https://sc.id-tv.kz/dorama_hd.m3u8
 #EXTINF:-1 tvg-id="Evraziya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://eurasia.orsk.ru/images/bg.jpg" group-title="Local",Евразия (Орск) (720p)
 http://infochhdcdn.trkeurasia.ru/orsk-infochhd/infochhd/playlist.m3u8
@@ -278,9 +278,9 @@ http://evronovosti.mediacdn.ru/sr1/evronovosti/playlist.m3u8
 #EXTINF:-1 tvg-id="Enisey.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Енисей (1080p) [Not 24/7]
 http://hls-eniseytv.cdnvideo.ru/eniseytv/stream1/playlist.m3u8
 #EXTINF:-1 tvg-id="ZharPtica.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.zhar-ptica.tv/sites/default/files/logo.png" group-title="Music",Жар Птица (1080p) [Geo-blocked]
-http://streamer.rtcommufa.ru:1935/ptica/ptica1/playlist.m3u8
-#EXTINF:-1 tvg-id="ZharPtica.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.zhar-ptica.tv/sites/default/files/logo.png" group-title="Music",Жар Птица (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/firebird/firebird0.m3u8
+#EXTINF:-1 tvg-id="ZharPtica.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.zhar-ptica.tv/sites/default/files/logo.png" group-title="Music",Жар Птица (404p) [Geo-blocked]
+http://streamer.rtcommufa.ru:1935/ptica/ptica1/playlist.m3u8
 #EXTINF:-1 tvg-id="Zhara.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Жара (576p) [Not 24/7]
 http://185.161.224.216/dash/JaraTv_SD.ism/playlist.mpd
 #EXTINF:-1 tvg-id="Zagorodnyy.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/RAfV5p7.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",Загородный (480p)
@@ -311,7 +311,7 @@ https://edge2.uk.kab.tv/live/tvrus-rus-medium/playlist.m3u8
 https://strm.yandex.ru/kal/kavkaz24_supres/kavkaz24_supres0.m3u8
 #EXTINF:-1 tvg-id="KarapuzTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",Карапуз ТВ (1080p) [Offline]
 https://karapuztv.fenixplustv.xyz/content/33418/index.m3u8
-#EXTINF:-1 tvg-id="Karusel.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/51763/2a0000017019a2436d387c572a4650c86f92/160x120" group-title="Kids",Карусель
+#EXTINF:-1 tvg-id="Karusel.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/51763/2a0000017019a2436d387c572a4650c86f92/160x120" group-title="Kids",Карусель (576p)
 http://91.185.3.218:4000/play/604
 #EXTINF:-1 tvg-id="Kinokomediya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Comedy",Кинокомедия [Not 24/7]
 https://sc.id-tv.kz/Kinokomediya_hd.m3u8
@@ -327,7 +327,7 @@ https://sc.id-tv.kz/Kinosemiya_hd.m3u8
 https://sc.id-tv.kz/Kinohit_hd.m3u8
 #EXTINF:-1 tvg-id="KlassikaKino.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Классика Кино (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/kinoclassic/kinoclassic0.m3u8
-#EXTINF:-1 tvg-id="Komediynoe.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a0000016929eb3477b344281e4cc3d0850b/170x100" group-title="",Комедийное (540p)
+#EXTINF:-1 tvg-id="Komediynoe.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a0000016929eb3477b344281e4cc3d0850b/170x100" group-title="",Комедийное (540p) [Timeout]
 http://185.97.150.19:8082/2402
 #EXTINF:-1 tvg-id="Komediya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Comedy",Комедия (576p) [Not 24/7]
 http://188.40.68.167/russia/komediya/playlist.m3u8
@@ -350,7 +350,7 @@ http://uiptv.do.am/1ufc/000000005/playlist.m3u8
 #EXTINF:-1 tvg-id="Kultura.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/jzhrYJq.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Culture",Культура (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s16/index.m3u8
-#EXTINF:-1 tvg-id="Kultura.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/jzhrYJq.png" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178" group-title="Culture",Культура (540p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Kultura.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/jzhrYJq.png" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178" group-title="Culture",Культура (1920p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178
 https://zabava-htlive.cdn.ngenix.net/hls/CH_RUSSIAK/variant.m3u8
 #EXTINF:-1 tvg-id="Kuray.ru" tvg-country="RU" tvg-language="Bashkir" tvg-logo="https://i.imgur.com/AxgNvdp.png" group-title="",Курай (576p)
@@ -365,13 +365,13 @@ http://46.46.143.222:1935/live/mp4:ldpr.stream_720p/playlist.m3u8
 http://46.46.143.222:1935/live/mp4:ldpr.stream_480p/playlist.m3u8
 #EXTINF:-1 tvg-id="Lipeckoevremya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Липецкое время (576p) [Not 24/7]
 http://serv25.vintera.tv:8081/liptime/liptime/playlist.m3u8
-#EXTINF:-1 tvg-id="LitKlubTVProza.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Culture",ЛитКлуб ТВ Проза (720p)
+#EXTINF:-1 tvg-id="LitKlubTVProza.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Culture",ЛитКлуб ТВ Проза (480p)
 http://hls-rossp.cdnvideo.ru/hls/5ace67f0dc96bf0a90d8a2b7/playlist.m3u8
-#EXTINF:-1 tvg-id="LitKlubTVSlovo.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Culture",ЛитКлуб ТВ Слово (720p)
+#EXTINF:-1 tvg-id="LitKlubTVSlovo.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Culture",ЛитКлуб ТВ Слово (480p)
 http://hls-rossp.cdnvideo.ru/hls/5ace6814e563f22e4ddc1f44/playlist.m3u8
 #EXTINF:-1 tvg-id="LitKlubTVStihi.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Culture",ЛитКлуб ТВ Стихи (720p)
 http://hls-rossp.cdnvideo.ru/hls/5aac88ffdc96bf05a7f78899/playlist.m3u8
-#EXTINF:-1 tvg-id="LuchPurovsk.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://trk-luch.ru.opt-images.1c-bitrix-cdn.ru/bitrix/templates/.default/static/images/logo.png" group-title="Local",Луч (Пуровск) [Not 24/7]
+#EXTINF:-1 tvg-id="LuchPurovsk.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://trk-luch.ru.opt-images.1c-bitrix-cdn.ru/bitrix/templates/.default/static/images/logo.png" group-title="Local",Луч (Пуровск) (720p) [Not 24/7]
 https://live.trk-luch.ru/hls/live.m3u8
 #EXTINF:-1 tvg-id="LyubimoeTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",Любимое.ТВ (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/lovedtv/lovedtv0.m3u8
@@ -389,6 +389,12 @@ http://live-minidey.cdnvideo.ru/minidey/minidey.sdp/playlist.m3u8
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv_2500/playlist.m3u8
 #EXTINF:-1 tvg-id="Mir.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_ru.jpg" group-title="General",Мир (1080p) [Not 24/7]
 http://uiptv.do.am/1ufc/113500247/playlist.m3u8
+#EXTINF:-1 tvg-id="MirPlus2.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мир +2 (540p)
+http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv2_2500/playlist.m3u8
+#EXTINF:-1 tvg-id="MirPlus4.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/CrFWXTD.png" group-title="",Мир +4 (540p)
+http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv3_2500/playlist.m3u8
+#EXTINF:-1 tvg-id="MirPlus7.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мир +7 (540p)
+http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv7_2500/playlist.m3u8
 #EXTINF:-1 tvg-id="Mir24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_24_ru.jpg" group-title="News",Мир 24 (1080p)
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/hd/playlist.m3u8
 #EXTINF:-1 tvg-id="Mir24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_24_ru.jpg" group-title="News",Мир 24 (1080p)
@@ -397,12 +403,6 @@ http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mir24_2500/playlist.m3u8
 http://188.40.68.167/russia/mir24/playlist.m3u8
 #EXTINF:-1 tvg-id="Mir24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_24_ru.jpg" group-title="News",Мир 24 (576p) [Not 24/7]
 https://sc.id-tv.kz/Mir24.m3u8
-#EXTINF:-1 tvg-id="MirPlus2.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мир +2 (540p)
-http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv2_2500/playlist.m3u8
-#EXTINF:-1 tvg-id="MirPlus4.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/CrFWXTD.png" group-title="",Мир +4 (540p)
-http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv3_2500/playlist.m3u8
-#EXTINF:-1 tvg-id="MirPlus7.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мир +7 (540p)
-http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv7_2500/playlist.m3u8
 #EXTINF:-1 tvg-id="MirBelogorya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://mirbelogorya.ru/images/stories/news/2014/08/мир/0белогорья_логотип.jpg" group-title="Local",Мир Белагорья (720p) [Geo-blocked]
 http://mirbelogorya.ru:8080/mirbelogorya/index.m3u8
 #EXTINF:-1 tvg-id="MirBelogorya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://mirbelogorya.ru/images/stories/news/2014/08/мир/0белогорья_логотип.jpg" group-title="Local",Мир Белогорья (720p) [Geo-blocked]
@@ -413,10 +413,10 @@ http://stream.tvbelgorod.ru:8080/mirbelogorya/index.m3u8
 http://185.161.224.216/dash/Mir_seriala_SD.ism/playlist.mpd
 #EXTINF:-1 tvg-id="Mirseriala.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Мир сериала (576p) [Not 24/7]
 http://188.40.68.167/russia/mir_seriala/playlist.m3u8
-#EXTINF:-1 tvg-id="Mistoplyus.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мисто плюс (720p)
-http://93.78.206.172:8080/stream5/stream.m3u8
 #EXTINF:-1 tvg-id="Mistoplyus.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мисто плюс (480p)
 http://93.78.206.172:8080/stream4/stream.m3u8
+#EXTINF:-1 tvg-id="Mistoplyus.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мисто плюс (720p) [Timeout]
+http://93.78.206.172:8080/stream5/stream.m3u8
 #EXTINF:-1 tvg-id="Mordoviya24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Мордовия 24 (720p) [Not 24/7]
 https://live-mordovia24.cdnvideo.ru/mordovia24/streamtr/playlist.m3u8
 #EXTINF:-1 tvg-id="Morskoy.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Морской (720p) [Not 24/7]
@@ -427,7 +427,7 @@ https://strm.yandex.ru/kal/msk24_supres/msk24_supres0.m3u8
 https://radio-live-mg.rtr-vesti.ru/hls/moscow_24/playlist.m3u8
 #EXTINF:-1 tvg-id="Moyaplaneta.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://digitalrussia.tv/upload/files/mp.png" group-title="",Моя планета (576p)
 http://cdnmg.secure.live.rtr-vesti.ru/live/smil:mplan.smil/master.m3u8
-#EXTINF:-1 tvg-id="MoyaPlaneta.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/70263/2a00000164125e2a9c190a856c5f1c67d358/260x160" group-title="",Моя Планета (576p)
+#EXTINF:-1 tvg-id="MoyaPlaneta.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/70263/2a00000164125e2a9c190a856c5f1c67d358/260x160" group-title="",Моя Планета (576p) [Timeout]
 https://a3569456481-s26881.cdn.ngenix.net/live/smil:mplan.smil/index.m3u8
 #EXTINF:-1 tvg-id="MTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://xn--b1ats.xn--80asehdb/img/logo.png" group-title="Local",МТВ (Волгоград) (720p) [Not 24/7]
 http://hls.volgograd1vtv.cdnvideo.ru/volgograd1vtv/volgograd1vtv.sdp/playlist.m3u8
@@ -435,14 +435,14 @@ http://hls.volgograd1vtv.cdnvideo.ru/volgograd1vtv/volgograd1vtv.sdp/playlist.m3
 https://sc.id-tv.kz/Mujskoe_kino_hd.m3u8
 #EXTINF:-1 tvg-id="Muzsoyuz.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Муз союз (576p)
 http://hls-tvsoyuz.cdnvideo.ru/tvsoyuz2/muzsoyuz.6fw0-58xp-acts-esy0/playlist.m3u8
-#EXTINF:-1 tvg-id="MuzTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/n7bGFXj.png" group-title="Music",Муз-ТВ (720p)
-https://strm.yandex.ru/kal/muztv_supres/muztv_supres0.m3u8
 #EXTINF:-1 tvg-id="MuzTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/n7bGFXj.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Music",Муз-ТВ (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s28/index.m3u8
+#EXTINF:-1 tvg-id="MuzTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/n7bGFXj.png" group-title="Music",Муз-ТВ (720p) [Offline]
+https://strm.yandex.ru/kal/muztv_supres/muztv_supres0.m3u8
 #EXTINF:-1 tvg-id="MuzSoyuz.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/55846/2a0000016585fe3d303aaed2be3e04b85166/170x100" group-title="",МузСоюз (576p)
 http://hls.tvsoyuz.cdnvideo.ru/tvsoyuz2/muzsoyuz.6fw0-58xp-acts-esy0/playlist.m3u8
-#EXTINF:-1 tvg-id="MuzikaPervogo.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/muz1.png" group-title="Music",Музыка Первого
+#EXTINF:-1 tvg-id="MuzikaPervogo.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/muz1.png" group-title="Music",Музыка Первого (576p)
 http://91.185.3.218:4000/play/608
 #EXTINF:-1 tvg-id="Multilandiya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/OwA1zSH.png" group-title="Kids",Мультиландия (576p) [Geo-blocked]
 http://serv30.vintera.tv:8081/detskiy/multimania20/playlist.m3u8
@@ -457,11 +457,11 @@ http://nano.teleservice.su:8080/hls/nano.m3u8
 http://ott-cdn.ucom.am/s98/index.m3u8
 #EXTINF:-1 tvg-id="Nashdom.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://pp.userapi.com/c5200/g33405934/a_1fa4a8a6.jpg" group-title="",Наш дом [Not 24/7]
 http://85.234.33.60/stream/c11.m3u8
-#EXTINF:-1 tvg-id="NashaSibir.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/nasha-sibir.png" group-title="Travel",Наша Сибирь (1080p) [Offline]
+#EXTINF:-1 tvg-id="NashaSibir.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/nasha-sibir.png" group-title="Travel",Наша Сибирь (1080p) [Timeout]
 https://strm.yandex.ru/kal/sibir/sibir0.m3u8
 #EXTINF:-1 tvg-id="NashaSibirKemerovo.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Наша Сибирь / Кемерово (480p) [Not 24/7]
 https://strm.yandex.ru/kal/sibir/sibir0_169_480p.json/index-v1-a1.m3u8
-#EXTINF:-1 tvg-id="NasheKrutoeHD.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Наше Крутое HD (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="NasheKrutoeHD.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Наше Крутое HD (1080p) [Not 24/7]
 http://ba5729d5.krasnafhg.ru/iptv/EAEWFFWBXPVVLY/915/index.m3u8
 #EXTINF:-1 tvg-id="NasheNovoeKino.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a0000015bb47bf0be402e2ca5127a767647/z" group-title="",Наше Новое Кино [Not 24/7]
 https://s1.idata.uz/stch_temp6/tracks-v1a1/mono.m3u8
@@ -483,31 +483,31 @@ http://ott.inmart.tv:8081/19/index.m3u8
 http://stream.studio360.tv/nw/nw_576p/playlist.m3u8
 #EXTINF:-1 tvg-id="Noyabrsk24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Ноябрьск 24 (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/noyabrsk24/noyabrsk240.m3u8
-#EXTINF:-1 tvg-id="NTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/i6wrwKy.png" group-title="",НТВ (576p)
-http://31.128.159.41:8080/ntv/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="NTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/i6wrwKy.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",НТВ (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s17/index.m3u8
-#EXTINF:-1 tvg-id="NTVStil.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",НТВ Стиль (480p)
+#EXTINF:-1 tvg-id="NTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/i6wrwKy.png" group-title="",НТВ (576p) [Timeout]
+http://31.128.159.41:8080/ntv/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="NTVStil.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",НТВ Стиль (480p) [Timeout]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s77/index.m3u8
 #EXTINF:-1 tvg-id="NTM.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",НТМ (Народное телевидение Мордовии) (720p) [Not 24/7]
 https://live-ntm13.cdnvideo.ru/ntm13/smil:ntm13.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="NTSSevastopol.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",НТС (Севастополь) (1080p) [Not 24/7]
 https://peqk71plnjy.a.trbcdn.net/livemaster/w4kz7pki62_nts_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="O2TV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://ustanovca-tricorol-tv.ru/wp-content/uploads/2017/12/o-tv.png" group-title="",О2ТВ (1080p) [Geo-blocked]
-https://strm.yandex.ru/kal/o2/o20.m3u8
 #EXTINF:-1 tvg-id="O.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",О! (576p) [Not 24/7]
 https://sc.id-tv.kz/o.m3u8
+#EXTINF:-1 tvg-id="O2TV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://ustanovca-tricorol-tv.ru/wp-content/uploads/2017/12/o-tv.png" group-title="",О2ТВ (1080p) [Geo-blocked]
+https://strm.yandex.ru/kal/o2/o20.m3u8
 #EXTINF:-1 tvg-id="Oplot2.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Оплот 2 (576p)
 http://ott.inmart.tv:8081/17/index.m3u8
 #EXTINF:-1 tvg-id="OplotTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Оплот ТВ (1080p)
 http://ott.inmart.tv:8081/54/index.m3u8
-#EXTINF:-1 tvg-id="Ostrosyuzhetnoe.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Остросюжетное (540p)
+#EXTINF:-1 tvg-id="Ostrosyuzhetnoe.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Остросюжетное (540p) [Timeout]
 http://185.97.150.19:8082/2235
 #EXTINF:-1 tvg-id="OTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",ОТВ (Одинцово) (576p)
 http://185.18.4.16/live/3m/playlist.m3u8
-#EXTINF:-1 tvg-id="OTR.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/otr_ru.png" group-title="General",ОТР (720p)
+#EXTINF:-1 tvg-id="OTR.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/otr_ru.png" group-title="General",ОТР (720p) [Offline]
 https://strm.yandex.ru/kal/otr/otr0.m3u8
 #EXTINF:-1 tvg-id="OTS.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",ОТС (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/otstv/otstv0.m3u8
@@ -558,7 +558,7 @@ http://ott-cdn.ucom.am/s50/index.m3u8
 http://langate.tv/acc/playlist.m3u8
 #EXTINF:-1 tvg-id="Radio1018.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Радио 101.8 (540p)
 https://video.penzainform.ru/e/r1018.m3u8
-#EXTINF:-1 tvg-id="RadioGovoritMoskva.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Радио Говорит Москва (405p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioGovoritMoskva.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Радио Говорит Москва (404p) [Not 24/7]
 http://video.govoritmoskva.ru:8080/live/rufmbk-1/index.m3u8
 #EXTINF:-1 tvg-id="RadioGovoritMoskvaVebkamera.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Радио Говорит Москва (Веб-камера) (720p)
 https://video.govoritmoskva.ru/rufm/index.m3u8
@@ -568,13 +568,13 @@ https://pilotfm.ru/cam/hls/pilothd.m3u8
 https://chgtrk.ru/pl/stream/hls/RR_720p/index.m3u8
 #EXTINF:-1 tvg-id="radioHitTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",радио Хит ТВ (300p)
 http://lova.me/hls/hit.m3u8
-#EXTINF:-1 tvg-id="RadioShanson.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://lion-tv.com/uploads/posts/2016-09/1472964269_178.png" group-title="Music",Радио Шансон (720p)
+#EXTINF:-1 tvg-id="RadioShanson.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://lion-tv.com/uploads/posts/2016-09/1472964269_178.png" group-title="Music",Радио Шансон (720p) [Offline]
 http://chanson-video.hostingradio.ru:8080/hls/chansonabr/live.m3u8
 #EXTINF:-1 tvg-id="RadostMoya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/38123/2a000001704427a91257203d4045e4fd2f2e/170x100" group-title="Kids",Радость Моя (576p) [Geo-blocked]
 https://cdn-01.bonus-tv.ru:8090/radostmoya_edge/playlist.m3u8
 #EXTINF:-1 tvg-id="RadostMoya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/38123/2a000001704427a91257203d4045e4fd2f2e/170x100" group-title="Kids",Радость Моя (576p) [Offline]
 http://188.40.68.167/russia/radost_moya/playlist.m3u8
-#EXTINF:-1 tvg-id="RamenskoeTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Раменское ТВ (720p)
+#EXTINF:-1 tvg-id="RamenskoeTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Раменское ТВ (720p) [Timeout]
 https://rtv.facecast.io/rtv/0.m3u8
 #EXTINF:-1 tvg-id="Ratnik.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/38123/2a0000015edc52c7dc8869cca66117c5a828/z" group-title="Entertainment",Ратник (576p)
 https://online-video.rbc.ru/online/rbctv.m3u8
@@ -641,7 +641,7 @@ http://ott-cdn.ucom.am/s15/index.m3u8
 http://4197b1f4.kazaktelekom.org/iptv/NXLLLMU654RENM/907/index.m3u8
 #EXTINF:-1 tvg-id="RusskiySever.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Русский Север (Вологда) (1080p)
 http://185.186.142.16/streams.rs.m3u8
-#EXTINF:-1 tvg-id="RusskiyEkstrim.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Русский Экстрим [Offline]
+#EXTINF:-1 tvg-id="RusskiyEkstrim.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Русский Экстрим [Timeout]
 http://vid.extremtv.ru/hls_get/cameraFeed.m3u8
 #EXTINF:-1 tvg-id="Rybolov.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/70263/2a000001715ed9f583fff05677a02fd9c186/214x121" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",Рыболов (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
@@ -657,16 +657,16 @@ https://sitv.ru/hls/stv.m3u8
 https://bsttv.bonus-tv.ru/cdn/salyam/playlist.m3u8
 #EXTINF:-1 tvg-id="SamaraGIS.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Самара ГИС (1080p) [Not 24/7]
 http://45.67.57.9:8080/new/new/playlist.m3u8
-#EXTINF:-1 tvg-id="Saratov24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Саратов 24 (576p)
+#EXTINF:-1 tvg-id="Saratov24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Саратов 24 (720p)
 https://saratov24.tv/online/playlist.php
-#EXTINF:-1 tvg-id="Sarafan.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/AgX6qoz.png" group-title="",Сарафан (576p) [Offline]
+#EXTINF:-1 tvg-id="Sarafan.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/AgX6qoz.png" group-title="",Сарафан (576p) [Not 24/7]
 http://195.26.83.96:7024/play/82
 #EXTINF:-1 tvg-id="Sever.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар) (1080p)
+https://live.mediacdn.ru/sr1/sever/playlist.m3u8
+#EXTINF:-1 tvg-id="Sever.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар) (1080p)
 https://live2.mediacdn.ru/sr1/sever-mobile/playlist.m3u8
 #EXTINF:-1 tvg-id="Sever.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар) (1080p)
 https://live2.mediacdn.ru/sr1/sever/playlist.m3u8
-#EXTINF:-1 tvg-id="Sever.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар) (1080p)
-https://live.mediacdn.ru/sr1/sever/playlist.m3u8
 #EXTINF:-1 tvg-id="SelengaTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Селенга ТВ (576p)
 http://90.188.37.86/live/playlist.m3u8
 #EXTINF:-1 tvg-id="Siesta.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Сиеста (720p) [Not 24/7]
@@ -683,9 +683,9 @@ http://hls-tvsoyuz.cdnvideo.ru/tvsoyuz/soyuz/playlist.m3u8
 https://strm.yandex.ru/kal/soyuz/soyuz0.m3u8
 #EXTINF:-1 tvg-id="Spas.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/6IcWl5r.png" group-title="Religious",СПАС (576p)
 http://spas.mediacdn.ru/cdn/spas/playlist.m3u8
-#EXTINF:-1 tvg-id="Start.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Sports",Старт (1080p)
+#EXTINF:-1 tvg-id="Start.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Sports",Старт (1080p) [Offline]
 https://strm.yandex.ru/kal/start/start0.m3u8
-#EXTINF:-1 tvg-id="STVKazahstan.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",СТВ Казахстан (576p) [Offline]
+#EXTINF:-1 tvg-id="STVKazahstan.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",СТВ Казахстан (576p) [Not 24/7]
 https://sc.id-tv.kz/STV.m3u8
 #EXTINF:-1 tvg-id="StranaFM.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Music",Страна FM (720p) [Not 24/7]
 http://live.stranafm.cdnvideo.ru/stranafm/stranafm_hd.sdp/playlist.m3u8
@@ -696,7 +696,7 @@ http://sochinskayatrk.ru/hdtv/hls/strc_hd/playlist.m3u8
 http://ott-cdn.ucom.am/s52/04.m3u8
 #EXTINF:-1 tvg-id="STS.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/pJNWVAz.png" group-title="Family",СТС [Not 24/7]
 https://sc.id-tv.kz/STS.m3u8
-#EXTINF:-1 tvg-id="Surgut24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://online-red.com/images/tv/surgut-24.png" group-title="Local",Сургут 24 (720p) [Offline]
+#EXTINF:-1 tvg-id="Surgut24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://online-red.com/images/tv/surgut-24.png" group-title="Local",Сургут 24 (720p) [Not 24/7]
 https://video1.in-news.ru/c24/index.m3u8
 #EXTINF:-1 tvg-id="TaktRenTVKursk.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Такт/Рен ТВ (Курск) (294p) [Not 24/7]
 http://109.194.62.29:8080
@@ -717,7 +717,7 @@ http://ott-cdn.ucom.am/s54/index.m3u8
 http://uiptv.do.am/1ufc/000000009/playlist.m3u8
 #EXTINF:-1 tvg-id="TVEkstra.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",ТВ Экстра (720p)
 http://live-1.otcnet.ru/tvextra720b/index.m3u8
-#EXTINF:-1 tvg-id="TV3.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a000001600802e79513a318979d766e2a3b/orig" group-title="",ТВ-3 (1080p)
+#EXTINF:-1 tvg-id="TV3.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a000001600802e79513a318979d766e2a3b/orig" group-title="",ТВ-3 (1080p) [Timeout]
 http://bar-timeshift-inet.ll-bar.zsttk.ru:8080/tv3/playlist.m3u8
 #EXTINF:-1 tvg-id="TVK24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",ТВК 24 (576p)
 http://air.tvk6.ru/tvk24/playlist.m3u8
@@ -725,18 +725,18 @@ http://air.tvk6.ru/tvk24/playlist.m3u8
 https://live-tvr24.cdnvideo.ru/tvr24/tvr24.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TVTUR.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Travel",ТВТУР (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/tvtour/tvtour0.m3u8
-#EXTINF:-1 tvg-id="TVCMezhdunarodnyy.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",ТВЦ (Международный) (576p) [Offline]
+#EXTINF:-1 tvg-id="TVCMezhdunarodnyy.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",ТВЦ (Международный) (576p) [Timeout]
 http://ad-hls-tvc.cdnvideo.ru/tvc-p222/smil:tvc.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TDK.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/tdk.png" group-title="",ТДК (576p) [Offline]
+#EXTINF:-1 tvg-id="TDK.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/tdk.png" group-title="",ТДК (576p) [Not 24/7]
 https://sc.id-tv.kz/TDK-42.m3u8
 #EXTINF:-1 tvg-id="Telekanal86.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://online-red.com/images/tv/86.png" group-title="Local",Телеканал 86 (Сургут) (1080p) [Not 24/7]
 https://sitv.ru/hls/s86.m3u8
-#EXTINF:-1 tvg-id="Telecafe.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a0000016285b7ee7ed6e5120fb155f395f6/428x280" group-title="",Телекафе
+#EXTINF:-1 tvg-id="Telecafe.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/69315/2a0000016285b7ee7ed6e5120fb155f395f6/428x280" group-title="",Телекафе (576p)
 http://91.185.3.218:4000/play/605
 #EXTINF:-1 tvg-id="Teleputeshestviya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/70787/2a000001662fa9eb27aefc58bb87bcf68f33/260x160" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Travel",Телепутешествия (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s71/index.m3u8
-#EXTINF:-1 tvg-id="TelestanciyaMIRNovosibirsk.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Телестанция МИР (Новосибирск) (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="TelestanciyaMIRNovosibirsk.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Телестанция МИР (Новосибирск) (720p) [Not 24/7]
 http://serv30.vintera.tv:8081/stanciya_mir/mir/playlist.m3u8
 #EXTINF:-1 tvg-id="TelplyusTVAstrahan.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Телплюс ТВ (Астрахань) (360p)
 http://streaming.astrakhan.ru/telplushd/playlist.m3u8
@@ -744,16 +744,16 @@ http://streaming.astrakhan.ru/telplushd/playlist.m3u8
 http://tvcom.stream.intelema.ru/tvcom/studio/playlist.m3u8
 #EXTINF:-1 tvg-id="TKAlmaznyykray.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",ТК Алмазный край (576p)
 https://stream.almaz-media.tv:8080/hls/576.m3u8
-#EXTINF:-1 tvg-id="TKRRyazan.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",ТКР (Рязань) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TKRRyazan.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",ТКР (Рязань) (1080p) [Not 24/7]
 http://live.tkr.cdnvideo.ru/tkr/tkr.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TNVPlaneta.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/38123/2a00000151869753910c522399c2749fd174/z" group-title="",ТНВ-Планета (576p)
 http://tnv.bonus-tv.ru/cdn/tnvplanet/playlist.m3u8
-#EXTINF:-1 tvg-id="TNT4.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a00000160931f198cccad25e259a608ae77/160x120" group-title="",ТНТ4 [Offline]
-https://sc.id-tv.kz/tnt4.m3u8
 #EXTINF:-1 tvg-id="TNTInternational.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/51763/2a00000162f2e7fc95aee02fbc1efd20c3d6/214x121" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Entertainment",ТНТ International (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s19/04.m3u8
-#EXTINF:-1 tvg-id="ToyDuman.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Той Думан (576p) [Offline]
+#EXTINF:-1 tvg-id="TNT4.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a00000160931f198cccad25e259a608ae77/160x120" group-title="",ТНТ4 (576p) [Not 24/7]
+https://sc.id-tv.kz/tnt4.m3u8
+#EXTINF:-1 tvg-id="ToyDuman.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Той Думан (576p) [Not 24/7]
 https://sc.id-tv.kz/ToiDuman.m3u8
 #EXTINF:-1 tvg-id="Tolyatti24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://ladamedia.ru/site/upload/lBPQBGJZ1hc.jpg" group-title="Local",Тольятти 24 (720p)
 http://91.234.108.26/hls-live/livepkgr/_definst_/liveevent1/vazlivestream1.m3u8
@@ -766,18 +766,18 @@ https://hls.tv.3angels.ru/stream/HQ.m3u8
 http://195.20.196.69:1935/tugantel/tugantel1/playlist.m3u8
 #EXTINF:-1 tvg-id="TuganTel.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/6rbVqcY.png" group-title="",Туган Тел (576p) [Offline]
 http://streamer.rtcommufa.ru:1935/tugantel/tugantel1/playlist.m3u8
-#EXTINF:-1 tvg-id="TuranTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Туран ТВ (576p) [Offline]
+#EXTINF:-1 tvg-id="TuranTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Туран ТВ (576p) [Not 24/7]
 https://sc.id-tv.kz/TuranTV.m3u8
 #EXTINF:-1 tvg-id="Udmurtiya.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/28884/2a0000015674c3cfa3ba882ae1a1a678797a/160x160" group-title="Local",Удмуртия (404p) [Offline]
 https://hls-myudm.cdnvideo.ru/myudm-live/myudm.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="UchalyTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Учалы ТВ (576p) [Not 24/7]
 http://live-uchalytv.cdnvideo.ru/uchalytv/uchalytv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="Futbol.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/g24DSFV.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",Футбол (480p)
+#EXTINF:-1 tvg-id="Futbol.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/g24DSFV.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",Футбол (480p) [Timeout]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s41/index.m3u8
-#EXTINF:-1 tvg-id="Habar.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Хабар (576p) [Offline]
+#EXTINF:-1 tvg-id="Habar.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Хабар (576p) [Not 24/7]
 https://sc.id-tv.kz/Khabar.m3u8
-#EXTINF:-1 tvg-id="Habar24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Хабар 24 (576p) [Offline]
+#EXTINF:-1 tvg-id="Habar24.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Хабар 24 (576p) [Not 24/7]
 https://sc.id-tv.kz/Khabar_24.m3u8
 #EXTINF:-1 tvg-id="HuzurTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://static.tildacdn.com/tild6230-3662-4537-a334-363564306535/Untitled-4.png" group-title="",Хузур ТВ (720p) [Not 24/7]
 https://hls-mycdn08724960135.cdnvideo.ru/mycdn08724960135/stream1/playlist.m3u8
@@ -797,7 +797,7 @@ http://uiptv.do.am/1ufc/602079679/playlist.m3u8
 https://hls-shansontv.cdnvideo.ru/shansontv/smil:shansontv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ShansonTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/NBWyJJQ.png" group-title="Music",Шансон ТВ (512p) [Geo-blocked]
 http://hls.shansontv.cdnvideo.ru/shansontv/shansontv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="Shokiruyushchee.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Шокирующее (540p)
+#EXTINF:-1 tvg-id="Shokiruyushchee.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Шокирующее (540p) [Timeout]
 http://185.97.150.19:8082/2401
 #EXTINF:-1 tvg-id="ShchyolkovskoeTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="http://tv41.ru/images/00.png" group-title="Local",Щёлковское ТВ (576p) [Not 24/7]
 http://stream0.tv41.ru/live.m3u8
diff --git a/channels/ru_okkotv.m3u b/channels/ru_okkotv.m3u
index 4c21fbe39e..42c66a9e6d 100644
--- a/channels/ru_okkotv.m3u
+++ b/channels/ru_okkotv.m3u
@@ -1,12 +1,12 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="5kanal.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/tWULJqX.png" group-title="General",5 канал (480p)
-https://okkotv-live.cdnvideo.ru/channel/5_OTT.m3u8
 #EXTINF:-1 tvg-id="BlackRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/rzrOS3N.png" group-title="Entertainment",.black Russia (480p)
 https://okkotv-live.cdnvideo.ru/channel/Sony_Turbo.m3u8
 #EXTINF:-1 tvg-id="RedRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/xUGWmyh.png" group-title="Entertainment",.red Russia (480p)
 https://okkotv-live.cdnvideo.ru/channel/Sony_ET.m3u8
 #EXTINF:-1 tvg-id="SciFiRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/5ezLSwB.png" group-title="Science",.sci-fi Russia (480p)
 https://okkotv-live.cdnvideo.ru/channel/Sony_SciFi.m3u8
+#EXTINF:-1 tvg-id="5kanal.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/tWULJqX.png" group-title="General",5 канал (480p)
+https://okkotv-live.cdnvideo.ru/channel/5_OTT.m3u8
 #EXTINF:-1 tvg-id="A1.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/lXlwfyw.png" group-title="Series",A1 (1080p)
 https://okkotv-live.cdnvideo.ru/channel/A1_HD.m3u8
 #EXTINF:-1 tvg-id="A2.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/GwQgT6X.png" group-title="Series",A2 (1080p)
@@ -21,7 +21,7 @@ https://okkotv-live.cdnvideo.ru/channel/Fox_Life_HD.m3u8
 https://okkotv-live.cdnvideo.ru/channel/Fox_HD.m3u8
 #EXTINF:-1 tvg-id="NationalGeographicRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://static.epg.best/id/NatGeo.id.png" group-title="Documentary",National Geographic (1080p)
 https://okkotv-live.cdnvideo.ru/channel/NGC_HD.m3u8
-#EXTINF:-1 tvg-id="NationalGeographicWildRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://static.epg.best/id/NatGeoWild.id.png" group-title="Outdoors",National Geographic Wild Russia (1080p)
+#EXTINF:-1 tvg-id="NationalGeographicWildRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://static.epg.best/id/NatGeoWild.id.png" group-title="",National Geographic Wild Russia (1080p)
 https://okkotv-live.cdnvideo.ru/channel/NGC_Wild_HD.m3u8
 #EXTINF:-1 tvg-id="TV1000ActionRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/dzOFwC0.png" group-title="Movies",TV1000 Action Russia (1080p)
 https://okkotv-live.cdnvideo.ru/channel/TV1000_Action_HD.m3u8
@@ -29,11 +29,11 @@ https://okkotv-live.cdnvideo.ru/channel/TV1000_Action_HD.m3u8
 https://okkotv-live.cdnvideo.ru/channel/TV1000_HD.m3u8
 #EXTINF:-1 tvg-id="TV1000RusskoeKino.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/iCUmr4k.png" group-title="Movies",TV1000 Русское кино (1080p)
 https://okkotv-live.cdnvideo.ru/channel/TV1000_Rus_Kino_HD.m3u8
-#EXTINF:-1 tvg-id="ViasatExploreRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/CnKhbJ3.png" group-title="Outdoors",Viasat Explore Russia (1080p)
+#EXTINF:-1 tvg-id="ViasatExploreRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/CnKhbJ3.png" group-title="",Viasat Explore Russia (1080p)
 https://okkotv-live.cdnvideo.ru/channel/Viasat_Explore_HD.m3u8
 #EXTINF:-1 tvg-id="ViasatHistoryRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/YU2vfQX.png" group-title="Documentary",Viasat History Russia (1080p)
 https://okkotv-live.cdnvideo.ru/channel/Viasat_History_ad_HD.m3u8
-#EXTINF:-1 tvg-id="ViasatNatureRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/YkvX94D.png" group-title="Outdoors",Viasat Nature Russia (1080p)
+#EXTINF:-1 tvg-id="ViasatNatureRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/YkvX94D.png" group-title="",Viasat Nature Russia (1080p)
 https://okkotv-live.cdnvideo.ru/channel/Viasat_Nature_ad_HD.m3u8
 #EXTINF:-1 tvg-id="ViPComedyRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/kHTdkiW.png" group-title="Comedy",ViP Comedy Russia (1080p)
 https://okkotv-live.cdnvideo.ru/channel/VIP_Comedy_HD.m3u8
@@ -61,7 +61,7 @@ https://okkotv-live.cdnvideo.ru/channel/MuzTV.m3u8
 https://okkotv-live.cdnvideo.ru/channel/Multilandia_HD.m3u8
 #EXTINF:-1 tvg-id="Pervyykanal.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/iW5vhkb.png" group-title="General",Первый канал (1080p)
 https://okkotv-live.cdnvideo.ru/channel/Pervii_Kanal_OTT_HD.m3u8
-#EXTINF:-1 tvg-id="RENTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a0000016e89588796d4590c9dd4dda32ffc/170x100" group-title="General",РЕН ТВ
+#EXTINF:-1 tvg-id="RENTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://avatars.mds.yandex.net/get-tv-channel-logos/30303/2a0000016e89588796d4590c9dd4dda32ffc/170x100" group-title="General",РЕН ТВ (1080p)
 https://okkotv-live.cdnvideo.ru/channel/Rentv_HD_OTT.m3u8
 #EXTINF:-1 tvg-id="Rossiya1HD.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/BNd83AQ.png" group-title="General",Россия 1 HD (1080p)
 https://okkotv-live.cdnvideo.ru/channel/Russia1HD.m3u8
diff --git a/channels/rw.m3u b/channels/rw.m3u
index 31146e8d45..813a3dfbbf 100644
--- a/channels/rw.m3u
+++ b/channels/rw.m3u
@@ -1,13 +1,13 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="KC2.rw" tvg-country="RW" tvg-language="Kinyarwanda" tvg-logo="https://i.imgur.com/13N8UX5.jpg" group-title="",KC2 (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="KC2.rw" tvg-country="RW" tvg-language="Kinyarwanda" tvg-logo="https://i.imgur.com/13N8UX5.jpg" group-title="",KC2 (720p) [Not 24/7]
 http://197.243.19.131:1935/kc2/kc2/chunklist.m3u8
 #EXTINF:-1 tvg-id="KC2.rw" tvg-country="RW" tvg-language="Kinyarwanda" tvg-logo="https://i.imgur.com/13N8UX5.jpg" group-title="",KC2 (576p) [Not 24/7]
 https://5c46fa289c89f.streamlock.net/kc2/kc2/chunklist.m3u8
 #EXTINF:-1 tvg-id="RTVRwanda.rw" tvg-country="RW" tvg-language="Kinyarwanda" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda (576p) [Not 24/7]
 https://1600706787.rsc.cdn77.org/1600706787/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="RTVRwanda.rw" tvg-country="RW" tvg-language="Kinyarwanda" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda (480p) [Not 24/7]
+http://197.243.19.131:1935/rtv/rtv/chunklist_w2093872577.m3u8
+#EXTINF:-1 tvg-id="RTVRwanda.rw" tvg-country="RW" tvg-language="Kinyarwanda" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda (480p) [Not 24/7]
 http://197.243.19.131:1935/rtv/rtv/chunklist.m3u8
 #EXTINF:-1 tvg-id="RTVRwanda.rw" tvg-country="RW" tvg-language="Kinyarwanda" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda (480p) [Not 24/7]
-http://197.243.19.131:1935/rtv/rtv/chunklist_w2093872577.m3u8
-#EXTINF:-1 tvg-id="RTVRwanda.rw" tvg-country="RW" tvg-language="Kinyarwanda" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda (576p) [Offline]
 https://5c46fa289c89f.streamlock.net/rtv/rtv/playlist.m3u8
diff --git a/channels/sa.m3u b/channels/sa.m3u
index 1bf6da7bb1..7b9a672ff2 100644
--- a/channels/sa.m3u
+++ b/channels/sa.m3u
@@ -5,7 +5,7 @@ https://5b18be6964c2f.streamlock.net/m/ngrp:ahul_all/playlist.m3u8
 https://iptv--iptv.repl.co/Arabic/Ekhbariyah
 #EXTINF:-1 tvg-id="ALHOKAIRGroupTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="http://jascotvstreaming.com/uploads/topics/15819734874770.jpg" group-title="General",AL HOKAIR Group TV (576p)
 http://82.212.74.3:8000/live/7513.m3u8
-#EXTINF:-1 tvg-id="AlKhalij.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="http://www.al-khalij.tv/wp-content/uploads/2015/03/logo-1.png" group-title="General",Al Khalij (1080p)
+#EXTINF:-1 tvg-id="AlKhalij.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="http://www.al-khalij.tv/wp-content/uploads/2015/03/logo-1.png" group-title="General",Al Khalij (720p)
 https://mn-nl.mncdn.com/khalij/khalij/playlist.m3u8
 #EXTINF:-1 tvg-id="AlQuranAlKareemTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/zmVCXIK.png" group-title="Religious",Al Quran Al Kareem TV (Mecca) (360p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/saudi_quran/hls1/saudi_quran.m3u8
@@ -17,12 +17,12 @@ http://m.live.net.sa:1935/live/quran/playlist.m3u8
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/saudi_tv/hls1/saudi_tv.m3u8
 #EXTINF:-1 tvg-id="AlSaudiya.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/MOiapKB.png" group-title="General",Al Saudiya (1080p) [Not 24/7]
 https://iptv--iptv.repl.co/Arabic/Saudi1_TV
-#EXTINF:-1 tvg-id="AlSunnahAlNabawiyahTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Mask-Group-55@2x.png" group-title="Religious",Al Sunnah Al Nabawiyah TV (Medina) (360p)
-https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/saudi_sunnah/hls1/saudi_sunnah.m3u8
 #EXTINF:-1 tvg-id="AlSunnahAlNabawiyahTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/84nqj99.png" group-title="Religious",Al Sunnah Al Nabawiyah TV (Medina) (1080p) [Not 24/7]
 https://iptv--iptv.repl.co/Arabic/Sunnah_TV
 #EXTINF:-1 tvg-id="AlSunnahAlNabawiyahTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Mask-Group-55@2x.png" group-title="Religious",Al Sunnah Al Nabawiyah TV (Medina) (720p) [Not 24/7]
 http://m.live.net.sa:1935/live/sunnah/playlist.m3u8
+#EXTINF:-1 tvg-id="AlSunnahAlNabawiyahTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Mask-Group-55@2x.png" group-title="Religious",Al Sunnah Al Nabawiyah TV (Medina) (360p) [Timeout]
+https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/saudi_sunnah/hls1/saudi_sunnah.m3u8
 #EXTINF:-1 tvg-id="AlResalah.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://rotana.net/assets/themes/TriTheme-new/images/channels/resala.png" group-title="Religious",Al-Resalah (1080p) [Geo-blocked]
 https://hiplayer.hibridcdn.net/t/rotana-risala.m3u8
 #EXTINF:-1 tvg-id="AlResalah.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://rotana.net/assets/themes/TriTheme-new/images/channels/resala.png" group-title="Religious",Al-Resalah (1080p) [Geo-blocked]
@@ -37,9 +37,9 @@ https://bcsecurelivehls-i.akamaihd.net/hls/live/1021447/6203311941001/index.m3u8
 https://bcliveunivsecure-lh.akamaihd.net/i/VERTICAL_1@301860/master.m3u8
 #EXTINF:-1 tvg-id="AtfalWaMawaheb.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://atfal1.com/wp-content/uploads/2018/02/logo.png" group-title="Kids",Atfal Wa Mawaheb (1080p)
 https://5d658d7e9f562.streamlock.net/atfal1.com/atfal2/playlist.m3u8
-#EXTINF:-1 tvg-id="Beity.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/7aD1yan.jpg" group-title="Outdoor",Beity [Offline]
+#EXTINF:-1 tvg-id="Beity.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/7aD1yan.jpg" group-title="Outdoor",Beity [Timeout]
 http://82.212.74.2:8000/live/7312.m3u8
-#EXTINF:-1 tvg-id="ENTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="http://jascotvstreaming.com/uploads/topics/15817550307058.png" group-title="General",EN TV [Offline]
+#EXTINF:-1 tvg-id="ENTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="http://jascotvstreaming.com/uploads/topics/15817550307058.png" group-title="General",EN TV [Timeout]
 http://82.212.74.100:8000/live/8130.m3u8
 #EXTINF:-1 tvg-id="Iqraa.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/3bug9dU.png" group-title="Religious",Iqraa (576p) [Not 24/7]
 https://iqraac.cdn.mangomolo.com/iqraa/smil:iqraar1.stream.smil/playlist.m3u8
@@ -91,12 +91,12 @@ https://shls-rotanamusic-prod-dub.shahid.net/out/v1/edfe0095261648908a3a931b7248
 https://shls-rotanaplus-prod-dub.shahid.net/out/v1/1fc6103458be480b96e6a574b00fe1c0/index.m3u8
 #EXTINF:-1 tvg-id="SBC.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/yazkC4P.png" group-title="General",SBC (1080p) [Not 24/7]
 https://iptv--iptv.repl.co/Arabic/SBC
-#EXTINF:-1 tvg-id="SSC1HD.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i5.satexpat.com/cha/sa/ssc-95x31.gif" group-title="Sports",SSC1 HD (1080p)
-https://ssc-5-ak.akamaized.net/out/v1/6ae0a2ebab224c72ab9c298afeec8d91/index.m3u8
-#EXTINF:-1 tvg-id="SSCActionWaleed.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="" group-title="Sports",SSC Action Waleed [Not 24/7]
+#EXTINF:-1 tvg-id="SSCActionWaleed.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="" group-title="Sports",SSC Action Waleed (1080p) [Not 24/7]
 https://shls-live-event2-prod-dub.shahid.net/out/v1/0456ede1a39145d98b3d8c8062ddc998/index.m3u8
 #EXTINF:-1 tvg-id="SSCActionWaleedExtra.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="" group-title="Sports",SSC Action Waleed Extra (1080p) [Not 24/7]
 https://d2x08mwxhmpplo.cloudfront.net/out/v1/587631773e55495a8aa3dd4050318f6e/index.m3u8
+#EXTINF:-1 tvg-id="SSC1HD.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i5.satexpat.com/cha/sa/ssc-95x31.gif" group-title="Sports",SSC1 HD (1080p)
+https://ssc-5-ak.akamaized.net/out/v1/6ae0a2ebab224c72ab9c298afeec8d91/index.m3u8
 #EXTINF:-1 tvg-id="ThikrayatTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/fAkScnI.png" group-title="Classic",Thikrayat TV (1080p) [Not 24/7]
 https://iptv--iptv.repl.co/Arabic/Zikrayat
 #EXTINF:-1 tvg-id="WesalTV.sa" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/SfG32dL.png" group-title="Religious",Wesal TV [Not 24/7]
diff --git a/channels/sd.m3u b/channels/sd.m3u
index 156f9c2419..fb26505993 100644
--- a/channels/sd.m3u
+++ b/channels/sd.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AlAlamiya2.sd" tvg-country="SD" tvg-language="Arabic" tvg-logo="http://jascotvstreaming.com/uploads/topics/15592492499912.jpg" group-title="",Al Alamiya 2 [Offline]
+#EXTINF:-1 tvg-id="AlAlamiya2.sd" tvg-country="SD" tvg-language="Arabic" tvg-logo="http://jascotvstreaming.com/uploads/topics/15592492499912.jpg" group-title="",Al Alamiya 2 [Timeout]
 http://82.212.74.98:8000/live/7815.m3u8
-#EXTINF:-1 tvg-id="SudanBukra.sd" tvg-country="SD" tvg-language="Arabic" tvg-logo="https://i.imgur.com/tkBFpJu.jpg" group-title="",Sudan Bukra (720p)
+#EXTINF:-1 tvg-id="SudanBukra.sd" tvg-country="SD" tvg-language="Arabic" tvg-logo="https://i.imgur.com/tkBFpJu.jpg" group-title="",Sudan Bukra (720p) [Offline]
 http://live.ditve.tv:1935/sudanbukra/sudanbukra.stream_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="SudanTV.sd" tvg-country="SD" tvg-language="Arabic" tvg-logo="" group-title="",Sudan TV (360p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/sudan_tv/hls1/sudan_tv.m3u8
diff --git a/channels/se.m3u b/channels/se.m3u
index f9f650b622..bfd0df4b5e 100644
--- a/channels/se.m3u
+++ b/channels/se.m3u
@@ -1,10 +1,10 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AftonbladetTV.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/LsAz0UW.jpg" group-title="",Aftonbladet TV (720p)
+#EXTINF:-1 tvg-id="AftonbladetTV.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/LsAz0UW.jpg" group-title="",Aftonbladet TV (144p)
 https://aftonbladetlive-lh.akamaihd.net/i/livestream01_1@182509/master.m3u8
-#EXTINF:-1 tvg-id="ATG.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/8ZFQ93Z.png" group-title="Sports",ATG (432p)
-https://httpcache0-00688-cacheliveedge0.dna.qbrick.com/00688-cacheliveedge0/out/u/atg_sdi_1_free.m3u8
 #EXTINF:-1 tvg-id="ATG.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/5CdW62M.png" group-title="Sports",ATG (432p)
 https://httpcache0-00688-cacheliveedge0.dna.qbrick.com/00688-cacheliveedge0/out/u/atg_sdi_1_free_3.m3u8
+#EXTINF:-1 tvg-id="ATG.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/8ZFQ93Z.png" group-title="Sports",ATG (432p)
+https://httpcache0-00688-cacheliveedge0.dna.qbrick.com/00688-cacheliveedge0/out/u/atg_sdi_1_free.m3u8
 #EXTINF:-1 tvg-id="AzerbaijanNewsTV.se" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://www.aznews.tv/wp-content/uploads/2019/04/headerlogo.fw_.png" group-title="News",Azerbaijan News TV (720p) [Not 24/7]
 https://edge1.socialsmart.tv/aznews/smil/playlist.m3u8
 #EXTINF:-1 tvg-id="DiTV.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/zApTDWn.png" group-title="News",Di TV (720p)
@@ -31,13 +31,13 @@ http://51.91.73.99:25461/sweden/PM66f7Y43H/12476
 https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791716.m3u8
 #EXTINF:-1 tvg-id="TV4.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/mvwiSqt.png" group-title="",TV4 (576p)
 https://lbs-aws-hls.tv4play.se/dailive/bbr-event1-p/master3404.m3u8
-#EXTINF:-1 tvg-id="TV4Nyheterna.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/psAAPIE.jpg" group-title="",TV4Nyheterna (720p)
-https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791350.m3u8
 #EXTINF:-1 tvg-id="TV4SvenskPolitik.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="" group-title="",TV4 Svensk Politik (720p)
 https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791553.m3u8
+#EXTINF:-1 tvg-id="TV4Nyheterna.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/psAAPIE.jpg" group-title="",TV4Nyheterna (720p)
+https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791350.m3u8
 #EXTINF:-1 tvg-id="VastmanlandsTV.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/Mol9GKz.jpg" group-title="",Västmanlands TV (720p)
 https://edg01-prd-se-dcs.solidtango.com/edge/_lo9yf4l5_/lo9yf4l5/playlist.m3u8
 #EXTINF:-1 tvg-id="VastmanlandsTV.se" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/Mol9GKz.jpg" group-title="",Västmanlands TV (720p) [Offline]
 http://83.140.64.214/edge/_lo9yf4l5_/lo9yf4l5/playlist.m3u8
-#EXTINF:-1 tvg-id="ViPComedyRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/kHTdkiW.png" group-title="Comedy",ViP Comedy Russia (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ViPComedyRussia.se" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/kHTdkiW.png" group-title="Comedy",ViP Comedy Russia (720p) [Not 24/7]
 http://188.40.68.167/russia/vip_comedy/playlist.m3u8
diff --git a/channels/si.m3u b/channels/si.m3u
index 5cd7b66e1c..48a0eee2d7 100644
--- a/channels/si.m3u
+++ b/channels/si.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="GTV.si" tvg-country="SI" tvg-language="Slovenian" tvg-logo="" group-title="",GTV (360p) [Not 24/7]
 http://91.220.221.60/gtv_hls/gtv_03.m3u8
-#EXTINF:-1 tvg-id="MMC.si" tvg-country="SI" tvg-language="Slovenian" tvg-logo="https://i.imgur.com/ogq22B7.png" group-title="",MMC (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MMC.si" tvg-country="SI" tvg-language="Slovenian" tvg-logo="https://i.imgur.com/ogq22B7.png" group-title="",MMC (360p) [Not 24/7]
 https://29-rtvslo-tv-mmc-int.cdn.eurovisioncdn.net/playlist.m3u8
 #EXTINF:-1 tvg-id="TVKOPER.si" tvg-country="SI" tvg-language="Italian" tvg-logo="https://i.imgur.com/XzkurJ3.png" group-title="",TV Koper-Capodistria (720p)
 https://27-rtvslo-tv-kp-int.cdn.eurovisioncdn.net/playlist.m3u8
-#EXTINF:-1 tvg-id="TVMARIBOR.si" tvg-country="SI" tvg-language="Slovenian" tvg-logo="https://i.imgur.com/jnEPJoV.png" group-title="",TV MARIBOR (720p)
+#EXTINF:-1 tvg-id="TVMARIBOR.si" tvg-country="SI" tvg-language="Slovenian" tvg-logo="https://i.imgur.com/jnEPJoV.png" group-title="",TV MARIBOR (360p)
 https://25-rtvslo-tv-mb-int.cdn.eurovisioncdn.net/playlist.m3u8
 #EXTINF:-1 tvg-id="TVSLOVENIJA1.si" tvg-country="SI" tvg-language="Slovenian" tvg-logo="https://i.imgur.com/3t60yS0.png" group-title="",TV SLOVENIJA 1 (1080p)
 https://31-rtvslo-tv-slo1-int.cdn.eurovisioncdn.net/playlist.m3u8
diff --git a/channels/sk.m3u b/channels/sk.m3u
index 917dc84e2f..d58e8ea0d6 100644
--- a/channels/sk.m3u
+++ b/channels/sk.m3u
@@ -15,7 +15,7 @@ https://nn.geo.joj.sk/hls/family-540.m3u8
 https://nn.geo.joj.sk/live/hls/family-540.m3u8
 #EXTINF:-1 tvg-id="JOJFamily.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="Family",JOJ Family (360p) [Not 24/7]
 https://nn.geo.joj.sk/hls/family-360.m3u8
-#EXTINF:-1 tvg-id="Kosicednes.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/ypZ4H5m.jpg" group-title="",Košice:dnes (450p)
+#EXTINF:-1 tvg-id="Kosicednes.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/ypZ4H5m.jpg" group-title="",Košice:dnes (450p) [Offline]
 http://lb.streaming.sk/tvnasa/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Lifetv.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/Rvy8Wdu.png" group-title="",Life.tv (720p) [Offline]
 http://86.110.233.68:1935/lifetv/lifetv.stream_360p/playlist.m3u8
@@ -49,17 +49,17 @@ http://ntv-st01-vod01-bts10-stage.orange.sk:8000/dna-5106-tv-pc/hls/4001v102.m3u
 http://s1.media-planet.sk/live/novezamky/BratuMarian.m3u8
 #EXTINF:-1 tvg-id="TVNoveZamky.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/k4IK5OS.png" group-title="",TV Nové Zámky (486p)
 http://s1.media-planet.sk/live/novezamky/lihattv.m3u8
-#EXTINF:-1 tvg-id="TVNoveZamky.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/k4IK5OS.png" group-title="",TV Nové Zámky (486p)
+#EXTINF:-1 tvg-id="TVNoveZamky.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/k4IK5OS.png" group-title="",TV Nové Zámky (486p) [Offline]
 rtmp://s1.media-planet.sk:80/live/novezamky
-#EXTINF:-1 tvg-id="TVPoprad.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="" group-title="",TV Poprad (1080p) [Offline]
+#EXTINF:-1 tvg-id="TVPoprad.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="" group-title="",TV Poprad (1080p) [Not 24/7]
 http://213.81.153.221:8080/poprad
 #EXTINF:-1 tvg-id="TVPovazie.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/3cEG19H.jpg" group-title="",TV Povazie (400p)
 http://213.181.128.248:8090/tvpovazie-h264.flv
-#EXTINF:-1 tvg-id="TVReduta.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/gBMtpOS.png" group-title="",TV Reduta (486p)
+#EXTINF:-1 tvg-id="TVReduta.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/gBMtpOS.png" group-title="",TV Reduta (486p) [Offline]
 rtmp://s1.media-planet.sk:80/live/reduta
 #EXTINF:-1 tvg-id="TVRuzinov.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/wmkg1FG.png" group-title="",TV Ružinov (1080p)
 http://lb.streaming.sk/tvruzinov/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TVSeverka.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/vtI89AA.png" group-title="",TV Severka (576p)
+#EXTINF:-1 tvg-id="TVSeverka.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/vtI89AA.png" group-title="",TV Severka (576p) [Timeout]
 http://88.212.7.11/live/test_severka_web_player/playlist.m3u8
 #EXTINF:-1 tvg-id="TVTurzovka.sk" tvg-country="SK" tvg-language="Slovak" tvg-logo="https://i.imgur.com/WsDAqKc.png" group-title="",TV Turzovka (486p) [Not 24/7]
 rtmp://s1.media-planet.sk:80/live/turzovka
diff --git a/channels/sv.m3u b/channels/sv.m3u
index 3329ebae02..dbde793ab2 100644
--- a/channels/sv.m3u
+++ b/channels/sv.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AgapeTVCanal8.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="" group-title="",Agape TV 8 (480p)
+#EXTINF:-1 tvg-id="AgapeTVCanal8.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="" group-title="",Agape TV 8 (480p) [Timeout]
 https://can1.krakeniptv.com:25463/live/agape/CPLdE2EadX/1764.m3u8
-#EXTINF:-1 tvg-id="Canal10.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://i.imgur.com/Iy5jUjV.png" group-title="",Canal 10 (1080p)
+#EXTINF:-1 tvg-id="Canal10.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://i.imgur.com/Iy5jUjV.png" group-title="",Canal 10 (720p)
 http://streamingcws20.com:1935/tves/tves.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal33.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://canal33.tv/home/wp-content/uploads/2019/08/200.png" group-title="",Canal 33 (1080p)
+#EXTINF:-1 tvg-id="Canal33.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://canal33.tv/home/wp-content/uploads/2019/08/200.png" group-title="",Canal 33 (1080p) [Not 24/7]
 https://5ca9af4645e15.streamlock.net/canal33/smil:canal33.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal33.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://canal33.tv/home/wp-content/uploads/2019/08/200.png" group-title="",Canal 33 (1080p)
+#EXTINF:-1 tvg-id="Canal33.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://canal33.tv/home/wp-content/uploads/2019/08/200.png" group-title="",Canal 33 (1080p) [Not 24/7]
 https://5ca9af4645e15.streamlock.net/canal33/videocanal33/playlist.m3u8
 #EXTINF:-1 tvg-id="ElimTV.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://i.imgur.com/AonXAXu.png" group-title="",Elim TV (480p) [Offline]
 http://live-15.viewer.dacast.com/i/dclive_1@397642/master.m3u8
@@ -13,11 +13,11 @@ http://live-15.viewer.dacast.com/i/dclive_1@397642/master.m3u8
 https://5dcabf026b188.streamlock.net/orbitatv/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="TCS.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/3/34/Logotipo-tcs-sv.png" group-title="",TCS (720p)
 https://secure-video.tcsgo.com/tcshd/index.m3u8
-#EXTINF:-1 tvg-id="Tele1.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://www.tele1.sv/wp-content/uploads/2019/06/TELE1_FINAL_BLUE-1-149x84.png" group-title="",Tele1 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Tele1.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://www.tele1.sv/wp-content/uploads/2019/06/TELE1_FINAL_BLUE-1-149x84.png" group-title="",Tele1 (720p) [Not 24/7]
 http://streamingcws40.com:1935/canaluno/videocanaluno/playlist.m3u8
 #EXTINF:-1 tvg-id="Tele1.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://www.tele1.sv/wp-content/uploads/2019/06/TELE1_FINAL_BLUE-1-149x84.png" group-title="",Tele1 (720p) [Not 24/7]
 https://5ca9af4645e15.streamlock.net/canaluno/smil:canaluno.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TribunaTV.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://hostlagarto.com/streaming/wp-content/uploads/2019/05/TRIBUNA-TV-253x194.jpg" group-title="",TribunaTV (614p) [Not 24/7]
+#EXTINF:-1 tvg-id="TribunaTV.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://hostlagarto.com/streaming/wp-content/uploads/2019/05/TRIBUNA-TV-253x194.jpg" group-title="",TribunaTV (720p) [Not 24/7]
 https://cm.hostlagarto.com:4445/TRIBUNA-TV/tribuna.myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMElSalvador.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="https://tvm.com.sv/wp-content/uploads/2020/02/TVM2.png" user-agent="Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36" group-title="News",TVM El Salvador (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36
diff --git a/channels/sy.m3u b/channels/sy.m3u
index 5168b262d2..a0f77a4147 100644
--- a/channels/sy.m3u
+++ b/channels/sy.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="alltv.sy" tvg-country="SY" tvg-language="Arabic" tvg-logo="" group-title="Music",alltv (400p)
+#EXTINF:-1 tvg-id="alltv.sy" tvg-country="SY" tvg-language="Arabic" tvg-logo="" group-title="Music",alltv (400p) [Timeout]
 http://185.96.70.242:1935/live/alltv/playlist.m3u8
 #EXTINF:-1 tvg-id="ANN.sy" tvg-country="SY" tvg-language="Arabic" tvg-logo="http://www.freeetv.com/images/01_logo/arab_news_network.jpg" group-title="News",ANN [Not 24/7]
 http://ns8.indexforce.com:1935/ann/ann/playlist.m3u8
diff --git a/channels/th.m3u b/channels/th.m3u
index 15dd03dd59..79b5736245 100644
--- a/channels/th.m3u
+++ b/channels/th.m3u
@@ -1,93 +1,93 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="ALTV.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.altv.tv/_nuxt/img/84f4d59.png" group-title="",ALTV (1080p)
 https://thaipbs-ujxrch.cdn.byteark.com/live/playlist_1080p/index.m3u8
-#EXTINF:-1 tvg-id="ASTVNews1.th" tvg-country="TH" tvg-language="Thai" tvg-logo="" group-title="Local",ASTV News 1 (1080p)
+#EXTINF:-1 tvg-id="ASTVNews1.th" tvg-country="TH" tvg-language="Thai" tvg-logo="" group-title="Local",ASTV News 1 (180p)
 http://news1.live14.com/stream/news1.m3u8
-#EXTINF:-1 tvg-id="Channel5.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.tv5.co.th/tv5hd1-web/img/tv5hd1_logo_light.png" group-title="",Channel 5 (240p)
+#EXTINF:-1 tvg-id="Channel5.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.tv5.co.th/tv5hd1-web/img/tv5hd1_logo_light.png" group-title="",Channel 5 (480p)
 https://tc-live1.sanook.com/live/22302_ch5.m3u8
 #EXTINF:-1 tvg-id="Channel7.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://upload.wikimedia.org/wikipedia/en/f/f3/BBTV_Channel_7.png" group-title="",Channel 7 (240p)
 https://bcovlive-a.akamaihd.net/2d37038b355f4ea6a6b0d46993dc285c/ap-southeast-1/5282994675001/profile_0/chunklist.m3u8
 #EXTINF:-1 tvg-id="Channel8.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://i.imgur.com/hzdMjA1.jpg" group-title="",Channel 8 (720p) [Not 24/7]
 http://usa.login.in.th:1935/ch8/ch8/playlist.m3u8
-#EXTINF:-1 tvg-id="DLTV1.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-01.png" group-title="",DLTV 1 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv01_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV2.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-02.png" group-title="",DLTV 2 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv02_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV3.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-03.png" group-title="",DLTV 3 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv03_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV4.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-04.png" group-title="",DLTV 4 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv04_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV5.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-05.png" group-title="",DLTV 5 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv05_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV6.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-06.png" group-title="",DLTV 6 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv06_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV7.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-07.png" group-title="",DLTV 7 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv07_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV8.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-08.png" group-title="",DLTV 8 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv08_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV9.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-09.png" group-title="",DLTV 9 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv09_720p/index.m3u8
-#EXTINF:-1 tvg-id="DLTV10.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-10.png" group-title="",DLTV 10 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv10_720p/index.m3u8
+#EXTINF:-1 tvg-id="DLTV1.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-01.png" group-title="",DLTV 1 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv01.m3u8
+#EXTINF:-1 tvg-id="DLTV2.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-02.png" group-title="",DLTV 2 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv02.m3u8
+#EXTINF:-1 tvg-id="DLTV3.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-03.png" group-title="",DLTV 3 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv03.m3u8
+#EXTINF:-1 tvg-id="DLTV4.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-04.png" group-title="",DLTV 4 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv04.m3u8
+#EXTINF:-1 tvg-id="DLTV5.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-05.png" group-title="",DLTV 5 (480p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv05.m3u8
+#EXTINF:-1 tvg-id="DLTV6.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-06.png" group-title="",DLTV 6 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv06.m3u8
+#EXTINF:-1 tvg-id="DLTV7.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-07.png" group-title="",DLTV 7 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv07.m3u8
+#EXTINF:-1 tvg-id="DLTV8.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-08.png" group-title="",DLTV 8 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv08.m3u8
+#EXTINF:-1 tvg-id="DLTV9.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-09.png" group-title="",DLTV 9 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv09.m3u8
+#EXTINF:-1 tvg-id="DLTV10.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-10.png" group-title="",DLTV 10 (1080p) [Not 24/7]
+https://dltv-live-edge.catcdn.cloud/dltv10.m3u8
 #EXTINF:-1 tvg-id="DLTV11.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-11.png" group-title="",DLTV 11 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv11_720p/index.m3u8
+https://dltv-live-edge.catcdn.cloud/dltv11.m3u8
 #EXTINF:-1 tvg-id="DLTV12.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-12.png" group-title="",DLTV 12 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv12_720p/index.m3u8
+https://dltv-live-edge.catcdn.cloud/dltv12.m3u8
 #EXTINF:-1 tvg-id="DLTV13.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-13.png" group-title="",DLTV 13 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv13_720p/index.m3u8
+https://dltv-live-edge.catcdn.cloud/dltv13.m3u8
 #EXTINF:-1 tvg-id="DLTV14.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-14.png" group-title="",DLTV 14 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv14_720p/index.m3u8
+https://dltv-live-edge.catcdn.cloud/dltv14.m3u8
 #EXTINF:-1 tvg-id="DLTV15.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.dltv.ac.th/themes/default/assets/images/DLTV/logo-channel-15.png" group-title="",DLTV 15 (720p) [Not 24/7]
-https://dltv-live-edge.catcdn.cloud/dltv15_720p/index.m3u8
-#EXTINF:-1 tvg-id="GolfChannelThailand.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-golf.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",Golf Channel Thailand (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_golfhd_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="Mono29.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d5/Mono_29_Logo.png" group-title="",Mono 29 (480p)
-https://59ffdfa4495c3.streamlock.net/MONO29_HLS_1080P/mono29hls_1080TH.stream/chunklist.m3u8
+https://dltv-live-edge.catcdn.cloud/dltv15.m3u8
+#EXTINF:-1 tvg-id="GolfChannelThailand.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-golf.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",Golf Channel Thailand (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_golfhd_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="Mono29.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d5/Mono_29_Logo.png" group-title="",Mono 29 (1080p) [Geo-blocked]
+https://edge2-bkk.3bb.co.th:9443/MONO29_HLS_1080P/mono29hls_1080TH.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="NBTBangkok.th" tvg-country="TH" tvg-language="Thai" tvg-logo="" group-title="",NBT Bangkok (1080p) [Not 24/7]
 http://live.prd.go.th:1935/live/ch1_L.sdp/chunklist.m3u8
 #EXTINF:-1 tvg-id="ThaiPBSOpt4.th" tvg-country="TH" tvg-language="Thai" tvg-logo="" group-title="",Thai PBS (Opt-4) (480p)
 https://thaipbs-live.cdn.byteark.com/live/playlist.m3u8
-#EXTINF:-1 tvg-id="ThairathTV32.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://i.imgur.com/0AiJcrC.png" group-title="",Thairath TV 32 (720p)
+#EXTINF:-1 tvg-id="ThairathTV32.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://i.imgur.com/0AiJcrC.png" group-title="",Thairath TV 32 (480p)
 https://live.thairath.co.th/trtv2/playlist.m3u8
-#EXTINF:-1 tvg-id="TPTV.th" tvg-country="TH" tvg-language="Thai" tvg-logo="http://live.parliament.go.th/images/coronationceremony/logo.png" group-title="",TPTV (286p) [Offline]
-http://49.231.66.85:1935/live/tptv/playlist.m3u8
-#EXTINF:-1 tvg-id="TruePremierFootballHD1.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl1.png" user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 1 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_PremierHD1_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TruePremierFootballHD2.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl2.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 2 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_PremierHD2_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TruePremierFootballHD3.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl3.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 3 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_PremierHD3_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TruePremierFootballHD4.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl4.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 4 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_PremierHD4_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TruePremierFootballHD5.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl5.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 5 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_PremierHD5_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TrueSport5.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/c275f890-f972-11e9-a1fc-5dda12c8d080_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Sport 5 (480p Scaled) (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_sport5_480p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TrueSport7.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/e52c8980-f972-11e9-a1fc-5dda12c8d080_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Sport 7 (480p Scaled) (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_sport7_480p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TrueSportHD1.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/feddd690-f972-11e9-91cd-2f79be09d2b3_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Sport HD 1 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_2sporthd1_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TrueSportHD2.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/1e8bbb60-f973-11e9-91cd-2f79be09d2b3_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Sport HD 2 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_2sporthd2_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TrueSportHD3.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/2dc8f250-f973-11e9-86dd-238985cbbd60_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Sport HD 3 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_2sporthd3_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TrueSportHD4.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/3f554960-f973-11e9-91cd-2f79be09d2b3_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Sport HD 4 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_2sporthd4_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="TrueTennisHD.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-tennis.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",True Tennis HD (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_TennisHD_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TPTV.th" tvg-country="TH" tvg-language="Thai" tvg-logo="http://live.parliament.go.th/images/coronationceremony/logo.png" group-title="",TPTV (286p)
+https://cdn-edge.i-iptv.com/live3/91b1-ff25-f5ee-c27f-283a/playlist.m3u8
+#EXTINF:-1 tvg-id="TruePremierFootballHD1.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl1.png" user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 1 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_PremierHD1_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TruePremierFootballHD2.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl2.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 2 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_PremierHD2_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TruePremierFootballHD3.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl3.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 3 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_PremierHD3_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TruePremierFootballHD4.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl4.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 4 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_PremierHD4_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TruePremierFootballHD5.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/doomovie-epl5.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Premier Football HD 5 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_PremierHD5_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TrueSport5.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/c275f890-f972-11e9-a1fc-5dda12c8d080_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Sport 5 (480p Scaled) (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_sport5_480p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TrueSport7.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/e52c8980-f972-11e9-a1fc-5dda12c8d080_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Sport 7 (480p Scaled) (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_sport7_480p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TrueSportHD1.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/feddd690-f972-11e9-91cd-2f79be09d2b3_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Sport HD 1 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_2sporthd1_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TrueSportHD2.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/1e8bbb60-f973-11e9-91cd-2f79be09d2b3_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Sport HD 2 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_2sporthd2_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TrueSportHD3.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/2dc8f250-f973-11e9-86dd-238985cbbd60_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Sport HD 3 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_2sporthd3_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TrueSportHD4.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://cms.dmpcdn.com/livetv/2019/10/28/3f554960-f973-11e9-91cd-2f79be09d2b3_320.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Sport HD 4 (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_2sporthd4_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="TrueTennisHD.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-tennis.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36" group-title="Sports",True Tennis HD (720p) [Not 24/7]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
+https://smart-tv.livedoomovie.com:4431/02_TennisHD_720p/chunklist.m3u8
 #EXTINF:-1 tvg-id="TVMuslim.th" tvg-country="TH" tvg-language="Thai" tvg-logo="" group-title="",TV Muslim (1080p) [Not 24/7]
 http://vip2.liveanywhere.asia:1935/tvmuslim/tvmuslim/playlist.m3u8
 #EXTINF:-1 tvg-id="WhiteChannel.th" tvg-country="TH" tvg-language="Thai" tvg-logo="https://i.imgur.com/lK52fpm.png" group-title="",White Channel (1080p)
diff --git a/channels/tm.m3u b/channels/tm.m3u
index 1acc2cc2c9..69aecea9b2 100644
--- a/channels/tm.m3u
+++ b/channels/tm.m3u
@@ -13,10 +13,10 @@ http://217.174.225.146/legacyhls/ch003_720/index.m3u8
 https://alpha.tv.online.tm/legacyhls/ch003_720/index.m3u8
 #EXTINF:-1 tvg-id="TurkmenOwazy.tm" tvg-country="TM" tvg-language="Turkmen" tvg-logo="https://turkmentv.gov.tm/assets/img/live-imgs/owaz.png" group-title="",Türkmen Owazy (406p) [Not 24/7]
 http://217.174.225.146/legacyhls/ch005_720/index.m3u8
+#EXTINF:-1 tvg-id="TurkmenOwazy.tm" tvg-country="TM" tvg-language="Turkmen" tvg-logo="https://turkmentv.gov.tm/assets/img/live-imgs/owaz.png" group-title="",Türkmen Owazy (406p) [Not 24/7]
+https://alpha.tv.online.tm/legacyhls/ch005_720/index.m3u8
 #EXTINF:-1 tvg-id="TurkmenOwazy.tm" tvg-country="TM" tvg-language="Turkmen" tvg-logo="https://turkmentv.gov.tm/assets/img/live-imgs/owaz.png" group-title="",Türkmen Owazy (226p) [Not 24/7]
 http://217.174.225.146/legacyhls/ch005_400/index.m3u8
-#EXTINF:-1 tvg-id="TurkmenOwazy.tm" tvg-country="TM" tvg-language="Turkmen" tvg-logo="https://turkmentv.gov.tm/assets/img/live-imgs/owaz.png" group-title="",Türkmen Owazy (406p) [Offline]
-https://alpha.tv.online.tm/legacyhls/ch005_720/index.m3u8
 #EXTINF:-1 tvg-id="Turkmenistan.tm" tvg-country="TM" tvg-language="Turkmen" tvg-logo="https://i.imgur.com/zKWfwAw.png" group-title="General",Türkmenistan (406p) [Not 24/7]
 http://217.174.225.146/legacyhls/ch007_720/index.m3u8
 #EXTINF:-1 tvg-id="Turkmenistan.tm" tvg-country="TM" tvg-language="Turkmen" tvg-logo="https://i.imgur.com/zKWfwAw.png" group-title="General",Türkmenistan (406p) [Not 24/7]
diff --git a/channels/tn.m3u b/channels/tn.m3u
index 7c014f98bd..c8ae92726a 100644
--- a/channels/tn.m3u
+++ b/channels/tn.m3u
@@ -19,7 +19,7 @@ https://query-streamlink-us.herokuapp.com/iptv-query?streaming-ip=https://www.da
 http://142.44.214.231:1935/saheltv/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="TunisieImmobilierTV.tn" tvg-country="TN" tvg-language="Arabic" tvg-logo="https://i.imgur.com/cZM2t0P.png" group-title="Travel",Tunisie Immobilier TV (720p) [Not 24/7]
 https://5ac31d8a4c9af.streamlock.net/tunimmob/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="TunisnaTV.tn" tvg-country="TN" tvg-language="Arabic" tvg-logo="https://tunisie360.net/img/tv/min/tunisna-tv.png" group-title="General",Tunisna TV [Offline]
+#EXTINF:-1 tvg-id="TunisnaTV.tn" tvg-country="TN" tvg-language="Arabic" tvg-logo="https://tunisie360.net/img/tv/min/tunisna-tv.png" group-title="General",Tunisna TV [Timeout]
 http://streaming.tunisna.tv:1935/live/tunisna/playlist.m3u8
 #EXTINF:-1 tvg-id="Watania1.tn" tvg-country="TN" tvg-language="Arabic" tvg-logo="https://tunisietv.com/wp-content/uploads/2015/05/El_Wataniya_1_Logo.png" group-title="General",Watania 1 (720p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/WataniaReplay/live
diff --git a/channels/tr.m3u b/channels/tr.m3u
index ce0b92ed81..98918207a7 100644
--- a/channels/tr.m3u
+++ b/channels/tr.m3u
@@ -4,7 +4,7 @@
 https://mn-nl.mncdn.com/kanal24/smil:kanal24.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="24TV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/8FO41es.png" group-title="",24 TV (1080p) [Not 24/7]
 http://163.172.39.215:25461/live/line/C4@!a3a1@!w72A/134.m3u8
-#EXTINF:-1 tvg-id="360TV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",360 TV (720p) [Offline]
+#EXTINF:-1 tvg-id="360TV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",360 TV (720p) [Not 24/7]
 https://turkmedya-live.ercdn.net/tv360/tv360.m3u8
 #EXTINF:-1 tvg-id="AALive.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",AA Live (720p)
 http://mtulqxgomrllive.mediatriple.net/mtulqxgomrllive/broadcast_59f9c0c785b88.smil/playlist.m3u8
@@ -14,7 +14,7 @@ https://5be5d840359c6.streamlock.net/afyonturktv/afyonturktv/playlist.m3u8
 https://akittv-live.ercdn.net/akittv/akittv.m3u8
 #EXTINF:-1 tvg-id="AKSUTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",AKSU TV (720p) [Geo-blocked]
 https://waw2.artiyerelmedya.net/aksutv/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="AlZahraTVTurkic.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/1LGHMzQ/lwkowCS.png" group-title="",Al-Zahra TV Turkic (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlZahraTVTurkic.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/1LGHMzQ/lwkowCS.png" group-title="",Al-Zahra TV Turkic (720p) [Not 24/7]
 https://live.al-zahratv.com/live/playlist.m3u8
 #EXTINF:-1 tvg-id="AlanyaPostaTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Alanya Posta TV (1080p)
 http://win4.yayin.com.tr/postatv/postatv/playlist.m3u8
@@ -42,10 +42,10 @@ https://win2.yayin.com.tr/bodrumbeltv/bodrumbeltv/playlist.m3u8
 https://waw2.artiyerelmedya.net/brtv/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="BursaASTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Bursa AS TV (720p) [Geo-blocked]
 https://waw2.artiyerelmedya.net/astv/bant1/playlist.m3u8
+#EXTINF:-1 tvg-id="BursaTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/9gta3PU.png" group-title="",Bursa TV (1080p) [Not 24/7]
+https://win1.yayin.com.tr/bursatv/bursatv/playlist.m3u8
 #EXTINF:-1 tvg-id="BursaTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/9gta3PU.png" group-title="",Bursa TV (720p) [Not 24/7]
 https://cdn-bursatv.yayin.com.tr/bursatv/bursatv/playlist.m3u8
-#EXTINF:-1 tvg-id="BursaTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/9gta3PU.png" group-title="",Bursa TV (720p) [Not 24/7]
-https://win1.yayin.com.tr/bursatv/bursatv/playlist.m3u8
 #EXTINF:-1 tvg-id="CanTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/qdBr2fH/kgwc6oT.jpg" group-title="",Can TV (720p)
 http://canbroadcast.com:7000/canlican/tv.m3u8
 #EXTINF:-1 tvg-id="CanTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/qdBr2fH/kgwc6oT.jpg" group-title="",Can TV (720p) [Not 24/7]
@@ -85,7 +85,7 @@ https://waw2.artiyerelmedya.net/dimtv/bant1/playlist.m3u8
 https://mn-nl.mncdn.com/blutv_diyanet/smil:diyanet_sd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="DRTTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/uOMuhrI.jpg" group-title="",DRT TV (720p) [Not 24/7]
 https://broadcasttr.com:446/drt/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="EgeTurkTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/DdJWGOk.jpg" group-title="",Ege Türk TV (360p)
+#EXTINF:-1 tvg-id="EgeTurkTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/DdJWGOk.jpg" group-title="",Ege Türk TV (480p)
 https://5be5d840359c6.streamlock.net/egeaturktv/egeaturktv/playlist.m3u8
 #EXTINF:-1 tvg-id="EgeTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Ege TV (720p) [Geo-blocked]
 https://waw2.artiyerelmedya.net/egetv/bant1/playlist.m3u8
@@ -107,7 +107,7 @@ https://ssl4.radyotvonline.com/e90tv/e90tvlive/playlist.m3u8
 https://dcunilive258-lh.akamaihd.net/i/dclive_1@126972/master.m3u8
 #EXTINF:-1 tvg-id="FenerbahceTVFBTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Fenerbahçe TV (FBTV) (480p)
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/video/x21oo10
-#EXTINF:-1 tvg-id="FinansTurkTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/wBwmB1T/iY0osc7.png" group-title="",Finans Turk TV (360p)
+#EXTINF:-1 tvg-id="FinansTurkTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/wBwmB1T/iY0osc7.png" group-title="",Finans Turk TV (720p)
 http://live.arkumedia.com:1935/finansturktv/finansturktv/playlist.m3u8
 #EXTINF:-1 tvg-id="GaziantepOlayTv.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Gaziantep Olay Tv (720p) [Geo-blocked]
 https://waw2.artiyerelmedya.net/olaytv/bant1/playlist.m3u8
@@ -115,7 +115,7 @@ https://waw2.artiyerelmedya.net/olaytv/bant1/playlist.m3u8
 http://kuzeykibris.tv/m3u8/tv_genc.m3u8
 #EXTINF:-1 tvg-id="GoncaTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/0N5jh8z.jpg" group-title="",Gonca TV [Offline]
 https://broadcasttr.com:446/tuncerciftci/smil:tuncerciftci.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="GRT.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",GRT (720p)
+#EXTINF:-1 tvg-id="GRT.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",GRT (720p) [Timeout]
 https://waw2.artiyerelmedya.net/grt/bant1/chunks.m3u8
 #EXTINF:-1 tvg-id="GRTGaziantep.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",GRT Gaziantep (720p) [Geo-blocked]
 http://yerelmedya.tv:1935/grt/_definst_/bant1/playlist.m3u8
@@ -129,12 +129,12 @@ http://stream2.taksimbilisim.com:1935/tarsusguneytv/bant1/playlist.m3u8
 http://stream2.taksimbilisim.com:1935/gtv/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="GuneydoguTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/JT5pp3Y.png" group-title="",Guneydoğu TV (480p) [Not 24/7]
 https://broadcasttr.com:446/gtv/bant1/playlist.m3u8
+#EXTINF:-1 tvg-id="HaberGlobal.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x50/5f607969cfef0b1593f28f74" group-title="",Haber Global (720p) [Not 24/7]
+https://tv.ensonhaber.com/tv/tr/haberglobal/index.m3u8
 #EXTINF:-1 tvg-id="Haber61TV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/RhPIYKu.jpg" group-title="",Haber61 TV (720p) [Not 24/7]
 https://cdn-haber61tv.yayin.com.tr/haber61tv/smil:haber61tv.smil/index.m3u8
 #EXTINF:-1 tvg-id="Haber61.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/RhPIYKu.jpg" group-title="",Haber61 TV (720p) [Not 24/7]
 https://win8.yayin.com.tr/haber61tv/smil:haber61tv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="HaberGlobal.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x50/5f607969cfef0b1593f28f74" group-title="",Haber Global (720p) [Not 24/7]
-https://tv.ensonhaber.com/tv/tr/haberglobal/index.m3u8
 #EXTINF:-1 tvg-id="HabertürkTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Habertürk TV (720p) [Not 24/7]
 https://tv.ensonhaber.com/tv/tr/haberturk/index.m3u8
 #EXTINF:-1 tvg-id="HabertürkTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Habertürk TV (480p) [Not 24/7]
@@ -181,12 +181,12 @@ https://edge1.socialsmart.tv/kanal32/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal33.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://izmottvsc23.tvplus.com.tr:33207/CPS/images/universal/film/logo/202103/20210324/16/202103241155383682ej_op.png" group-title="",Kanal 33 (720p) [Not 24/7]
 http://stream.taksimbilisim.com:1935/kanal33/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal34.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/gFzHUE6.png" group-title="",Kanal 34 (720p)
-http://live.arkumedia.com:1935/kanal34tv/kanal34tv/playlist.m3u8
-#EXTINF:-1 tvg-id="Kanal34.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/gFzHUE6.png" group-title="",Kanal 34 (720p)
 https://5be5d840359c6.streamlock.net/kanal34tv/kanal34tv/playlist.m3u8
+#EXTINF:-1 tvg-id="Kanal34.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/gFzHUE6.png" group-title="",Kanal 34 (720p) [Offline]
+http://live.arkumedia.com:1935/kanal34tv/kanal34tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal38.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Kanal 38 (576p) [Not 24/7]
 http://yayin3.canlitv.com:1935/live/kanal38/playlist.m3u8
-#EXTINF:-1 tvg-id="KANAL58.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",KANAL 58 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="KANAL58.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",KANAL 58 (720p) [Not 24/7]
 https://broadcasttr.com:446/kanal58/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal68.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/gx7m6Fz.jpg" group-title="",Kanal 68 (720p) [Not 24/7]
 https://waw2.artiyerelmedya.net/kanal68/bant1/playlist.m3u8
@@ -194,10 +194,10 @@ https://waw2.artiyerelmedya.net/kanal68/bant1/playlist.m3u8
 http://51.15.2.151/hls/kanalavrupa.m3u8
 #EXTINF:-1 tvg-id="KanalB.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Kanal B (480p) [Not 24/7]
 http://212.174.58.161/hls-live/livepkgr/_definst_/liveevent/kanalb.m3u8
-#EXTINF:-1 tvg-id="KanalD.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x60/59f19761cfef0b221f7da806" group-title="",Kanal D (540p)
-https://2122248074.duhnet.tv/S2/HLS_LIVE/kanaldnp/track_3_750/playlist.m3u8
 #EXTINF:-1 tvg-id="KanalD.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x60/59f19761cfef0b221f7da806" group-title="",Kanal D (480p) [Not 24/7]
 http://163.172.39.215:25461/live/line/C4@!a3a1@!w72A/66.m3u8
+#EXTINF:-1 tvg-id="KanalD.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x60/59f19761cfef0b221f7da806" group-title="",Kanal D (540p) [Offline]
+https://2122248074.duhnet.tv/S2/HLS_LIVE/kanaldnp/track_3_750/playlist.m3u8
 #EXTINF:-1 tvg-id="KanalDRomania.tr" tvg-country="RO" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x60/59f19761cfef0b221f7da806" group-title="",Kanal D Romania (384p) [Not 24/7]
 https://stream1.kanald.ro/iphone/live.m3u8
 #EXTINF:-1 tvg-id="KanalFirat.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/QhfTGyS.jpg" group-title="",Kanal Firat (720p) [Not 24/7]
@@ -208,7 +208,7 @@ http://kuzeykibris.tv/m3u8/tv_kanalt.m3u8
 https://broadcasttr.com:446/kanalurfa/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="KanalV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://izmottvsc23.tvplus.com.tr:33207/CPS/images/universal/film/poster/fileEntity/20170221/001300/001300000002742527/d3cdff38-e389-49f1-a54c-63f9bf4194aa.png" group-title="",Kanal V (720p) [Not 24/7]
 http://yerelmedya.tv:1935/kanalv/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="KanalZ.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/elAlSno.png" group-title="",Kanal Z (720p)
+#EXTINF:-1 tvg-id="KanalZ.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/elAlSno.png" group-title="",Kanal Z (720p) [Geo-blocked]
 https://waw2.artiyerelmedya.net/kanalz/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="KardelenTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Kardelen TV [Offline]
 http://cdn1.streamencoding.com:1935/kardelen_live/HD/playlist.m3u8
@@ -246,7 +246,7 @@ https://waw2.artiyerelmedya.net/mavikaradeniz/bant1/playlist.m3u8
 http://137.74.205.201/medmuzik/MedStream/playlist.m3u8
 #EXTINF:-1 tvg-id="MEDMUZIK.tr" tvg-country="TR" tvg-language="Kurdish" tvg-logo="" group-title="",Med Müzik TV (480p) [Not 24/7]
 http://163.172.39.215:25461/live/line/C4@!a3a1@!w72A/29.m3u8
-#EXTINF:-1 tvg-id="MedyaHaberTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Medya Haber TV (720p)
+#EXTINF:-1 tvg-id="MedyaHaberTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Medya Haber TV (1080p)
 https://602ccc850c9bb.streamlock.net/Medya/smil:1280.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MedyaHaberTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Medya Haber TV (480p) [Not 24/7]
 http://163.172.39.215:25461/line/C4@!a3a1@!w72A/23
@@ -260,17 +260,17 @@ https://waw2.artiyerelmedya.net/mercantv/bant1/playlist.m3u8
 https://b01c02nl.mediatriple.net/videoonlylive/mtfgdbkwkjllolive/broadcast_5b1673b7c36b7.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MilyonTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/LNcC7EH.jpg" group-title="",Milyon TV (720p) [Offline]
 https://milyontv-live.ercdn.net/milyontv/milyontv_720p.m3u8
-#EXTINF:-1 tvg-id="MiskFM.tr" tvg-country="TR" tvg-language="Arabic" tvg-logo="https://www.miskfm.net/wp-content/uploads/2020/07/%D9%84%D9%88%D8%AC%D9%88.png" group-title="",Misk FM (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MiskFM.tr" tvg-country="TR" tvg-language="Arabic" tvg-logo="https://www.miskfm.net/wp-content/uploads/2020/07/%D9%84%D9%88%D8%AC%D9%88.png" group-title="",Misk FM (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCrvsAwtrxZ0q31yU9JEBdWA/live
 #EXTINF:-1 tvg-id="MSBCKanal2000.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",MSBC Kanal 2000 (360p) [Not 24/7]
 https://59cba4d34b678.streamlock.net/canlitv/kanal-2000/playlist.m3u8
-#EXTINF:-1 tvg-id="NaturalTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/SBw828K/f460YQg.png" group-title="",Natural TV (1080p) [Not 24/7]
-http://broadcasttr.com:1935/naturaltv/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="NaturalTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://naturaltv.com.tr/sites/default/files/naturaltv-logo.png" group-title="",Natural TV (1080p) [Not 24/7]
 https://broadcasttr.com:446/naturaltv/bant1/playlist.m3u8
+#EXTINF:-1 tvg-id="NaturalTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/SBw828K/f460YQg.png" group-title="",Natural TV (720p) [Not 24/7]
+http://broadcasttr.com:1935/naturaltv/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="NTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="http://contentlibrary.digiturk.com.tr/Channel/28/Image/NTV.png" group-title="",NTV (480p) [Not 24/7]
 http://163.172.39.215:25461/line/C4@!a3a1@!w72A/128
-#EXTINF:-1 tvg-id="NTVSpor.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",NTV Spor [Offline]
+#EXTINF:-1 tvg-id="NTVSpor.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",NTV Spor [Timeout]
 http://46.4.193.238:8484/hls/ntvspor/playlist.m3u8
 #EXTINF:-1 tvg-id="OgunTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Ogün TV (360p)
 https://s01.vpis.io/ogun/ogun.m3u8
@@ -278,19 +278,19 @@ https://s01.vpis.io/ogun/ogun.m3u8
 https://waw2.artiyerelmedya.net/olayturk/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="OlayTurkKayseri.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",OlayTürk Kayseri (720p) [Geo-blocked]
 http://waw1.artiyerelmedya.net:1935/olayturk/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="On4TV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/TtbYRZD/i3ua14I.jpg" group-title="",On4 TV (1080p)
-http://yayin.netradyom.com:1935/live/on4/playlist.m3u8
 #EXTINF:-1 tvg-id="ONMedyaHaber.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",ON Medya Haber (720p) [Geo-blocked]
 http://live.arkumedia.com:1935/marmaratv/marmaratv/playlist.m3u8
+#EXTINF:-1 tvg-id="On4TV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/TtbYRZD/i3ua14I.jpg" group-title="",On4 TV (1080p)
+http://yayin.netradyom.com:1935/live/on4/playlist.m3u8
 #EXTINF:-1 tvg-id="OncuTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/TGPNYrD.jpg" group-title="",Öncü TV (720p) [Not 24/7]
 https://broadcasttr.com:446/oncurtv/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="PetraTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Petra TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="PetraTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",Petra TV (720p) [Not 24/7]
 http://tt61.mine.nu/live/PetraTV/Fw99Gpq7Gq/6478.m3u8
+#EXTINF:-1 tvg-id="PowerTurk.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/9OPoXQG.png" group-title="",Power Turk (1080p) [Not 24/7]
+https://livetv.powerapp.com.tr/powerturkTV/powerturkhd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="PowerTurk.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/9OPoXQG.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="",Power Turk (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://mn-nl.mncdn.com/blutv_powerturk/smil:powerturk_sd.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="PowerTurk.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/9OPoXQG.png" group-title="",Power Turk (1080p) [Offline]
-https://livetv.powerapp.com.tr/powerturkTV/powerturkhd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="PowerTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/291uOcR.png" group-title="",Power TV (1080p)
 https://livetv.powerapp.com.tr/powerTV/powerhd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="PowerTurkTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://cdn-0.tvprofil.com/cdn/100x40/10/img/kanali-logo/power_turk_tr_tv.png" group-title="",PowerTürk TV (1080p) [Geo-blocked]
@@ -346,7 +346,7 @@ https://tv.ensonhaber.com/tv/tr/tgrtbelgesel/index.m3u8
 https://b01c02nl.mediatriple.net/videoonlylive/mtsxxkzwwuqtglive/broadcast_5fe462afc6a0e.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TGRTEU.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x60/59f19761cfef0b221f7da8ee" group-title="",TGRT EU (576p)
 https://tv.ensonhaber.com/tv/tr/tgrteu/index.m3u8
-#EXTINF:-1 tvg-id="TGRTHaber.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x50/59f19761cfef0b221f7da8ea" group-title="News",TGRT Haber [Offline]
+#EXTINF:-1 tvg-id="TGRTHaber.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x50/59f19761cfef0b221f7da8ea" group-title="News",TGRT Haber (360p) [Not 24/7]
 https://b01c02nl.mediatriple.net/videoonlylive/mtsxxkzwwuqtglive/broadcast_5fe4598be8e5d.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ThaqalaynTV.tr" tvg-country="TR" tvg-language="Arabic" tvg-logo="https://i.imgur.com/qlfjzN1.png" group-title="Religious",Thaqalayn TV (720p) [Not 24/7]
 https://live.thaqalayn.tv/hls/live.m3u8
@@ -367,7 +367,7 @@ https://mn-nl.mncdn.com/blutv_trt1/smil:trt1_sd.smil/playlist.m3u8
 https://tv-trt2.live.trt.com.tr/master.m3u8
 #EXTINF:-1 tvg-id="TRT3.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/r41SGOT.png" group-title="",TRT 3 (720p) [Offline]
 https://tv-trt3.live.trt.com.tr/master.m3u8
-#EXTINF:-1 tvg-id="TRTArabi.tr" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.ibb.co/HTzkq9P/iJIHMq9.png" group-title="News",TRT Arabi (1080p)
+#EXTINF:-1 tvg-id="TRTArabi.tr" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.ibb.co/HTzkq9P/iJIHMq9.png" group-title="News",TRT Arabi (720p)
 https://tv-trtarabi.live.trt.com.tr/master.m3u8
 #EXTINF:-1 tvg-id="TRTArabi.tr" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.ibb.co/HTzkq9P/iJIHMq9.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="News",TRT Arabi̇ (720p) [Offline]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
@@ -397,20 +397,13 @@ https://mn-nl.mncdn.com/blutv_trtmuzik/smil:trtmuzik_sd.smil/playlist.m3u8
 https://tv-trtspor1.live.trt.com.tr/master.m3u8
 #EXTINF:-1 tvg-id="TRTTurk.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/Br1knP7/R8SJH2m.png" group-title="",TRT Türk (720p)
 https://tv-trtturk.live.trt.com.tr/master.m3u8
-#EXTINF:-1 tvg-id="TRTWorld.tr" tvg-country="INT" tvg-language="English" tvg-logo="https://i.ibb.co/phw4pjP/mjTjJ1N.png" group-title="News",TRT World (1080p)
+#EXTINF:-1 tvg-id="TRTWorld.tr" tvg-country="INT" tvg-language="English" tvg-logo="https://i.ibb.co/phw4pjP/mjTjJ1N.png" group-title="News",TRT World (720p)
 https://tv-trtworld.live.trt.com.tr/master.m3u8
-#EXTINF:-1 tvg-id="TV4.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="http://orsatek.tv/wp-content/uploads/2017/03/logo_tv4-1.png" group-title="",TV4 (720p)
-https://turkmedya-live.ercdn.net/tv4/tv4_720p.m3u8
-#EXTINF:-1 tvg-id="TV8.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="http://contentlibrary.digiturk.com.tr/Channel/428/Image/70x46_tv8hd.png" group-title="",TV8 (576p) [Not 24/7]
-http://62.112.9.63:88/TV8_TR/index.m3u8?token=test
 #EXTINF:-1 tvg-id="TV8.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="http://contentlibrary.digiturk.com.tr/Channel/428/Image/70x46_tv8hd.png" group-title="",TV 8 (480p) [Not 24/7]
 http://163.172.39.215:25461/live/line/C4@!a3a1@!w72A/74.m3u8
 #EXTINF:-1 tvg-id="TV85.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://www.dsmart.com.tr/epg/images/0x50/5924449cd6f439663be1e725" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="",TV 8.5 (720p) [Offline]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://mn-nl.mncdn.com/blutv_tv8_5/smil:tv8_5_sd.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TV24.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="",TV24 (720p) [Offline]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://mn-nl.mncdn.com/blutv_kanal24/smil:kanal24_sd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TV35.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/XRX9fGi.png" group-title="",TV 35 (720p) [Offline]
 https://59cba4d34b678.streamlock.net/canlitv/tv35/playlist.m3u8
 #EXTINF:-1 tvg-id="TV38.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/KDBXLqn.png" group-title="",TV 38 (360p) [Not 24/7]
@@ -421,20 +414,27 @@ https://waw1.artiyerelmedya.net/tv41/bant1/playlist.m3u8
 http://stream.taksimbilisim.com:1935/tv41/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="TV41.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",TV 41 (720p) [Not 24/7]
 http://stream.taksimbilisim.com:1935/tv41/bant1/TV41.m3u8
-#EXTINF:-1 tvg-id="TV41.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",TV41 (720p) [Not 24/7]
-https://waw2.artiyerelmedya.net/tv41/bant1/chunks.m3u8
-#EXTINF:-1 tvg-id="TV41.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",TV 41 (270p) [Not 24/7]
+#EXTINF:-1 tvg-id="TV41.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",TV 41 (720p) [Not 24/7]
 http://stream.taksimbilisim.com:1935/tv41/smil:tv41.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TV52.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/jt92HbR.jpg" group-title="",TV 52 (720p) [Not 24/7]
-https://broadcasttr.com:446/tv52/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="TV52.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/jt92HbR.jpg" group-title="",TV 52 (270p) [Not 24/7]
 http://stream.taksimbilisim.com:1935/tv52/smil:tv52.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="TV52.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/jt92HbR.jpg" group-title="",TV 52 (720p) [Not 24/7]
+https://broadcasttr.com:446/tv52/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="TVDen.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/PFWOkNh.png" group-title="",TV Den (576p) [Not 24/7]
 http://canli.tvden.com.tr/hls/live.m3u8
 #EXTINF:-1 tvg-id="TVEm.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",TV Em (486p)
 http://cdn-tvem.yayin.com.tr/TVEM/TVEM/playlist.m3u8
 #EXTINF:-1 tvg-id="TVEm.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",TV Em (486p)
 https://cdn.yayin.com.tr/TVEM/TVEM/chunklist.m3u8
+#EXTINF:-1 tvg-id="TV4.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="http://orsatek.tv/wp-content/uploads/2017/03/logo_tv4-1.png" group-title="",TV4 (720p)
+https://turkmedya-live.ercdn.net/tv4/tv4_720p.m3u8
+#EXTINF:-1 tvg-id="TV8.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="http://contentlibrary.digiturk.com.tr/Channel/428/Image/70x46_tv8hd.png" group-title="",TV8 (576p) [Not 24/7]
+http://62.112.9.63:88/TV8_TR/index.m3u8?token=test
+#EXTINF:-1 tvg-id="TV24.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="",TV24 (720p) [Offline]
+#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
+https://mn-nl.mncdn.com/blutv_kanal24/smil:kanal24_sd.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="TV41.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="" group-title="",TV41 (720p) [Not 24/7]
+https://waw2.artiyerelmedya.net/tv41/bant1/chunks.m3u8
 #EXTINF:-1 tvg-id="UcanKusTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/qF8Rstv/0PTAYbs.jpg" group-title="",UçanKuş TV (720p)
 https://ucankus-live.cdnnew.com/ucankus/ucankus.m3u8
 #EXTINF:-1 tvg-id="UcanKusTV.tr" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/qF8Rstv/0PTAYbs.jpg" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="",UçanKuş TV (720p) [Offline]
diff --git a/channels/tw.m3u b/channels/tw.m3u
index 5acc6b6dd2..48ca0f6adf 100644
--- a/channels/tw.m3u
+++ b/channels/tw.m3u
@@ -115,13 +115,13 @@ http://www.dalitv.com.tw:4568/live/dali/index.m3u8
 http://seb.sason.top/sc/dsxw_fhd.m3u8
 #EXTINF:-1 tvg-id="DongLingCaiJingXingWen.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://img-fnc.ebc.net.tw/EbcFnc/logoes/pc_logo.png" group-title="News",東森財經新聞 (1080p) [Not 24/7]
 http://seb.sason.top/sc/dscjxw_fhd.m3u8
-#EXTINF:-1 tvg-id="MinShi.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://www.ftv.com.tw/images/Ch_01.png" group-title="General",民視 (720p) [Offline]
+#EXTINF:-1 tvg-id="MinShi.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://www.ftv.com.tw/images/Ch_01.png" group-title="General",民視 (720p) [Not 24/7]
 http://seb.sason.top/ptv/ftv.php?id=ms
-#EXTINF:-1 tvg-id="MinShiTaiWan.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://www.ftv.com.tw/images/Ch_03.png" group-title="News",民視台灣 (720p) [Offline]
+#EXTINF:-1 tvg-id="MinShiTaiWan.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://www.ftv.com.tw/images/Ch_03.png" group-title="News",民視台灣 (720p) [Not 24/7]
 http://seb.sason.top/ptv/ftv.php?id=tw
 #EXTINF:-1 tvg-id="MinShiXinWenTai.tw" tvg-country="TW" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://i.imgur.com/6jbjVNy.png" group-title="News",民視新聞台 (720p) [Offline]
 https://6.mms.vlog.xuite.net/hls/ftvtv/index.m3u8
-#EXTINF:-1 tvg-id="MinShiDiYi.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://www.ftv.com.tw/images/Ch_02.png" group-title="General",民視第一 (720p) [Offline]
+#EXTINF:-1 tvg-id="MinShiDiYi.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://www.ftv.com.tw/images/Ch_02.png" group-title="General",民視第一 (720p) [Not 24/7]
 http://seb.sason.top/ptv/ftv.php?id=dy
 #EXTINF:-1 tvg-id="LiFaYuanIVODZhiBoJiaoTongWeiYuanHui.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://i.imgur.com/PxYhFpb.png" group-title="Legislative",立法院IVOD直播交通委員會 (450p)
 https://lylive-videorent.cdn.hinet.net/out/u/live/gop4/ly/ly-Live6/hls-cl-tv/index.m3u8
@@ -145,5 +145,5 @@ https://lylive-videorent.cdn.hinet.net/out/u/live/gop4/ly/ly-Live2/hls-cl-tv/ind
 https://lylive-videorent.cdn.hinet.net/out/u/live/gop4/ly/ly-Live1/hls-cl-tv/index.m3u8
 #EXTINF:-1 tvg-id="HuaShiXingWen.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/2/27/Cts_news_info.png/200px-Cts_news_info.png" group-title="News",華視新聞資訊 [Geo-blocked]
 http://seb.sason.top/sc/hsxw_fhd.m3u8
-#EXTINF:-1 tvg-id="HuaZhangWeiShi.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://www.hwazan.org/statics/images/newhztv_logo.png" group-title="Religious",華藏衛視 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="HuaZhangWeiShi.tw" tvg-country="TW" tvg-language="Chinese" tvg-logo="https://www.hwazan.org/statics/images/newhztv_logo.png" group-title="Religious",華藏衛視 (1080p) [Not 24/7]
 http://118.163.88.61:1935/hwazanlivetv/live.stream/playlist.m3u8
diff --git a/channels/ua.m3u b/channels/ua.m3u
index cde9692a1e..7a7f7db8f7 100644
--- a/channels/ua.m3u
+++ b/channels/ua.m3u
@@ -35,13 +35,13 @@ https://cdn1.live-tv.od.ua:8083/a1od/gtvod-720p/playlist.m3u8
 https://cdn1.live-tv.od.ua:8083/a1od/gtvod-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="GTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/Rc6UGkb.jpg" group-title="",GTV (480p)
 https://cdn1.live-tv.od.ua:8083/a1od/gtvod-480p/playlist.m3u8
-#EXTINF:-1 tvg-id="GTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/Rc6UGkb.jpg" group-title="",GTV (240p)
+#EXTINF:-1 tvg-id="GTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/Rc6UGkb.jpg" group-title="",GTV (224p)
 https://cdn1.live-tv.od.ua:8083/a1od/gtvod-240p/playlist.m3u8
 #EXTINF:-1 tvg-id="HDFashionLifeStyle.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/LtQL1q9.jpg" group-title="Lifestyle",HDFashion & LifeStyle (1080p)
 http://95.67.47.114/hls/hdfashion_ua.m3u8
 #EXTINF:-1 tvg-id="HDFashionLifeStyle.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/LtQL1q9.jpg" group-title="Lifestyle",HDFashion & LifeStyle (1080p)
 http://95.67.47.115/hls/hdfashion_ua.m3u8
-#EXTINF:-1 tvg-id="IDFashion.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/Y50tmIN.png" group-title="Lifestyle",ID Fashion (1080p) [Offline]
+#EXTINF:-1 tvg-id="IDFashion.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/Y50tmIN.png" group-title="Lifestyle",ID Fashion (1080p) [Not 24/7]
 https://idfashion.cdn-02.cosmonova.net.ua/hls/idfashion_ua.m3u8
 #EXTINF:-1 tvg-id="IHTEP.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/R06gbuT.png" group-title="",IHTEP (576p)
 https://edge1.iptv.macc.com.ua/img/inter_3/index.m3u8
@@ -55,15 +55,15 @@ https://cdn10.live-tv.od.ua:8083/kratu/kratu-abr/playlist.m3u8
 https://cdn10.live-tv.od.ua:8083/kratu/kratu/playlist.m3u8
 #EXTINF:-1 tvg-id="Lale.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="Kids",Lale (504p)
 http://stream.atr.ua/lale/live/index.m3u8
-#EXTINF:-1 tvg-id="M1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.postimg.cc/SRCMK3vb/m1-ua.png" group-title="Music",M1 (1080p)
+#EXTINF:-1 tvg-id="M1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.postimg.cc/SRCMK3vb/m1-ua.png" group-title="Music",M1 (720p)
 http://live.m2.tv/hls2/stream.m3u8
-#EXTINF:-1 tvg-id="M2.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="Music",M2 (720p)
+#EXTINF:-1 tvg-id="M2.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="Music",M2 (540p)
 http://live.m2.tv/hls3/stream.m3u8
-#EXTINF:-1 tvg-id="Micto.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/p7bzHf4.png" group-title="",Micto (360p)
+#EXTINF:-1 tvg-id="Micto.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/p7bzHf4.png" group-title="",Micto (360p) [Timeout]
 http://93.78.206.172:8080/stream3/stream.m3u8
 #EXTINF:-1 tvg-id="MostVideoTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",MostVideo.TV (720p)
 http://w4.mostvideo.tv/tv/ch1.m3u8
-#EXTINF:-1 tvg-id="OdessaFashion.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="Lifestyle",Odessa Fashion (720p) [Offline]
+#EXTINF:-1 tvg-id="OdessaFashion.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="Lifestyle",Odessa Fashion (720p) [Not 24/7]
 https://cdn10.live-tv.od.ua:8083/ofod/ofod-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="Renome.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/Uy9gD3l.jpg" group-title="",Renome (576p)
 http://85.238.112.40:8810/hls_sec/online/list-renome.m3u8
@@ -74,9 +74,9 @@ https://open-cdn.lanet.tv/live/1008.m3u8
 #EXTINF:-1 tvg-id="Sport1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/wBJI5Jw.png" group-title="Sports",Sport 1 (576p) [Not 24/7]
 https://95-213-224-183.livesports24.online/sport1ua.m3u8
 #EXTINF:-1 tvg-id="TravelGuideTV.ua" tvg-country="UA" tvg-language="Ukrainian;Russian" tvg-logo="" group-title="Travel",Travel Guide TV (720p)
-https://cdn10.live-tv.od.ua:8083/leonovtv/test1/playlist.m3u8
-#EXTINF:-1 tvg-id="TravelGuideTV.ua" tvg-country="UA" tvg-language="Ukrainian;Russian" tvg-logo="" group-title="Travel",Travel Guide TV (720p)
 https://cdn10.live-tv.od.ua:8083/leonovtv/test-abr/playlist.m3u8
+#EXTINF:-1 tvg-id="TravelGuideTV.ua" tvg-country="UA" tvg-language="Ukrainian;Russian" tvg-logo="" group-title="Travel",Travel Guide TV (720p)
+https://cdn10.live-tv.od.ua:8083/leonovtv/test1/playlist.m3u8
 #EXTINF:-1 tvg-id="TV5.ua" tvg-country="UA" tvg-language="Ukrainian;Russian" tvg-logo="https://i.imgur.com/ixKcTad.png" group-title="",TV5 (Запорожье) (360p)
 https://hls.cdn.ua/tv5.zp.ua_live/mp4:tv5/playlist.m3u8
 #EXTINF:-1 tvg-id="TV5.ua" tvg-country="UA" tvg-language="Ukrainian;Russian" tvg-logo="https://i.imgur.com/ixKcTad.png" group-title="",TV5 (Запорожье) (360p)
@@ -121,7 +121,7 @@ https://glas.org.ua/hls/glassru.m3u8
 https://glas.org.ua/hls/glassua.m3u8
 #EXTINF:-1 tvg-id="DonbasOnline.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Донбас Online (1080p)
 http://176.110.1.30:1935/live/donbasonline/playlist.m3u8
-#EXTINF:-1 tvg-id="DumskayaTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Думская ТВ (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="DumskayaTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Думская ТВ (1080p) [Not 24/7]
 https://cdn1.live-tv.od.ua:8083/dumska/dumska-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="Zdorove.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Здоровье (504p) [Not 24/7]
 https://cdn1.live-tv.od.ua:8083/zdorovood/zdorovo/playlist.m3u8
@@ -169,10 +169,10 @@ https://cdn1.live-tv.od.ua:8083/riood/riood/playlist.m3u8
 http://ftp.orbita.dn.ua/hls/orbita.m3u8
 #EXTINF:-1 tvg-id="OTVDnepr.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",ОТВ (Днепр) (576p)
 http://91.193.128.233:1935/live/otv.stream_576p/playlist.m3u8
+#EXTINF:-1 tvg-id="PervyygorodskoyKrivoyRog.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="http://big-tv.org/uploads/posts/2017-11/thumbs/1510692123_pervyy-gorodskoy-krivoy-rog.png" group-title="",Первый городской (Кривой Рог) (720p) [Not 24/7]
+https://cdn1.live-tv.od.ua:8083/1tvkr/1tvkr-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="PervyyGorodskoyKrivoyRog.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Первый Городской (Кривой Рог) (720p) [Not 24/7]
 https://cdn1.live-tv.od.ua:8083/1tvkr/1tvkr/playlist.m3u8
-#EXTINF:-1 tvg-id="PervyygorodskoyKrivoyRog.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="http://big-tv.org/uploads/posts/2017-11/thumbs/1510692123_pervyy-gorodskoy-krivoy-rog.png" group-title="",Первый городской (Кривой Рог) (720p) [Offline]
-https://cdn1.live-tv.od.ua:8083/1tvkr/1tvkr-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="PervyygorodskoyOdessa.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://sun9-18.userapi.com/c639227/v639227583/45ae7/tw3dA0ptuXI.jpg" group-title="",Первый городской (Одесса) (1080p)
 http://91.194.79.46:8081/stream1/channel1/playlist.m3u8
 #EXTINF:-1 tvg-id="PervyyGorodskoyOdessa.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Первый Городской (Одесса) (576p)
@@ -191,18 +191,18 @@ http://pershij-dlovij-hls1.cosmonova.net.ua/hls/pershij-dlovij_ua_mid/index.m3u8
 http://pershij-dlovij-hls3.cosmonova.net.ua/hls/pershij-dlovij_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="PershiyDiloviy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Перший Діловий (576p)
 http://pershij-dlovij-hls3.cosmonova.net.ua/hls/pershij-dlovij_ua_mid/index.m3u8
+#EXTINF:-1 tvg-id="PershiyZahidniy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Перший Західний (Львов) (576p)
+http://rtmp.cdn.ua/1zahid.com_live/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="PershiyZahidniy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Перший Західний (Львов) (480p)
 http://hls.cdn.ua/1zahid.com_live/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="PershiyZahidniy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Перший Західний (Львов) (480p)
-http://rtmp.cdn.ua/1zahid.com_live/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="Pershiynezalezhniy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="News",Перший незалежний (1080p)
 https://app.live.112.events/hls-ua/112hd_mid/index.m3u8
 #EXTINF:-1 tvg-id="Pershiynezalezhniy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="News",Перший незалежний (1080p)
 https://app.live.112.events/hls/112hd_hi/index.m3u8
-#EXTINF:-1 tvg-id="Pershiynezalezhniy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="News",Перший незалежний (1080p)
-https://app.live.112.events/hls/112hd_mid/index.m3u8
 #EXTINF:-1 tvg-id="Pershiynezalezhniy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="News",Перший незалежний (1080p) [Not 24/7]
 http://app.live.112.events/hls-ua/112hd_hi/index.m3u8
+#EXTINF:-1 tvg-id="Pershiynezalezhniy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="News",Перший незалежний (1080p) [Timeout]
+https://app.live.112.events/hls/112hd_mid/index.m3u8
 #EXTINF:-1 tvg-id="PravdaTUT.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",ПравдаТУТ (720p)
 http://95.67.17.131/hls/pravdatytkievshina_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="PravdaTUT.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",ПравдаТУТ (720p)
@@ -224,14 +224,14 @@ http://80.91.177.102:1935/live/live1/playlist.m3u8
 #EXTINF:-1 tvg-id="Svarozhichi.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Сварожичи (720p)
 http://tv.tv-project.com:1935/live/live1/playlist.m3u8
 #EXTINF:-1 tvg-id="SK1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/wr0CN1l.png" group-title="",СК 1 (720p) [Not 24/7]
-https://cdn10.live-tv.od.ua:8083/sk1zt/sk1zt720p/playlist.m3u8
-#EXTINF:-1 tvg-id="SK1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/wr0CN1l.png" group-title="",СК 1 (720p) [Not 24/7]
 https://cdn10.live-tv.od.ua:8083/sk1zt/sk1zt-abr/playlist.m3u8
+#EXTINF:-1 tvg-id="SK1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/wr0CN1l.png" group-title="",СК 1 (720p) [Not 24/7]
+https://cdn10.live-tv.od.ua:8083/sk1zt/sk1zt720p/playlist.m3u8
 #EXTINF:-1 tvg-id="SK1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/wr0CN1l.png" group-title="",СК 1 (480p) [Not 24/7]
 https://cdn10.live-tv.od.ua:8083/sk1zt/sk1zt480p/playlist.m3u8
 #EXTINF:-1 tvg-id="SK1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/wr0CN1l.png" group-title="",СК 1 (256p) [Not 24/7]
 https://cdn10.live-tv.od.ua:8083/sk1zt/sk1zt240p/playlist.m3u8
-#EXTINF:-1 tvg-id="STB.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/Av0pftd.png" group-title="",СТБ [Offline]
+#EXTINF:-1 tvg-id="STB.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/Av0pftd.png" group-title="",СТБ [Timeout]
 http://188.35.9.11:11021/j
 #EXTINF:-1 tvg-id="TVDom.ua" tvg-country="UA" tvg-language="Russian" tvg-logo="" group-title="",ТВ Дом [Offline]
 http://46.149.48.21:1234
@@ -243,7 +243,7 @@ http://rtsp.cdn.ua/tva.ua_live/livestream/playlist.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCH9H_b9oJtSHBovh94yB5HA/live
 #EXTINF:-1 tvg-id="TisTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Тис ТВ (480p) [Not 24/7]
 https://cdn10.live-tv.od.ua:8083/riood/tisod504/playlist.m3u8
-#EXTINF:-1 tvg-id="TretiyCifrovoy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="http://tretiy.tv/wp-content/uploads/2017/12/logo.png" group-title="",Третий Цифровой (576p) [Offline]
+#EXTINF:-1 tvg-id="TretiyCifrovoy.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="http://tretiy.tv/wp-content/uploads/2017/12/logo.png" group-title="",Третий Цифровой (576p) [Not 24/7]
 https://cdn1.live-tv.od.ua:8083/3tvod/3tvod-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="TRKAleks.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",ТРК Алекс (576p)
 http://46.46.112.223/live/livestream1.m3u8
@@ -251,13 +251,13 @@ http://46.46.112.223/live/livestream1.m3u8
 https://cdn1.live-tv.od.ua:8083/krugod/krugod/playlist.m3u8
 #EXTINF:-1 tvg-id="TRKReporter.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",ТРК Репортер (480p) [Not 24/7]
 https://cdn1.live-tv.od.ua:8083/31chod/31chod-sub/playlist.m3u8
-#EXTINF:-1 tvg-id="TrofeyTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/3LSDHHJ.png" group-title="",Трофей ТВ (1080p) [Offline]
+#EXTINF:-1 tvg-id="TrofeyTV.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/3LSDHHJ.png" group-title="",Трофей ТВ (1080p) [Timeout]
 https://5db1ab4f970be.streamlock.net/live/smil:trofey.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Futbol1.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/J1VuYAB.png" group-title="Sports",Футбол 1 (576p) [Not 24/7]
 https://95-213-224-183.livesports24.online/uafootballua1.m3u8
 #EXTINF:-1 tvg-id="HersonPlyus.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://khersontv.com/wp-content/themes/hueman/img/logo.png" group-title="",Херсон Плюс (576p)
 http://46.175.163.130/ks_plus/index.m3u8
-#EXTINF:-1 tvg-id="Cherniveckiypromin.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Чернівецький промінь (720p) [Offline]
+#EXTINF:-1 tvg-id="Cherniveckiypromin.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",Чернівецький промінь (720p) [Not 24/7]
 https://langate.tv/promin/live_720/index.m3u8
 #EXTINF:-1 tvg-id="ChPInfo.ua" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="" group-title="",ЧП Инфо (576p)
 http://edge3.iptv.macc.com.ua/life/magnolia_3/index.m3u8
diff --git a/channels/ug.m3u b/channels/ug.m3u
index 8558035790..535b76bd3b 100644
--- a/channels/ug.m3u
+++ b/channels/ug.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="ArkTV.ug" tvg-country="UG" tvg-language="English" tvg-logo="" group-title="",Ark TV [Offline]
-https://streaming.viewmedia.tv/viewsatstream35/viewsatstream35.smil/chunklist.m3u8
+#EXTINF:-1 tvg-id="ArkTV.ug" tvg-country="UG" tvg-language="English" tvg-logo="" group-title="",Ark TV (576p)
+https://arktelevision.org/hlslive/test/test.m3u8
+#EXTINF:-1 tvg-id="NBSTV.ug" tvg-country="UG" tvg-language="English" tvg-logo="https://rndcdn.dstv.com/dstvcms/2018/07/03/NBS_logo_4-3_001_xlrg.png" group-title="",NBS TV (480p) [Not 24/7]
+https://vse-cdn1-readymedia.rea.cdn.moderntv.eu/readymedia/stream/NBSTV/5-20-hls/live.m3u8
 #EXTINF:-1 tvg-id="NBSTV.ug" tvg-country="UG" tvg-language="English" tvg-logo="https://rndcdn.dstv.com/dstvcms/2018/07/03/NBS_logo_4-3_001_xlrg.png" group-title="",NBS TV (360p) [Not 24/7]
 https://cdn1.rea.cdn.moderntv.eu/readymedia/stream/NBSTV/10-hls/live-media.m3u8
-#EXTINF:-1 tvg-id="NBSTV.ug" tvg-country="UG" tvg-language="English" tvg-logo="https://rndcdn.dstv.com/dstvcms/2018/07/03/NBS_logo_4-3_001_xlrg.png" group-title="",NBS TV (480p) [Offline]
-https://vse-cdn1-readymedia.rea.cdn.moderntv.eu/readymedia/stream/NBSTV/5-20-hls/live.m3u8
 #EXTINF:-1 tvg-id="SaltTV.ug" tvg-country="UG" tvg-language="English" tvg-logo="http://thedronemedia.ug/wp-content/uploads/2017/07/salt.png" group-title="Religious",Salt TV (576p)
 https://dcunilive38-lh.akamaihd.net/i/dclive_1@692676/master.m3u8
diff --git a/channels/uk.m3u b/channels/uk.m3u
index 2e608cbcbc..41615185f8 100644
--- a/channels/uk.m3u
+++ b/channels/uk.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="4Music.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://d126oek9ze5bb6.cloudfront.net/uploads/2018/07/4Music_primary.png" group-title="Music",4Music (576p) [Offline]
 http://csm-e.tm.yospace.com/csm/extlive/boxplus01,4music-desktop.m3u8?yo.up=http://boxtv-origin-elb.cds1.yospace.com/uploads/4music/
-#EXTINF:-1 tvg-id="Afrobeats.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/Iaey8k5.jpg" group-title="Music",Afrobeats (720p)
+#EXTINF:-1 tvg-id="Afrobeats.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/Iaey8k5.jpg" group-title="Music",Afrobeats (1080p)
 https://stream.ecable.tv/afrobeats/index.m3u8
 #EXTINF:-1 tvg-id="AhlulbaytTV.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/qLqHPhK.png" group-title="Religious",Ahlulbayt TV (404p) [Not 24/7]
 http://109.123.126.14:1935/live/livestream1.sdp/playlist.m3u8
@@ -11,7 +11,7 @@ https://5f3e23ac71915.streamlock.net:4434/live/livestream1.sdp/playlist.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/ahwaznach
 #EXTINF:-1 tvg-id="AkaalTV.uk" tvg-country="UK" tvg-language="Punjabi;English" tvg-logo="https://i.imgur.com/62IpVDn.png" group-title="Religious",Akaal TV (396p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/akaal_tv/hls1_smart_akaal/akaal_tv.m3u8
-#EXTINF:-1 tvg-id="AkaalTV.uk" tvg-country="UK" tvg-language="Punjabi;English" tvg-logo="https://i.imgur.com/62IpVDn.png" group-title="Religious",Akaal TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="AkaalTV.uk" tvg-country="UK" tvg-language="Punjabi;English" tvg-logo="https://i.imgur.com/62IpVDn.png" group-title="Religious",Akaal TV (360p) [Not 24/7]
 http://akaal.zecast.net/akaal-live/smil:akaaltv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlarabyTV.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/LNI1HNi.png" group-title="News",Alaraby TV (1080p)
 https://alaraby.cdn.octivid.com/alaraby/smil:alaraby.stream.smil/playlist.m3u8
@@ -23,18 +23,18 @@ https://live-anandtv.anandmedia.net/anandtvapp/anandtv/index.m3u8
 https://news.ashttp9.visionip.tv/live/visiontvuk-news-arise-tv-hsslive-25f-16x9-SD/playlist.m3u8
 #EXTINF:-1 tvg-id="AriseNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/BlNMp0k.png" group-title="News",Arise News (480p)
 https://contributionstreams.sechls01.visionip.tv/live/visiontv-contributionstreams-arise-tv-25f-16x9-SDh/playlist.m3u8
-#EXTINF:-1 tvg-id="AwraasTV.uk" tvg-country="UK" tvg-language="Arabic" tvg-logo="https://www.awraas.tv/assets/img/logo.png" group-title="",Awraas TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="AwraasTV.uk" tvg-country="UK" tvg-language="Arabic" tvg-logo="https://www.awraas.tv/assets/img/logo.png" group-title="",Awraas TV (1080p) [Not 24/7]
 https://b01c02nl.mediatriple.net/videoonlylive/mtqtqloqdxtlive/broadcast_5cefc3677caee.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="BBCAlba.uk" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC Alba (540p) [Geo-blocked]
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_alba/mobile_wifi_main_sd_abr_v2_akamai_hls_live_http.m3u8
 #EXTINF:-1 tvg-id="BBCArabic.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/oFGPG9Y.png" group-title="News",BBC Arabic (720p)
-https://vs-cmaf-pushb-ww-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_arabic_tv/pc_hd_abr_v2_akamai_dash_live.mpd
-#EXTINF:-1 tvg-id="BBCArabic.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/oFGPG9Y.png" group-title="News",BBC Arabic (720p)
 https://vs-cmaf-pushb-ww-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_arabic_tv/pc_hd_abr_v2_akamai_dash_live_http.mpd
 #EXTINF:-1 tvg-id="BBCArabic.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/oFGPG9Y.png" group-title="News",BBC Arabic (720p)
-https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_arabic_tv/pc_hd_abr_v2_cloudfrontms_live.mpd
+https://vs-cmaf-pushb-ww-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_arabic_tv/pc_hd_abr_v2_akamai_dash_live.mpd
 #EXTINF:-1 tvg-id="BBCArabic.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/oFGPG9Y.png" group-title="News",BBC Arabic (720p)
 https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_arabic_tv/pc_hd_abr_v2_cloudfrontms_live_http.mpd
+#EXTINF:-1 tvg-id="BBCArabic.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/oFGPG9Y.png" group-title="News",BBC Arabic (720p)
+https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_arabic_tv/pc_hd_abr_v2_cloudfrontms_live.mpd
 #EXTINF:-1 tvg-id="BBCArabic.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/oFGPG9Y.png" group-title="News",BBC Arabic (540p)
 https://vs-hls-pushb-ww-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_arabic_tv/pc_hd_abr_v2_akamai_hls_live.m3u8
 #EXTINF:-1 tvg-id="BBCArabic.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/oFGPG9Y.png" group-title="News",BBC Arabic (540p)
@@ -102,13 +102,13 @@ https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_one_yo
 #EXTINF:-1 tvg-id="BBCParliament.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://otv-us-web.s3-us-west-2.amazonaws.com/logos/guide/2/Open/92x36_352/Source/24973/bbcparliamerntchannel.png" group-title="",BBC Parliament (540p) [Geo-blocked]
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_parliament/mobile_wifi_main_sd_abr_v2_akamai_hls_live_http.m3u8
 #EXTINF:-1 tvg-id="BBCPersian.uk" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/44/BBC_News_Persian_Logo.jpg" group-title="News",BBC Persian (720p)
-https://vs-cmaf-pushb-ww-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_akamai_dash_live.mpd
-#EXTINF:-1 tvg-id="BBCPersian.uk" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/44/BBC_News_Persian_Logo.jpg" group-title="News",BBC Persian (720p)
 https://vs-cmaf-pushb-ww-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_akamai_dash_live_http.mpd
 #EXTINF:-1 tvg-id="BBCPersian.uk" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/44/BBC_News_Persian_Logo.jpg" group-title="News",BBC Persian (720p)
-https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_cloudfrontms_live.mpd
+https://vs-cmaf-pushb-ww-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_akamai_dash_live.mpd
 #EXTINF:-1 tvg-id="BBCPersian.uk" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/44/BBC_News_Persian_Logo.jpg" group-title="News",BBC Persian (720p)
 https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_cloudfrontms_live_http.mpd
+#EXTINF:-1 tvg-id="BBCPersian.uk" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/44/BBC_News_Persian_Logo.jpg" group-title="News",BBC Persian (720p)
+https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_cloudfrontms_live.mpd
 #EXTINF:-1 tvg-id="BBCPersian.uk" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/44/BBC_News_Persian_Logo.jpg" group-title="News",BBC Persian (540p)
 https://vs-hls-pushb-ww-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_akamai_hls_live.m3u8
 #EXTINF:-1 tvg-id="BBCPersian.uk" tvg-country="IR" tvg-language="Persian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/44/BBC_News_Persian_Logo.jpg" group-title="News",BBC Persian (540p)
@@ -196,7 +196,7 @@ http://ott-cdn.ucom.am/s24/index.m3u8
 https://csm-e-boxplus.tls1.yospace.com/csm/extlive/boxplus01,boxhits-alldev.m3u8?yo.up=http://boxtv-origin-elb.cds1.yospace.com/uploads/boxhits/
 #EXTINF:-1 tvg-id="BoxHits.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://tvepg.eu/img/united_kingdom/logo/box_hits.png" group-title="Music",Box Hits (576p) [Geo-blocked]
 https://csm-e-boxplus.tls1.yospace.com/csm/extlive/boxplus01,boxhits-alldev.m3u8?yo.up=https://boxtv.secure.footprint.net/boxhits/
-#EXTINF:-1 tvg-id="BritAsiaLiveUSEastern.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/BPS22GM.png" group-title="",Brit Asia Live (US Eastern) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="BritAsiaLiveUSEastern.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/BPS22GM.png" group-title="",Brit Asia Live (US Eastern) (360p) [Not 24/7]
 https://a.jsrdn.com/broadcast/22693_4rGhgrBU/-0500/c.m3u8
 #EXTINF:-1 tvg-id="BritAsiaLiveUSPacific.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/BPS22GM.png" group-title="",Brit Asia Live (US Pacific) (720p) [Not 24/7]
 https://a.jsrdn.com/broadcast/22693_4rGhgrBU/-0800/c.m3u8
@@ -205,7 +205,7 @@ https://api.visionip.tv/live/ASHTTP/visiontvuk-international-britishmuslimtv-hss
 #EXTINF:-1 tvg-id="BTSport1.uk" tvg-country="UK" tvg-language="English" tvg-logo="" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="",BT Sport 1 (576p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://sport.livedoomovie.com/02_BTSPORTHD_1_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="BTSport2.uk" tvg-country="UK" tvg-language="English" tvg-logo="" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="",BT Sport 2 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="BTSport2.uk" tvg-country="UK" tvg-language="English" tvg-logo="" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="",BT Sport 2 (576p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://sport.livedoomovie.com/02_BTSPORTHD_2_720p/chunklist.m3u8
 #EXTINF:-1 tvg-id="CBBC.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://www.sms.cz/kategorie/televize/bmp/loga/velka/bbcthree.png" group-title="",CBBC (540p) [Geo-blocked]
@@ -238,7 +238,7 @@ https://csm-e-stv.tls1.yospace.com/csm/live/195300285.m3u8
 https://imgedge.akamaized.net/amagi_hls_data_imgAAA2AA-edgesports/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="EmanChannel.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/NWljgKa.png" group-title="Religious",Eman Channel (576p)
 https://ap02.iqplay.tv:8082/iqb8002/3m9n/playlist.m3u8
-#EXTINF:-1 tvg-id="EnglishClubTV.uk" tvg-country="UK" tvg-language="English" tvg-logo="http://ocdn.eu/images/program-tv/NTU7MDA_/e7114237dc0731c7dd660c32d6822432.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",English Club TV (480p)
+#EXTINF:-1 tvg-id="EnglishClubTV.uk" tvg-country="UK" tvg-language="English" tvg-logo="http://ocdn.eu/images/program-tv/NTU7MDA_/e7114237dc0731c7dd660c32d6822432.png" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="",English Club TV (480p) [Timeout]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s37/index.m3u8
 #EXTINF:-1 tvg-id="FadakTV.uk" tvg-country="UK" tvg-language="Arabic" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/1/13/FadakTV.png" group-title="Religious",Fadak TV (1080p) [Not 24/7]
@@ -307,7 +307,7 @@ https://csm-e-boxplus.tls1.yospace.com/csm/extlive/boxplus01,kerrang-alldev.m3u8
 http://csm-e.tm.yospace.com/csm/extlive/boxplus01,kiss-inapp.m3u8?yo.up=http://boxtv-origin-elb.cds1.yospace.com/uploads/kiss/
 #EXTINF:-1 tvg-id="kMTV.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://www.kentonline.co.uk/_assets/kmtvlogo2017_2.png" group-title="",KMTV (576p)
 https://dk7psf0dh3v1r.cloudfront.net/KMTV/playlist.m3u8
-#EXTINF:-1 tvg-id="KoolLondonRadio.uk" tvg-country="UK" tvg-language="English" tvg-logo="http://undergroundbass.co.uk/image/koollondon.png" group-title="Music",Kool London Radio (720p)
+#EXTINF:-1 tvg-id="KoolLondonRadio.uk" tvg-country="UK" tvg-language="English" tvg-logo="http://undergroundbass.co.uk/image/koollondon.png" group-title="Music",Kool London Radio (720p) [Timeout]
 http://w10.streamgb.com:1935/kool/kool/playlist.m3u8
 #EXTINF:-1 tvg-id="LondonLive.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/londonlive.png" group-title="",London Live (720p) [Offline]
 http://bcoveliveios-i.akamaihd.net/hls/live/217434/3083279840001/master.m3u8
@@ -353,7 +353,7 @@ https://esmhls2-i.akamaihd.net/hls/live/510581/hls2/playlist.m3u8
 https://esmhls3-i.akamaihd.net/hls/live/510582/hls3/playlist.m3u8
 #EXTINF:-1 tvg-id="S4C.uk" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",S4C (540p) [Geo-blocked]
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:s4cpbs/mobile_wifi_main_sd_abr_v2_akamai_hls_live_http.m3u8
-#EXTINF:-1 tvg-id="SangatTelevision.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/KcPEkHh.png" group-title="",Sangat Television (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="SangatTelevision.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/KcPEkHh.png" group-title="",Sangat Television (368p) [Not 24/7]
 https://api.new.livestream.com/accounts/6986636/events/5362122/live.m3u8
 #EXTINF:-1 tvg-id="SheffieldLiveTV.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eUqnYU1.png" group-title="Local",Sheffield Live TV (360p) [Not 24/7]
 http://tv.sheffieldlive.org/hls/main.m3u8
@@ -367,23 +367,23 @@ http://skynews-sn-cdhls.ak-cdn.skydvn.com/cdhlsskynews/1404/latest.m3u8
 https://stream.skynewsarabia.com/hls/sna.m3u8
 #EXTINF:-1 tvg-id="SkyNewsArabia.uk" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/kF7TvcH.png" group-title="News",Sky News Arabia (Portrait) (1080p) [Not 24/7]
 https://stream.skynewsarabia.com/vertical/vertical.m3u8
-#EXTINF:-1 tvg-id="SkyNewsExtra1.uk" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Wl0iGsD.png" group-title="News",Sky News Extra 1 (576p)
+#EXTINF:-1 tvg-id="SkyNewsExtra1.uk" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Wl0iGsD.png" group-title="News",Sky News Extra 1 (540p)
 https://skynewsau-live.akamaized.net/hls/live/2002689/skynewsau-extra1/master.m3u8
 #EXTINF:-1 tvg-id="SkyNewsExtra2.uk" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Wl0iGsD.png" group-title="News",Sky News Extra 2 (540p)
 https://skynewsau-live.akamaized.net/hls/live/2002690/skynewsau-extra2/master.m3u8
-#EXTINF:-1 tvg-id="SkyNewsExtra3.uk" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Wl0iGsD.png" group-title="News",Sky News Extra 3 (540p)
+#EXTINF:-1 tvg-id="SkyNewsExtra3.uk" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/Wl0iGsD.png" group-title="News",Sky News Extra 3 (1080p)
 https://skynewsau-live.akamaized.net/hls/live/2002691/skynewsau-extra3/master.m3u8
-#EXTINF:-1 tvg-id="Spike.uk" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",Spike (480p)
+#EXTINF:-1 tvg-id="Spike.uk" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",Spike (404p)
 https://viacomitalytest-lh.akamaihd.net/i/sbshdlive_1@829515/master.m3u8
 #EXTINF:-1 tvg-id="SportsTonight.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/Nh4LyPv.png" group-title="Sports",Sports Tonight (576p)
 http://sports.ashttp9.visionip.tv/live/visiontvuk-sports-sportstonightlive-hsslive-25f-4x3-SD/chunklist.m3u8
-#EXTINF:-1 tvg-id="SportyStuffTV.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://www.sportystuff.tv/src/img/logo-purple.png" group-title="Sports",Sporty Stuff TV (720p)
+#EXTINF:-1 tvg-id="SportyStuffTV.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://www.sportystuff.tv/src/img/logo-purple.png" group-title="Sports",Sporty Stuff TV (1080p)
 https://ayozat-live.secure2.footprint.net/egress/bhandler/ayozat/sportystufftv/playlist.m3u8
 #EXTINF:-1 tvg-id="SpotlightTV.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/axXipp8.png" group-title="",Spotlight TV (576p)
 https://securecontributions.sechls01.visionip.tv/live/securecontributions-securecontributions-spotlighttv-hsslive-25f-SD/chunklist.m3u8
-#EXTINF:-1 tvg-id="STV.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://images.stv.tv/player/master/617962-stv.png" group-title="",STV (1080p) [Geo-Blocked]
+#EXTINF:-1 tvg-id="STV.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://images.stv.tv/player/master/617962-stv.png" group-title="",STV (1080p) [Timeout]
 https://csm-e-stv.tls1.yospace.com/csm/live/139900483.m3u8
-#EXTINF:-1 tvg-id="STVPlus1.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://images.stv.tv/player/master/607358-stv-1.jpg" group-title="",STV+1 (1080p) [Offline]
+#EXTINF:-1 tvg-id="STVPlus1.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://images.stv.tv/player/master/607358-stv-1.jpg" group-title="",STV+1 (1080p) [Timeout]
 https://csm-e-stv.tls1.yospace.com/csm/live/181023311.m3u8
 #EXTINF:-1 tvg-id="TheBoxUK.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/1/16/The_Box_2013.png" group-title="Music",The Box UK (576p)
 https://csm-e-boxplus.tls1.yospace.com/csm/extlive/boxplus01,thebox-alldev.m3u8?yo.up=http://boxtv-origin-elb.cds1.yospace.com/uploads/thebox/
diff --git a/channels/uk_sportstribal.m3u b/channels/uk_sportstribal.m3u
index 1b178b733f..9990cbf515 100644
--- a/channels/uk_sportstribal.m3u
+++ b/channels/uk_sportstribal.m3u
@@ -15,7 +15,7 @@ https://live.serverside.ai/hls/4a34ba0f-2ffd-47cf-9f8d-5e91ede78e5a/master.m3u8?
 https://pac12-sportstribal.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="PokerNightInAmerica.us" tvg-country="UK" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzA3OTUzMzJf/PokerNight_720x720.png" group-title="Sports",Poker Night In America (720p) [Offline]
 https://rushstreet-sportstribal.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="SKITV.us" tvg-country="UK" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzA3OTUzMjlf/SkiTV_400x400.png" group-title="Sports",SKI TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SKITV.us" tvg-country="UK" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzA3OTUzMjlf/SkiTV_400x400.png" group-title="Sports",SKI TV (720p) [Not 24/7]
 https://d2xeo83q8fcni6.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/SkiTV-SportsTribal/193.m3u8
 #EXTINF:-1 tvg-id="SportsGrid.us" tvg-country="UK" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzA3OTUzNTZf/SportsGrid_512x512.png" group-title="Sports",SportsGrid (1080p)
 https://sportsgrid-tribal.amagi.tv/playlist.m3u8
diff --git a/channels/unsorted.m3u b/channels/unsorted.m3u
index 81031601ae..3116f647db 100644
--- a/channels/unsorted.m3u
+++ b/channels/unsorted.m3u
@@ -1,6 +1,4 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="Arabic" tvg-logo="http://www.daawah.tv/img/logo.png" group-title="Religious",Daawah TV
-http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",1A Network
 https://simultv.s.llnwi.net/n4s4/2ANetwork/interlink.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Adria Music RS
@@ -41,6 +39,8 @@ https://stmv.panel.mivideo.pro/bajocerotv/bajocerotv/playlist.m3u8
 https://5b57bb229a2e6.streamlock.net/live/televizija/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Belarus 24
 http://serv30.vintera.tv:8081/belarus24/belarus24/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Bella Asuncion TV
+https://tvdatta.com:3602/stream/play.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Beteve
 https://cdnapisec.kaltura.com/p/2346171/sp/234617100/playManifest/entryId/1_n6442jz0/format/applehttp/protocol/https/uiConfId/42816492/a.m3u8?referrer=aHR0cHM6Ly9iZXRldmUuY2F0
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Bitlis TV (720p) [Not 24/7]
@@ -54,7 +54,7 @@ http://stream.fion.es:1936/Canal_Coin/canalcoin.stream/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Canal Orbe 21
 https://cdn2.zencast.tv:30443/orbe/orbe21smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Canal Parlamento
-http://congresodirecto-f.akamaihd.net:80/i/congreso6_1@54665/master.m3u8
+http://congresodirecto-f.akamaihd.net/i/congreso6_1@54665/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Canalcosta TV
 https://5d8d85cf2c308.streamlock.net:1936/CanalcostaTV/WXP6YT/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Carolina TV
@@ -77,6 +77,8 @@ https://simultv.s.llnwi.net/o054/CowboyTheater/interlink.m3u8
 https://simultv.s.llnwi.net/n4s4/CutUpNCook/interlink.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Cycle World
 http://a.jsrdn.com/broadcast/3e5befe5dd/+0000/high/c.m3u8
+#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="Arabic" tvg-logo="http://www.daawah.tv/img/logo.png" group-title="Religious",Daawah TV
+http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",DeepHouse District
 https://eu-nl-012.worldcast.tv/dancetelevisiontwo/dancetelevisiontwo.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Dijlah Tarab
@@ -151,6 +153,8 @@ http://51.15.154.138/providus/live2805_hq/index.m3u8
 https://w2.kringvarp.fo/uttanlands/_definst_/smil:uttanlands.smil/chunklist_w587901821_b772000_slfao.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",La Muscle TV
 https://streamcdn.lamuscle.com/lamtv-origin/smil:monsterworkout-tricepspt1.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Ländle Tv
+https://streaming13.huberwebmedia.at/LiveApp/streams/985585225397790082777809.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Latest TV [Not 24/7]
 https://5a0e89631aa14.streamlock.net/LatestTV/LatestTV/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Latvijas Radio 1
@@ -159,8 +163,6 @@ http://5a44e5b800a41.streamlock.net:1935/liveVLR1/mp4:LR1/playlist.m3u8
 https://5856e1a25f71a.streamlock.net/easycast9-live/_definst_/mp4:livestreamhd10/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Lifestyle
 https://simultv.s.llnwi.net/o058/Lifestyle/interlink.m3u8
-#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Ländle Tv
-https://streaming13.huberwebmedia.at/LiveApp/streams/985585225397790082777809.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",MDF.1 Magdeburg
 https://58bd5b7a98e04.streamlock.net/medienasa-live/_definst_/mp4:mdf1_high/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Messinia TV
@@ -257,8 +259,6 @@ https://simultv.s.llnwi.net/o059/ReadySetAction/interlink.m3u8
 https://rbmn-live.akamaized.net/hls/live/622817/BoRB-US/master_928.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Red TV
 https://live.rednet.rs/providus/redtv_multi_hq/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Marajoara
-https://video01.kshost.com.br:4443/tv31966/tv31966/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",RedeTV! Tocantins
 https://59f1cbe63db89.streamlock.net:1443/redetvro/_definst_/redetvro/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Report TV
@@ -279,10 +279,10 @@ https://rmc2hdslive-lh.akamaihd.net/i/DVMR_RMC@167269/master.m3u8
 http://79.106.48.2:4578/live/rtsh_1mob_pp2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",RTSH 2
 http://79.106.48.2:4578/live/rtsh_2mob_p2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",RTSH 24
-http://79.106.48.2:4578/live/rtsh_24_mob/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",RTSH 3
 http://79.106.48.2:4578/live/rtsh3mobp1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",RTSH 24
+http://79.106.48.2:4578/live/rtsh_24_mob/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",RTSH Film
 http://79.106.48.2:4578/live/rtsh_film_mob_p1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",RTSH Gjirokastra
@@ -378,13 +378,15 @@ https://59f2354c05961.streamlock.net:1443/pascoal/_definst_/pascoal/playlist.m3u
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Dielli
 http://stream.tvdielli.com:8081/dielli/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Gazeta
-http://api.new.livestream.com:80/accounts/5381476/events/8947634/live.m3u8
+http://api.new.livestream.com/accounts/5381476/events/8947634/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Guará
 https://59f2354c05961.streamlock.net:1443/tvguara/_definst_/tvguara/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Halle
 https://58bd5b7a98e04.streamlock.net/medienasa-live/_definst_/mp4:tvhalle_high/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Johaniter
 https://nesertv.live/webstream/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Marajoara (720p)
+https://video01.kshost.com.br:4443/tv31966/tv31966/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Max
 https://59f1cbe63db89.streamlock.net:1443/tvmax/_definst_/tvmax/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Pai Eterno
@@ -415,5 +417,3 @@ https://5caf24a595d94.streamlock.net:1937/8132/8132/playlist.m3u8
 http://62.113.210.250:1935/medienasa-live/ok-wettin_high/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",XZone
 https://simultv.s.llnwi.net/o060/xzone/interlink.m3u8
-#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Bella Asuncion TV
-https://tvdatta.com:3602/stream/play.m3u8
diff --git a/channels/us.m3u b/channels/us.m3u
index ec995370ca..b83d15bc31 100644
--- a/channels/us.m3u
+++ b/channels/us.m3u
@@ -1,4 +1,6 @@
 #EXTM3U
+#EXTINF:-1 tvg-id="WKYC.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/tjlSkyp.jpg" group-title="Local",3 Studios Cleveland OH (WKYC) (1080p)
+https://livevideo01.wkyc.com/hls/live/2015504/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="3ABN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GVZuKc7.png" group-title="Religious",3ABN (720p) [Not 24/7]
 https://moiptvhls-i.akamaihd.net/hls/live/652042/secure/master.m3u8
 #EXTINF:-1 tvg-id="K17JIDT3.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zI6jr9L.png" group-title="Religious",3ABN Dare to Dream (720p) [Not 24/7]
@@ -11,7 +13,7 @@ https://moiptvhls-i.akamaihd.net/hls/live/652312/secure/master.m3u8
 https://moiptvhls-i.akamaihd.net/hls/live/652318/secure/master.m3u8
 #EXTINF:-1 tvg-id="K17JIDT4.us" tvg-country="US;HISPAM" tvg-language="Spanish" tvg-logo="https://i.imgur.com/4ydVVIA.png" group-title="Religious",3ABN Latino (480p)
 http://uni5rtmp.tulix.tv:1935/bettervida/bettervida/playlist.m3u8
-#EXTINF:-1 tvg-id="K18JLD2.us" tvg-country="US;HISPAM" tvg-language="Spanish" tvg-logo="https://i.imgur.com/4ydVVIA.png" group-title="Religious",3ABN Latino (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="K18JLD2.us" tvg-country="US;HISPAM" tvg-language="Spanish" tvg-logo="https://i.imgur.com/4ydVVIA.png" group-title="Religious",3ABN Latino (360p) [Not 24/7]
 https://moiptvhls-i.akamaihd.net/hls/live/652315/secure/master.m3u8
 #EXTINF:-1 tvg-id="3ABNPraiseHimMusicChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/t6Ydwqg.png" group-title="Religious",3ABN Praise Him Music Channel (720p) [Not 24/7]
 https://moiptvhls-i.akamaihd.net/hls/live/554145/secure/playlist.m3u8
@@ -19,8 +21,6 @@ https://moiptvhls-i.akamaihd.net/hls/live/554145/secure/playlist.m3u8
 https://moiptvhls-i.akamaihd.net/hls/live/652317/secure/master.m3u8
 #EXTINF:-1 tvg-id="3ABNRussia.us" tvg-country="US" tvg-language="Russian" tvg-logo="https://i.imgur.com/8fKWpo3.png" group-title="Religious",3ABN Russia (720p) [Not 24/7]
 https://moiptvhls-i.akamaihd.net/hls/live/652316/secure/master.m3u8
-#EXTINF:-1 tvg-id="WKYC.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/tjlSkyp.jpg" group-title="Local",3 Studios Cleveland OH (WKYC) (1080p)
-https://livevideo01.wkyc.com/hls/live/2015504/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WHDH.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/WHDH_7_logo.png" group-title="Local",7News Boston MA (WHDH) (540p)
 https://bcsecurelivehls-i.akamaihd.net/hls/live/598046/4744899807001_1/livestream/master.m3u8
 #EXTINF:-1 tvg-id="KBMT.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/boVFg14.jpg" group-title="Local",12 News Beaumont TX (KBMT) (1080p)
@@ -120,15 +120,15 @@ https://cdn.igocast.com/channel4_hls/channel4_master.m3u8
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c7e25a1932c8368bdbfd87d/playlist.m3u8
 #EXTINF:-1 tvg-id="ActionMaxEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Snba5W2.jpg" group-title="Movies",ActionMax East (360p) [Geo-blocked]
 http://31.220.41.88:8081/live/us-cinemaxaction.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="AdoracionReal.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/AdoracionReal1/picture?width=320&height=320" group-title="Music",Adoración Real (360p)
+#EXTINF:-1 tvg-id="AdoracionReal.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/AdoracionReal1/picture?width=320&height=320" group-title="Music",Adoración Real (360p) [Offline]
 https://tv.tvcontrolcp.com:1936/8012/8012/playlist.m3u8
-#EXTINF:-1 tvg-id="AdventureSportsTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/wZk4nZI.png" group-title="Sports",Adventure Sports TV (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="AdventureSportsTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/wZk4nZI.png" group-title="Sports",Adventure Sports TV (720p) [Not 24/7]
 https://gizmeon.s.llnwi.net/channellivev3/live/master.m3u8?channel=275
-#EXTINF:-1 tvg-id="Akaku53.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/MQET539.jpg" group-title="Local",Akaku 53 (Hawaii) (720p)
+#EXTINF:-1 tvg-id="Akaku53.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/MQET539.jpg" group-title="Local",Akaku 53 (Hawaii) (1080p)
 https://akaku.vod.castus.tv/live/ch1.m3u8
-#EXTINF:-1 tvg-id="Akaku54.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/MQET539.jpg" group-title="Local",Akaku 54 (Hawaii) (720p)
+#EXTINF:-1 tvg-id="Akaku54.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/MQET539.jpg" group-title="Local",Akaku 54 (Hawaii) (1080p)
 https://akaku.vod.castus.tv/live/ch2.m3u8
-#EXTINF:-1 tvg-id="Akaku55.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/MQET539.jpg" group-title="Local",Akaku 55 (Hawaii) (720p)
+#EXTINF:-1 tvg-id="Akaku55.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/MQET539.jpg" group-title="Local",Akaku 55 (Hawaii) (1080p)
 https://akaku.vod.castus.tv/live/ch3.m3u8
 #EXTINF:-1 tvg-id="AKCTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YNdQXDz.jpg" group-title="Outdoor",AKC TV (1080p)
 https://video.blivenyc.com/broadcast/prod/2061/22/desktop-playlist.m3u8
@@ -156,13 +156,13 @@ https://58cc65c534c67.streamlock.net/alkarmatv.com/alkarmaau.smil/playlist.m3u8
 https://58cc65c534c67.streamlock.net/alkarmatv.com/alkarmaNA2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlkarmaTVMiddleEast.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://i2.wp.com/en.alkarmatv.com/wp-content/uploads/2020/02/Logo-ME.png" group-title="Religious",Alkarma TV Middle East (1080p)
 https://58cc65c534c67.streamlock.net/alkarmatv.com/alkarmame1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AlkarmaTVNorthAmericaCanada.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://i0.wp.com/en.alkarmatv.com/wp-content/uploads/2020/02/Logo-NA.png" group-title="Religious",Alkarma TV North America & Canada (1080p)
+#EXTINF:-1 tvg-id="AlkarmaTVNorthAmericaCanada.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://i0.wp.com/en.alkarmatv.com/wp-content/uploads/2020/02/Logo-NA.png" group-title="Religious",Alkarma TV North America & Canada (720p)
 https://5aafcc5de91f1.streamlock.net/alkarmatv.com/alkarmana1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlkarmaTVPraise.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://i0.wp.com/en.alkarmatv.com/wp-content/uploads/2020/02/Logo-Praise.png" group-title="Religious",Alkarma TV Praise (1080p)
 https://58cc65c534c67.streamlock.net/alkarmatv.com/alkarmapa.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AlkarmaTVTalmazaDiscipleship.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://i1.wp.com/en.alkarmatv.com/wp-content/uploads/2020/02/Logo-Talmaza.png" group-title="Religious",Alkarma TV Talmaza (Discipleship) (1080p)
+#EXTINF:-1 tvg-id="AlkarmaTVTalmazaDiscipleship.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://i1.wp.com/en.alkarmatv.com/wp-content/uploads/2020/02/Logo-Talmaza.png" group-title="Religious",Alkarma TV Talmaza (Discipleship) (720p)
 https://58cc65c534c67.streamlock.net/alkarmatv.com/alkarmame2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AlkarmaTVYouthEnglish.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://i0.wp.com/en.alkarmatv.com/wp-content/uploads/2020/11/Logo-US-1024x576-1.png" group-title="Religious",Alkarma TV Youth & English (1080p)
+#EXTINF:-1 tvg-id="AlkarmaTVYouthEnglish.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://i0.wp.com/en.alkarmatv.com/wp-content/uploads/2020/11/Logo-US-1024x576-1.png" group-title="Religious",Alkarma TV Youth & English (720p)
 https://5aafcc5de91f1.streamlock.net/alkarmatv.com/alkarmaus.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Alkerazatv.us" tvg-country="US" tvg-language="Arabic" tvg-logo="" group-title="Religious",Alkerazatv (720p)
 https://597f64b67707a.streamlock.net/alkerazatv.org/alkerazatv.smil/playlist.m3u8
@@ -172,7 +172,7 @@ https://2-fss-2.streamhoster.com/pl_120/amlst:203932-1476320/playlist.m3u8
 https://597f64b67707a.streamlock.net/almagd.tv/almagd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlmagdTVNorthAmerica.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://www.almagd.tv/en/images/logo.png" group-title="Religious",Almagd TV North America (1080p)
 https://5aafcc5de91f1.streamlock.net/almagd.tv/almagd.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AMCLatinAmerica.us" tvg-country="US" tvg-language="English;Spanish" tvg-logo="https://i.imgur.com/yngqRL8.png" group-title="",AMC Latin America [Offline]
+#EXTINF:-1 tvg-id="AMCLatinAmerica.us" tvg-country="US" tvg-language="English;Spanish" tvg-logo="https://i.imgur.com/yngqRL8.png" group-title="",AMC Latin America [Timeout]
 http://209.91.213.10:8088/play/a013
 #EXTINF:-1 tvg-id="America.us" tvg-country="US" tvg-language="English" tvg-logo="https://s-media-cache-ak0.pinimg.com/originals/40/48/2c/40482cf6af582372c2a22072a2394a80.png" group-title="",America (720p) [Not 24/7]
 http://45.6.4.154/americatuc/vivo.m3u8
@@ -205,13 +205,13 @@ https://htv-drm-live-cdn.fptplay.net/CDN-FPT02/AXN-HD-1080p/playlist.m3u8
 https://www.livedoomovie.com/02_AXNHD_720p/chunklist.m3u8
 #EXTINF:-1 tvg-id="AXNEastAsia.us" tvg-country="VN" tvg-language="Vietnamese" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-axn.png" group-title="Movies",AXN East Asia (Vietnamese) (1080p) [Offline]
 http://103.81.104.118/hls/stream2.m3u8
-#EXTINF:-1 tvg-id="AXNLatinoamerica.us" tvg-country="HISPAM" tvg-language="English;Spanish" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-axn.png" group-title="Entertainment",AXN Latinoamérica (576p)
+#EXTINF:-1 tvg-id="AXNLatinoamerica.us" tvg-country="HISPAM" tvg-language="English;Spanish" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-axn.png" group-title="Entertainment",AXN Latinoamérica (576p) [Timeout]
 http://209.91.213.10:8088/play/a011
 #EXTINF:-1 tvg-id="AXSTVNow.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/605d1bba10396351a3042dd4" group-title="General",AXS TV Now (1080p)
 https://dikcfc9915kp8.cloudfront.net/hls/main.m3u8
 #EXTINF:-1 tvg-id="AyenehTV.us" tvg-country="US" tvg-language="Persian" tvg-logo="https://i.imgur.com/TpnmasZ.png" group-title="General",Ayeneh TV (720p) [Not 24/7]
 https://livestream.5centscdn.com/cls040318/b0d2763968fd0bdd2dc0d44ba2abf9ce.sdp/index.m3u8
-#EXTINF:-1 tvg-id="BabyFirstTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://zap2it.tmsimg.com/h3/NowShowing/50338/s50338_h3_aa.png" group-title="Kids",BabyFirst TV (576p)
+#EXTINF:-1 tvg-id="BabyFirstTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://zap2it.tmsimg.com/h3/NowShowing/50338/s50338_h3_aa.png" group-title="Kids",BabyFirst TV (1080p)
 https://babyfirst.akamaized.net/hls/live/2028842/bftvusaott/playlist.m3u8
 #EXTINF:-1 tvg-id="BeachTVCSULB.us" tvg-country="US" tvg-language="English" tvg-logo="http://www.cla.csulb.edu/departments/polisci/wp-content/uploads/2016/01/Beach-TV-Logo-300x169.jpg" group-title="Education",Beach TV CSULB (720p) [Not 24/7]
 http://stream04.amp.csulb.edu:1935/Beach_TV/smil:BeachTV.smil/playlist.m3u8
@@ -231,7 +231,7 @@ https://5ed325193d4e1.streamlock.net:444/LiveTV/MTVHD/playlist.m3u8
 http://media4.tripsmarter.com:1935/LiveTV/BTVHD/playlist.m3u8
 #EXTINF:-1 tvg-id="BeachTVPanamaCity.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GaUcUCZ.png" group-title="Local",Beach TV Panama City (720p)
 https://5ed325193d4e1.streamlock.net:444/LiveTV/BTVHD/playlist.m3u8
-#EXTINF:-1 tvg-id="BeautyIQ.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qtirIFA.png" group-title="Shop",Beauty IQ (720p)
+#EXTINF:-1 tvg-id="BeautyIQ.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qtirIFA.png" group-title="Shop",Beauty IQ (1080p)
 https://lsqvc4us-lh.akamaihd.net/i/lsqvc4us_01@802711/master.m3u8
 #EXTINF:-1 tvg-id="BekSportsEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://pbs.twimg.com/media/DfLqnf4VMAA0m27.png" group-title="Sports",Bek Sports East (720p)
 https://wowzaprod188-i.akamaihd.net/hls/live/728897/54d0bcd5/playlist.m3u8
@@ -272,9 +272,9 @@ https://liveprodapnortheast.global.ssl.fastly.net/ap1/Channel-APTVqvs-AWS-tokyo-
 #EXTINF:-1 tvg-id="BloombergTVAsiaLiveEvent.us" tvg-country="APAC" tvg-language="English" tvg-logo="http://cdn-profiles.tunein.com/s47135/images/logog.png" group-title="Business",Bloomberg TV Asia Live Event (720p)
 https://www.bloomberg.com/media-manifest/streams/asia-event.m3u8
 #EXTINF:-1 tvg-id="BloombergTVAustralia.us" tvg-country="AU" tvg-language="English" tvg-logo="http://cdn-profiles.tunein.com/s47135/images/logog.png" group-title="Business",Bloomberg TV Australia (720p)
-https://liveprodapnortheast.akamaized.net/oz1/Channel-OZTVqvs-AWS-tokyo-1/Source-OZTVqvs-440-1_live.m3u8
-#EXTINF:-1 tvg-id="BloombergTVAustralia.us" tvg-country="AU" tvg-language="English" tvg-logo="http://cdn-profiles.tunein.com/s47135/images/logog.png" group-title="Business",Bloomberg TV Australia (720p)
 https://liveprodapnortheast.global.ssl.fastly.net/oz1/Channel-OZTVqvs-AWS-tokyo-1/Source-OZTVqvs-1000-1_live.m3u8
+#EXTINF:-1 tvg-id="BloombergTVAustralia.us" tvg-country="AU" tvg-language="English" tvg-logo="http://cdn-profiles.tunein.com/s47135/images/logog.png" group-title="Business",Bloomberg TV Australia (270p)
+https://liveprodapnortheast.akamaized.net/oz1/Channel-OZTVqvs-AWS-tokyo-1/Source-OZTVqvs-440-1_live.m3u8
 #EXTINF:-1 tvg-id="BloombergTVEMEALiveEvent.us" tvg-country="EMEA" tvg-language="English" tvg-logo="http://cdn-profiles.tunein.com/s47135/images/logog.png" group-title="Business",Bloomberg TV EMEA Live Event (720p)
 https://www.bloomberg.com/media-manifest/streams/eu-event.m3u8
 #EXTINF:-1 tvg-id="BloombergTVEurope.us" tvg-country="EUR" tvg-language="English" tvg-logo="http://cdn-profiles.tunein.com/s47135/images/logog.png" group-title="Business",Bloomberg TV Europe (720p)
@@ -295,13 +295,13 @@ https://liveproduseast.global.ssl.fastly.net/us/Channel-USTV-AWS-virginia-1/Sour
 https://www.bloomberg.com/media-manifest/streams/us-event.m3u8
 #EXTINF:-1 tvg-id="BloombergTVUSPoliticsLiveEvent.us" tvg-country="US" tvg-language="English" tvg-logo="http://cdn-profiles.tunein.com/s47135/images/logog.png" group-title="Business",Bloomberg TV US Politics Live Event (720p)
 https://www.bloomberg.com/media-manifest/streams/politics.m3u8
-#EXTINF:-1 tvg-id="BluegrassMusic4U.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/nm3N3aw.png" group-title="Music",Bluegrass Music 4U (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="BluegrassMusic4U.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/nm3N3aw.png" group-title="Music",Bluegrass Music 4U (480p) [Not 24/7]
 https://59d39900ebfb8.streamlock.net/blugrassmusic/blugrassmusic/playlist.m3u8
 #EXTINF:-1 tvg-id="BoomerangLatinoamerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="" group-title="Kids",Boomerang Latinoamérica [Geo-blocked]
 http://45.5.8.78:8000/play/a00i
 #EXTINF:-1 tvg-id="WFXTTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YGdDVAQ.jpg" group-title="Local",Boston 25 News (WFXT) (720p)
 https://d2dy6pkj44n6e7.cloudfront.net/v1/master/77872db67918a151b697b5fbc23151e5765767dc/cmg_PROD_cmg-tv-10020_27d61a9c-67b2-4d7c-9486-626a6a071467_LE/in/cmg-wftxtv-hls-v3/live.m3u8
-#EXTINF:-1 tvg-id="BowieTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ZgrlVYT.jpg" group-title="Local",Bowie TV (720p)
+#EXTINF:-1 tvg-id="BowieTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ZgrlVYT.jpg" group-title="Local",Bowie TV (360p)
 https://granicusliveus3-a.akamaihd.net/cityofbowie/G0466_001/playlist.m3u8
 #EXTINF:-1 tvg-id="BrazzersLatinoamerica.us" tvg-country="US" tvg-language="Spanish" tvg-logo="" group-title="XXX",Brazzers Latinoamérica [Geo-blocked]
 http://45.5.8.78:8000/play/a029
@@ -327,7 +327,7 @@ https://skystreams-lh.akamaihd.net/i/SkyC1_1@500806/master.m3u8
 https://skystreams-lh.akamaihd.net/i/SkyC2_1@500807/master.m3u8
 #EXTINF:-1 tvg-id="CSPAN3.us" tvg-country="US" tvg-language="English" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cspan3.png" group-title="Legislative",C-SPAN 3 (108p) [Not 24/7]
 https://skystreams-lh.akamaihd.net/i/SkyC3_1@500808/master.m3u8
-#EXTINF:-1 tvg-id="CableHits.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zl7Gzwm.png" group-title="Entertainment",Cable Hits (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="CableHits.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zl7Gzwm.png" group-title="Entertainment",Cable Hits (720p) [Not 24/7]
 https://bk7l2w4nlx53-hls-live.5centscdn.com/AETV/514c04b31b5f01cf00dd4965e197fdda.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="CaliforniaMusicChannel.us" tvg-country="US" tvg-language="English" tvg-logo="http://3.bp.blogspot.com/-Ngn_IHUGV-E/VoGzyGsSlkI/AAAAAAAAAjc/XTspAPwP2TE/s1600/CMC-Music-Channel.png" group-title="Music",California Music Channel (720p) [Geo-blocked]
 https://cmctv.ios.internapcdn.net/cmctv_vitalstream_com/live_1/CMC-TV/playlist.m3u8
@@ -345,13 +345,13 @@ https://na-us-se13.secdn.net/pegstream3-live/play/5f0d9ca5-4e85-4c01-a426-9ec8d4
 https://d2up1hmow19bcd.cloudfront.net/livecf/liveracing/playlist.m3u8
 #EXTINF:-1 tvg-id="CartoonNetworkArabic.us" tvg-country="MENA" tvg-language="Arabic" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/bb/Cartoon_Network_Arabic_logo.png/693px-Cartoon_Network_Arabic_logo.png" group-title="Kids",Cartoon Network Arabic (1080p)
 https://shls-cartoon-net-prod-dub.shahid.net/out/v1/dc4aa87372374325a66be458f29eab0f/index.m3u8
-#EXTINF:-1 tvg-id="CartoonNetworkAsia.us" tvg-country="ASIA" tvg-language="English" tvg-logo="https://www.mncvision.id/userfiles/image/channel/channel_47.png" group-title="Kids",Cartoon Network Asia (720p) [Offline]
+#EXTINF:-1 tvg-id="CartoonNetworkAsia.us" tvg-country="ASIA" tvg-language="English" tvg-logo="https://www.mncvision.id/userfiles/image/channel/channel_47.png" group-title="Kids",Cartoon Network Asia (720p) [Timeout]
 http://198.16.106.62:8278/streams/d/Cn/playlist.m3u8
 #EXTINF:-1 tvg-id="CartoonNetworkIndia.us" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://www.lyngsat.com/logo/tv/cc/cartoon_network_global.png" group-title="Kids",Cartoon Network India (432p) [Not 24/7]
 http://70.39.83.58:8278/cartoonnetworkhindikdin/playlist.m3u8
-#EXTINF:-1 tvg-id="CartoonNetworkIndia.us" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://www.lyngsat.com/logo/tv/cc/cartoon_network_global.png" group-title="Kids",Cartoon Network India (576p) [Offline]
+#EXTINF:-1 tvg-id="CartoonNetworkIndia.us" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://www.lyngsat.com/logo/tv/cc/cartoon_network_global.png" group-title="Kids",Cartoon Network India (576p) [Timeout]
 http://103.153.39.34:8000/play/a04k/index.m3u8
-#EXTINF:-1 tvg-id="CartoonNetworkLatinAmerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://www.lyngsat.com/logo/tv/cc/cartoon_network_global.png" group-title="Kids",Cartoon Network Latin America [Offline]
+#EXTINF:-1 tvg-id="CartoonNetworkLatinAmerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://www.lyngsat.com/logo/tv/cc/cartoon_network_global.png" group-title="Kids",Cartoon Network Latin America [Timeout]
 http://209.91.213.10:8088/play/a00k
 #EXTINF:-1 tvg-id="CartoonNetworkVietnam.us" tvg-country="VN" tvg-language="Vietnamese" tvg-logo="https://www.lyngsat.com/logo/tv/cc/cartoon_network_global.png" group-title="Kids",Cartoon Network Vietnam (720p) [Geo-blocked]
 https://htv-drm-live-cdn.fptplay.net/CDN-FPT02/CARTOON-SD-720p/playlist.m3u8
@@ -387,7 +387,7 @@ https://livevideo01.5newsonline.com/hls/live/2011653/newscasts/live.m3u8
 https://livevideo01.kens5.com/hls/live/2016281/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WRGBTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ByPFQGp.png" group-title="Local",CBS 6 Albany NY (WRGB) (720p)
 https://content.uplynk.com/channel/bba3e7da884a49bba96341ecf5128f0f.m3u8
-#EXTINF:-1 tvg-id="WHIO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/n38ZKuE.png" group-title="Local",CBS 7 Dayton OH (WHIO) [Offline]
+#EXTINF:-1 tvg-id="WHIO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/n38ZKuE.png" group-title="Local",CBS 7 Dayton OH (WHIO) [Timeout]
 https://svc-lvanvato-cxtv-whio.cmgvideo.com/whio/2596k/index.m3u8
 #EXTINF:-1 tvg-id="KIROTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://mediaweb.kirotv.com/photo/2018/09/24/kiro7_header_logo_152x60_13118164_ver1.0.png" group-title="Local",CBS 7 Seattle WA (KIRO-TV) [Offline]
 https://svc-lvanvato-cxtv-kiro.cmgvideo.com/kiro/1864k/index.m3u8
@@ -395,7 +395,7 @@ https://svc-lvanvato-cxtv-kiro.cmgvideo.com/kiro/1864k/index.m3u8
 https://livevideo01.cbs8.com/hls/live/2014967/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="KCALTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Q8IwOiL.jpg" group-title="Local",CBS 9 Los Angeles CA (KCAL-TV) (720p)
 https://cbsn-la-cedexis.cbsnstream.cbsnews.com/out/v1/57b6c4534a164accb6b1872b501e0028/master.m3u8
-#EXTINF:-1 tvg-id="WUSATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ekt1an0.png" group-title="Local",CBS 9 Washington DC (WUSA) (720p)
+#EXTINF:-1 tvg-id="WUSATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ekt1an0.png" group-title="Local",CBS 9 Washington DC (WUSA) (1080p)
 https://livevideo01.wusa9.com/hls/live/2015498/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WBNSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Wq4M60P.jpg" group-title="Local",CBS 10 Columbus OH (WBNS-TV) (1080p)
 https://livevideo01.10tv.com/hls/live/2013836/newscasts/live.m3u8
@@ -463,10 +463,10 @@ https://rpn1.bozztv.com/36bay2/gusa-chefchampion/mono.m3u8
 https://rpn1.bozztv.com/36bay2/gusa-chefrock/mono.m3u8
 #EXTINF:-1 tvg-id="ChiveTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://yt3.ggpht.com/a-/AN66SAz6Ssqjkt5Zn__8q2-hhZEPzoma1h3_IshrpQ=s900-mo-c-c0xffffffff-rj-k-no" group-title="Outdoor",Chive TV (720p)
 https://a.jsrdn.com/broadcast/4df1bf71c1/+0000/c.m3u8
-#EXTINF:-1 tvg-id="ChristianYouthChannelCYC.us" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/PfFJy5E.png" group-title="Religious",Christian Youth Channel (CYC) (1080p)
-http://media3.smc-host.com:1935/cycnow.com/smil:cyc.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ChristianYouthChannelCYC.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/PfFJy5E.png" group-title="Religious",Christian Youth Channel (CYC) (1080p)
 http://media.smc-host.com:1935/cycnow.com/cyc2/playlist.m3u8
+#EXTINF:-1 tvg-id="ChristianYouthChannelCYC.us" tvg-country="EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/PfFJy5E.png" group-title="Religious",Christian Youth Channel (CYC) (1080p)
+http://media3.smc-host.com:1935/cycnow.com/smil:cyc.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Cinemax.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://static.epg.best/ph/Cinemax.ph.png" group-title="Movies",Cinemax [Geo-blocked]
 http://23.237.202.43:7283/CINEMAX-FHD/index.m3u8?sn=Ux0Oojow5FkqHQCpMmUNQKUr4Wb&tm=1626349319&un=rommel07
 #EXTINF:-1 tvg-id="CinemaxAsia.us" tvg-country="US" tvg-language="English;Vietnamese" tvg-logo="https://static.epg.best/ph/Cinemax.ph.png" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36" group-title="Movies",Cinemax Asia (720p)
@@ -484,7 +484,7 @@ https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c7e2531932c8368bdbfd87c/
 https://d3s1xaoyhrialn.cloudfront.net/CAS/index.m3u8
 #EXTINF:-1 tvg-id="ClassicCinema.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/tC4AePW.png" group-title="Classic",Classic Cinema (240p)
 https://rpn1.bozztv.com/36bay2/gusa-classiccinema/mono.m3u8
-#EXTINF:-1 tvg-id="ClassicMoviesChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pltVS6t.png" group-title="Classic",Classic Movies Channel (480p)
+#EXTINF:-1 tvg-id="ClassicMoviesChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pltVS6t.png" group-title="Classic",Classic Movies Channel (540p)
 https://b83608fe932143099bb8b25a66857730.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5f86075a0d552957bf5aa4dd/playlist.m3u8
 #EXTINF:-1 tvg-id="ClassicTV4U.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzU1NDU0OTVf/NostTV_ClassicTV4U.png" group-title="Classic",Classic TV 4U (480p)
 https://broadcast.mytvtogo.net/classictv4u/classictv4u/playlist.m3u8
@@ -499,9 +499,9 @@ http://ott-cdn.ucom.am/s65/index.m3u8
 https://live.cnbcindonesia.com/livecnbc/smil:cnbctv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CNBCTV18.us" tvg-country="IN" tvg-language="Hindi" tvg-logo="https://i.imgur.com/3yumcV3.jpg" group-title="Business",CNBC TV 18 (504p)
 https://cnbctv18-lh.akamaihd.net/i/cnbctv18_1@174868/index_5_av-p.m3u8
-#EXTINF:-1 tvg-id="CNNChile.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/tNxumYO.png" group-title="News",CNN Chile (720p) [Offline]
+#EXTINF:-1 tvg-id="CNNChile.cl" tvg-country="CL" tvg-language="Spanish" tvg-logo="https://i.imgur.com/tNxumYO.png" group-title="News",CNN Chile (720p) [Timeout]
 https://unlimited1-cl-movistar.dps.live/cnn/cnn.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="CNNenEspanol.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/zeg2ZGW.jpg" group-title="News",CNN en Español [Offline]
+#EXTINF:-1 tvg-id="CNNenEspanol.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/zeg2ZGW.jpg" group-title="News",CNN en Español [Timeout]
 http://209.91.213.10:8088/play/a014
 #EXTINF:-1 tvg-id="CNNPhilippines.us" tvg-country="PH" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/48/CNN_Philippines_Logo.svg/220px-CNN_Philippines_Logo.svg.png" group-title="News",CNN Philippines (720p) [Not 24/7]
 https://streaming.cnnphilippines.com/live/myStream/playlist.m3u8
@@ -513,10 +513,10 @@ https://turnerlive.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_0_35
 https://turnerlive.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_2_1964000.m3u8
 #EXTINF:-1 tvg-id="CNNUSA.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ivyl5SQ.gif" group-title="News",CNN USA (480p) [Geo-blocked]
 https://turnerlive.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_3_1464000.m3u8
-#EXTINF:-1 tvg-id="CNNUSA.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ivyl5SQ.gif" group-title="News",CNN USA (480p) [Geo-blocked]
-https://turnerlive.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_4_1064000.m3u8
 #EXTINF:-1 tvg-id="CNNUSA.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ivyl5SQ.gif" group-title="News",CNN USA (360p) [Geo-blocked]
 http://stream.tvtap.live:8081/live/us-cnn.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="CNNUSA.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ivyl5SQ.gif" group-title="News",CNN USA (360p) [Geo-blocked]
+https://turnerlive.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_4_1064000.m3u8
 #EXTINF:-1 tvg-id="ComedyDynamics.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/ComedyDynamics_640x640.png" group-title="Comedy",Comedy Dynamics (1080p)
 https://comedydynamics-wurl.cinedigm.com/playlist.m3u8
 #EXTINF:-1 tvg-id="Comet.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/53/Comet_TV_Logo.png" group-title="Entertainment",Comet (720p)
@@ -525,7 +525,7 @@ http://content.uplynk.com/channel/3e45c6b5354a40f787e0b2aadb0f5d6a.m3u8
 https://d2rir1vttzppfq.cloudfront.net/playlist.m3u8
 #EXTINF:-1 tvg-id="CookingPanda.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Z6pDpzl.png" group-title="Cooking",Cooking Panda (720p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=46
-#EXTINF:-1 tvg-id="CornerstoneTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/cV8FKR9.png" group-title="Religious",Cornerstone TV (720p)
+#EXTINF:-1 tvg-id="CornerstoneTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/cV8FKR9.png" group-title="Religious",Cornerstone TV (640p)
 http://cdn.media9.truegod.tv/ctvnlive/smil:ctvn.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CourtTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/60526b849849524498245b78" group-title="Documentary",Court TV (1080p)
 https://cdn-katz-networks-01.vos360.video/Content/HLS/Live/channel(courttv)/index.m3u8
@@ -533,7 +533,7 @@ https://cdn-katz-networks-01.vos360.video/Content/HLS/Live/channel(courttv)/inde
 https://content.uplynk.com/channel/6c0bd0f94b1d4526a98676e9699a10ef.m3u8
 #EXTINF:-1 tvg-id="CrimePlusInvestigationAsia.us" tvg-country="US" tvg-language="English" tvg-logo="https://static.epg.best/id/CrimeInvestigation.id.png" group-title="Entertainment",Crime + Investigation Asia [Offline]
 http://203.154.243.31:15001
-#EXTINF:-1 tvg-id="CSatTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/cigpFzt.png" group-title="Religious",CSat TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="CSatTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/cigpFzt.png" group-title="Religious",CSat TV (720p) [Not 24/7]
 http://media.smc-host.com:1935/csat.tv/smil:csat.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CTNCourtFeed.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/He6Ugfn.jpg" group-title="Local",CT-N Court Feed (360p)
 http://video.ct-n.com/live/ctnSupreme/playlist_DVR.m3u8
@@ -544,12 +544,12 @@ http://video.ct-n.com/live/ctnstream/playlist_DVR.m3u8
 #EXTINF:-1 tvg-id="CTN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="Religious",CTN (720p)
 https://rrsatrtmp.tulix.tv/ctntv/ctntvmulti.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CTN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="Religious",CTN (480p)
-http://admin.ottdemo.rrsat.com:1935/ctntv/ctntv2/playlist.m3u8
-#EXTINF:-1 tvg-id="CTN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="Religious",CTN (480p)
 http://rtmp.ottdemo.rrsat.com/ctntv/ctntvmulti.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="CTN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="Religious",CTN (404p)
+http://admin.ottdemo.rrsat.com:1935/ctntv/ctntv2/playlist.m3u8
 #EXTINF:-1 tvg-id="WFGCDT1.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/UtaBUfH.png" group-title="Religious",CTN 61 Riviera Beach FL (WFGC) (720p) [Not 24/7]
 http://hls1.livestreamingcdn.com:1935/livecdn631/myStream.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="CWSeed.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/PZrtfPb.png" group-title="Entertainment",CW Seed [Geo-blocked]
+#EXTINF:-1 tvg-id="CWSeed.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/PZrtfPb.png" group-title="Entertainment",CW Seed (432p) [Geo-blocked]
 https://cwseedlive.cwtv.com/ingest/playlist.m3u8
 #EXTINF:-1 tvg-id="CycleWorld.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RZE3Pwf.png" group-title="Auto",Cycle World (720p) [Offline]
 https://a.jsrdn.com/broadcast/3e5befe5dd/+0000/c.m3u8
@@ -560,17 +560,17 @@ https://vcndstv.teleosmedia.com/stream/dstv/dstv/playlist.m3u8
 https://video.oct.dc.gov/out/u/15_12.m3u8
 #EXTINF:-1 tvg-id="DCEagleCam.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/VPTRThD.png" group-title="Outdoor",DC Eagle Cam (720p)
 http://americaneagle-lh.akamaihd.net/i/AEF_DC1@31049/master.m3u8
-#EXTINF:-1 tvg-id="DisneyChannelAsia.us" tvg-country="ASIA" tvg-language="English" tvg-logo="" group-title="Kids",Disney Channel Asia (720p) [Offline]
+#EXTINF:-1 tvg-id="DisneyChannelAsia.us" tvg-country="ASIA" tvg-language="English" tvg-logo="" group-title="Kids",Disney Channel Asia (720p) [Timeout]
 http://198.16.106.62:8278/streams/d/Disneyxd/playlist.m3u8
-#EXTINF:-1 tvg-id="DisneyChannelEspana.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/Disney_Channel_logo_%282014%29.svg/792px-Disney_Channel_logo_%282014%29.svg.png" group-title="Kids",Disney Channel España (1080p)
+#EXTINF:-1 tvg-id="DisneyChannelEspana.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/Disney_Channel_logo_%282014%29.svg/792px-Disney_Channel_logo_%282014%29.svg.png" group-title="Kids",Disney Channel España (1080p) [Timeout]
 http://5.255.90.184:2004/play/a006/index.m3u8
-#EXTINF:-1 tvg-id="DisneyChannelJapan.us" tvg-country="JP" tvg-language="Japan" tvg-logo="https://i.imgur.com/H2O9F2E.png" group-title="Entertainment",Disney Channel Japan (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="DisneyChannelJapan.us" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/H2O9F2E.png" group-title="Entertainment",Disney Channel Japan (720p) [Not 24/7]
 https://redlabmcdn.s.llnwi.net/jp04/bs13hd/index.mpd
 #EXTINF:-1 tvg-id="DisneyChannelPortugal.es" tvg-country="PT" tvg-language="Portuguese;English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/Disney_Channel_logo_%282014%29.svg/792px-Disney_Channel_logo_%282014%29.svg.png" group-title="Kids",Disney Channel Portugal [Offline]
 http://185.236.229.21:9981/play/a056
-#EXTINF:-1 tvg-id="DisneyJuniorAsia.us" tvg-country="ASIA" tvg-language="Arabic" tvg-logo="" group-title="Kids",Disney Junior Asia (720p) [Offline]
+#EXTINF:-1 tvg-id="DisneyJuniorAsia.us" tvg-country="ASIA" tvg-language="Arabic" tvg-logo="" group-title="Kids",Disney Junior Asia (720p) [Timeout]
 http://198.16.106.62:8278/streams/d/Disneyjr/playlist.m3u8
-#EXTINF:-1 tvg-id="DisneyJuniorLatinoamerica.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="Kids",Disney Junior Latinoamérica [Offline]
+#EXTINF:-1 tvg-id="DisneyJuniorLatinoamerica.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="Kids",Disney Junior Latinoamérica [Timeout]
 http://209.91.213.10:8088/play/a00n
 #EXTINF:-1 tvg-id="DisneyJuniorPortugal.es" tvg-country="PT" tvg-language="Portuguese;English" tvg-logo="" group-title="Kids",Disney Junior Portugal [Offline]
 http://185.236.229.21:9981/play/a03q
@@ -606,7 +606,7 @@ http://135.181.79.179/ElmaqarTVHD/playlist.m3u8?token=mobileuser
 https://zypelive-lh.akamaihd.net/i/default_1@710948/master.m3u8
 #EXTINF:-1 tvg-id="ElSembradorNuevaEvangelizacionESNE.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/APhSi1Y.jpg" group-title="Religious",El Sembrador Nueva Evangelización (ESNE) (720p)
 https://zypelive-lh.akamaihd.net/i/default_1@745572/master.m3u8
-#EXTINF:-1 tvg-id="ElbesharaGTV.us" tvg-country="US;EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/wup8DKR.jpg" group-title="Religious",Elbeshara GTV (720p)
+#EXTINF:-1 tvg-id="ElbesharaGTV.us" tvg-country="US;EG" tvg-language="Arabic" tvg-logo="https://i.imgur.com/wup8DKR.jpg" group-title="Religious",Elbeshara GTV (1080p)
 http://media3.smc-host.com:1935/elbesharagtv.com/gtv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ElectricNow.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjgzOTI0NjRf/ElectricNow_300x300.png" group-title="Entertainment",Electric Now (1080p)
 https://ov.ottera.tv/live/master.m3u8?channel=elec_en
@@ -614,13 +614,13 @@ https://ov.ottera.tv/live/master.m3u8?channel=elec_en
 https://etlive-mediapackage-fastly.cbsaavideo.com/dvr/manifest.m3u8
 #EXTINF:-1 tvg-id="Entrepreneur.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Wb4WPPK.jpg" group-title="Series",Entrepreneur (720p)
 https://a.jsrdn.com/broadcast/7582ed85f7/+0000/c.m3u8
-#EXTINF:-1 tvg-id="EscambiaCountyTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SKfoci2.png" group-title="Legislative",Escambia County TV (720p)
+#EXTINF:-1 tvg-id="EscambiaCountyTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SKfoci2.png" group-title="Legislative",Escambia County TV (720p) [Offline]
 https://stream.swagit.com/live-edge/escambiacountyfl/live-1-a/playlist.m3u8
 #EXTINF:-1 tvg-id="EsperanzaTV.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/U5vTVsL.jpg" group-title="Religious",Esperanza TV (480p)
 http://k3.usastreams.com:1935/etvSD/etvSD/playlist.m3u8
 #EXTINF:-1 tvg-id="ESR24x7eSportsNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/605d2f4c46818164091e1fd4" group-title="Entertainment",ESR 24x7 eSports Network (1080p)
 https://eyeonesports.com/ES2RA-628g.m3u8
-#EXTINF:-1 tvg-id="EverydayHeroes.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Iam3ol3.png" group-title="",Everyday Heroes (720p)
+#EXTINF:-1 tvg-id="EverydayHeroes.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Iam3ol3.png" group-title="",Everyday Heroes (576p)
 https://a.jsrdn.com/broadcast/7b1451fa52/+0000/c.m3u8
 #EXTINF:-1 tvg-id="EWTNAfricaAsia.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQyNTQ1MzNf/EWTN_450x450.png" group-title="Religious",EWTN Africa-Asia (1080p) [Offline]
 https://live-c348a30.rmbl.ws/slot-18/ngrp:yjnk-afxc_all/playlist.m3u8
@@ -634,10 +634,10 @@ https://dyo5cp96eopax.cloudfront.net/p/CANE.m3u8
 https://cdn3.wowza.com/1/YW5wSWZiRGd2eFlU/bGV0aVBq/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNCanada.us" tvg-country="CA" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQyNTQ1MzNf/EWTN_450x450.png" group-title="Religious",EWTN Canada (1080p) [Offline]
 https://live-c348a30.rmbl.ws/slot-34/ngrp:1d1d-wqrm_all/playlist.m3u8
-#EXTINF:-1 tvg-id="EWTNelCanalCatolico.us" tvg-country="ES;HISPAM" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/cl_ewtn_m.png" group-title="Religious",EWTN el Canal Católico (1080p)
-https://live-fd164e1.rmbl.ws/slot-21/ngrp:ajdj-xq6n_all/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNelCanalCatolico.us" tvg-country="ES;HISPAM" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/cl_ewtn_m.png" group-title="Religious",EWTN el Canal Católico (720p) [Not 24/7]
 https://cdn3.wowza.com/1/SmVrQmZCUXZhVDgz/b3J3MFJv/hls/live/playlist.m3u8
+#EXTINF:-1 tvg-id="EWTNelCanalCatolico.us" tvg-country="ES;HISPAM" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/cl_ewtn_m.png" group-title="Religious",EWTN el Canal Católico (1080p) [Timeout]
+https://live-fd164e1.rmbl.ws/slot-21/ngrp:ajdj-xq6n_all/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNEurope.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQyNTQ1MzNf/EWTN_450x450.png" group-title="Religious",EWTN Europe (720p) [Not 24/7]
 https://cdn3.wowza.com/1/T2NXeHF6UGlGbHY3/WFluRldQ/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNEurope.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQyNTQ1MzNf/EWTN_450x450.png" group-title="Religious",EWTN Europe (1080p) [Offline]
@@ -646,9 +646,9 @@ https://live-fd164e1.rmbl.ws/slot-27/ngrp:ipy0-yeb3_all/playlist.m3u8
 https://cdn3.wowza.com/1/NWFLbEVOVjNsQWhP/YnpVbld5/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNUS.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQyNTQ1MzNf/EWTN_450x450.png" group-title="Religious",EWTN US (720p)
 https://d3kr0d4mfjxpbv.cloudfront.net/p/SPAS.m3u8
-#EXTINF:-1 tvg-id="ExternalOttera.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",External Ottera (720p)
+#EXTINF:-1 tvg-id="ExternalOttera.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",External Ottera (1080p)
 https://otteravision-tg.ottera.tv/live/master.m3u8?channel=tg_tg_us
-#EXTINF:-1 tvg-id="ExtremaTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.unored247.com/bill/templates/smartlinehost/html/images/extrema_client_logo.png" group-title="",Extrema TV (1080p)
+#EXTINF:-1 tvg-id="ExtremaTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.unored247.com/bill/templates/smartlinehost/html/images/extrema_client_logo.png" group-title="",Extrema TV (720p)
 http://livestreamcdn.net:1935/ExtremaTV/ExtremaTV/playlist.m3u8
 #EXTINF:-1 tvg-id="EYE95America.us" tvg-country="US" tvg-language="Urdu" tvg-logo="https://i.imgur.com/0uRtaTf.jpg" group-title="News",EYE95 America (1080p) [Not 24/7]
 https://cdn20.liveonlineservices.com/hls/eye95tv.m3u8
@@ -663,7 +663,7 @@ http://ott-cdn.ucom.am/s79/index.m3u8
 http://fastway.ddns.net:6421/fastway/live10/index.m3u8
 #EXTINF:-1 tvg-id="FieldStream.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9NsnVCJ.png" group-title="Outdoor",Field & Stream (720p) [Offline]
 https://a.jsrdn.com/broadcast/7536b84786/+0000/c.m3u8
-#EXTINF:-1 tvg-id="FIGHTSPORTS.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Sports",FIGHT SPORTS
+#EXTINF:-1 tvg-id="FIGHTSPORTS.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Sports",FIGHT SPORTS (1080p)
 https://shls-fight-sports-ak.akamaized.net/out/v1/ee7e6475b12e484bbfa5c31461ad4306/index.m3u8
 #EXTINF:-1 tvg-id="FightBoxHD.us" tvg-country="US" tvg-language="English" tvg-logo="https://i0.pngocean.com/files/812/462/345/filmbox-hd-high-definition-television-set-top-box-broadcasting-fightbox.jpg" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" group-title="Sports",FightBox HD (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
@@ -672,7 +672,7 @@ http://ott-cdn.ucom.am/s86/index.m3u8
 https://a.jsrdn.com/broadcast/47cff5378f/+0000/c.m3u8
 #EXTINF:-1 tvg-id="FireplaceLounge.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1VZZCZU.jpg" group-title="Relax",Fireplace Lounge (720p)
 https://a.jsrdn.com/broadcast/aee08372e5/+0000/c.m3u8
-#EXTINF:-1 tvg-id="FishTank.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/L5JDAkh.png" group-title="Relax",Fish Tank (720p)
+#EXTINF:-1 tvg-id="FishTank.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/L5JDAkh.png" group-title="Relax",Fish Tank (360p)
 https://a.jsrdn.com/broadcast/8b43a16c1e/+0000/c.m3u8
 #EXTINF:-1 tvg-id="Fite.us" tvg-country="US" tvg-language="English" tvg-logo="https://images-na.ssl-images-amazon.com/images/I/21QWq2v0DGL.png" group-title="Sports",Fite (720p) [Not 24/7]
 https://cdn-cf.fite.tv/linear/fite247/playlist.m3u8
@@ -716,27 +716,10 @@ https://www.livedoomovie.com/02_FoxMoviesTH_720p/chunklist.m3u8
 http://htv-drm-live-cdn.fptplay.net/CDN-FPT02/FOXMOVIES-HD-1080p/playlist.m3u8
 #EXTINF:-1 tvg-id="FoxNewsChannel.us" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/us/FoxNews.us.png" group-title="News",Fox News Channel (720p)
 http://1111296894.rsc.cdn77.org/ls-54548-2/mono.m3u8
-#EXTINF:-1 tvg-id="FoxNewsRadio.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Z5SATrd.png" group-title="News",FOX News Radio (192p)
+#EXTINF:-1 tvg-id="FoxNewsRadio.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Z5SATrd.png" group-title="News",FOX News Radio (720p)
 https://fnurtmp-f.akamaihd.net/i/FNRADIO_1@92141/master.m3u8
 #EXTINF:-1 tvg-id="FoxRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/992gw0d.png" group-title="Movies",Fox Russia (576p) [Not 24/7]
 http://188.40.68.167/russia/fox_russia_sd/playlist.m3u8
-#EXTINF:-1 tvg-id="FoxSports2Asia.us" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-foxsports2.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",Fox Sports 2 Asia (Thai) (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_FoxSport2_TH_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="FoxSports2LatinAmerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-foxsports2.png" group-title="Sports",Fox Sports 2 Latin America (1080p)
-http://209.91.213.10:8088/play/a02r
-#EXTINF:-1 tvg-id="FoxSports2LatinAmerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-foxsports2.png" group-title="Sports",Fox Sports 2 Latin America (576p)
-http://209.91.213.10:8088/play/a026
-#EXTINF:-1 tvg-id="FoxSports3Asia.us" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-foxsports3.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",Fox Sports 3 Asia (Thai) (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_FoxSport3_TH_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="FoxSports3LatinAmerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-foxsports3.png" group-title="Sports",Fox Sports 3 Latin America [Offline]
-http://209.91.213.10:8088/play/a00y
-#EXTINF:-1 tvg-id="FoxSportsNewsAustralia.us" tvg-country="AU" tvg-language="English" tvg-logo="https://i.imgur.com/X491SzR.gif" group-title="Sports",Fox Sports News Australia (720p) [Not 24/7]
-https://austchannel-live.akamaized.net/hls/live/2002736/austchannel-sport/master.m3u8
-#EXTINF:-1 tvg-id="FoxSportsThailand.us" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-foxsports1.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",Fox Sports Thailand (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
-https://www.livedoomovie.com/02_foxsport_720p/chunklist.m3u8
 #EXTINF:-1 tvg-id="FoxThai.us" tvg-country="TH" tvg-language="Thai" tvg-logo="https://www.we-play.tv//uploads/posters/-poster1602704474.jpeg" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Movies",Fox Thai (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://www.livedoomovie.com/02_FoxThai_TH_720p/chunklist.m3u8
@@ -752,9 +735,9 @@ https://i.mjh.nz/au/Sydney/tv.7fueltv.m3u8
 https://stream.ads.ottera.tv/playlist.m3u8?network_id=516
 #EXTINF:-1 tvg-id="FunRoads.us" tvg-country="US" tvg-language="English" tvg-logo="https://funroads.tv/wp-content/uploads/fun-roads-header-horizontal-1.png" group-title="Travel",Fun Roads (720p)
 http://104.143.4.5:2080/funroads.m3u8
-#EXTINF:-1 tvg-id="FXPeru.us" tvg-country="PE" tvg-language="Spanish;English" tvg-logo="https://i.imgur.com/E32ISMV.png" group-title="Entertainment",FX Peru [Offline]
+#EXTINF:-1 tvg-id="FXPeru.us" tvg-country="PE" tvg-language="Spanish;English" tvg-logo="https://i.imgur.com/E32ISMV.png" group-title="Entertainment",FX Peru [Timeout]
 http://209.91.213.10:8088/play/a01z
-#EXTINF:-1 tvg-id="GalvestonCountyTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://img.new.livestream.com/accounts/000000000141794a/1769dc58-4a38-4815-9cb7-feb1140db5ec_170x170.png" group-title="Local",Galveston County TV (720p)
+#EXTINF:-1 tvg-id="GalvestonCountyTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://img.new.livestream.com/accounts/000000000141794a/1769dc58-4a38-4815-9cb7-feb1140db5ec_170x170.png" group-title="Local",Galveston County TV (720p) [Offline]
 https://stream.swagit.com/live-edge/galvestontx/smil:hd-16x9-1-b/playlist.m3u8
 #EXTINF:-1 tvg-id="GalxyTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oPnzAPC.png" group-title="",Galxy TV (720p)
 https://content.uplynk.com/channel/f467430e4a8e49a59ff3183cf51092b2.m3u8
@@ -770,7 +753,7 @@ https://vcngfcssai.teleosmedia.com/linear/globalfashionchannel/globalfashionchan
 https://rpn1.bozztv.com/36bay2/gusa-goldentv/mono.m3u8
 #EXTINF:-1 tvg-id="GoodLife45.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/t9xHfSV.png" group-title="Religious",GoodLife 45 (720p)
 http://1-fss29-s0.streamhoster.com/lv_goodlife45f1/broadcast1/playlist.m3u8
-#EXTINF:-1 tvg-id="GospelTruthTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7vQrPvk.png" group-title="Religious",Gospel Truth TV [Offline]
+#EXTINF:-1 tvg-id="GospelTruthTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7vQrPvk.png" group-title="Religious",Gospel Truth TV [Timeout]
 https://bstna.tulix.tv/live/bs_2m/index.m3u8
 #EXTINF:-1 tvg-id="WZRACD.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/biG4n2a.jpg" group-title="Entertainment",Greek Voice Live 48 Tampa Bay FL (WZRA-CD1) (480p)
 http://wpso.com:1936/hls/wzra.m3u8
@@ -780,10 +763,10 @@ https://t07113a-lh.akamaihd.net/i/t07113a_1@756729/master.m3u8
 https://granicusliveus4-a.akamaihd.net/greensboro/G0197_003/chunklist.m3u8
 #EXTINF:-1 tvg-id="grvty.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/6065639a7ec4e2633f0c7d83" group-title="Sports",grvty (1080p)
 https://d37j5jg7ob6kji.cloudfront.net/index.m3u8
-#EXTINF:-1 tvg-id="GunAzTV.us" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://upload.wikimedia.org/wikipedia/az/a/a3/G%C3%BCnAz_TV.png" group-title="General",GünAz TV (720p)
-https://gtv.live-s.cdn.bitgravity.com/cdn-live/_definst_/gtv/live/feed03/playlist.m3u8
 #EXTINF:-1 tvg-id="GunAzTV.us" tvg-country="US;AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/0lJwdDH.jpg" group-title="General",GünAz TV (480p)
 http://gtv.live.cdn.bitgravity.com/gtv/live/feed03
+#EXTINF:-1 tvg-id="GunAzTV.us" tvg-country="AZ" tvg-language="Azerbaijani" tvg-logo="https://upload.wikimedia.org/wikipedia/az/a/a3/G%C3%BCnAz_TV.png" group-title="General",GünAz TV (720p) [Offline]
+https://gtv.live-s.cdn.bitgravity.com/cdn-live/_definst_/gtv/live/feed03/playlist.m3u8
 #EXTINF:-1 tvg-id="GunAzTV.us" tvg-country="US;AZ" tvg-language="Azerbaijani" tvg-logo="https://i.imgur.com/0lJwdDH.jpg" group-title="General",GünAz TV (480p) [Offline]
 rtsp://gtv.live-s.cdn.bitgravity.com/cdn-live/_definst_/gtv/live/feed02?nc=1
 #EXTINF:-1 tvg-id="GustoTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ygVGi3s.png" group-title="Cooking",Gusto TV (1080p)
@@ -795,7 +778,7 @@ https://a.jsrdn.com/broadcast/ebf95254ca/+0000/c.m3u8
 https://www.livedoomovie.com/02_H2HD_720p/chunklist.m3u8
 #EXTINF:-1 tvg-id="HarleyDavidsonFactoryTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DQOp8Ft.png" group-title="Auto",Harley Davidson Factory TV (1080p) [Not 24/7]
 https://hdtv.prod2.ioio.tv/broker/play/e529407a-cb61-45ce-a9ad-94f0ad5e0ad9.m3u8
-#EXTINF:-1 tvg-id="HarleyDavidsonRacingTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DQOp8Ft.png" group-title="Auto",Harley Davidson Racing TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="HarleyDavidsonRacingTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DQOp8Ft.png" group-title="Auto",Harley Davidson Racing TV (720p) [Not 24/7]
 https://hdtv.prod2.ioio.tv/broker/play/de245a96-516c-413d-81e9-419c05bbc6a7.m3u8
 #EXTINF:-1 tvg-id="HarleyDavidsonRidesTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DQOp8Ft.png" group-title="Auto",Harley Davidson Rides TV (1080p) [Not 24/7]
 https://hdtv.prod2.ioio.tv/broker/play/d4b0111a-3dcb-46fb-b2bb-1c27eca5df35.m3u8
@@ -844,9 +827,9 @@ https://hcintlinc.mmdlive.lldns.net/hcintlinc/60f14a7fec64454e90712421a46ac6f1/m
 http://media1.adventist.no:1935/live/hope1/playlist.m3u8
 #EXTINF:-1 tvg-id="HopeChannelNorge.us" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/pLeCUEV.png" group-title="Religious",Hope Channel Norge (540p)
 http://media1.adventist.no:1935/live/hope2/playlist.m3u8
-#EXTINF:-1 tvg-id="HopeChannelNorge.us" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/pLeCUEV.png" group-title="Religious",Hope Channel Norge (540p)
+#EXTINF:-1 tvg-id="HopeChannelNorge.us" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/pLeCUEV.png" group-title="Religious",Hope Channel Norge (360p)
 http://media1.adventist.no:1935/live/hope3/playlist.m3u8
-#EXTINF:-1 tvg-id="HopeChannelPhilippines.us" tvg-country="PH" tvg-language="English" tvg-logo="https://i.imgur.com/pLeCUEV.png" group-title="Religious",Hope Channel Philippines (720p) [Offline]
+#EXTINF:-1 tvg-id="HopeChannelPhilippines.us" tvg-country="PH" tvg-language="English" tvg-logo="https://i.imgur.com/pLeCUEV.png" group-title="Religious",Hope Channel Philippines (576p) [Not 24/7]
 https://hcfilipino.mmdlive.lldns.net/hcfilipino/f6e775755f2647159e0adefe01a44a0e/manifest.m3u8
 #EXTINF:-1 tvg-id="HorizonArmenian.us" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/GVUIJiD.png" group-title="",Horizon Armenian (1080p)
 http://5.254.76.34:17070/C441/index.m3u8?token=kdsdkwy453wrRq29IIIo
@@ -858,7 +841,7 @@ https://a.jsrdn.com/broadcast/20dc4269f3/+0000/c.m3u8
 https://html5-lh.akamaihd.net/i/html5_01@182967/master.m3u8
 #EXTINF:-1 tvg-id="HSN.us" tvg-country="US" tvg-language="English" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/homeshop.png" group-title="Shop",HSN (720p)
 https://lshsn1usott-lh.akamaihd.net/i/lshsn1usott_01@838842/master.m3u8
-#EXTINF:-1 tvg-id="HSN2.us" tvg-country="US" tvg-language="English" tvg-logo="https://live-tv-channels.org/pt-data/uploads/logo/us-hsn-2.jpg" group-title="Shop",HSN 2 (414p)
+#EXTINF:-1 tvg-id="HSN2.us" tvg-country="US" tvg-language="English" tvg-logo="https://live-tv-channels.org/pt-data/uploads/logo/us-hsn-2.jpg" group-title="Shop",HSN 2 (720p)
 https://hsn2html5-lh.akamaihd.net/i/hsn2html5_01@13178/master.m3u8
 #EXTINF:-1 tvg-id="HTV1HoustonTelevision.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zvj1boM.jpg" group-title="Local",HTV 1 Houston Television (720p)
 https://stream.swagit.com/live-edge/houstontx/smil:hd-16x9-2-a/playlist.m3u8
@@ -914,11 +897,11 @@ http://d3lzjtrf5mvf3p.cloudfront.net/playlist.m3u8
 https://vcnovation.teleosmedia.com/linear/ovation/journy/playlist.m3u8
 #EXTINF:-1 tvg-id="Journy.us" tvg-country="US" tvg-language="English" tvg-logo="https://web.opendrive.com/api/v1/download/file.json/MF8yMjg5MzMxNjNf?inline=1" group-title="Travel",Journy (1080p)
 https://vcnplex.teleosmedia.com/linear/ovation/journy/playlist.m3u8
-#EXTINF:-1 tvg-id="JudgeKarensCourt.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/rku6tmo.png" group-title="",Judge Karen's Court (720p)
+#EXTINF:-1 tvg-id="JudgeKarensCourt.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/rku6tmo.png" group-title="",Judge Karen's Court (540p)
 https://cb5273f195a147f2bcf23544e4495f66.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5eb1e7261474f9020c06f9ec/playlist.m3u8
 #EXTINF:-1 tvg-id="JuventudRenovadaenelEspirituSanto.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/9Brfh2M.png" group-title="Religious",Juventud Renovada en el Espiritu Santo (720p) [Not 24/7]
 http://teleredmcp.com:1935/jrestv/jrestv/playlist.m3u8
-#EXTINF:-1 tvg-id="KalemehTV.us" tvg-country="US" tvg-language="Farsi" tvg-logo="https://i.imgur.com/j4VjHWN.jpg" group-title="Religious",Kalemeh TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="KalemehTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/j4VjHWN.jpg" group-title="Religious",Kalemeh TV (1080p) [Not 24/7]
 http://184.75.208.98:1935/live/kalemeh/playlist.m3u8
 #EXTINF:-1 tvg-id="KartoonCircus.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/KartoonFunTime_209x209.png?raw=true" group-title="Kids",Kartoon Circus (720p)
 https://simultv.s.llnwi.net/n4s4/KartoonCircus/interlink.m3u8
@@ -930,11 +913,11 @@ http://66.242.170.53/hls/live/temp/index.m3u8
 http://granicusliveus3-a.akamaihd.net/richmond/G0034_002/playlist.m3u8
 #EXTINF:-1 tvg-id="KFSNNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",KFSN News (1080p)
 https://api.abcotvs.com/v3/kfsn/m3u8/url?id=432725&key=yuemix
-#EXTINF:-1 tvg-id="KidsFlix.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ZbAVzad.png" group-title="Kids",KidsFlix (720p)
+#EXTINF:-1 tvg-id="KidsFlix.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ZbAVzad.png" group-title="Kids",KidsFlix (576p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=50
 #EXTINF:-1 tvg-id="KoolTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/aILvazd.jpg" group-title="Local",Kool TV (1080p)
 http://209.182.219.50:1935/roku/roku/playlist.m3u8
-#EXTINF:-1 tvg-id="KTLATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JH99Psi.jpg" group-title="Local",KTLA 5 Los Angeles CA (720p)
+#EXTINF:-1 tvg-id="KTLATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JH99Psi.jpg" group-title="Local",KTLA 5 Los Angeles CA (144p)
 https://content.uplynk.com/channel/6cbf2d32a5384dc1b787539b1102433c.m3u8
 #EXTINF:-1 tvg-id="KTRKTVNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",KTRK TV News (720p)
 https://api.abcotvs.com/v3/ktrk/m3u8/url?id=514944&key=yuemix
@@ -962,7 +945,7 @@ http://edu.leominster.tv/Edu/smil:Edu.smil/playlist.m3u8
 http://gov.leominster.tv/Gov/smil:Gov.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="LeominsterTVPublic.us" tvg-country="US" tvg-language="English" tvg-logo="http://www.leominster.tv/SiteAssets/LATV%20Black%20and%20Gold.png" group-title="Local",Leominster TV Public (1080p)
 http://gov.leominster.tv/Pub/smil:Pub.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="LevelOne.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Kids",Level One [Offline]
+#EXTINF:-1 tvg-id="LevelOne.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Kids",Level One [Timeout]
 https://stitcheraws.unreel.me/wse-node04.powr.com/live/5af61be7d5eeee7af3d1db47/playlist.m3u8
 #EXTINF:-1 tvg-id="LexTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OyUrnuD.jpg" group-title="Local",Lex TV (720p)
 https://granicusliveus2-a.akamaihd.net/lfucg/G0264_002/playlist.m3u8
@@ -1026,7 +1009,7 @@ https://90a0d12cbaff4b959ea24bb8a3560adf.mediatailor.us-west-2.amazonaws.com/v1/
 http://d2dw21aq0j0l5c.cloudfront.net/playlist.m3u8
 #EXTINF:-1 tvg-id="LoveNature4K.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LXpqmgn.jpg" group-title="Outdoor",Love Nature 4K [Offline]
 https://d27r4t30huw0iy.cloudfront.net/playlist.m3u8
-#EXTINF:-1 tvg-id="LoveWorldUSA.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YnOZtNm.png" group-title="Religious",LoveWorld USA (1080p)
+#EXTINF:-1 tvg-id="LoveWorldUSA.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YnOZtNm.png" group-title="Religious",LoveWorld USA (1080p) [Offline]
 https://loveworldusa-lh.akamaihd.net/i/lwusa2_1@514985/master.m3u8
 #EXTINF:-1 tvg-id="LuckyDog.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1j4gwL3.png" group-title="",Lucky Dog [Offline]
 http://d1gsmhzkyjhxg4.cloudfront.net/playlist.m3u8
@@ -1034,7 +1017,7 @@ http://d1gsmhzkyjhxg4.cloudfront.net/playlist.m3u8
 https://rpn1.bozztv.com/36bay2/gusa-mwg/playlist.m3u8
 #EXTINF:-1 tvg-id="MajestadTelevision.us" tvg-country="US" tvg-language="Spanish" tvg-logo="" group-title="Religious",Majestad Televisión (480p)
 https://5b3050bb1b2d8.streamlock.net/majestadtv/majestadtv/playlist.m3u8
-#EXTINF:-1 tvg-id="MarvelHQ.us" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/QuDem5OD.png" group-title="",Marvel HQ (1080p)
+#EXTINF:-1 tvg-id="MarvelHQ.us" tvg-country="IN" tvg-language="Hindi" tvg-logo="http://imagesdishtvd2h.whatsonindia.com/dasimages/channel/landscape/360x270/QuDem5OD.png" group-title="",Marvel HQ (1080p) [Timeout]
 https://feed.play.mv/live/10005200/niZoVrR2vD/master.m3u8
 #EXTINF:-1 tvg-id="MCN6.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/KOgoXoG.png" group-title="",MCN6 (1080p) [Not 24/7]
 https://d18fcxaqfnwjhj.cloudfront.net/CDN_Ingest/MCN6_MAIN.smil/Playlist.m3u8
@@ -1060,10 +1043,10 @@ http://iptv.mihantv.com/live/playlist.m3u8
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/mnews24.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="MillenniumTVUSA.us" tvg-country="US" tvg-language="English" tvg-logo="https://millenniumtv.org/wp-content/uploads/2021/06/Icon-512.png" group-title="General",Millennium TV USA (1080p) [Not 24/7]
 https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/millenniumtv-odr-up2.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="MissionTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1qJkLDZ.png" group-title="Religious",Mission TV (1080p)
-https://6096a9cf11ae5.streamlock.net:1943/live/missiontv/playlist.m3u8
 #EXTINF:-1 tvg-id="MissionTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1qJkLDZ.png" group-title="Religious",Mission TV (720p)
 http://stream.missiontv.com:1935/live/missiontv_720p/playlist.m3u8
+#EXTINF:-1 tvg-id="MissionTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1qJkLDZ.png" group-title="Religious",Mission TV (1080p) [Offline]
+https://6096a9cf11ae5.streamlock.net:1943/live/missiontv/playlist.m3u8
 #EXTINF:-1 tvg-id="MLBNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oDOpMph.png" group-title="Sports",MLB Network [Offline]
 https://hlslive-akc-med1.media.mlb.com/ls01/mlbnetwork/NETWORK_LINEAR_1/master_wired.m3u8
 #EXTINF:-1 tvg-id="MMAJunkie.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/nSUiODh.jpg" group-title="Sports",MMA Junkie (720p)
@@ -1076,17 +1059,17 @@ https://a.jsrdn.com/broadcast/0c9a09c94c/+0000/c.m3u8
 https://a.jsrdn.com/broadcast/256ad9e679/+0000/c.m3u8
 #EXTINF:-1 tvg-id="Movee4U.us" tvg-country="US" tvg-language="English" tvg-logo="https://mytvtogo.net/wp-content/uploads/2018/11/Network_Movee4U-196x126.jpg" group-title="Movies",Movee 4U (720p)
 https://broadcast.mytvtogo.net/movee4u/movee4u/playlist.m3u8
-#EXTINF:-1 tvg-id="MovieKingdom.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pIuJqYk.png" group-title="Movies",Movie Kingdom (720p)
+#EXTINF:-1 tvg-id="MovieKingdom.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pIuJqYk.png" group-title="Movies",Movie Kingdom (480p)
 https://a.jsrdn.com/broadcast/e9b4093a41/+0000/c.m3u8
-#EXTINF:-1 tvg-id="MPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/kt0R7ua.jpg" group-title="General",MPT PBS Owings Mills MD (1080p)
+#EXTINF:-1 tvg-id="MPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/kt0R7ua.jpg" group-title="General",MPT PBS Owings Mills MD (1088p)
 https://2-fss-2.streamhoster.com/pl_138/amlst:201814-1291584/playlist.m3u8
 #EXTINF:-1 tvg-id="MSNBC.us" tvg-country="US" tvg-language="English" tvg-logo="https://static-s.aa-cdn.net/img/ios/396885309/4ad7161a83db264f3ba4b62ef1ab662a?v=1" group-title="News",MSNBC (720p) [Not 24/7]
 http://1111296894.rsc.cdn77.org/LS-ATL-54548-10/playlist.m3u8
 #EXTINF:-1 tvg-id="MTVHitsEurope.us" tvg-country="EUR" tvg-language="Catalan" tvg-logo="https://i.imgur.com/hwaLKuJ.png" group-title="Music",MTV Hits Europe (576p) [Offline]
 http://188.40.68.167/russia/mtv_hits/playlist.m3u8
-#EXTINF:-1 tvg-id="MTVHitsLatinoamerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://i.imgur.com/hwaLKuJ.png" group-title="Music",MTV Hits Latinoamérica (576p)
+#EXTINF:-1 tvg-id="MTVHitsLatinoamerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://i.imgur.com/hwaLKuJ.png" group-title="Music",MTV Hits Latinoamérica (576p) [Timeout]
 http://209.91.213.10:8088/play/a00z
-#EXTINF:-1 tvg-id="MTV.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Entertainment",MTV Latinoamérica (1080p)
+#EXTINF:-1 tvg-id="MTV.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Entertainment",MTV Latinoamérica (1080p) [Timeout]
 http://209.91.213.10:8088/play/a01a
 #EXTINF:-1 tvg-id="WISCDT2.us" tvg-country="US" tvg-language="English" tvg-logo="https://zap2it.tmsimg.com/h3/NowShowing/25125/s51307_h3_aa.png" group-title="",My Madison TV (WISC-DT2) (720p)
 https://ad-playlistserver.aws.syncbak.com/playlist/13613390/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdyYXkyMDE2MDgyOSJ9.eyJtaWQiOjEzNjEzMzkwLCJtZDUiOiI2Y2M5MzczYjIxZWIwNzQ4ZDA0YTRlYzYyMjU2YjBhMiIsImlhdCI6MTQ5NzM4MTU5NywiaXNzIjoiU3luY2JhayIsInN1YiI6IkdyYXkifQ.qJPiMCbnGjAn9wgPrGjVl3M9Xfc4CVSyoZTZ5OH-1jo
@@ -1096,19 +1079,19 @@ https://rpn1.bozztv.com/36bay2/gusa-mythos/playlist.m3u8
 http://65.36.6.216:1935/live/kcwx.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="NASATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/bKVNdeh.jpg" group-title="Science",NASA TV (720p) [Not 24/7]
 https://hls.ums.ustream.tv/playlist/directhls/channel/6540154/playlist.m3u8?sgn=31d0dfb847c358d4cedcd2256dc4e1c42a7f13a7
-#EXTINF:-1 tvg-id="NASATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/bKVNdeh.jpg" group-title="Science",NASA TV (720p) [Offline]
+#EXTINF:-1 tvg-id="NASATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/bKVNdeh.jpg" group-title="Science",NASA TV (720p) [Timeout]
 http://iphone-streaming.ustream.tv/uhls/6540154/streams/live/iphone/playlist.m3u8
-#EXTINF:-1 tvg-id="NASATVISSViews.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/bKVNdeh.jpg" group-title="Science",NASA TV ISS Views (480p) [Offline]
+#EXTINF:-1 tvg-id="NASATVISSViews.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/bKVNdeh.jpg" group-title="Science",NASA TV ISS Views (480p) [Not 24/7]
 http://iphone-streaming.ustream.tv/uhls/9408562/streams/live/iphone/playlist.m3u8
 #EXTINF:-1 tvg-id="NASATVMedia.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/bKVNdeh.jpg" group-title="Education",NASA TV Media (720p)
 https://ntv2.akamaized.net/hls/live/2013923/NASA-NTV2-HLS/master.m3u8
 #EXTINF:-1 tvg-id="NASATVPublic.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/CH6VcTR.jpg" group-title="Education",NASA TV Public (720p)
 https://ntv1.akamaized.net/hls/live/2014075/NASA-NTV1-HLS/master.m3u8
 #EXTINF:-1 tvg-id="NationalGeographicAbuDhabi.us" tvg-country="US" tvg-language="Arabic" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d2/Nat_geo_channel_abu_dhabi.png/220px-Nat_geo_channel_abu_dhabi.png" group-title="Documentary",National Geographic Abu Dhabi (1080p)
-http://admdn2.cdn.mangomolo.com/nagtv/smil:nagtv.stream.smil/playlist.m3u8
+https://admdn2.cdn.mangomolo.com/nagtv/smil:nagtv.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="NationalGeographicEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://1000logos.net/wp-content/uploads/2017/04/Color-National-Geographic-Logo-500x250.jpg" group-title="Documentary",National Geographic East (720p) [Geo-blocked]
 https://livecdn.fptplay.net/foxlive/natgeohd_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="NationalGeographicEspaña.us" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://1000logos.net/wp-content/uploads/2017/04/Color-National-Geographic-Logo-500x250.jpg" group-title="Documentary",National Geographic España [Offline]
+#EXTINF:-1 tvg-id="NationalGeographicEspaña.us" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://1000logos.net/wp-content/uploads/2017/04/Color-National-Geographic-Logo-500x250.jpg" group-title="Documentary",National Geographic España [Timeout]
 http://5.255.90.184:2001/play/a04i
 #EXTINF:-1 tvg-id="NationalGeographicWild.us" tvg-country="US" tvg-language="English" tvg-logo="https://static.epg.best/id/NatGeoWild.id.png" group-title="Documentary",National Geographic Wild [Offline]
 https://cdn1.mobiletv.bg/T5/ng_wild_hd/ng_wild_hd_794613_850k.m3u8
@@ -1121,6 +1104,8 @@ http://stream.ec.nau.edu/live/amlst:channelfour/playlist.m3u8
 #EXTINF:-1 tvg-id="NBATV.us" tvg-country="TH" tvg-language="English" tvg-logo="https://www.img09.xyz/assets/img/ch_logo/hd-nba.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Sports",NBA TV (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://www.livedoomovie.com/02_nbahd_720p/chunklist.m3u8
+#EXTINF:-1 tvg-id="WTLVTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/KQrtvoo.jpg" group-title="Local",NBC / ABC Jacksonville FL (WTLV) (1080p)
+https://livevideo01.firstcoastnews.com/hls/live/2014550/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WGRZTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/m4MZTtj.jpg" group-title="Local",NBC 2 Buffalo NY (WGRZ) (1080p)
 https://livevideo01.wgrz.com/hls/live/2016286/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WRCTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/0/0f/Logo_of_WRC-TV.png" group-title="Local",NBC 4 News Washington DC (WRC-TV) (720p) [Not 24/7]
@@ -1163,19 +1148,17 @@ https://content.uplynk.com/channel/1fbfb28ae5044f619f75ae0adb011989.m3u8
 https://livevideo01.wcnc.com/hls/live/2015505/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WLBZ.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DJrdp7S.jpg" group-title="Local",NBC 207 Bangor Portland ME (WLBZ) (1080p)
 https://livevideo01.newscentermaine.com/hls/live/2014540/newscasts/live/wcsh.m3u8
-#EXTINF:-1 tvg-id="WTLVTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/KQrtvoo.jpg" group-title="Local",NBC / ABC Jacksonville FL (WTLV) (1080p)
-https://livevideo01.firstcoastnews.com/hls/live/2014550/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="NBCNewsNow.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now (1080p)
 http://nbcnews2.akamaized.net/hls/live/723426-b/NBCNewsPlaymaker24x7Linear99a3a827-ua/master.m3u8
 #EXTINF:-1 tvg-id="NBCNewsNow.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now (1080p) [Offline]
 https://nbcnewshls.akamaized.net/hls/live/2011820/nnn_live1/master.m3u8
 #EXTINF:-1 tvg-id="NBCNewsNowEvent1.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now Event 1 (720p)
 https://nbcnews-lh.akamaihd.net/i/nbc_live11@183427/master.m3u8
-#EXTINF:-1 tvg-id="NBCNewsNowEvent2.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now Event 2 (720p)
+#EXTINF:-1 tvg-id="NBCNewsNowEvent2.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now Event 2 (360p)
 https://nbcnews-lh.akamaihd.net/i/nbc_live12@187393/master.m3u8
-#EXTINF:-1 tvg-id="NBCNewsNowEvent3.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now Event 3 (720p)
+#EXTINF:-1 tvg-id="NBCNewsNowEvent3.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now Event 3 (360p)
 https://nbcnews-lh.akamaihd.net/i/nbc_live13@187394/master.m3u8
-#EXTINF:-1 tvg-id="NBCNewsNowEvent4.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now Event 4 (720p)
+#EXTINF:-1 tvg-id="NBCNewsNowEvent4.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now Event 4 (360p)
 https://nbcnews-lh.akamaihd.net/i/nbc_live14@187395/master.m3u8
 #EXTINF:-1 tvg-id="KWESTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qshcBQk.jpg" group-title="Local",NBC NewsWest 9 Midland-Odessa TX (KWES) (1080p)
 https://livevideo01.newswest9.com/hls/live/2017380/newscasts/live.m3u8
@@ -1209,7 +1192,7 @@ https://content.uplynk.com/channel/4bb4901b934c4e029fd4c1abfc766c37.m3u8
 https://content.uplynk.com/channel/387c33ce09da4de699668c0c7d1244a8.m3u8
 #EXTINF:-1 tvg-id="NickJrEast.us" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/sa/NickJr.sa.png" group-title="Kids",Nick Jr East [Offline]
 https://cdn1.mobiletv.bg/T5/bit/bit_794613_850k.m3u8
-#EXTINF:-1 tvg-id="NickJrLatinoamerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="" group-title="Kids",Nick Jr Latinoamérica (480p)
+#EXTINF:-1 tvg-id="NickJrLatinoamerica.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="" group-title="Kids",Nick Jr Latinoamérica (480p) [Timeout]
 http://201.168.205.12:8000/play/a0ck/index.m3u8
 #EXTINF:-1 tvg-id="NickJrTooUK.us" tvg-country="UK;IE" tvg-language="English" tvg-logo="http://neczbm.to/images/channels/NickJrToo.png" group-title="Kids",Nick Jr Too UK (576p) [Geo-blocked]
 http://212.224.98.213:2200/EX/Nick_Jr_Too-uk/index.m3u8?token=
@@ -1219,13 +1202,13 @@ http://c0.cdn.trinity-tv.net/stream/7tsewn83ddjifz69us9je7eftbm5nuausb4dsvz9g5ay
 http://31.220.41.88:8081/live/us-nick.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="NoseyDivorceCourt.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Divorce Court (720p) [Not 24/7]
 https://stitcheraws.unreel.me/wse-node02.powr.com/powr/ngrp:5eb1e76d1474f9020c06f9ee_all/playlist.m3u8
-#EXTINF:-1 tvg-id="NoseyJerrySpringer.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Jerry Springer [Offline]
+#EXTINF:-1 tvg-id="NoseyJerrySpringer.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Jerry Springer [Timeout]
 https://stitcheraws.unreel.me/wse-node04.powr.com/powr_480pt/ngrp:5eb1e7f848f1ff2e1d2555a2_all/playlist.m3u8
-#EXTINF:-1 tvg-id="NoseyJudgeKarensCourt.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Judge Karen's Court (720p)
+#EXTINF:-1 tvg-id="NoseyJudgeKarensCourt.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Judge Karen's Court (480p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/powr/ngrp:5eb1e7261474f9020c06f9ec_all/playlist.m3u8
-#EXTINF:-1 tvg-id="NoseyMaury.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Maury [Offline]
+#EXTINF:-1 tvg-id="NoseyMaury.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Maury [Timeout]
 https://stitcheraws.unreel.me/wse-node04.powr.com/powr_480pt/ngrp:5eb1e88458ad7801fa2cfc2e_all/playlist.m3u8
-#EXTINF:-1 tvg-id="NoseySteveWilkos.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Steve Wilkos [Offline]
+#EXTINF:-1 tvg-id="NoseySteveWilkos.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jlUuE2j.png" group-title="Series",Nosey Steve Wilkos [Timeout]
 https://stitcheraws.unreel.me/wse-node04.powr.com/powr_480pt/ngrp:5eb1e84c95ee0253b97679d7_all/playlist.m3u8
 #EXTINF:-1 tvg-id="NothingScripted.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QSH4Z4p.png" group-title="Local",Nothing Scripted (720p)
 https://30a-tv.com/NothingScripted.m3u8
@@ -1249,7 +1232,7 @@ http://livestream.5centscdn.com/shaditv/23abe62a446fc05ce0a6c810f4045308.sdp/ind
 https://hls-cdn.tvstartup.net/barakyah-channel/play/mp4:ourtvedge/playlist.m3u8
 #EXTINF:-1 tvg-id="OrangeTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://lh4.ggpht.com/rTO2b4xizn7KZy6X-3RUSMWmNi86B116IuF9kgi51fyNTp8mrEhP25svcAMx5BngXwlf=w300" group-title="Local",Orange TV (720p)
 http://otv3.ocfl.net:1936/OrangeTV/smil:OrangeTV.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="OutdoorChannel.us" tvg-country="US" tvg-language="English" tvg-logo="http://i.mjh.nz/.images/tv.7outdoor.png" group-title="Outdoor",Outdoor Channel (720p)
+#EXTINF:-1 tvg-id="OutdoorChannel.us" tvg-country="US" tvg-language="English" tvg-logo="http://i.mjh.nz/.images/tv.7outdoor.png" group-title="Outdoor",Outdoor Channel (1080p)
 http://ott.watch/stream/E7Q3UVKI5H/211.m3u8
 #EXTINF:-1 tvg-id="OutdoorChannel.us" tvg-country="AU" tvg-language="English" tvg-logo="http://i.mjh.nz/.images/tv.7outdoor.png" group-title="Outdoor",Outdoor Channel (720p) [Geo-blocked]
 https://i.mjh.nz/au/Sydney/tv.7outdoor.m3u8
@@ -1259,7 +1242,7 @@ https://livecdn.fptplay.net/world/outdoorfhd_hls.smil/playlist.m3u8
 https://i.mjh.nz/au/Sydney/tv.7pac12.m3u8
 #EXTINF:-1 tvg-id="KNETCD2.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/A3kHNyp.jpg" group-title="",Panarmenian TV (KNET-CD 25.2) (360p) [Not 24/7]
 http://granicusliveus6-a.akamaihd.net/torrance/G0057_005/playlist.m3u8
-#EXTINF:-1 tvg-id="ParamountComedyRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/u50d1gv.jpg" group-title="Comedy",Paramount Comedy Russia [Offline]
+#EXTINF:-1 tvg-id="ParamountComedyRussia.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/u50d1gv.jpg" group-title="Comedy",Paramount Comedy Russia [Timeout]
 http://45.145.32.11:20007/paramount_comedy/video.m3u8
 #EXTINF:-1 tvg-id="PartyTymeKaraoke.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Jj4zvOK.png" group-title="Entertainment",Party Tyme Karaoke (720p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=64
@@ -1269,11 +1252,13 @@ http://g5nl6xx5lpq6-hls-live.5centscdn.com/live1234/2621b29e501b445fabf227b08612
 http://uni6rtmp.tulix.tv:1935/ucur1/Payvand/playlist.m3u8
 #EXTINF:-1 tvg-id="PBCTapeshTV.us" tvg-country="US;IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/Yry3FXW.png" group-title="General",PBC Tapesh TV (720p) [Offline]
 https://iptv.tapesh.tv/tapesh/playlist.m3u8
+#EXTINF:-1 tvg-id="WorldChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBSWorld_972x972.png?raw=true" group-title="Entertainment",PBS | World Channel (480p)
+https://cs.ebmcdn.net/eastbay-live-hs-1/apt/mp4:apt-world/playlist.m3u8
 #EXTINF:-1 tvg-id="WLVTTV" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",PBS 39 Allentown PA (WLVT) (720p)
 https://forerunnerrtmp.livestreamingcdn.com/output18/output18.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="WPPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",PBS 39 Extra Philadelphia PA (WPPT) (480p)
 https://forerunnerrtmp.livestreamingcdn.com/output18-2/output18-2.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="KLCSDT3.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jmaNzgg.jpg" group-title="Entertainment",PBS Create Los Angeles CA (KLCS-DT3) (360p) [Geo-blocked]
+#EXTINF:-1 tvg-id="KLCSDT3.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jmaNzgg.jpg" group-title="Entertainment",PBS Create Los Angeles CA (KLCS-DT3) (720p) [Geo-blocked]
 https://d1mxoeplf1ak5a.cloudfront.net/index.m3u8
 #EXTINF:-1 tvg-id="KERATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="General",PBS Dallas TX (KERA) (1080p) [Geo-blocked]
 https://kera-flash.streamguys1.com/live/eventStream/playlist.m3u8
@@ -1285,8 +1270,6 @@ https://2-fss-2.streamhoster.com/pl_140/amlst:200914-1298290/playlist.m3u8
 https://livestream.pbskids.org/out/v1/00a3b9014fa54c40bee6ca68a104a8a4/mst.m3u8
 #EXTINF:-1 tvg-id="PBSKidsFlorida.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ambc9le.png" group-title="Kids",PBS Kids Florida (1080p)
 https://livestream.pbskids.org/out/v1/1e3d77b418ad4a819b3f4c80ac0373b5/est.m3u8
-#EXTINF:-1 tvg-id="WorldChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBSWorld_972x972.png?raw=true" group-title="Entertainment",PBS | World Channel (480p)
-https://cs.ebmcdn.net/eastbay-live-hs-1/apt/mp4:apt-world/playlist.m3u8
 #EXTINF:-1 tvg-id="PCCTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9PEAPwY.png" group-title="Local",PCC-TV Pinellas County FL (480p)
 http://granicusliveus1-a.akamaihd.net/pinellas/G1551_004/playlist.m3u8
 #EXTINF:-1 tvg-id="PeopleTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7SarjaU.png" group-title="Entertainment",People TV (1080p)
@@ -1299,7 +1282,7 @@ https://peopletv-samsungus-ingest.akamaized.net/playlist.m3u8
 https://content.uplynk.com/channel/98828f7707b84dc496472d5789143df2.m3u8
 #EXTINF:-1 tvg-id="PlantBasedNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/iwd9Jxb.png" group-title="",Plant Based Network (1080p)
 https://hls-cdn.tvstartup.net/barakyah-channel/live/pbtv/playlist.m3u8
-#EXTINF:-1 tvg-id="Pop.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/tTGgNWX.png" group-title="General",Pop (1080p) [Offline]
+#EXTINF:-1 tvg-id="Pop.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/tTGgNWX.png" group-title="General",Pop (1080p) [Timeout]
 https://live-poptv-fastly-prod.global.ssl.fastly.net/pop/master.m3u8
 #EXTINF:-1 tvg-id="PopstarTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/mWrqBaS.png" group-title="Entertainment",Popstar! TV (1080p) [Offline]
 https://a.jsrdn.com/broadcast/wAlxn4cs/c.m3u8
@@ -1319,17 +1302,15 @@ https://t06243a-lh.akamaihd.net/i/t06243a_1@536897/index_750_av-p.m3u8
 https://lsqvc1uscln-lh.akamaihd.net/i/lsqvc1uscln_01@809410/master.m3u8
 #EXTINF:-1 tvg-id="QVC.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC (720p)
 https://lsqvc1usott-lh.akamaihd.net/i/lsqvc1usott_01@838836/master.m3u8
-#EXTINF:-1 tvg-id="QVC2.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC 2 (720p)
-https://lsqvc2us-lh.akamaihd.net/i/lsqvc2us_01@809440/master.m3u8
-#EXTINF:-1 tvg-id="QVC2Deutsch.us" tvg-country="US" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC2 (Deutsch) (540p)
-http://live.qvcde.simplestreamcdn.com/live/qvcde_plus_clean/bitrate1.isml/live.m3u8
-#EXTINF:-1 tvg-id="QVC3.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC 3 (720p)
-https://lsqvc3us-lh.akamaihd.net/i/lsqvc3us_01@809459/master.m3u8
 #EXTINF:-1 tvg-id="QVC.us" tvg-country="US" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC (German) (540p)
 https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_main_clean/bitrate1.isml/live.m3u8
+#EXTINF:-1 tvg-id="QVC2.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC 2 (720p)
+https://lsqvc2us-lh.akamaihd.net/i/lsqvc2us_01@809440/master.m3u8
+#EXTINF:-1 tvg-id="QVC3.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC 3 (720p)
+https://lsqvc3us-lh.akamaihd.net/i/lsqvc3us_01@809459/master.m3u8
 #EXTINF:-1 tvg-id="QVCBeauty.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC Beauty (German) (540p)
 https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_beauty_clean/bitrate1.isml/live.m3u8
-#EXTINF:-1 tvg-id="QVCItalia.us" tvg-country="IT" tvg-language="Italian" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC Italia (720p)
+#EXTINF:-1 tvg-id="QVCItalia.us" tvg-country="IT" tvg-language="Italian" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC Italia (540p)
 https://qrg.akamaized.net/hls/live/2017383/lsqvc1it/master.m3u8
 #EXTINF:-1 tvg-id="QVCJapan.us" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC Japan (720p)
 https://cdn-live1.qvc.jp/iPhone/1501/1501.m3u8
@@ -1339,16 +1320,18 @@ https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_plus_clean/bitrate1.isml/live.m
 http://live.qvcde.simplestreamcdn.com/live/qvcde_beauty_clean/bitrate1.isml/live.m3u8
 #EXTINF:-1 tvg-id="QVCUK.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC UK (540p)
 http://live.qvcuk.simplestreamcdn.com/live/qvcuk_main_clean/bitrate1.isml/live.m3u8
-#EXTINF:-1 tvg-id="QVCUK.us" tvg-country="UK" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC UK (540p)
+#EXTINF:-1 tvg-id="QVCUK.us" tvg-country="UK" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC UK (288p)
 https://d1txbbj1u9asam.cloudfront.net/live/qvcuk_main_clean/bitrate1.isml/live.m3u8
 #EXTINF:-1 tvg-id="QVCUKPlus1.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC UK +1 (540p)
 https://live-qvcuk.simplestreamcdn.com/hera/remote/qvcuk_primary_sdi1/live.m3u8
 #EXTINF:-1 tvg-id="QVCUKBeauty.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC UK Beauty (540p)
 http://live.qvcuk.simplestreamcdn.com/live/qvcuk_beauty_clean/bitrate1.isml/live.m3u8
-#EXTINF:-1 tvg-id="QVCUKExtra.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC UK Extra (540p)
+#EXTINF:-1 tvg-id="QVCUKExtra.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC UK Extra (540p) [Offline]
 https://live-qvcuk.simplestreamcdn.com/live/qvcuk_extra_clean/bitrate1.isml/live.m3u8
 #EXTINF:-1 tvg-id="QVCUKStyle.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC UK Style (540p)
 http://live.qvcuk.simplestreamcdn.com/live/qvcuk_style_clean/bitrate1.isml/live.m3u8
+#EXTINF:-1 tvg-id="QVC2Deutsch.us" tvg-country="US" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/qvc.png" group-title="Shop",QVC2 (Deutsch) (540p)
+http://live.qvcde.simplestreamcdn.com/live/qvcde_plus_clean/bitrate1.isml/live.m3u8
 #EXTINF:-1 tvg-id="QVTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/X9LBFzK.jpg" group-title="Religious",QVTV (720p)
 https://qvmstream.tulix.tv/720p/720p/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioInmaculada.us" tvg-country="US" tvg-language="Spanish" tvg-logo="" group-title="Religious",Radio Inmaculada (1080p) [Not 24/7]
@@ -1359,7 +1342,7 @@ https://stream.rjtv.stream/live/smil:rjtv.smil/playlist.m3u8
 https://59514edd5dd8e.streamlock.net/lax/lax/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://radiou.com/wp-content/uploads/2018/06/RadioUSiteFooterTransparent.png" group-title="Music",Radio U TV (720p)
 https://cdnlive.radiou.com/LS-ATL-43240-1/index.m3u8
-#EXTINF:-1 tvg-id="RadioyTelevisionMarti.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/B6C0FyM.png" group-title="Local",Radio y Televisión Martí (480p)
+#EXTINF:-1 tvg-id="RadioyTelevisionMarti.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/B6C0FyM.png" group-title="Local",Radio y Televisión Martí (1080p)
 https://ocb-lh.akamaihd.net/i/ocb_mpls_tvmc1@383606/master.m3u8
 #EXTINF:-1 tvg-id="RealVision.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/mLUmsCt.png" group-title="Business",Real Vision (720p)
 https://a.jsrdn.com/broadcast/2a755012a8/+0000/c.m3u8
@@ -1378,9 +1361,9 @@ https://bcovlive-a.akamaihd.net/a71236fdda1747999843bd3d55bdd6fa/us-east-1/61839
 #EXTINF:-1 tvg-id="KCKSLD7.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjM5NTI2OTZf/TV25_360x360.png" group-title="Auto",Rev'n (KCKS-LD7) (480p)
 https://cdn.igocast.com/channel7_hls/channel7_master.m3u8
 #EXTINF:-1 tvg-id="RevelationTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sOVdYJZ.png" group-title="Religious",Revelation TV (720p)
-https://rtv.cdn.mangomolo.com/rtv/smil:rtv.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="RevelationTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sOVdYJZ.png" group-title="Religious",Revelation TV (720p)
 https://rtv.cdn.mangomolo.com/rtv/smil:switch.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="RevelationTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sOVdYJZ.png" group-title="Religious",Revelation TV (576p)
+https://rtv.cdn.mangomolo.com/rtv/smil:rtv.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RevryQueer.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5fc81016d98cab623846a4f3" group-title="Lifestyle",Revry Queer (720p)
 https://4aafa23ec0a6477ca31466bd83a115a4.mediatailor.us-west-2.amazonaws.com/v1/master/ba62fe743df0fe93366eba3a257d792884136c7f/LINEAR-43-REVRY2-GALXY/mt/galxy/43/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="RoosterTeethTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/3o9cG76.png" group-title="",Rooster Teeth TV (1080p)
@@ -1403,7 +1386,7 @@ https://content.uplynk.com/channel/3e4b9cada2b74cf18977298804134a36.m3u8
 https://wowzaprod188-i.akamaihd.net/hls/live/730322/3fa8d5f5/playlist.m3u8
 #EXTINF:-1 tvg-id="SentTVGlobalNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ogvLLji.png" group-title="General",Sent TV Global Network (720p) [Not 24/7]
 https://rpn1.bozztv.com/36bay2/gusa-stgn/mono.m3u8
-#EXTINF:-1 tvg-id="SGTN49.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/mJtJhjF.png" group-title="General",Sent TV Global Network Atlanta (SGTN-49) (720p) [Offline]
+#EXTINF:-1 tvg-id="SGTN49.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/mJtJhjF.png" group-title="General",Sent TV Global Network Atlanta (SGTN-49) (720p) [Timeout]
 http://stgn-49.tulix.tv/live19/Stream1/playlist.m3u8
 #EXTINF:-1 tvg-id="Shabakeh7.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LeYSfhX.png" group-title="",Shabakeh 7 (720p)
 http://rtmp.abnsat.com/hls/txministry.m3u8
@@ -1421,7 +1404,7 @@ https://cdn.igocast.com/channel10_hls/channel10_master.m3u8
 https://shoutfactory-shoutfactory-zype.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Skwad.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sv7WkKe.png" group-title="Kids",SKWAD (720p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=71
-#EXTINF:-1 tvg-id="Slimo.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Slimo (1080p)
+#EXTINF:-1 tvg-id="Slimo.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Slimo (540p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c7e2783932c8368bdbfd8a5/playlist.m3u8
 #EXTINF:-1 tvg-id="SmartLifestyleTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/CxKWwjx.jpg" group-title="Lifestyle",Smart Lifestyle TV [Offline]
 https://t01587-lh.akamaihd.net/i/t01587SmartLifeStyle_1@692079/master.m3u8
@@ -1431,7 +1414,7 @@ https://api.new.livestream.com/accounts/27460990/events/8266916/live.m3u8
 https://tv2.fastcast4u.com:3728/live/soniderostvlive.m3u8
 #EXTINF:-1 tvg-id="SBN.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting (SBN) (720p)
 https://sonlife5-i.akamaihd.net/hls/live/584631/ch5/master.m3u8
-#EXTINF:-1 tvg-id="SBN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting (SBN) (540p)
+#EXTINF:-1 tvg-id="SBN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting (SBN) (720p)
 https://sonlife7-i.akamaihd.net/hls/live/585011/ch7/master.m3u8
 #EXTINF:-1 tvg-id="SBNGlobal.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/h9Gxavk.png" group-title="Religious",SonLife Broadcasting Global (SBN) (720p)
 https://sonlife10-i.akamaihd.net/hls/live/585013/ch10/master.m3u8
@@ -1441,7 +1424,7 @@ https://viacomitalytest-lh.akamaihd.net/i/sbshdlive_1@829515/master.m3u8
 https://cdnlive.myspirit.tv/LS-ATL-43240-2/index.m3u8
 #EXTINF:-1 tvg-id="SportsGrid.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/46gdAeg.png" group-title="Sports",SportsGrid (720p)
 https://playout4multirtmp.tulix.tv/live6/Stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="SportskoolTV.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Sports",Sportskool TV (720p)
+#EXTINF:-1 tvg-id="SportskoolTV.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Sports",Sportskool TV (486p)
 https://a.jsrdn.com/broadcast/fabeab4b08/+0000/c.m3u8
 #EXTINF:-1 tvg-id="SpydarTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NostTV_SpydarTV.png" group-title="Entertainment",Spydar TV (720p)
 https://simultv.s.llnwi.net/n4s4/Spydar/interlink.m3u8
@@ -1467,7 +1450,7 @@ https://cdn61.liveonlineservices.com/hls/subrang.m3u8
 https://a.jsrdn.com/broadcast/9e63a1b236/+0000/c.m3u8
 #EXTINF:-1 tvg-id="TAGTV.us" tvg-country="US" tvg-language="Hindi" tvg-logo="https://i.imgur.com/9vosZt4.jpg" group-title="News",TAG TV (1080p) [Not 24/7]
 https://cdn30.liveonlineservices.com/hls/tagtv.m3u8
-#EXTINF:-1 tvg-id="TangoTV.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/tangotvchannel/picture?width=320&height=320" group-title="Entertainment",TangoTV (480p)
+#EXTINF:-1 tvg-id="TangoTV.us" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/tangotvchannel/picture?width=320&height=320" group-title="Entertainment",TangoTV (1080p)
 https://panel.streamingtv-mediacp.online:1936/8066/8066/playlist.m3u8
 #EXTINF:-1 tvg-id="TasteItTV.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Taste It TV (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5af61f59d5eeee7af3d1db8f/playlist.m3u8
@@ -1487,13 +1470,13 @@ http://210.210.155.35/qwr9ew/s/s39/02.m3u8
 https://api.new.livestream.com/accounts/27460990/events/8266920/live.m3u8
 #EXTINF:-1 tvg-id="TBNUkraina.us" tvg-country="UA" tvg-language="Ukrainian" tvg-logo="https://i.imgur.com/DHwhdRF.png" group-title="Religious",TBN Украина (720p)
 http://62.32.67.187:1935/WEB_Ukraine24/Ukraine24.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TBSEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7e/TBS_Network-logo.svg/320px-TBS_Network-logo.svg.png" group-title="General",TBS East [Geo-blocked]
+#EXTINF:-1 tvg-id="TBSEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7e/TBS_Network-logo.svg/320px-TBS_Network-logo.svg.png" group-title="General",TBS East (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023172/tbseast/slate/VIDEO_0_3564000.m3u8
-#EXTINF:-1 tvg-id="TBSWest.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7e/TBS_Network-logo.svg/320px-TBS_Network-logo.svg.png" group-title="General",TBS West [Geo-blocked]
+#EXTINF:-1 tvg-id="TBSWest.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7e/TBS_Network-logo.svg/320px-TBS_Network-logo.svg.png" group-title="General",TBS West (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023174/tbswest/slate/VIDEO_0_3564000.m3u8
-#EXTINF:-1 tvg-id="TCMEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sbrSfhC.jpg" group-title="Classic",TCM East [Geo-blocked]
+#EXTINF:-1 tvg-id="TCMEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sbrSfhC.jpg" group-title="Classic",TCM East (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023186/tcmeast/noslate/VIDEO_1_5128000.m3u8
-#EXTINF:-1 tvg-id="TCMWest.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sbrSfhC.jpg" group-title="Classic",TCM West [Geo-blocked]
+#EXTINF:-1 tvg-id="TCMWest.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sbrSfhC.jpg" group-title="Classic",TCM West (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023187/tcmwest/noslate/VIDEO_1_5128000.m3u8
 #EXTINF:-1 tvg-id="TCT.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/TV29g3L.png" group-title="Religious",TCT (1080p) [Offline]
 https://iptv-all.lanesh4d0w.repl.co/united-states/tct
@@ -1507,7 +1490,7 @@ https://eu-nl-012.worldcast.tv/dancetelevisionthree/dancetelevisionthree.m3u8
 https://wmaqlive-f.akamaihd.net/i/wmaqb1_1@24420/master.m3u8
 #EXTINF:-1 tvg-id="WZDCCD.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/G8Bk8si.png" group-title="General",Telemundo 44 Washington DC (432p) [Offline]
 https://wrclive-f.akamaihd.net/i/wrcb2_1@46880/master.m3u8
-#EXTINF:-1 tvg-id="TeleRaydo.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/yxKb7yF.jpg" group-title="",TeleRadyo (480p)
+#EXTINF:-1 tvg-id="TeleRaydo.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/yxKb7yF.jpg" group-title="",TeleRadyo (720p)
 https://abscbn-ono.akamaized.net/midroll/amagi_hls_data_abscbnAAA-abscbn-teleradyo-oando/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Tempe11.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Rgy4qWN.gif" group-title="Local",Tempe 11 AZ (720p) [Not 24/7]
 https://granicusliveus1-a.akamaihd.net/tempe/G0355_003/playlist.m3u8
@@ -1527,7 +1510,7 @@ https://a.jsrdn.com/broadcast/9Kl3dcb5l/c.m3u8
 https://thefirst-distroscale.amagi.tv/index.m3u8
 #EXTINF:-1 tvg-id="TheHeartlandNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzI1NDE5MjJf/Heartland_720x720.png" group-title="",The Heartland Network (720p)
 https://bcovlive-a.akamaihd.net/1ad942d15d9643bea6d199b729e79e48/us-east-1/6183977686001/playlist.m3u8
-#EXTINF:-1 tvg-id="TheLoveDestination.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/eXBQfaP.png" group-title="Entertainment",The Love Destination (720p)
+#EXTINF:-1 tvg-id="TheLoveDestination.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/eXBQfaP.png" group-title="Entertainment",The Love Destination (404p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=43
 #EXTINF:-1 tvg-id="TheNowNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://channels.roku.com/images/be4667a16b1e483b8c7746156192b5ba-hd.jpg" group-title="Religious",The Now Network (480p) [Not 24/7]
 https://link.frontlayer.com/services/hls2/fl619843/index.m3u8
@@ -1549,9 +1532,9 @@ https://wsjlivehls-lh.akamaihd.net/i/events1_1@174990/master.m3u8
 https://d155hi8td9k2ns.cloudfront.net/out/wapo-medialive3-rtmp/live.m3u8
 #EXTINF:-1 tvg-id="ThisTVNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FQCVaSR.png" group-title="",This TV Network (480p)
 https://cdn.igocast.com/channel11_hls/channel11_master.m3u8
-#EXTINF:-1 tvg-id="TNTEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xvL9KPI.png" group-title="General",TNT East [Geo-blocked]
+#EXTINF:-1 tvg-id="TNTEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xvL9KPI.png" group-title="General",TNT East (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023168/tnteast/slate/VIDEO_0_3564000.m3u8
-#EXTINF:-1 tvg-id="TNTSports2Brasil.us" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sports",TNT Sports 2 Brasil (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TNTSports2Brasil.us" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sports",TNT Sports 2 Brasil (480p) [Not 24/7]
 https://glxlmn026c.singularcdn.net.br/playout_02/playlist.m3u8
 #EXTINF:-1 tvg-id="TNTSports3Brasil.us" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sports",TNT Sports 3 Brasil (720p)
 https://glxlmn026c.singularcdn.net.br/playout_03/playlist.m3u8
@@ -1559,7 +1542,7 @@ https://glxlmn026c.singularcdn.net.br/playout_03/playlist.m3u8
 https://glxlmn026c.singularcdn.net.br/playout_04/playlist.m3u8
 #EXTINF:-1 tvg-id="TNTSports5Brasil.us" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sports",TNT Sports 5 Brasil (720p) [Not 24/7]
 https://glxlmn026c.singularcdn.net.br/playout_05/playlist.m3u8
-#EXTINF:-1 tvg-id="TNTWest.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xvL9KPI.png" group-title="General",TNT West [Geo-blocked]
+#EXTINF:-1 tvg-id="TNTWest.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xvL9KPI.png" group-title="General",TNT West (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023170/tntwest/slate/VIDEO_0_3564000.m3u8
 #EXTINF:-1 tvg-id="ToonGoggles.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oyIMxzM.png" group-title="Kids",Toon Goggles (1080p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=36
@@ -1573,11 +1556,11 @@ https://content.uplynk.com/channel/33c48f602cfd4474b957eb4ad999caf8.m3u8
 https://a.jsrdn.com/broadcast/18b42f9aef/+0000/c.m3u8
 #EXTINF:-1 tvg-id="TravelChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9C2e563.png" group-title="Travel",Travel Channel [Offline]
 https://cdn1.mobiletv.bg/T5/travel_channel/travel_channel_794613_850k.m3u8
-#EXTINF:-1 tvg-id="TrinityChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.ytimg.com/vi/_Jt1yB1y-MM/hqdefault.jpg" group-title="Religious",Trinity Channel (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TrinityChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.ytimg.com/vi/_Jt1yB1y-MM/hqdefault.jpg" group-title="Religious",Trinity Channel (540p) [Not 24/7]
 http://rtmp1.abnsat.com/hls/trinity.m3u8
-#EXTINF:-1 tvg-id="TruTVEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/e3KabTt.jpg" group-title="",TruTV East [Geo-blocked]
+#EXTINF:-1 tvg-id="TruTVEast.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/e3KabTt.jpg" group-title="",TruTV East (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023176/trueast/slate/VIDEO_0_3564000.m3u8
-#EXTINF:-1 tvg-id="TruTVWest.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/e3KabTt.jpg" group-title="",TruTV West [Geo-blocked]
+#EXTINF:-1 tvg-id="TruTVWest.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/e3KabTt.jpg" group-title="",TruTV West (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023178/truwest/slate/VIDEO_0_3564000.m3u8
 #EXTINF:-1 tvg-id="TSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/IX8uInV.png" group-title="Local",TSTV (720p)
 http://tstv-stream.tsm.utexas.edu/hls/livestream_hi/index.m3u8
@@ -1585,53 +1568,53 @@ http://tstv-stream.tsm.utexas.edu/hls/livestream_hi/index.m3u8
 https://dcunilive262-lh.akamaihd.net/i/dclive_1@303126/index_150_av-p.m3u8?rebase=on&sd=10
 #EXTINF:-1 tvg-id="WHPSCD.us" tvg-country="US" tvg-language="English" tvg-logo="http://313watkins.com/images/logo.png" group-title="Local",TV33 Detroit Live (WHPR) (720p) [Not 24/7]
 http://162.244.81.156:1935/whprtv33roku/whprtv33roku/playlist.m3u8
-#EXTINF:-1 tvg-id="TVBJ1.us" tvg-country="HK" tvg-language="Cantonese" tvg-logo="" group-title="",TVB J1 [Geo-blocked]
+#EXTINF:-1 tvg-id="TVBJ1.us" tvg-country="HK" tvg-language="Chinese" tvg-logo="" group-title="",TVB J1 (720p) [Geo-blocked]
 https://bcovlive-a.akamaihd.net/f23dfe49b06b45d8878b55b4b6909595/us-west-2/5324042807001/4a3bca5b047b4564b18bb12dfa26ba62/playlist_ssaiM.m3u8
 #EXTINF:-1 tvg-id="TVS.us" tvg-country="US" tvg-language="English" tvg-logo="https://paraguaype.com/wp-content/uploads/2016/07/tvs-encarnacion-televisora-del-sur-en-vivo-online.jpg" group-title="",TVS (720p) [Not 24/7]
 https://rds3.desdeparaguay.net/tvs/tvs/playlist.m3u8
-#EXTINF:-1 tvg-id="TVSBoxing.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sal5CkX.jpg" group-title="Sports",TVS Boxing (720p)
+#EXTINF:-1 tvg-id="TVSBoxing.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sal5CkX.jpg" group-title="Sports",TVS Boxing (360p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsboxing/index.m3u8
 #EXTINF:-1 tvg-id="TVSCipherNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Cipher Network (360p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsmystery/index.m3u8
 #EXTINF:-1 tvg-id="TVSClassicMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/VLWDHGs.png" group-title="Classic",TVS Classic Movies (480p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsclassicmovies/index.m3u8
-#EXTINF:-1 tvg-id="TVSClassicSports.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ui099xQ.jpg" group-title="Sports",TVS Classic Sports (720p)
+#EXTINF:-1 tvg-id="TVSClassicSports.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ui099xQ.jpg" group-title="Sports",TVS Classic Sports (360p)
 http://rpn1.bozztv.com/36bay2/gusa-tvs/index.m3u8
-#EXTINF:-1 tvg-id="TVSComedyNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lHvWCyV.jpg" group-title="Comedy",TVS Comedy Network (480p)
+#EXTINF:-1 tvg-id="TVSComedyNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lHvWCyV.jpg" group-title="Comedy",TVS Comedy Network (720p)
 https://rpn1.bozztv.com/36bay2/gusa-comedyclassics/index.m3u8
-#EXTINF:-1 tvg-id="TVSDriveInMovie.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RhKSIGQ.jpg" group-title="Movies",TVS Drive In Movie (360p)
+#EXTINF:-1 tvg-id="TVSDriveInMovie.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RhKSIGQ.jpg" group-title="Movies",TVS Drive In Movie (480p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsdriveinmovie/index.m3u8
-#EXTINF:-1 tvg-id="TVSFamilyChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/iuQyJ7f.jpg" group-title="Family",TVS Family Channel (360p)
+#EXTINF:-1 tvg-id="TVSFamilyChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/iuQyJ7f.jpg" group-title="Family",TVS Family Channel (480p)
 https://rpn1.bozztv.com/36bay2/gusa-TVSFamilyChannel/index.m3u8
-#EXTINF:-1 tvg-id="TVSFilmNoirNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Movies",TVS Film Noir Network (360p)
+#EXTINF:-1 tvg-id="TVSFilmNoirNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Movies",TVS Film Noir Network (720p)
 https://rpn1.bozztv.com/36bay2/gusa-TVSFilmNoir/index.m3u8
-#EXTINF:-1 tvg-id="TVSFrontPageDetective.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Front Page Detective (360p)
+#EXTINF:-1 tvg-id="TVSFrontPageDetective.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Front Page Detective (720p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsfrontpagedetective/index.m3u8
-#EXTINF:-1 tvg-id="TVSHiTops.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Kids",TVS Hi Tops (490p)
+#EXTINF:-1 tvg-id="TVSHiTops.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Kids",TVS Hi Tops (480p)
 https://rpn1.bozztv.com/36bay2/gusa-hitops/index.m3u8
-#EXTINF:-1 tvg-id="TVSHollywoodHistory.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Hollywood History (408p)
+#EXTINF:-1 tvg-id="TVSHollywoodHistory.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Hollywood History (360p)
 https://rpn1.bozztv.com/36bay2/gusa-tvshollywoohistory/mono.m3u8
 #EXTINF:-1 tvg-id="TVSHorrorNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/uNQeGHw.jpg" group-title="Classic",TVS Horror Network (480p)
 https://rpn1.bozztv.com/36bay2/gusa-tvshorror/index.m3u8
 #EXTINF:-1 tvg-id="TVSInspirationalNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Inspirational Network (480p) [Not 24/7]
 https://rpn1.bozztv.com/36bay2/gusa-TVSInspirationalNetwork/index.m3u8
-#EXTINF:-1 tvg-id="TVSMainstreet.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/37OGfa3.jpg" group-title="Classic",TVS Mainstreet (264p)
+#EXTINF:-1 tvg-id="TVSMainstreet.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/37OGfa3.jpg" group-title="Classic",TVS Mainstreet (360p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsmainst/index.m3u8
 #EXTINF:-1 tvg-id="TVSMusicNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Music",TVS Music Network (360p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsmusic/index.m3u8
-#EXTINF:-1 tvg-id="TVSNostalgia.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Nostalgia (720p)
+#EXTINF:-1 tvg-id="TVSNostalgia.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Nostalgia (240p)
 https://rpn1.bozztv.com/36bay2/gusa-nostalgia/index.m3u8
-#EXTINF:-1 tvg-id="TVSNostalgiaMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/5Ygj2DL.jpg" group-title="Classic",TVS Nostalgia Movies (480p)
+#EXTINF:-1 tvg-id="TVSNostalgiaMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/5Ygj2DL.jpg" group-title="Classic",TVS Nostalgia Movies (464p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsNostalgiaMovies/index.m3u8
-#EXTINF:-1 tvg-id="TVSPetParadeNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Pet Parade Network (480p)
+#EXTINF:-1 tvg-id="TVSPetParadeNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Pet Parade Network (694p)
 https://rpn1.bozztv.com/36bay2/gusa-petparadenetwork/index.m3u8
-#EXTINF:-1 tvg-id="TVSPinballNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Kids",TVS Pinball Network (1080p)
+#EXTINF:-1 tvg-id="TVSPinballNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Kids",TVS Pinball Network (360p)
 https://rpn1.bozztv.com/36bay2/gusa-TVSCartoonNetwork/index.m3u8
-#EXTINF:-1 tvg-id="TVSQuizShowNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Quiz Show Network (480p)
+#EXTINF:-1 tvg-id="TVSQuizShowNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Classic",TVS Quiz Show Network (720p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsgameshow/index.m3u8
 #EXTINF:-1 tvg-id="TVSRareCollectibles.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Shop",TVS Rare Collectibles (720p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsrarecollectibles/index.m3u8
-#EXTINF:-1 tvg-id="TVSSelectNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="General",TVS Select Network (720p)
+#EXTINF:-1 tvg-id="TVSSelectNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="General",TVS Select Network (368p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsselect/index.m3u8
 #EXTINF:-1 tvg-id="TVSSiloDiscountNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Shop",TVS Silo Discount Network (720p) [Not 24/7]
 https://rpn1.bozztv.com/36bay2/gusa-tvssilodiscount/index.m3u8
@@ -1639,19 +1622,19 @@ https://rpn1.bozztv.com/36bay2/gusa-tvssilodiscount/index.m3u8
 https://rpn1.bozztv.com/36bay2/gusa-tvssports/index.m3u8
 #EXTINF:-1 tvg-id="TVSSportsBureau.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="Sports",TVS Sports Bureau (720p)
 https://rpn1.bozztv.com/36bay2/gusa-tvssportsbureau/index.m3u8
-#EXTINF:-1 tvg-id="TVSTallyHo.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/t0ly2m8.jpg" group-title="Classic",TVS Tally Ho (360p)
+#EXTINF:-1 tvg-id="TVSTallyHo.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/t0ly2m8.jpg" group-title="Classic",TVS Tally Ho (480p)
 https://rpn1.bozztv.com/36bay2/gusa-tvstallyho/index.m3u8
 #EXTINF:-1 tvg-id="TVSTavern.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/5UjqDht.jpg" group-title="Classic",TVS Tavern (720p)
 https://rpn1.bozztv.com/36bay2/gusa-tavern/index.m3u8
-#EXTINF:-1 tvg-id="TVSTelevisionNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="General",TVS Television Network (490p)
+#EXTINF:-1 tvg-id="TVSTelevisionNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="General",TVS Television Network (720p)
 https://rpn1.bozztv.com/36bay2/gusa-tvstn/index.m3u8
 #EXTINF:-1 tvg-id="TVSTodayHomeEntertainmentNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXOyNEy.png" group-title="",TVS Today Home Entertainment Network (720p) [Not 24/7]
 https://rpn1.bozztv.com/36bay2/gusa-TVSTodayHomeEntertainment/index.m3u8
 #EXTINF:-1 tvg-id="TVSTravel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bgqy4fL.jpg" group-title="Travel",TVS Travel Network (720p) [Not 24/7]
 https://rpn1.bozztv.com/36bay2/gusa-tvstravel/index.m3u8
-#EXTINF:-1 tvg-id="TVSTurbo.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RMewTGr.jpg" group-title="Sports",TVS Turbo (360p)
+#EXTINF:-1 tvg-id="TVSTurbo.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RMewTGr.jpg" group-title="Sports",TVS Turbo (720p)
 https://rpn1.bozztv.com/36bay2/gusa-tvsturbo/index.m3u8
-#EXTINF:-1 tvg-id="TVSWesternMovie.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/UsgbmfF.png" group-title="Classic",TVS Western Movie (360p)
+#EXTINF:-1 tvg-id="TVSWesternMovie.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/UsgbmfF.png" group-title="Classic",TVS Western Movie (288p)
 https://rpn1.bozztv.com/36bay2/gusa-tvswesternmovies/index.m3u8
 #EXTINF:-1 tvg-id="TVSWomenSports.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jQdBjyx.jpg" group-title="Sports",TVS Women Sports (480p)
 https://rpn1.bozztv.com/36bay2/gusa-tvswsn/index.m3u8
@@ -1693,7 +1676,7 @@ https://5dcc6a2840dfd15e7f8518ef-s-3.ssai.zype.com/5dcc6a2840dfd15e7f8518ef-s-3/
 https://content.uplynk.com/channel/36953f5b6546464590d2fcd954bc89cf.m3u8
 #EXTINF:-1 tvg-id="VictorValleyMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/VictorValleyMovies_229x229.png?raw=true" group-title="Movies",Victor Valley Movies (1080p) [Not 24/7]
 https://2-fss-1.streamhoster.com/pl_122/201794-1414514-1/playlist.m3u8
-#EXTINF:-1 tvg-id="VictoryTelevisionNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/yqA2PJj.jpg" group-title="Religious",Victory Television Network (240p)
+#EXTINF:-1 tvg-id="VictoryTelevisionNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/yqA2PJj.jpg" group-title="Religious",Victory Television Network (240p) [Timeout]
 http://184.173.179.163:1935/victorytelevisionnetwork/victorytelevisionnetwork/playlist.m3u8
 #EXTINF:-1 tvg-id="WHOHTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oua9m6O.jpg" group-title="Local",Village of Hastings-On-Hudson NY (WHOH-TV) (360p)
 http://stream.swagit.com/live-edge/hastingsonhudsonny/smil:std-4x3-1-a/playlist.m3u8
@@ -1710,13 +1693,13 @@ http://203.154.243.89:11205
 #EXTINF:-1 tvg-id="WarnerTV.us" tvg-country="TH" tvg-language="Thai" tvg-logo="http://static.epg.best/fr/WarnerTV.fr.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Movies",Warner TV (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://www.livedoomovie.com/02_WarnerTVHD_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="WatchItKid.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DAhbkLv.png" group-title="Kids",Watch It Kid (720p)
+#EXTINF:-1 tvg-id="WatchItKid.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DAhbkLv.png" group-title="Kids",Watch It Kid (486p)
 https://content.uplynk.com/channel/ce3b524c342247549e996e7d3a977157.m3u8
 #EXTINF:-1 tvg-id="WatchItScream.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ylPU4Uf.jpg" group-title="Movies",Watch It Scream! (720p)
 https://content.uplynk.com/channel/29aff31fecb848ab9044369db2d61642.m3u8
 #EXTINF:-1 tvg-id="WCCATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://worcester.vod.castus.tv/wccalive.png" group-title="Local",WCCA 194 Worcester MA (WCCA-TV) (480p)
 https://worcester.vod.castus.tv/live/ch1.m3u8
-#EXTINF:-1 tvg-id="KCKSLD6.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjM5NTI2OTZf/TV25_360x360.png" group-title="Weather",WeatherNation (KCKS-LD6) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="KCKSLD6.us" tvg-country="US" tvg-language="English" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/1/18/WeatherNation_icon.png" group-title="Weather",WeatherNation (KCKS-LD6) (480p) [Not 24/7]
 https://cdn.igocast.com/channel6_hls/channel6_master.m3u8
 #EXTINF:-1 tvg-id="Westerns4U.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzU1NDU0OTlf/NostTV_Westerns4U.png" group-title="Classic",Westerns 4U (480p)
 https://broadcast.mytvtogo.net/westerntv4u/westerntv4u/playlist.m3u8
@@ -1740,9 +1723,9 @@ https://wfcint.mediacdn.ru/cdn/wfcintweb/playlist.m3u8
 http://71.187.29.220:8000/play/a08o/index.m3u8
 #EXTINF:-1 tvg-id="WTVDTVNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",WTVD TV News (720p)
 https://api.abcotvs.com/v3/wtvd/m3u8/url?id=563661&key=yuemix
-#EXTINF:-1 tvg-id="WuTangCollection.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jbMmsjI.png" group-title="Music",Wu Tang Collection (720p)
+#EXTINF:-1 tvg-id="WuTangCollection.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jbMmsjI.png" group-title="Music",Wu Tang Collection (540p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=73
-#EXTINF:-1 tvg-id="Xcorps.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SDKWWQu.png" group-title="Series",Xcorps (720p)
+#EXTINF:-1 tvg-id="Xcorps.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SDKWWQu.png" group-title="Series",Xcorps (720p) [Timeout]
 https://simultv.s.llnwi.net/n4s4/xcorps/interlink.m3u8
 #EXTINF:-1 tvg-id="Xcorps.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SDKWWQu.png" group-title="Series",Xcorps (720p) [Offline]
 https://rpn1.bozztv.com/36bay2/gusa-xcorps/playlist.m3u8
@@ -1760,3 +1743,9 @@ https://thegateway.app/YouToo/CueTones/playlist.m3u8
 https://thegateway.app/YouToo/YTamerica/playlist.m3u8
 #EXTINF:-1 tvg-id="KanalDisney.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/Q9KoVy9.png" group-title="Kids",Канал Disney (576p) [Not 24/7]
 http://188.40.68.167/russia/disney/playlist.m3u8
+#EXTINF:-1 tvg-id="WABCTV.us" tvg-country="US" tvg-logo="" tvg-language="English" group-title="News",WABC-TV News (720p)
+https://api.abcotvs.com/v3/wabc/m3u8/url?id=503123&key=yuemix
+#EXTINF:-1 tvg-id="WPVITV.us" tvg-country="US" tvg-logo="" tvg-language="English" group-title="News",WPVI-TV News (720p)
+https://api.abcotvs.com/v3/wpvi/m3u8/url?id=531099&key=yuemix
+#EXTINF:-1 tvg-id="KGOTV.us" tvg-country="US" tvg-logo="" tvg-language="English" group-title="News",KGO-TV News (720p)
+https://api.abcotvs.com/v3/kgo/m3u8/url?id=530971&key=yuemix
diff --git a/channels/us_bumblebee.m3u b/channels/us_bumblebee.m3u
index 7e776d04be..e0f35b5ef4 100644
--- a/channels/us_bumblebee.m3u
+++ b/channels/us_bumblebee.m3u
@@ -5,7 +5,7 @@ https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c9537b8932c837b49397343/
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c953819932c837b49397345/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVAutoMoto.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Se1a8Mm.png" group-title="Auto",Bumblebee TV AutoMoto (720p)
 https://stitcheraws.unreel.me/wse-node01.powr.com/live/5bf220fad5eeee0f5a40941a/playlist.m3u8
-#EXTINF:-1 tvg-id="BumblebeeTVBeachesLive.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4rIbV7e.png" group-title="Relax",Bumblebee TV Beaches Live (1080p)
+#EXTINF:-1 tvg-id="BumblebeeTVBeachesLive.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4rIbV7e.png" group-title="Relax",Bumblebee TV Beaches Live (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c95396f932c837b49397360/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVClassicsOne.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/dxPsj2s.png" group-title="Movies",Bumblebee TV Classics #1 (480p)
 https://b83608fe932143099bb8b25a66857730.mediatailor.us-east-1.amazonaws.com/v1/manifest/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5f86075a0d552957bf5aa4dd/0d14dc99-cc30-4c0e-8531-40cdfe650694/1.m3u8
@@ -17,7 +17,7 @@ https://stitcheraws.unreel.me/wse-node02.powr.com/live/5e7559e8a46b495a2283c5e8/
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf225aed5eeee0f5a4094bd/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVCuteZone.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/unYHTWg.png" group-title="Kids",Bumblebee TV Cute Zone (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf22518d5eeee0f5a409486/playlist.m3u8
-#EXTINF:-1 tvg-id="BumblebeeTVDocsChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Fqxw3Mx.png" group-title="",Bumblebee TV Docs Channel (720p)
+#EXTINF:-1 tvg-id="BumblebeeTVDocsChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Fqxw3Mx.png" group-title="",Bumblebee TV Docs Channel (480p)
 https://0813a4e76b5d404a97a4070b8e087bc4.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5f8609d9d6344257cbfb6ee4/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVEpicM.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/uu19VR0.png" group-title="",Bumblebee TV Epic M (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf22225d5eeee0f5a40941d/playlist.m3u8
@@ -39,13 +39,13 @@ https://stitcheraws.unreel.me/wse-node02.powr.com/live/5e2625700145130f25474624/
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf22681932c8304fc453418/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVMasterBuilder.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/KQsAdB4.png" group-title="Kids",Bumblebee TV Master Builder (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf2256ed5eeee0f5a4094bb/playlist.m3u8
-#EXTINF:-1 tvg-id="BumblebeeTVMotorCyclist.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QIEhpPp.png" group-title="Auto",Bumblebee TV MotorCyclist (1080p)
+#EXTINF:-1 tvg-id="BumblebeeTVMotorCyclist.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QIEhpPp.png" group-title="Auto",Bumblebee TV MotorCyclist (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf2218bd5eeee0f5a40941b/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVMountainLive.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2Ipv14J.png" group-title="Relax",Bumblebee TV Mountain Live (1080p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c95387b932c837b49397357/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVNowYouKnow.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/78K3L8J.png" group-title="Education",Bumblebee TV Now You Know (548p)
 https://stitcheraws.unreel.me/wse-node01.powr.com/live/5b284f40d5eeee07522b775e/playlist.m3u8
-#EXTINF:-1 tvg-id="BumblebeeTVNowYouKnow.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/78K3L8J.png" group-title="Education",Bumblebee TV Now You Know [Offline]
+#EXTINF:-1 tvg-id="BumblebeeTVNowYouKnow.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/78K3L8J.png" group-title="Education",Bumblebee TV Now You Know [Timeout]
 https://stitcheraws.unreel.me/wse-node04.powr.com/live/5b284f40d5eeee07522b775e/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVPopCornFlixAction.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ths3dIy.png" group-title="Movies",Bumblebee TV PopCornFlix Action (1080p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5d4b21643f4d602ba521b06c/playlist.m3u8
@@ -53,7 +53,7 @@ https://stitcheraws.unreel.me/wse-node02.powr.com/live/5d4b21643f4d602ba521b06c/
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c7dff0f932c8368bdbfd5fd/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVRiversLive.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ii2IDmA.png" group-title="Relax",Bumblebee TV Rivers Live (1080p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c95388f932c837b4939735a/playlist.m3u8
-#EXTINF:-1 tvg-id="BumblebeeTVShortsChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/TaihS36.jpg" group-title="",Bumblebee TV Shorts Channel (540p)
+#EXTINF:-1 tvg-id="BumblebeeTVShortsChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/TaihS36.jpg" group-title="",Bumblebee TV Shorts Channel (720p)
 https://b29da26d9a17436eafe339c08e488f33.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5f8609010d552957bf5aa546/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVSmosh.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/eCBYHJ4.png" group-title="",Bumblebee TV Smosh (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5e2625af5748670f12a3bee9/playlist.m3u8
@@ -61,7 +61,7 @@ https://stitcheraws.unreel.me/wse-node02.powr.com/live/5e2625af5748670f12a3bee9/
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c9538a5932c837b4939735b/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVThinknoodles.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/puiUDbS.png" group-title="Entertainment",Bumblebee TV Thinknoodles [Offline]
 https://stitcheraws.unreel.me/wse-node04.powr.com/live/5afc8Bumblebee+TV10e932c833522744733/playlist.m3u8
-#EXTINF:-1 tvg-id="BumblebeeTVThinknoodles.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/puiUDbS.png" group-title="Entertainment",Bumblebee TV Thinknoodles (Test for Bitcentral) (720p)
+#EXTINF:-1 tvg-id="BumblebeeTVThinknoodles.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/puiUDbS.png" group-title="Entertainment",Bumblebee TV Thinknoodles (Test for Bitcentral) (1080p)
 https://2459f78c2f5d42c996bb24407b76877a.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_60f88620abf1e257404a9250/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVToyZone.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/uRxkOD1.jpg" group-title="Kids",Bumblebee TV Toy Zone (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf22491932c8304fc4533e4/playlist.m3u8
diff --git a/channels/us_fubo.m3u b/channels/us_fubo.m3u
index ca15f89f3c..8af3b72b5c 100644
--- a/channels/us_fubo.m3u
+++ b/channels/us_fubo.m3u
@@ -5,5 +5,5 @@ https://dai2-xumo.fubo.tv/amagi_hls_data_xumo1212A-adventuresportsnetwork/CDN/ma
 https://dai2-xumo.fubo.tv/amagi_hls_data_xumo1212A-footballdaily/CDN/master.m3u8
 #EXTINF:-1 tvg-id="fuboSportsNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/cArIeKS.png" group-title="Sports",fubo Sports Network (720p)
 https://dai2-xumo.fubo.tv/amagi_hls_data_xumo1212A-fubo/CDN/master.m3u8
-#EXTINF:-1 tvg-id="MotorvisionXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WPklHVE.jpg" group-title="Auto",Motorvision (XUMO) (720p)
+#EXTINF:-1 tvg-id="MotorvisionXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WPklHVE.jpg" group-title="Auto",Motorvision (XUMO) (720p) [Timeout]
 https://dai2-xumo.fubo.tv/amagi_hls_data_xumo1212A-motorvisiontv/CDN/master.m3u8
diff --git a/channels/us_localnow.m3u b/channels/us_localnow.m3u
index 8063cabc8e..fb5a0a5658 100644
--- a/channels/us_localnow.m3u
+++ b/channels/us_localnow.m3u
@@ -13,15 +13,15 @@ https://wxyz-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431
 https://wsoc-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60ec767ccf811b28ab4b5178_wsoc-live/fc31136d-53d2-40ce-bf5c-968151104189/0.m3u8
 #EXTINF:-1 tvg-id="WFTVTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2TYoO5j.png" group-title="News",ABC 9 Orlando FL (WFTV-TV) (720p)
 https://wftv-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60ec6c88697fde61b473b215_wftv-live/02d33bc1-916f-49a6-b410-0cf80a00f52b/0.m3u8
-#EXTINF:-1 tvg-id="KGTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1j1Hx75.png" group-title="Local",ABC 10 San Diego CA (KGTV) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="KGTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1j1Hx75.png" group-title="Local",ABC 10 San Diego CA (KGTV) (1080p) [Not 24/7]
 https://kgtv-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_608c3eab42d73848377823a0_kgtv-live/64a7b248-d0ab-4bb0-ac0a-241cbec4c23a/0.m3u8
 #EXTINF:-1 tvg-id="KNXVTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SBiEXzP.png" group-title="News",ABC 15 Phoenix AZ (KNXV-TV) (1080p) [Not 24/7]
 https://d1x9zfzf9roioy.cloudfront.net/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60998e4a5b0b051955170c4e_knxv-live/b7ba6371-db64-4797-9ff9-0a6e3f3c2ff1/0.m3u8
-#EXTINF:-1 tvg-id="WFTSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/R8o4o9i.png" group-title="Local",ABC 28 Action News Tampa Bay FL (WFTS-TV) (720p) [Offline]
+#EXTINF:-1 tvg-id="WFTSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/R8o4o9i.png" group-title="Local",ABC 28 Action News Tampa Bay FL (WFTS-TV) (720p) [Timeout]
 https://wfts-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60abf8e76af28261840b9882_wfts-live/ff2299eb-ac63-4030-9d0a-41269d4ccb6e/6.m3u8
 #EXTINF:-1 tvg-id="KWYBTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/vws7p6H.png" group-title="Local",ABC-FOX 18 Butte MT (KWYB-TV) (720p) [Not 24/7]
 https://kwyb-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60f9af3601a42f4980067072_kwyb-live/44bb663d-febe-44d9-9064-018ae5ccb94d/1.m3u8
-#EXTINF:-1 tvg-id="AfrolandTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RAJsPmP.png" group-title="Movies",Afroland TV (720p)
+#EXTINF:-1 tvg-id="AfrolandTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RAJsPmP.png" group-title="Movies",Afroland TV (432p)
 https://afrolandtv-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60e4824fda9b1e0dc15f2264_afrolandtv-live-1/ca5ddbc8-7087-47ef-beff-fc55393d74a2/4.m3u8
 #EXTINF:-1 tvg-id="AFV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lG3OHxA.png" group-title="Comedy",AFV (720p)
 https://linear-12.frequency.stream/dist/localnow/12/hls/master/playlist.m3u8
@@ -39,7 +39,7 @@ https://localnow.bmd.bloomberg.com/hls/manifests/bmd_us_tickerless/master.m3u8
 https://bnc-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_5ff8a1dc16f3794e5e326417_bnc-live/6cf34b0f-8e7d-4743-ae7c-857d56ca05aa/3.m3u8
 #EXTINF:-1 tvg-id="WFXT.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/u2HLfZg.png" group-title="General",Boston 25 News Now (WFXT) (720p)
 https://wfxt-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60ec6e73bf2fa637c1113392_wfxt-live/b8c36e4f-5455-4038-a56a-526acd528ead/0.m3u8
-#EXTINF:-1 tvg-id="WTVF.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXP12FV.png" group-title="Local",CBS 5 Nashville TN (WTVF) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="WTVF.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pXP12FV.png" group-title="Local",CBS 5 Nashville TN (WTVF) (1080p) [Not 24/7]
 https://wtvf-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60a7ff2dc8e6a009e40d13c2_epg-wtvf/0a873ded-726a-4fcc-8b6f-fa88dac0f807/0.m3u8
 #EXTINF:-1 tvg-id="WHIOTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WT4UtR7.png" group-title="News",CBS 7 Dayton OH (WHIO-TV) (720p)
 https://whio-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60ec6ffdf7633b2e077bda44_whio-live/6301d11e-05d0-4487-8d2e-09d3927d0d70/0.m3u8
@@ -81,7 +81,7 @@ https://linear-163.frequency.stream/dist/localnow/163/hls/master/playlist.m3u8
 https://fireside.localnowlive.com/v1/master/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_5fdd393a31300f16077a1692_fireside/playlist.m3u8
 #EXTINF:-1 tvg-id="WHBQTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/95mOsU4.png" group-title="News",FOX 13 Now Memphis TN (WHBQ-TV) (720p)
 https://d19n8xh4l47isv.cloudfront.net/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60a6bc0404a67d082e463913_whbq-live/abc1b709-6d84-4deb-84a8-dec3ea77b5e8/0.m3u8
-#EXTINF:-1 tvg-id="KSTU.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YvZ1LaR.png" group-title="Local",FOX 13 Salt Lake City UT (KSTU) (720p) [Offline]
+#EXTINF:-1 tvg-id="KSTU.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YvZ1LaR.png" group-title="Local",FOX 13 Salt Lake City UT (KSTU) (720p) [Timeout]
 https://d2uqyfw51vci2o.cloudfront.net/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60a41d72dbad4630db5fc2b5_kstu-live/8a3483d4-e89d-4c29-9686-00b69c099d3b/6.m3u8
 #EXTINF:-1 tvg-id="KOKITV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/IS30eiF.png" group-title="News",FOX 23 Tulsa OK (KOKI-TV) (720p)
 https://d1qauyesiiplpj.cloudfront.net/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60a6c3588e35957ea840bb02_koki-live-1/e13a6437-9c85-428e-a079-a88f84dbbd7a/0.m3u8
@@ -115,7 +115,7 @@ https://prod.localnowapi.com/vod/api/v2/LiveStream/Playback/alBirmingham/index.m
 https://prod.localnowapi.com/vod/api/v2/LiveStream/Playback/idBoise/index.m3u8
 #EXTINF:-1 tvg-id="LocalNowCareerDay.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Local Now Career Day (720p)
 https://linear-88.frequency.stream/dist/localnow/88/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="LocalNowChicagoIL.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/x8KRwBz.png" group-title="Local",Local Now Chicago IL [Geo-blocked]
+#EXTINF:-1 tvg-id="LocalNowChicagoIL.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/x8KRwBz.png" group-title="Local",Local Now Chicago IL (720p) [Geo-blocked]
 https://prod.localnowapi.com/vod/api/v2/LiveStream/Playback/ilChicago/index.m3u8
 #EXTINF:-1 tvg-id="LocalNowChopperTown.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Local Now ChopperTown (720p)
 https://linear-11.frequency.stream/dist/localnow/11/hls/master/playlist.m3u8
@@ -261,9 +261,9 @@ https://linear-144.frequency.stream/dist/localnow/144/hls/hd/playlist.m3u8
 https://mmatv-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_61327d317542b31350435482_mmatv-live/a504c826-6950-4b5b-a518-171d9aef07ee/4.m3u8
 #EXTINF:-1 tvg-id="MysteryScienceTheater3000.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5f9ace054964ba19ff258256" group-title="Comedy",Mystery Science Theater 3000 (1080p)
 https://mst3k-localnow.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="WPTVTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/dwtqWbI.png" group-title="Local",NBC 5 West Palm Beach FL (WPTV-TV) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="WPTVTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/dwtqWbI.png" group-title="Local",NBC 5 West Palm Beach FL (WPTV-TV) (1080p) [Not 24/7]
 https://d2w2eizx69h821.cloudfront.net/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_609990656eddc37f4b745083_wptv-live/d298beaa-c8a5-4de9-b7fd-d293f4ed479d/0.m3u8
-#EXTINF:-1 tvg-id="KHQTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LwwJQw0.png" group-title="Local",NBC 6 Spokane WA (KHQTV) (720p)
+#EXTINF:-1 tvg-id="KHQTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LwwJQw0.png" group-title="Local",NBC 6 Spokane WA (KHQTV) (360p)
 https://fuel-streaming-prod01.fuelmedia.io/v1/sem/96ef92fd-36df-43e5-b434-ed10cc615742.m3u8
 #EXTINF:-1 tvg-id="KULRTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/crx24mD.png" group-title="Local",NBC 8 Missoula MT (KULR-TV) (720p) [Offline]
 https://kurl-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60f9adb894c8f908ec6278f3_kurl-live/048bc886-11ac-43d9-880d-ffcbf41766e3/1.m3u8
@@ -271,7 +271,7 @@ https://kurl-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431
 https://wpxi-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60ec734b33fbda22ed1fff54_wpxi-live/ccbdde1e-b076-4373-a12a-61ff453cdc7b/0.m3u8
 #EXTINF:-1 tvg-id="KNDU.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/q6GeuW8.png" group-title="Local",NBC 25 Tri-Cities Richland WA (KNDU) (720p) [Not 24/7]
 https://kndu-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60f9a3541653bb5d8d5dbb96_kndu-live-1/8a5c1c57-d616-4677-929f-ee80ebbea564/1.m3u8
-#EXTINF:-1 tvg-id="KSHBTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/BMncWbQ.png" group-title="Local",NBC 41 Kansas City (KSHB-TV) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="KSHBTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/BMncWbQ.png" group-title="Local",NBC 41 Kansas City (KSHB-TV) (1080p) [Not 24/7]
 https://kshb-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60b682c64fcc8c629d172d35_kshb-live/bd89bcf7-e584-44ae-af55-e1f24eaf701f/0.m3u8
 #EXTINF:-1 tvg-id="News12NewYork.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5f9c57ad92cd1774a1091752" group-title="Local",News 12 New York (1080p)
 https://livestream.chdrstatic.com/2272f9cc29d3f9e812a3b4cacbd767bf69c95a59434c3f482606a67962a0dd5e/localnow/n12nyLocalNow/news12newyork/primary/index.m3u8
@@ -319,7 +319,7 @@ https://spacechannel-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186
 https://linear-165.frequency.stream/dist/localnow/165/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="TheFirst.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5fc953ab6426646dbd7347b4" group-title="News",The First (1080p)
 https://redseat-thefirst-localnow.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="theGrio.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GQgERPy.png" group-title="Local",theGrio (720p)
+#EXTINF:-1 tvg-id="theGrio.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GQgERPy.png" group-title="Local",theGrio (720p) [Offline]
 https://thegriov2-live.localnowlive.com/v1/manifest/385c85a93929f94966d0fb186fc33b431e6f1eb9/DSP_60b677f241a2d8778e68a712_thegriov2-live/31f886c1-1ea4-4cb3-9493-057c5f5fdc26/6.m3u8
 #EXTINF:-1 tvg-id="VENN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zVoX1fM.jpg" group-title="Entertainment",VENN (1080p)
 https://venntv-localnow.amagi.tv/index.m3u8
diff --git a/channels/us_pbs.m3u b/channels/us_pbs.m3u
index 5857b63da9..8f45a2085d 100644
--- a/channels/us_pbs.m3u
+++ b/channels/us_pbs.m3u
@@ -50,7 +50,7 @@ https://wneddt.lls.pbs.org/out/v1/9042ad5168e54cf8bf14b5db5582a84a/index.m3u8
 #EXTINF:-1 tvg-id="WETK.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Burlington VT (WETK) (1080p) [Geo-blocked]
 https://wetkdt.lls.pbs.org/out/v1/9c3c95a5cabc4611b06086ae798b7716/index.m3u8
 #EXTINF:-1 tvg-id="WSIUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Carbondale IL (WSIU) (1080p) [Geo-blocked]
-https://pbs.lls.cdn.pbs.org/est/index.m3u8?WSIU=
+https://pbs.lls.cdn.pbs.org/est/index.m3u8?WVPB=
 #EXTINF:-1 tvg-id="WUNCTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Chapel Hill NC (WUNC) (1080p) [Geo-blocked]
 https://wuncdt.lls.pbs.org/out/v1/84bedaad5c7e4d7abd8a6b63f1b8d4c4/index.m3u8
 #EXTINF:-1 tvg-id="WVPBTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Charleston WV (WVPB) (1080p) [Geo-blocked]
@@ -98,13 +98,13 @@ https://wenhdt.lls.pbs.org/out/v1/a1c1eea03387432086459cf0fdd96334/index.m3u8
 #EXTINF:-1 tvg-id="WKARTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS East Lansing MI (WKAR) (1080p) [Geo-blocked]
 https://wkardt.lls.pbs.org/out/v1/5b13b5c72f5d4b80a6ee9140392caf74/index.m3u8
 #EXTINF:-1 tvg-id="WQLNTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wqln-color-single-brand-logo-riys76F.png" group-title="Local",PBS Erie PA (WQLN) (1080p) [Geo-blocked]
-https://pbs.lls.cdn.pbs.org/est/index.m3u8
+https://pbs.lls.cdn.pbs.org/est/index.m3u8?WVPB=
 #EXTINF:-1 tvg-id="KEET.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Eureka CA (KEET) (1080p) [Geo-blocked]
 https://keetdt.lls.pbs.org/out/v1/a223371529b14afa882d1e872d8acd3d/index.m3u8
 #EXTINF:-1 tvg-id="WNINTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Evansville IN (WNIN) (1080p) [Geo-blocked]
 https://wnindt.lls.pbs.org/out/v1/338a207086464e179e97f83d4b1798be/index.m3u8
 #EXTINF:-1 tvg-id="KUACTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Fairbanks AK (KUAC) (1080p) [Geo-blocked]
-https://pbs.lls.cdn.pbs.org/pst/index.m3u8?KUAC=
+https://pbs.lls.cdn.pbs.org/pst/index.m3u8
 #EXTINF:-1 tvg-id="KFMETV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Fargo ND (KFME) (1080p) [Geo-blocked]
 https://kfmedt.lls.pbs.org/out/v1/25be24fcd0864ec9be6f6b60cb2be826/index.m3u8
 #EXTINF:-1 tvg-id="WGCUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wgcu-color-cobranded-logo-4WExUqg.png" group-title="Local",PBS Fort Myers FL (WGCU) (1080p) [Geo-blocked]
@@ -112,7 +112,7 @@ https://wgcudt.lls.pbs.org/out/v1/ac57905c80c8486a8290af7ca78c5026/index.m3u8
 #EXTINF:-1 tvg-id="WFWA.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Fort Wayne IN (WFWA) (1080p) [Geo-blocked]
 https://wfwadt.lls.pbs.org/out/v1/8b2a780393274c2ba9b71b9168df2208/index.m3u8
 #EXTINF:-1 tvg-id="WUFTTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Gainesville FL (WUFT) (1080p) [Geo-blocked]
-https://pbs.lls.cdn.pbs.org/est/index.m3u8?WUFT=
+https://pbs.lls.cdn.pbs.org/est/index.m3u8?WVPB=
 #EXTINF:-1 tvg-id="WYIN.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Gary IN (WYIN) (1080p) [Geo-blocked]
 https://wyindt.lls.pbs.org/out/v1/27414b46e52d43758be8227e4a91c863/index.m3u8
 #EXTINF:-1 tvg-id="WITFTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/witf-color-single-brand-logo-aqqLQqo.png" group-title="Local",PBS Harrisburg PA (WITF) (1080p) [Geo-blocked]
@@ -147,7 +147,7 @@ https://wkledt.lls.pbs.org/out/v1/26354efcebc1400e8861988cd6a321ca/index.m3u8
 https://wljtdt.lls.pbs.org/out/v1/1ddf810d67f64eeeab40ad9da8885945/index.m3u8
 #EXTINF:-1 tvg-id="KUONTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Lincoln NE (KUON) (1080p) [Geo-blocked]
 https://kuondt.lls.pbs.org/out/v1/8647e38af690461cbcc29c86b94f5b85/index.m3u8
-#EXTINF:-1 tvg-id="KLCSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Entertainment",PBS Los Angeles CA (KLCS-DT1) (432p) [Geo-blocked]
+#EXTINF:-1 tvg-id="KLCSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Entertainment",PBS Los Angeles CA (KLCS-DT1) (1080p) [Geo-blocked]
 https://klcsdt.lls.pbs.org/out/v1/6ee318cffa774733acf31f9a1af38036/index.m3u8
 #EXTINF:-1 tvg-id="KOCETV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Los Angeles CA (KOCE) (1080p) [Geo-blocked]
 https://kocedt.lls.pbs.org/out/v1/75f564cba25e4053a8789a1a14d13344/index.m3u8
@@ -246,7 +246,7 @@ https://wnitdt.lls.pbs.org/out/v1/0eb01a8a161e4650af15b6542a20cde5/index.m3u8
 #EXTINF:-1 tvg-id="KSPS.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Spokane WA (KSPS) (1080p) [Geo-blocked]
 https://kspsdt.lls.pbs.org/out/v1/cf8babf84d2b48e3876bae15e08dcdc6/index.m3u8
 #EXTINF:-1 tvg-id="KOZKTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Springfield MO (KOZK) (1080p) [Geo-blocked]
-https://pbs.lls.cdn.pbs.org/est/index.m3u8?KOZK=
+https://pbs.lls.cdn.pbs.org/est/index.m3u8?WVPB=
 #EXTINF:-1 tvg-id="KBTC.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Tacoma WA (KBTC) (1080p) [Geo-blocked]
 https://kbtcdt.lls.pbs.org/out/v1/4f08c8e00549441b9a2acce47d112525/index.m3u8
 #EXTINF:-1 tvg-id="WFSUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wfsu-color-cobranded-logo-ok3uUgp.png" group-title="Local",PBS Tallahassee FL (WFSU) (1080p) [Geo-blocked]
@@ -254,7 +254,7 @@ https://wfsudt.lls.pbs.org/out/v1/d2be172139764358a0d54352c8411845/index.m3u8
 #EXTINF:-1 tvg-id="WEDUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wedu-color-cobranded-logo-87oN0he.png" group-title="Local",PBS Tampa FL (WEDU) (1080p) [Geo-blocked]
 https://wedudt.lls.pbs.org/out/v1/3e147f13bc464958b6ace4e5a5b9accc/index.m3u8
 #EXTINF:-1 tvg-id="WGTETV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Toledo OH (WGTE) (1080p) [Geo-blocked]
-https://pbs.lls.cdn.pbs.org/est/index.m3u8?WGTE=
+https://pbs.lls.cdn.pbs.org/est/index.m3u8?WVPB=
 #EXTINF:-1 tvg-id="KTWUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/ktwu-color-single-brand-logo-aW2G3PU.png" group-title="Local",PBS Topeka KS (KTWU) (1080p) [Geo-blocked]
 https://ktwudt.lls.pbs.org/out/v1/567e503539034dd0ab8838b7e33ba5de/index.m3u8
 #EXTINF:-1 tvg-id="KUATTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="Local",PBS Tucson AZ (KUAT) (1080p) [Geo-blocked]
diff --git a/channels/us_plex.m3u b/channels/us_plex.m3u
index 2b02251a6d..b77ab8cec2 100644
--- a/channels/us_plex.m3u
+++ b/channels/us_plex.m3u
@@ -3,6 +3,8 @@
 https://d15690s323oesy.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/UDU-Plex/158.m3u8
 #EXTINF:-1 tvg-id="ACCNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/UHcFiHk.png" group-title="Sports",ACC Network (1080p) [Offline]
 https://120sports-accdn-1.plex.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="AccuWeather.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yNDUzNzc0Mjlf/AccuWeather_500x500.png" group-title="Weather",AccuWeather Now (1080p)
+https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00684-accuweather-accuweather-plex/playlist.m3u8
 #EXTINF:-1 tvg-id="AFV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lG3OHxA.png" group-title="Comedy",AFV (720p)
 https://linear-12.frequency.stream/dist/plex/12/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="AFVenEspanol.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5f7b66af901c6845181f33d3" group-title="Comedy",AFV en Español (720p) [Not 24/7]
@@ -145,7 +147,7 @@ https://lds-realstories-plex.amagi.tv/playlist.m3u8
 https://45034ce1cbb7489ab1499301f6274415.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Plex_RetroCrush/playlist.m3u8?ads.app_bundle=&ads.app_store_url=&ads.consent=0&ads.gdpr=0&ads.plex_id=5ef4e1b40d9ad000423c442a&ads.plex_token=z1MCPUpbxYcHru-5hdyq&ads.psid=&ads.targetopt=1&ads.ua=Mozilla/5.0+(Windows+NT+10.0;+Win64;+x64)+AppleWebKit/537.36+(KHTML,+like+Gecko)+Chrome/84.0.4147.89+Safari/537.36+OPR/70.0.3728.71&ads.us_privacy=1---&ads.wurl_channel=491&ads.wurl_name=RetroCrush
 #EXTINF:-1 tvg-id="RetroCrushTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQwMDkzNDRf/RetroCrush_576x576.png" group-title="",RetroCrush TV (1080p) [Offline]
 https://digitalmediarights-retrocrush-1.plex.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="Reuters.uk" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",Reuters (720p)
+#EXTINF:-1 tvg-id="Reuters.uk" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",Reuters (1080p)
 https://reuters-reutersnow-1.plex.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Revry.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5fc81016d98cab623846a4f3" group-title="Lifestyle",Revry (720p) [Not 24/7]
 https://linear-5.frequency.stream/dist/plex/5/hls/master/playlist.m3u8
@@ -167,7 +169,7 @@ https://cinedigm-so-real-1.plex.wurl.com/manifest/playlist.m3u8
 https://sportsgrid-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Stadium.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/n38w3FD.png" group-title="Sports",Stadium (720p) [Offline]
 https://stadium-ringofhonor-1.plex.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="Tankee.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oMWbZ8n.png" group-title="Entertainment",Tankee (1080p)
+#EXTINF:-1 tvg-id="Tankee.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oMWbZ8n.png" group-title="Entertainment",Tankee (720p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?app_bundle=com.plexapp.desktop&app_domain=app.plex.tv&app_name=plex&content_series=5f12332eeca6a20040b328e5&content_title=MorUy57ijWhGe4ixZb_T&coppa=1&custom4=plex&device_make=Windows&device_model=Firefox&did=df8e1a36-847d-5096-86a7-3803ed330ede&gdpr=1&h=691&live=1&network_id=39&us_privacy=1---&w=1224
 #EXTINF:-1 tvg-id="Tankee.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oMWbZ8n.png" group-title="Kids",Tankee (720p) [Offline]
 https://playworksdigital-tankee-1.plex.wurl.com/manifest/playlist.m3u8
@@ -215,5 +217,3 @@ https://yahoo-plex.amagi.tv/hls/amagi_hls_data_yahoofina-yahoofinance-plex/CDN/p
 https://yahoo-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="YuyuTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bbvtcd7.png" group-title="",Yuyu TV (1080p) [Offline]
 https://yuyu-samsung.plex.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="AccuWeather.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yNDUzNzc0Mjlf/AccuWeather_500x500.png" group-title="Weather",AccuWeather Now (1080p)
-https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00684-accuweather-accuweather-plex/playlist.m3u8
diff --git a/channels/us_pluto.m3u b/channels/us_pluto.m3u
index 11b7d85859..c11f212ac1 100644
--- a/channels/us_pluto.m3u
+++ b/channels/us_pluto.m3u
@@ -11,7 +11,7 @@ http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/609a33d06972da00077
 http://stitcher.pluto.tv/stitch/hls/channel/5268abcd0ce20a8472000114/master.m3u8?appVersion=5.2.7&deviceDNT=web&deviceId=web24163643069&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=1&serverSideAds=false&sid=web24157571521
 #EXTINF:-1 tvg-id="ClubbingTV.fr" tvg-country="CH;FR" tvg-language="French" tvg-logo="http://images.pluto.tv/channels/600ad8f86e1eba00081da3ce/solidLogoPNG.png" group-title="",Clubbing TV (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/600ad8f86e1eba00081da3ce/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8ae1b0-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=97358d7c-5219-43db-bcda-c5057f0bc369
-#EXTINF:-1 tvg-id="ComediaMadeinSpain.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JcJbAQv.png" group-title="",Comedia Made in Spain (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ComediaMadeinSpain.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JcJbAQv.png" group-title="",Comedia Made in Spain (240p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1abce155a03d0007718834/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1abce155a03d0007718834&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=505&terminate=false&userId=
 #EXTINF:-1 tvg-id="ComedyCentralEast.us" tvg-country="US" tvg-language="German" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/60/Comedy_central.png" group-title="Comedy",Comedy Central East (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d4947590ba40f75dc29c26b/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d4947590ba40f75dc29c26b&deviceLat=51.2993&deviceLon=9.4910&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=400&terminate=false&userId=
@@ -55,11 +55,11 @@ http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60817e1aa6997500072
 http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cb0cae7a461406ffe3f5213/master.m3u8?advertisingId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&appVersion=unknown&deviceDNT=0&deviceId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceUA=samsung/SM-T720/10&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain=https://play.google.com/store/apps/details?id=com.samsung.android.tvplus&samsung_app_name=Mobile+TV+Plus&us_privacy=1YNY
 #EXTINF:-1 tvg-id="PeopleareAwesome.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/msHBlDz.png" group-title="Entertainment",People are Awesome (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e54169f4b9b25000994a303/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e54169f4b9b25000994a303&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=340&terminate=false&userId=
-#EXTINF:-1 tvg-id="007.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.007.com/wp-content/uploads/2017/07/rgb_logo_650-1.jpg" group-title="Movies",Pluto TV 007 (720p)
+#EXTINF:-1 tvg-id="007.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.007.com/wp-content/uploads/2017/07/rgb_logo_650-1.jpg" group-title="Movies",Pluto TV 007 (684p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d4db961034718b2f52f9e52/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d4db961034718b2f52f9e52&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=50&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTV21JumpStreet.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5d4af00df345adb154b7a1f4/colorLogoPNG.png" group-title="Series",Pluto TV 21 Jump Street (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d4af00df345adb154b7a1f4/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTV70sCinema.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f4d878d3d19b30007d2e782/colorLogoPNG.png" group-title="Movies",Pluto TV 70s Cinema (720p)
+#EXTINF:-1 tvg-id="PlutoTV70sCinema.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f4d878d3d19b30007d2e782/colorLogoPNG.png" group-title="Movies",Pluto TV 70s Cinema (360p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f4d878d3d19b30007d2e782/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTV80sRewind.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca525b650be2571e3943c63/colorLogoPNG.png" group-title="Movies",Pluto TV 80s Rewind (684p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ca525b650be2571e3943c63/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -93,7 +93,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5938876b7
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/56171fafada51f8004c4b40f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVAFVTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5e82b55ad0213e00079c509f/colorLogoPNG.png" group-title="Series",Pluto TV AFV TV (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e82b55ad0213e00079c509f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVAllEliteWrestling.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f4d1697f10a0e000798ed8d/colorLogoPNG.png" group-title="Sports",Pluto TV All Elite Wrestling (240p)
+#EXTINF:-1 tvg-id="PlutoTVAllEliteWrestling.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f4d1697f10a0e000798ed8d/colorLogoPNG.png" group-title="Sports",Pluto TV All Elite Wrestling (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f4d1697f10a0e000798ed8d/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVAllRealitybyWEtv.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5e82530945600e0007ca076c/colorLogoPNG.png" group-title="Entertainment",Pluto TV All Reality by WE tv (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e82530945600e0007ca076c/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -101,7 +101,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e8253094
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e84f54a82f05300080e6746/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e84f54a82f05300080e6746&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=605&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVAmericasTestKitchen.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5e84f54a82f05300080e6746/colorLogoPNG.png" group-title="Cooking",Pluto TV America's Test Kitchen (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e84f54a82f05300080e6746/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVAmericanGladiators.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5d815e489b315b154db2e053/colorLogoPNG.png" group-title="Series",Pluto TV American Gladiators (684p)
+#EXTINF:-1 tvg-id="PlutoTVAmericanGladiators.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5d815e489b315b154db2e053/colorLogoPNG.png" group-title="Series",Pluto TV American Gladiators (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d815e489b315b154db2e053/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d815e489b315b154db2e053&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=303&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVAmericanGladiators.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5d815e489b315b154db2e053/colorLogoPNG.png" group-title="Series",Pluto TV American Gladiators (684p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d815e489b315b154db2e053/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -117,7 +117,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aabee6
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1aabee6f4a2c00076a322c/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1aabee6f4a2c00076a322c&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=905&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVAnimakidsPlus.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f1aabee6f4a2c00076a322c/colorLogoPNG.png" group-title="Kids",Pluto TV Animakids Plus (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f5a0b44cc331900075e7769/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVAnimales.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd834c66fe2ca0009303b8d/colorLogoPNG.png" group-title="Family",Pluto TV Animales (720p)
+#EXTINF:-1 tvg-id="PlutoTVAnimales.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd834c66fe2ca0009303b8d/colorLogoPNG.png" group-title="Family",Pluto TV Animales (240p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd834c66fe2ca0009303b8d/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVAnimals.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/56b27f85ff3037045055037e/colorLogoPNG.png" group-title="Family",Pluto TV Animals (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d767ae7b456c8cf265ce922/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5d767ae7b456c8cf265ce922&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=9015b970-057f-11eb-aeab-0242ac110002&terminate=false&userId=
@@ -141,12 +141,12 @@ http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60925a44f0350600075
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f12136385bccc00070142ed/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVAnime.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde17bf6591d0009839e02/colorLogoPNG.png" group-title="Animation",Pluto TV Anime (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde17bf6591d0009839e02/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVAnimeAccion.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e6a4d875d7ccf0007cc2cf1/colorLogoPNG.png" group-title="Animation",Pluto TV Animé Acción (360p)
+#EXTINF:-1 tvg-id="PlutoTVAnimeAccion.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e6a4d875d7ccf0007cc2cf1/colorLogoPNG.png" group-title="Animation",Pluto TV Animé Acción (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e6a4d875d7ccf0007cc2cf1/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVAnimeAllAges.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5be4c6311843b56328bce619/colorLogoPNG.png" group-title="Animation",Pluto TV Anime All Ages (720p)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5be4c6311843b56328bce619/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVAnimeAllDay.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5812b7d3249444e05d09cc49/colorLogoPNG.png" group-title="Animation",Pluto TV Anime All Day (720p)
 http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5be4c6311843b56328bce619/master.m3u8?advertisingId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&appVersion=unknown&deviceDNT=0&deviceId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceUA=samsung/SM-T720/10&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain=https://play.google.com/store/apps/details?id=com.samsung.android.tvplus&samsung_app_name=Mobile+TV+Plus&us_privacy=1YNY
+#EXTINF:-1 tvg-id="PlutoTVAnimeAllAges.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5be4c6311843b56328bce619/colorLogoPNG.png" group-title="Animation",Pluto TV Anime All Ages (720p)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5be4c6311843b56328bce619/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVAnimeAllDay.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5812b7d3249444e05d09cc49/colorLogoPNG.png" group-title="Animation",Pluto TV Anime All Day (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5812b7d3249444e05d09cc49/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5812b7d3249444e05d09cc49&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=830&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVAnimeAllDay.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5812b7d3249444e05d09cc49/colorLogoPNG.png" group-title="Animation",Pluto TV Anime All Day (720p)
@@ -181,7 +181,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f760c3d41aa2d0007
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f760c3d41aa2d0007bfde19/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVAvatar.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/600adbdf8c554e00072125c9/colorLogoPNG.png" group-title="",Pluto TV Avatar (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/600adbdf8c554e00072125c9/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVAventura.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ddc266f80e3550009136843/colorLogoPNG.png" group-title="Series",Pluto TV Aventura (480p)
+#EXTINF:-1 tvg-id="PlutoTVAventura.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ddc266f80e3550009136843/colorLogoPNG.png" group-title="Series",Pluto TV Aventura (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddc266f80e3550009136843/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVAwesomenessTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5595e43c66ace1652e63c6a2/colorLogoPNG.png" group-title="Series",Pluto TV Awesomeness TV (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5595e43c66ace1652e63c6a2/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5595e43c66ace1652e63c6a2&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=194&terminate=false&userId=
@@ -194,9 +194,9 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e67e20c9331210007
 #EXTINF:-1 tvg-id="PlutoTVBabyFirst.us" tvg-country="US" tvg-language="Spanish" tvg-logo="" group-title="Family",Pluto TV BabyFirst (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ebac49ce4dc8b00078b23bc/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVBackcountry.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cabdf1437b88b26947346b2/colorLogoPNG.png" group-title="Outdoor",Pluto TV Backcountry (720p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5cabdf1437b88b26947346b2/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5cabdf1437b88b26947346b2&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=755&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVBackcountry.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cabdf1437b88b26947346b2/colorLogoPNG.png" group-title="Outdoor",Pluto TV Backcountry (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cabdf1437b88b26947346b2/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVBackcountry.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cabdf1437b88b26947346b2/colorLogoPNG.png" group-title="Outdoor",Pluto TV Backcountry (480p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5cabdf1437b88b26947346b2/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5cabdf1437b88b26947346b2&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=755&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVBarney.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f29ada4bdaebd000708d49d/colorLogoPNG.png" group-title="Series",Pluto TV Barney (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f29ada4bdaebd000708d49d/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVBaywatch.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5d815eb889bca2ce7b746fdd/colorLogoPNG.png" group-title="Series",Pluto TV Baywatch (720p)
@@ -215,7 +215,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e78f4dd0019770007
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e78f4dd001977000787d7e3/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVBellatorMMA.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ebc8688f3697d00072f7cf8/colorLogoPNG.png" group-title="Sports",Pluto TV Bellator MMA (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ebc8688f3697d00072f7cf8/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVBellatorMMA.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ebc8688f3697d00072f7cf8/colorLogoPNG.png" group-title="Sports",Pluto TV Bellator MMA (240p)
+#EXTINF:-1 tvg-id="PlutoTVBellatorMMA.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ebc8688f3697d00072f7cf8/colorLogoPNG.png" group-title="Sports",Pluto TV Bellator MMA (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ebc8688f3697d00072f7cf8/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ebc8688f3697d00072f7cf8&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=730&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVBestLife.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5887ba337b8e94223eb121bd/colorLogoPNG.png" group-title="Lifestyle",Pluto TV Best Life (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5887ba337b8e94223eb121bd/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5887ba337b8e94223eb121bd&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=630&terminate=false&userId=
@@ -279,11 +279,11 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e8b564ff
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aca0b4e448e00075e7c5e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVBobEsponjaPlus.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f1aca0b4e448e00075e7c5e/colorLogoPNG.png" group-title="Kids",Pluto TV Bob Esponja Plus (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5fd87d882574170007fac022/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVBobleponge.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5ffc8c345822750007e167de/colorLogoPNG.png" group-title="Kids",Pluto TV Bob l'éponge (720p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ffc8c345822750007e167de/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVBobleponge.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ffc8c345822750007e167de/colorLogoPNG.png" group-title="Kids",Pluto TV Bob l'éponge (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ffc8c345822750007e167de/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVBoxing.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5fac425f949b4600079938f3/colorLogoPNG.png" group-title="Sports",Pluto TV Boxing (720p)
+#EXTINF:-1 tvg-id="PlutoTVBobleponge.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5ffc8c345822750007e167de/colorLogoPNG.png" group-title="Kids",Pluto TV Bob l'éponge (360p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ffc8c345822750007e167de/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
+#EXTINF:-1 tvg-id="PlutoTVBoxing.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5fac425f949b4600079938f3/colorLogoPNG.png" group-title="Sports",Pluto TV Boxing (684p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5fac425f949b4600079938f3/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVBritishTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b68a18823ecb93393cba2f1/colorLogoPNG.png" group-title="Entertainment",Pluto TV British TV (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b68a18823ecb93393cba2f1/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b68a18823ecb93393cba2f1&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=154&terminate=false&userId=
@@ -378,11 +378,11 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1ac2591
 #EXTINF:-1 tvg-id="PlutoTVCineClasico.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/61373bb45168fe000773eecd/colorLogoPNG.png" group-title="Movies",Pluto TV Cine Clásico (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/61373bb45168fe000773eecd/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVCineComedia.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcdde78f080d900098550e4/colorLogoPNG.png" group-title="Comedy",Pluto TV Cine Comédia (720p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcdde78f080d900098550e4/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
+#EXTINF:-1 tvg-id="PlutoTVCineComedia.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcdde78f080d900098550e4/colorLogoPNG.png" group-title="Comedy",Pluto TV Cine Comédia (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1ac8099c49f600076579b2/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVCineComedia.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcdde78f080d900098550e4/colorLogoPNG.png" group-title="Comedy",Pluto TV Cine Comédia (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f12101f0b12f00007844c7c/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVCineComedia.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcdde78f080d900098550e4/colorLogoPNG.png" group-title="Comedy",Pluto TV Cine Comédia (240p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcdde78f080d900098550e4/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVCineDrama.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcddfcb229eff00091b6bdf/colorLogoPNG.png" group-title="Movies",Pluto TV Cine Drama (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcddfcb229eff00091b6bdf/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVCineDrama.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcddfcb229eff00091b6bdf/colorLogoPNG.png" group-title="Movies",Pluto TV Cine Drama (720p)
@@ -405,14 +405,14 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f171f032
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8ed168f72fcd0007e56269/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVCineRetro.us" tvg-country="US" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8ed168f72fcd0007e56269/colorLogoPNG.png" group-title="Movies",Pluto TV Ciné Rétro (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed168f72fcd0007e56269/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVCineSuspenso.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f984c1dc54853000797a5e8/colorLogoPNG.png" group-title="Culture",Pluto TV Cine Suspenso (240p)
+#EXTINF:-1 tvg-id="PlutoTVCineSuspenso.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f984c1dc54853000797a5e8/colorLogoPNG.png" group-title="Culture",Pluto TV Cine Suspenso (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddc4e8bcbb9010009b4e84f/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVCineTerror.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcddf1ed95e740009fef7ab/colorLogoPNG.png" group-title="Movies",Pluto TV Cine Terror (720p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcddf1ed95e740009fef7ab/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
+#EXTINF:-1 tvg-id="PlutoTVCineTerror.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcddf1ed95e740009fef7ab/colorLogoPNG.png" group-title="Movies",Pluto TV Cine Terror (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8d180092e97a5e107638d3/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVCineTerror.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcddf1ed95e740009fef7ab/colorLogoPNG.png" group-title="Movies",Pluto TV Cine Terror (684p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d8d180092e97a5e107638d3/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d8d180092e97a5e107638d3&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=913&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVCineTerror.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcddf1ed95e740009fef7ab/colorLogoPNG.png" group-title="Movies",Pluto TV Cine Terror (480p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcddf1ed95e740009fef7ab/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVCineTerror.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcddf1ed95e740009fef7ab/colorLogoPNG.png" group-title="Movies",Pluto TV Cine Terror (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f12111c9e6c2c00078ef3bb/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVCinePlus.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="http://images.pluto.tv/channels/5ff5eb810e2996000768c0e2/solidLogoPNG.png" group-title="Movies",Pluto TV Ciné+ (720p) [Not 24/7]
@@ -435,10 +435,10 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/562ea53fa
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e46ae801f347500099d461a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=35f76fb0-e986-11eb-a0af-c3b401f46211&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2fac39a7-56bc-492e-ae1e-3f6fb6cef1bc
 #EXTINF:-1 tvg-id="PlutoTVClassicTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5e46ae801f347500099d461a/solidLogoPNG.png" group-title="Classic",Pluto TV Classic TV (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d134a74ca91eedee1630faa/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVClassicTVComedy.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f15e32b297f96000768f928/colorLogoPNG.png" group-title="Classic",Pluto TV Classic TV Comedy (720p)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f15e32b297f96000768f928/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVClassicTVComedy.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f15e32b297f96000768f928/colorLogoPNG.png" group-title="Classic",Pluto TV Classic TV Comedy (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f15e32b297f96000768f928/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f15e32b297f96000768f928&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=501&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVClassicTVComedy.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f15e32b297f96000768f928/colorLogoPNG.png" group-title="Classic",Pluto TV Classic TV Comedy (480p)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f15e32b297f96000768f928/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVClassicTVDrama.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f15e3cccf49290007053c67/colorLogoPNG.png" group-title="Classic",Pluto TV Classic TV Drama (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f15e3cccf49290007053c67/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f15e3cccf49290007053c67&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=520&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVClassicTVDrama.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f15e3cccf49290007053c67/colorLogoPNG.png" group-title="Classic",Pluto TV Classic TV Drama (720p)
@@ -465,19 +465,19 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b4e94282d4ec87bdc
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/56283c8769ba54637dea0464/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=56283c8769ba54637dea0464&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=228&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVCNET.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/56283c8769ba54637dea0464/colorLogoPNG.png" group-title="",Pluto TV CNET (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/56283c8769ba54637dea0464/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVCNN.us" tvg-country="US" tvg-language="News" tvg-logo="" group-title="News",Pluto TV CNN (720p)
+#EXTINF:-1 tvg-id="PlutoTVCNN.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",Pluto TV CNN (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5421f71da6af422839419cb3/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5421f71da6af422839419cb3&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=209&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVCocina.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde0657444a40009cd2422/colorLogoPNG.png" group-title="Cooking",Pluto TV Cocina (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d8d0fbaa8742fa3093899da/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d8d0fbaa8742fa3093899da&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=956&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVCocina.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde0657444a40009cd2422/colorLogoPNG.png" group-title="Cooking",Pluto TV Cocina (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8d0fbaa8742fa3093899da/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVCocina.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde0657444a40009cd2422/colorLogoPNG.png" group-title="Cooking",Pluto TV Cocina (720p)
+#EXTINF:-1 tvg-id="PlutoTVCocina.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde0657444a40009cd2422/colorLogoPNG.png" group-title="Cooking",Pluto TV Cocina (480p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1acdaa8ba90f0007d5e760/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVCocina.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde0657444a40009cd2422/colorLogoPNG.png" group-title="Cooking",Pluto TV Cocina (480p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde0657444a40009cd2422/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVCocinaSpain.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5c37d6712de254456f7ec340/colorLogoPNG.png" group-title="Series",Pluto TV Cocina (Spain) (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1acdaa8ba90f0007d5e760/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1acdaa8ba90f0007d5e760&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=700&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVColdCaseFiles.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5c37d6712de254456f7ec340/colorLogoPNG.png" group-title="Series",Pluto TV Cold Case Files (480p)
+#EXTINF:-1 tvg-id="PlutoTVColdCaseFiles.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5c37d6712de254456f7ec340/colorLogoPNG.png" group-title="Series",Pluto TV Cold Case Files (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5c37d6712de254456f7ec340/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5c37d6712de254456f7ec340&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=373&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVColdCaseFiles.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5c37d6712de254456f7ec340/colorLogoPNG.png" group-title="Series",Pluto TV Cold Case Files (480p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c37d6712de254456f7ec340/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -487,7 +487,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5bb1ac3e268cae539b
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5bb1ac3e268cae539bcedb07/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVComediaMadeinSpain.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f1abce155a03d0007718834/colorLogoPNG.png" group-title="Comedy",Pluto TV Comedia (Made in Spain) (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1abce155a03d0007718834/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVComedie.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8eb91bb9b9e7000817e67f/colorLogoPNG.png" group-title="Comedy",Pluto TV Comédie (480p)
+#EXTINF:-1 tvg-id="PlutoTVComedie.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8eb91bb9b9e7000817e67f/colorLogoPNG.png" group-title="Comedy",Pluto TV Comédie (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eb91bb9b9e7000817e67f/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVComedie.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8eb91bb9b9e7000817e67f/colorLogoPNG.png" group-title="Comedy",Pluto TV Comédie (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8eb91bb9b9e7000817e67f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -523,11 +523,11 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f99e2463
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5cf96dad1652631e36d43320/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5cf96dad1652631e36d43320&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=967&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVComedyCentralLatino.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5cf96dad1652631e36d43320/colorLogoPNG.png" group-title="Comedy",Pluto TV Comedy Central Latino (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cf96dad1652631e36d43320/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVCompetencias.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd6d935d000120009bc1132/colorLogoPNG.png" group-title="",Pluto TV Competencias (240p)
+#EXTINF:-1 tvg-id="PlutoTVCompetencias.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd6d935d000120009bc1132/colorLogoPNG.png" group-title="",Pluto TV Competencias (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd6d935d000120009bc1132/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVConspiracy.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5d4ae94ef1a1bbb350ca41bb/colorLogoPNG.png" group-title="",Pluto TV Conspiracy (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVConspiracy.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5d4ae94ef1a1bbb350ca41bb/colorLogoPNG.png" group-title="",Pluto TV Conspiracy (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d4ae94ef1a1bbb350ca41bb/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVConspiracyEngland.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5d4ae94ef1a1bbb350ca41bb/colorLogoPNG.png" group-title="",Pluto TV Conspiracy (England) (480p)
+#EXTINF:-1 tvg-id="PlutoTVConspiracyEngland.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5d4ae94ef1a1bbb350ca41bb/colorLogoPNG.png" group-title="",Pluto TV Conspiracy (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d4ae94ef1a1bbb350ca41bb/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d4ae94ef1a1bbb350ca41bb&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=202&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVCookalong.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dbc297672961b0009f12e5b/colorLogoPNG.png" group-title="Cooking",Pluto TV Cookalong (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dbc297672961b0009f12e5b/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -607,7 +607,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c6eeb85c
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5de58ef515635d00091f605d/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVDemandAfrica.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f061242a7951e00075d7413/colorLogoPNG.png" group-title="Lifestyle",Pluto TV Demand Africa (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f061242a7951e00075d7413/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f061242a7951e00075d7413&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=172&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVDeportes.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde07af1c85b0009b18651/colorLogoPNG.png" group-title="Sports",Pluto TV Deportes (720p)
+#EXTINF:-1 tvg-id="PlutoTVDeportes.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde07af1c85b0009b18651/colorLogoPNG.png" group-title="Sports",Pluto TV Deportes (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde07af1c85b0009b18651/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVDoctorWhoClassic.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ce4475cd43850831ca91ce7/colorLogoPNG.png" group-title="Classic",Pluto TV Doctor Who Classic (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ce4475cd43850831ca91ce7/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ce4475cd43850831ca91ce7&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=532&terminate=false&userId=
@@ -623,7 +623,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b85a7582
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5db048f9447d6c0009b8f29d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVDocumentaries.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b85a7582921777994caea63/colorLogoPNG.png" group-title="Documentary",Pluto TV Documentaries (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5db04252241007000975faac/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVDogelcazarrecompensas.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f9992c685a2a80007fa414a/colorLogoPNG.png" group-title="Series",Pluto TV Dog el cazarrecompensas (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVDogelcazarrecompensas.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f9992c685a2a80007fa414a/colorLogoPNG.png" group-title="Series",Pluto TV Dog el cazarrecompensas (480p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f9992c685a2a80007fa414a/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVDogtheBountyHunter.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5bee1a7359ee03633e780238/colorLogoPNG.png" group-title="Series",Pluto TV Dog the Bounty Hunter (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5bee1a7359ee03633e780238/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5bee1a7359ee03633e780238&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=381&terminate=false&userId=
@@ -695,7 +695,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f280149c
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60e45687313c5f0007bc8e94/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&serverSideAds=false&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVElReinoInfantil.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f4d3d06fb60d8000781fce8/colorLogoPNG.png" group-title="",Pluto TV El Reino Infantil (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f4d3d06fb60d8000781fce8/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVEmpenosalobestia.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f23102d5e239d00074b092a/colorLogoPNG.png" group-title="",Pluto TV Empeños a lo bestia (360p)
+#EXTINF:-1 tvg-id="PlutoTVEmpenosalobestia.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f23102d5e239d00074b092a/colorLogoPNG.png" group-title="",Pluto TV Empeños a lo bestia (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f23102d5e239d00074b092a/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PLUTOTVENDIRECTOENVIVO.us" tvg-country="US" tvg-language="Spanish" tvg-logo="" group-title="",Pluto TV EN DIRECTO EN VIVO (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcddfcb229eff00091b6bdf/master.m3u8?appVersion=0&deviceDNT=0&deviceId=0&deviceMake=0&deviceModel=0&deviceType=0&deviceVersion=0&sid=a6f8
@@ -703,7 +703,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcddfcb229eff0009
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d8d180092e97a5e107638d3/master.m3u8?appVersion=0&deviceDNT=0&deviceId=0&deviceMake=0&deviceModel=0&deviceType=0&deviceVersion=0&sid=9f61
 #EXTINF:-1 tvg-id="PlutoTVESR24/7.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5ca1e0ee50be2571e393ad33/colorLogoPNG.png" group-title="Sports",Pluto TV ESR 24/7 (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ca1e0ee50be2571e393ad33/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVEstrellasdeAccion.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e972a21ad709d00074195ba/colorLogoPNG.png" group-title="",Pluto TV Estrellas de Acción (720p)
+#EXTINF:-1 tvg-id="PlutoTVEstrellasdeAccion.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e972a21ad709d00074195ba/colorLogoPNG.png" group-title="",Pluto TV Estrellas de Acción (360p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e972a21ad709d00074195ba/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVETLive.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5dc0c78281eddb0009a02d5e/colorLogoPNG.png" group-title="Entertainment",Pluto TV ET Live (1080p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dc0c78281eddb0009a02d5e/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5dc0c78281eddb0009a02d5e&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=190&terminate=false&userId=
@@ -742,24 +742,24 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc3fc6b9
 #EXTINF:-1 tvg-id="PlutoTVFamilyTies.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f77939a630f530007dde654/colorLogoPNG.png" group-title="Series",Pluto TV Family Ties (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f77939a630f530007dde654/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVFantastic.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b64a245a202b3337f09e51d/colorLogoPNG.png" group-title="Series",Pluto TV Fantastic (720p)
-http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b64a245a202b3337f09e51d/master.m3u8?advertisingId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&appVersion=unknown&deviceDNT=0&deviceId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceUA=samsung/SM-T720/10&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&us_privacy=1YNY
-#EXTINF:-1 tvg-id="PlutoTVFantastic.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b64a245a202b3337f09e51d/colorLogoPNG.png" group-title="Series",Pluto TV Fantastic (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b64a245a202b3337f09e51d/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b64a245a202b3337f09e51d&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=66&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVFantastic.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b64a245a202b3337f09e51d/colorLogoPNG.png" group-title="Series",Pluto TV Fantastic (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b64a245a202b3337f09e51d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVFantastic.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b64a245a202b3337f09e51d/colorLogoPNG.png" group-title="Series",Pluto TV Fantastic (684p)
+http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b64a245a202b3337f09e51d/master.m3u8?advertisingId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&appVersion=unknown&deviceDNT=0&deviceId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceUA=samsung/SM-T720/10&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&us_privacy=1YNY
 #EXTINF:-1 tvg-id="PlutoTVFashionTV.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/60c882460ea4a200076a2a37/colorLogoPNG.png" group-title="Lifestyle",Pluto TV Fashion TV (720p)
 https://siloh.pluto.tv/lilo/production/FashionTV/master.m3u8
-#EXTINF:-1 tvg-id="PlutoTVFashionBox.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ee8d84bfb286e0007285aad/colorLogoPNG.png" group-title="Lifestyle",Pluto TV FashionBox (720p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ee8d84bfb286e0007285aad/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVFashionbox.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5ee8d84bfb286e0007285aad/colorLogoPNG.png" group-title="Lifestyle",Pluto TV Fashionbox (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f516730b78b7600079294f5/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVFashionBox.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ee8d84bfb286e0007285aad/colorLogoPNG.png" group-title="Lifestyle",Pluto TV FashionBox (480p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ee8d84bfb286e0007285aad/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVFBIFiles.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5cb6f6f9a461406ffe4022cf/colorLogoPNG.png" group-title="Series",Pluto TV FBI Files (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cb6f6f9a461406ffe4022cf/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVFearFactor.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/588128d17d64bc0d0f385c34/colorLogoPNG.png" group-title="Series",Pluto TV Fear Factor (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c362ded581a86051df509b4/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVFearFactor.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/588128d17d64bc0d0f385c34/colorLogoPNG.png" group-title="Series",Pluto TV Fear Factor (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/588128d17d64bc0d0f385c34/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=588128d17d64bc0d0f385c34&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=301&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVFearFactor.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/588128d17d64bc0d0f385c34/colorLogoPNG.png" group-title="Series",Pluto TV Fear Factor (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVFearFactor.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/588128d17d64bc0d0f385c34/colorLogoPNG.png" group-title="Series",Pluto TV Fear Factor (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/588128d17d64bc0d0f385c34/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVFemmesdeLoi.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8ed673cad35f0007651fd4/colorLogoPNG.png" group-title="",Pluto TV Femmes de Loi (720p) [Offline]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8ed673cad35f0007651fd4/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
@@ -772,11 +772,11 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad9bda9fd87eb3a27
 #EXTINF:-1 tvg-id="PlutoTVFight.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5812b0f2237a6ff45d16c3f9/colorLogoPNG.png" group-title="Sports",Pluto TV Fight (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5812b0f2237a6ff45d16c3f9/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5812b0f2237a6ff45d16c3f9&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=726&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVFight.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5812b0f2237a6ff45d16c3f9/colorLogoPNG.png" group-title="Sports",Pluto TV Fight (720p)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad8d659fd87eb3a2717afc9/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVFight.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5812b0f2237a6ff45d16c3f9/colorLogoPNG.png" group-title="Sports",Pluto TV Fight (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad9bda9fd87eb3a2717cce0/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVFight.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5812b0f2237a6ff45d16c3f9/colorLogoPNG.png" group-title="Sports",Pluto TV Fight (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5812b0f2237a6ff45d16c3f9/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVFight.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5812b0f2237a6ff45d16c3f9/colorLogoPNG.png" group-title="Sports",Pluto TV Fight (480p)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad8d659fd87eb3a2717afc9/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVFilmesAcao.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f120f41b7d403000783a6d6/colorLogoPNG.png" group-title="",Pluto TV Filmes Ação (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f120f41b7d403000783a6d6/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVFilmesSuspense.us" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5f171d3442a0500007362f22/colorLogoPNG.png" group-title="",Pluto TV Filmes Suspense (720p)
@@ -835,7 +835,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e78faa05
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/580e87ff497c73ba2f321dd3/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=580e87ff497c73ba2f321dd3&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=450&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVFunnyAF.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/580e87ff497c73ba2f321dd3/colorLogoPNG.png" group-title="Comedy",Pluto TV Funny AF (684p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/580e87ff497c73ba2f321dd3/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVFutbolParaFans.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e3ddd1a3ef73b00091d5779/colorLogoPNG.png" group-title="Sports",Pluto TV Fútbol Para Fans (480p)
+#EXTINF:-1 tvg-id="PlutoTVFutbolParaFans.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e3ddd1a3ef73b00091d5779/colorLogoPNG.png" group-title="Sports",Pluto TV Fútbol Para Fans (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e3ddd1a3ef73b00091d5779/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVGameShowCentral.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5e54187aae660e00093561d6/colorLogoPNG.png" group-title="Entertainment",Pluto TV Game Show Central (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e54187aae660e00093561d6/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e54187aae660e00093561d6&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=167&terminate=false&userId=
@@ -847,15 +847,15 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ca7f16c37b88b2694
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ca7f16c37b88b2694731c79/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVGameSpot.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f186626dcd00d0007936443/colorLogoPNG.png" group-title="Entertainment",Pluto TV GameSpot (1080p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f186626dcd00d0007936443/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f186626dcd00d0007936443&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=806&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVGameSpot.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f186626dcd00d0007936443/colorLogoPNG.png" group-title="Entertainment",Pluto TV GameSpot (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVGameSpot.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f186626dcd00d0007936443/colorLogoPNG.png" group-title="Entertainment",Pluto TV GameSpot (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f186626dcd00d0007936443/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVGamingTV.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8eccd81062c300078a11df/colorLogoPNG.png" group-title="Entertainment",Pluto TV Gaming TV (720p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eccd81062c300078a11df/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVGamingTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8eccd81062c300078a11df/colorLogoPNG.png" group-title="Entertainment",Pluto TV Gaming TV (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8eccd81062c300078a11df/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVGamingTV.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8eccd81062c300078a11df/colorLogoPNG.png" group-title="Entertainment",Pluto TV Gaming TV (480p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eccd81062c300078a11df/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVGarfield.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/6054ab20a365c70007e4fd44/colorLogoPNG.png" group-title="Kids",Pluto TV Garfield (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/6054ab20a365c70007e4fd44/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVGetfactual.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dc2a69bc928a600093a7976/colorLogoPNG.png" group-title="",Pluto TV Get.factual (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVGetfactual.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dc2a69bc928a600093a7976/colorLogoPNG.png" group-title="",Pluto TV Get.factual (480p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc2a69bc928a600093a7976/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVGhostDimension.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5c45f5a9d40d58066869fa60/colorLogoPNG.png" group-title="",Pluto TV Ghost Dimension (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c45f5a9d40d58066869fa60/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -866,18 +866,18 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5417a212ff9fba6828
 #EXTINF:-1 tvg-id="PlutoTVGloryKickboxing.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5417a212ff9fba68282fbf5e/colorLogoPNG.png" group-title="Sports",Pluto TV Glory Kickboxing (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad8d6f5e738977e2c310949/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVGloryKickboxing.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5417a212ff9fba68282fbf5e/colorLogoPNG.png" group-title="Sports",Pluto TV Glory Kickboxing (720p)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad9be1be738977e2c312134/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVGloryKickboxing.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5417a212ff9fba68282fbf5e/colorLogoPNG.png" group-title="Sports",Pluto TV Glory Kickboxing (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5417a212ff9fba68282fbf5e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVGloryKickboxing.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5417a212ff9fba68282fbf5e/colorLogoPNG.png" group-title="Sports",Pluto TV Glory Kickboxing (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad9be1be738977e2c312134/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5ad9be1be738977e2c312134&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=f6e88030-d7c8-47c8-8fed-7e24dd0a038a&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVGloryKickboxing.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5417a212ff9fba68282fbf5e/colorLogoPNG.png" group-title="Sports",Pluto TV Glory Kickboxing (480p)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad9be1be738977e2c312134/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVGoDiegoGo.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f1aa89d42a0500007363ea3/colorLogoPNG.png" group-title="",Pluto TV Go Diego Go! (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aa89d42a0500007363ea3/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVGordonRamsaysKitchen.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e99f4423e067bd6df6903/colorLogoPNG.png" group-title="Cooking",Pluto TV Gordon Ramsay's Kitchen (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b4e99f4423e067bd6df6903/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b4e99f4423e067bd6df6903&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=294&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVGordonRamsaysKitchen.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e99f4423e067bd6df6903/colorLogoPNG.png" group-title="Cooking",Pluto TV Gordon Ramsay's Kitchen (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b4e99f4423e067bd6df6903/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVGuíadecanales.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e793a7cfbdf780007f7eb75/colorLogoPNG.png" group-title="",Pluto TV Guía de canales (720p)
+#EXTINF:-1 tvg-id="PlutoTVGuíadecanales.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e793a7cfbdf780007f7eb75/colorLogoPNG.png" group-title="",Pluto TV Guía de canales (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e793a7cfbdf780007f7eb75/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVGustoTV.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Pluto TV Gusto TV (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c5c47f3662f6b3c476fc03e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -911,7 +911,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d4af1803
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d767b1c126c65d0a307355f/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d767b1c126c65d0a307355f&deviceLat=51.2993&deviceLon=9.4910&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=302&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVHISTORYPlus.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Pluto TV HISTORY+ (720p) [Offline]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad9b6941b95267e225e59c0/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5ad9b6941b95267e225e59c0&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=4637a2ad-1dd6-49d1-a8cc-435684c4a7ea&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVHogar.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd6ab8056beb000091fc6b6/colorLogoPNG.png" group-title="",Pluto TV Hogar (720p)
+#EXTINF:-1 tvg-id="PlutoTVHogar.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd6ab8056beb000091fc6b6/colorLogoPNG.png" group-title="",Pluto TV Hogar (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd6ab8056beb000091fc6b6/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVHome.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5db04c9eedc89300090d2884/colorLogoPNG.png" group-title="Lifestyle",Pluto TV Home (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5eb96303f5bb020008e7e44f/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5eb96303f5bb020008e7e44f&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=8044788b-0583-11eb-a18c-0242ac110002&terminate=false&userId=
@@ -925,7 +925,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c5c2e9d8
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/569546031a619b8f07ce6e25/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=569546031a619b8f07ce6e25&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=75&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVHorror.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/569546031a619b8f07ce6e25/colorLogoPNG.png" group-title="Movies",Pluto TV Horror (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/569546031a619b8f07ce6e25/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVHorror.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/569546031a619b8f07ce6e25/colorLogoPNG.png" group-title="Movies",Pluto TV Horror (720p)
+#EXTINF:-1 tvg-id="PlutoTVHorror.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/569546031a619b8f07ce6e25/colorLogoPNG.png" group-title="Movies",Pluto TV Horror (684p)
 https://stitcher.pluto.tv/stitch/hls/channel/569546031a619b8f07ce6e25/master.m3u8?advertisingId=&appName=&appStoreUrl=&appVersion=2.0.0&app_name=&deviceDNT=0&deviceId=889540f0-712d-11e8-b9ec-8ba319deeadf&deviceLat=38.5783&deviceLon=-90.6666&deviceMake=Chrome&deviceModel=Chrome&deviceType=web&deviceVersion=37.0.2049.0&serverSideAds=false&sid=6e360db0-724b-11e8-be77-bf4d1417b012&userId=
 #EXTINF:-1 tvg-id="PlutoTVHSN.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f8a02476b72230007e62b7d/colorLogoPNG.png" group-title="",Pluto TV HSN (720p) [Offline]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8a02476b72230007e62b7d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -987,7 +987,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d767857f
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed3892ed7bb000741a1d2/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVInsideEngland.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8ed3892ed7bb000741a1d2/colorLogoPNG.png" group-title="Series",Pluto TV Inside (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d767857f65029ce2385b217/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d767857f65029ce2385b217&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=302&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVInsideGermany.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8ed3892ed7bb000741a1d2/colorLogoPNG.png" group-title="Series",Pluto TV Inside (Germany) (480p)
+#EXTINF:-1 tvg-id="PlutoTVInsideGermany.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8ed3892ed7bb000741a1d2/colorLogoPNG.png" group-title="Series",Pluto TV Inside (Germany) (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d767b4889bca2ce7b73ef2e/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d767b4889bca2ce7b73ef2e&deviceLat=51.2993&deviceLon=9.4910&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=303&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVInspectorGadget.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5d765786aad587cf4d0e2bf6/colorLogoPNG.png" group-title="Series",Pluto TV Inspector Gadget (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dbc2d1ce10f0b0009e6cf9e/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5dbc2d1ce10f0b0009e6cf9e&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=efbfa162-0713-11eb-9b92-0242ac110002&terminate=false&userId=
@@ -1027,12 +1027,12 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ecb336
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f12141b146d760007934ea7/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVJunior.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde2ac4bc6c500094ab45b/colorLogoPNG.png" group-title="Kids",Pluto TV Junior (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde2ac4bc6c500094ab45b/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVKenanyKel.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5fcea93ffcf94500071c4b2f/colorLogoPNG.png" group-title="Comedy",Pluto TV Kenan y Kel (720p)
+#EXTINF:-1 tvg-id="PlutoTVKenanyKel.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5fcea93ffcf94500071c4b2f/colorLogoPNG.png" group-title="Comedy",Pluto TV Kenan y Kel (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5fcea93ffcf94500071c4b2f/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVKevinHartLOL.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5af09e645126c2157123f9eb/colorLogoPNG.png" group-title="Comedy",Pluto TV Kevin Hart LOL (720p) [Not 24/7]
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5af09e645126c2157123f9eb/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVKevinHartLOL.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5af09e645126c2157123f9eb/colorLogoPNG.png" group-title="Comedy",Pluto TV Kevin Hart LOL (684p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5af09e645126c2157123f9eb/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5af09e645126c2157123f9eb&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=462&terminate=false&userId=
+#EXTINF:-1 tvg-id="PlutoTVKevinHartLOL.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5af09e645126c2157123f9eb/colorLogoPNG.png" group-title="Comedy",Pluto TV Kevin Hart LOL (684p) [Not 24/7]
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5af09e645126c2157123f9eb/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVKids.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dd6dae8ce788b0009eaf77b/colorLogoPNG.png" group-title="Kids",Pluto TV Kids (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad9b648e738977e2c312131/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5ad9b648e738977e2c312131&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=30292edb-0714-11eb-97af-0242ac110002&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVKids.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dd6dae8ce788b0009eaf77b/colorLogoPNG.png" group-title="Kids",Pluto TV Kids (720p)
@@ -1045,11 +1045,11 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad9b648e
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aab1d29b39600073e243f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVKids.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dd6dae8ce788b0009eaf77b/colorLogoPNG.png" group-title="Kids",Pluto TV Kids (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/51c75f7bb6f26ba1cd00002f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVKids.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd6dae8ce788b0009eaf77b/colorLogoPNG.png" group-title="Kids",Pluto TV Kids (720p) [Not 24/7]
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd6dae8ce788b0009eaf77b/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVKids.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dd6dae8ce788b0009eaf77b/colorLogoPNG.png" group-title="Kids",Pluto TV Kids (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1214a637c6fd00079c652f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVKids.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd6dae8ce788b0009eaf77b/colorLogoPNG.png" group-title="Kids",Pluto TV Kids (684p) [Not 24/7]
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd6dae8ce788b0009eaf77b/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVKidsSpain.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dd6dae8ce788b0009eaf77b/colorLogoPNG.png" group-title="Kids",Pluto TV Kids (Spain) (720p)
+#EXTINF:-1 tvg-id="PlutoTVKidsSpain.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dd6dae8ce788b0009eaf77b/colorLogoPNG.png" group-title="Kids",Pluto TV Kids (Spain) (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1aab1d29b39600073e243f/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1aab1d29b39600073e243f&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=910&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVKidsAnimation.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8eba14a4ffb8000764e950/colorLogoPNG.png" group-title="Kids",Pluto TV Kids Animation (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eba14a4ffb8000764e950/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
@@ -1075,11 +1075,11 @@ http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ff5ebe299d30c0007b
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1abe3ffcd659000770d88d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVLandSitcoms.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tvplus/all-channels/12082020/TVLand_190x190circle.png?raw=true" group-title="",Pluto TV Land Sitcoms [Offline]
 http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c2d64ffbdf11b71587184b8/997452/playlist.m3u8?advertisingId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&appName=samsungmobiletvplus&appVersion=unknown&architecture=&deviceDNT=0&deviceId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsungmobiletvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&includeExtendedEvents=&paln=&serverSideAds=true&sid=SAMSUNG-TVPLUS-fcaa053c-0ece-49c6-ae1f-c3e42a7faf17&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVLasPistasdeBlue.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f9996533c9de3000759ccb5/colorLogoPNG.png" group-title="Series",Pluto TV Las Pistas de Blue (480p)
+#EXTINF:-1 tvg-id="PlutoTVLasPistasdeBlue.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f9996533c9de3000759ccb5/colorLogoPNG.png" group-title="Series",Pluto TV Las Pistas de Blue (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f9996533c9de3000759ccb5/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVLasreglasdeljuego.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f1acb4eebe0f0000767b40f/colorLogoPNG.png" group-title="Series",Pluto TV Las reglas del juego (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1acb4eebe0f0000767b40f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVLatinAngels.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5df41355939756000921d15b/colorLogoPNG.png" group-title="Series",Pluto TV Latin Angels (720p)
+#EXTINF:-1 tvg-id="PlutoTVLatinAngels.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5df41355939756000921d15b/colorLogoPNG.png" group-title="Series",Pluto TV Latin Angels (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5df41355939756000921d15b/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVLemieletlesabeilles.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="http://images.pluto.tv/channels/60549a8d8f1b53000768bc52/solidLogoPNG.png" group-title="Series",Pluto TV Le miel et les abeilles (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60549a8d8f1b53000768bc52/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8b56e0-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9dcb446c-ad5a-4171-a84f-d144607d7b33
@@ -1101,7 +1101,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5eb301b73956710007
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/6080411af03506000759916e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=35fbb571-e986-11eb-a0af-c3b401f46211&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9c6d294f-660b-47ef-bc20-1961faf21c6a
 #EXTINF:-1 tvg-id="PlutoTVLiveMusicReplay.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5873fc21cad696fb37aa9054/colorLogoPNG.png" group-title="Music",Pluto TV Live Music Replay (720p)
 http://stitcher.pluto.tv/stitch/hls/channel/5873fc21cad696fb37aa9054/master.m3u8?appVersion=5.2.7&deviceDNT=web&deviceId=web24163643069&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=1&serverSideAds=false&sid=web24157571521
-#EXTINF:-1 tvg-id="PlutoTVLiveMusicReplay.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5873fc21cad696fb37aa9054/colorLogoPNG.png" group-title="Music",Pluto TV Live Music Replay (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVLiveMusicReplay.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5873fc21cad696fb37aa9054/colorLogoPNG.png" group-title="Music",Pluto TV Live Music Replay (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5873fc21cad696fb37aa9054/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVLiveMusicReplay.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5873fc21cad696fb37aa9054/colorLogoPNG.png" group-title="Music",Pluto TV Live Music Replay (US) (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5873fc21cad696fb37aa9054/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5873fc21cad696fb37aa9054&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=855&terminate=false&userId=
@@ -1134,9 +1134,9 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8ed6d569d2d40008
 #EXTINF:-1 tvg-id="PlutoTVLouisLaBrocante.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f8ed6d569d2d4000864a976/colorLogoPNG.png" group-title="",Pluto TV Louis La Brocante (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed6d569d2d4000864a976/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVLoupe.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5f0cb39b4ae1f80007bad585/colorLogoPNG.png" group-title="",Pluto TV Loupe (720p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f0cb39b4ae1f80007bad585/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f0cb39b4ae1f80007bad585&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=694&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVLoupe.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5f0cb39b4ae1f80007bad585/colorLogoPNG.png" group-title="",Pluto TV Loupe (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f0cb39b4ae1f80007bad585/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVLoupe.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5f0cb39b4ae1f80007bad585/colorLogoPNG.png" group-title="",Pluto TV Loupe (480p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f0cb39b4ae1f80007bad585/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f0cb39b4ae1f80007bad585&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=694&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVLoveHipHop.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5d51ddf0369acdb278dfb05e/colorLogoPNG.png" group-title="Series",Pluto TV Love & Hip Hop (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d51ddf0369acdb278dfb05e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVLoveHipHop.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5d51ddf0369acdb278dfb05e/colorLogoPNG.png" group-title="Series",Pluto TV Love & Hip Hop (720p) [Not 24/7]
@@ -1167,14 +1167,12 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dc02ece31f6050009
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dbc264e0451770009ed742f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVMariovsSonic.us" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5dc02ece31f6050009de4b39/colorLogoPNG.png" group-title="Kids",Pluto TV Mario vs Sonic (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc02ece31f6050009de4b39/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVMasterChef.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e3ddbd27091820009f86dd9/colorLogoPNG.png" group-title="",Pluto TV MasterChef (360p)
+#EXTINF:-1 tvg-id="PlutoTVMasterChef.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e3ddbd27091820009f86dd9/colorLogoPNG.png" group-title="",Pluto TV MasterChef (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e3ddbd27091820009f86dd9/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVMcLeodsDaughters.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5ea18e5df6dd1d0007cf7bad/colorLogoPNG.png" group-title="Series",Pluto TV McLeod's Daughters (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ea18e5df6dd1d0007cf7bad/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVMidsomerMurders.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f77977bd924d80007eee60c/colorLogoPNG.png" group-title="Series",Pluto TV Midsomer Murders (720p)
+#EXTINF:-1 tvg-id="PlutoTVMidsomerMurders.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cbf6a868a1bce4a3d52a5e9/colorLogoPNG.png" group-title="Series",Pluto TV Midsomer Murders (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5cbf6a868a1bce4a3d52a5e9/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5cbf6a868a1bce4a3d52a5e9&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=385&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVMidsomerMurders.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f77977bd924d80007eee60c/colorLogoPNG.png" group-title="Series",Pluto TV Midsomer Murders (720p)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f77977bd924d80007eee60c/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVMilitary.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5bb3fea0f711fd76340eebff/colorLogoPNG.png" group-title="Series",Pluto TV Military (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5bb3fea0f711fd76340eebff/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5bb3fea0f711fd76340eebff&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=655&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVMilitary.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5bb3fea0f711fd76340eebff/colorLogoPNG.png" group-title="Series",Pluto TV Military (720p)
@@ -1189,13 +1187,13 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad9bca67
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5812b821249444e05d09cc4c/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVMinutoParaGanar.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e46e64dc73db400094b5f0b/colorLogoPNG.png" group-title="Series",Pluto TV Minuto Para Ganar (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e46e64dc73db400094b5f0b/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVMissionImpossible.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cbf6a868a1bce4a3d52a5e9/colorLogoPNG.png" group-title="Series",Pluto TV Mission: Impossible (720p)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cbf6a868a1bce4a3d52a5e9/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVMissionImpossible.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f77977bd924d80007eee60c/colorLogoPNG.png" group-title="Series",Pluto TV Mission: Impossible (720p)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f77977bd924d80007eee60c/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVMisterios.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde2f53449c50009b2b4dc/colorLogoPNG.png" group-title="Series",Pluto TV Misterios (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde2f53449c50009b2b4dc/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="MisteriosMedicos.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f230e416b68ff00075b0139/colorLogoPNG.png" group-title="Series",Pluto TV Misterios Medicos (720p)
+#EXTINF:-1 tvg-id="MisteriosMedicos.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f230e416b68ff00075b0139/colorLogoPNG.png" group-title="Series",Pluto TV Misterios Medicos (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f230e416b68ff00075b0139/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVMisteriossinResolver.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f610042272f68000867685b/colorLogoPNG.png" group-title="Series",Pluto TV Misterios sin Resolver (720p)
+#EXTINF:-1 tvg-id="PlutoTVMisteriossinResolver.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f610042272f68000867685b/colorLogoPNG.png" group-title="Series",Pluto TV Misterios sin Resolver (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f610042272f68000867685b/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVMLB.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5e66968a70f34c0007d050be/colorLogoPNG.png" group-title="Sports",Pluto TV MLB (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e66968a70f34c0007d050be/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -1209,7 +1207,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cb626cfc
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5db0510962948d000961d3c6/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVMotorEngland.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5db0510962948d000961d3c6/colorLogoPNG.png" group-title="Auto",Pluto TV Motor (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5db0510962948d000961d3c6/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5db0510962948d000961d3c6&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=576&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVMOVIECHANNEL.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Movies",Pluto TV MOVIE CHANNEL (720p)
+#EXTINF:-1 tvg-id="PlutoTVMOVIECHANNEL.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Movies",Pluto TV MOVIE CHANNEL (684p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5cb0cae7a461406ffe3f5213/master.m3u8?advertisingId=&appName=web&appVersion=5.2.2-d60060c7283e0978cc63ba036956b5c1657f8eba&architecture=&buildVersion=&clientTime=&deviceDNT=0&deviceId=9daeec78-6a24-43e9-b800-df83d8e465a8&deviceLat=-35.1192&deviceLon=-60.5047&deviceMake=Chrome&deviceModel=Chrome&deviceType=web&deviceVersion=80.0.3987.149&includeExtendedEvents=false&serverSideAds=true&sid=e2177d24-366a-4c1c-b974-702fe1d6159a&userId=
 #EXTINF:-1 tvg-id="PlutoTVMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5ad8d3a31b95267e225e4e09/colorLogoPNG.png" group-title="Movies",Pluto TV Movies (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5c5c3b948002db3c3e0b262e/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5c5c3b948002db3c3e0b262e&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=eddfafe3-0584-11eb-82fe-0242ac110002&terminate=false&userId=
@@ -1245,7 +1243,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcebe53d352330009
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5fab088b3279760007d4e4fd/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVMTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca672f515a62078d2ec0ad2/colorLogoPNG.png" group-title="Music",Pluto TV MTV (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ca672f515a62078d2ec0ad2/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVMTV.us" tvg-country="DE" tvg-language="Gernman" tvg-logo="http://images.pluto.tv/channels/5ca672f515a62078d2ec0ad2/colorLogoPNG.png" group-title="Music",Pluto TV MTV (720p)
+#EXTINF:-1 tvg-id="PlutoTVMTV.us" tvg-country="DE" tvg-language="" tvg-logo="http://images.pluto.tv/channels/5ca672f515a62078d2ec0ad2/colorLogoPNG.png" group-title="Music",Pluto TV MTV (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5caf325764025859afdd6c4d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVMTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca672f515a62078d2ec0ad2/colorLogoPNG.png" group-title="Music",Pluto TV MTV (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e13b6dd7ec3510009e032d0/master.m3u8?advertisingId=8f35210d-be26-5e0d-8c57-d0f910026ee7&appName=rokuchannel&appVersion=1.0&deviceDNT=1&deviceId=8f35210d-be26-5e0d-8c57-d0f910026ee7&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel
@@ -1277,7 +1275,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d3609cd6a6c78d767
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5db6a697d5f34a000934cd13/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5db6a697d5f34a000934cd13&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=f1438745-0586-11eb-82fe-0242ac110002&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVMTVCatfish.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f1ab3c7778230000735cf41/colorLogoPNG.png" group-title="Series",Pluto TV MTV Catfish (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1ab3c7778230000735cf41/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVMTVCatfishGermany.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Series",Pluto TV MTV Catfish (Germany) (720p)
+#EXTINF:-1 tvg-id="PlutoTVMTVCatfishGermany.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Series",Pluto TV MTV Catfish (Germany) (360p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5db6a697d5f34a000934cd13/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5db6a697d5f34a000934cd13&deviceLat=51.2993&deviceLon=9.4910&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=1&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVMTVCatfishSpain.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Series",Pluto TV MTV Catfish (Spain) (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1ab3c7778230000735cf41/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1ab3c7778230000735cf41&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=305&terminate=false&userId=
@@ -1301,7 +1299,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ea815a51
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1ab9c6d8f1300007f54e30/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVMTVCribsGermany.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Series",Pluto TV MTV Cribs (Germany) (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ea815a515d149000748ee9b/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ea815a515d149000748ee9b&deviceLat=51.2993&deviceLon=9.4910&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=8&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVMTVCribsPlutoTVSpain.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Series",Pluto TV MTV Cribs (Spain) (720p)
+#EXTINF:-1 tvg-id="PlutoTVMTVCribsPlutoTVSpain.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Series",Pluto TV MTV Cribs (Spain) (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1ab9c6d8f1300007f54e30/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1ab9c6d8f1300007f54e30&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=315&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVMTVCribsPlus.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5ea815a515d149000748ee9b/colorLogoPNG.png" group-title="Series",Pluto TV MTV Cribs+ (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5efb54eaa5714d000744b6a0/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5efb54eaa5714d000744b6a0&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=f664f477-078c-4957-bc9a-51f90e3d9ce7&terminate=false&userId=
@@ -1333,7 +1331,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60a26a056
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aadf373bed3000794d1d7/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVMTVOriginalsSpain.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f1aadf373bed3000794d1d7/colorLogoPNG.png" group-title="Series",Pluto TV MTV Originals (Spain) (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1aadf373bed3000794d1d7/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1aadf373bed3000794d1d7&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=300&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVMTVPranks.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e98a911c881310007d7aae2/colorLogoPNG.png" group-title="Series",Pluto TV MTV Pranks (720p)
+#EXTINF:-1 tvg-id="PlutoTVMTVPranks.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e98a911c881310007d7aae2/colorLogoPNG.png" group-title="Series",Pluto TV MTV Pranks (240p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e98a911c881310007d7aae2/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVMTVRealities.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/6130d8dc943001000708548d/colorLogoPNG.png" group-title="Series",Pluto TV MTV Realities (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/6130d8dc943001000708548d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
@@ -1439,10 +1437,10 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ede448d3d50590007
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f3d2b57d6c60800074cb305/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5f3d2b57d6c60800074cb305&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=19a8ba6e-9713-4df0-83d9-93dd72c984f0&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVNICK.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5ca673e0d0bd6c2689c94ce3/colorLogoPNG.png" group-title="Kids",Pluto TV Nick (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8d08395f39465da6fb3ec4/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVNick.us" tvg-country="DE" tvg-language="German" tvg-logo="http://images.pluto.tv/channels/5ca673e0d0bd6c2689c94ce3/colorLogoPNG.png" group-title="Kids",Pluto TV Nick (720p)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ede448d3d50590007a4419e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVNick.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca673e0d0bd6c2689c94ce3/colorLogoPNG.png" group-title="Kids",Pluto TV Nick (720p)
 https://siloh.pluto.tv/lilo/production/Nick/01/master.m3u8
+#EXTINF:-1 tvg-id="PlutoTVNick.us" tvg-country="DE" tvg-language="German" tvg-logo="http://images.pluto.tv/channels/5ca673e0d0bd6c2689c94ce3/colorLogoPNG.png" group-title="Kids",Pluto TV Nick (480p)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ede448d3d50590007a4419e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVNick.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5ede448d3d50590007a4419e/colorLogoPNG.png" group-title="Kids",Pluto TV Nick (720p) [Not 24/7]
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ca673e0d0bd6c2689c94ce3/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ca673e0d0bd6c2689c94ce3&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=977&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVNick.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca673e0d0bd6c2689c94ce3/colorLogoPNG.png" group-title="Kids",Pluto TV Nick (720p) [Not 24/7]
@@ -1493,7 +1491,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5aec96ec5126c21571
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5aec96ec5126c2157123c657/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVnosey.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5aec96ec5126c2157123c657/colorLogoPNG.png" group-title="Series",Pluto TV nosey (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc2ba1a9c91420009db4858/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVNovelas.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde0cc2efd2700090b7ff4/colorLogoPNG.png" group-title="",Pluto TV Novelas (480p)
+#EXTINF:-1 tvg-id="PlutoTVNovelas.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dcde0cc2efd2700090b7ff4/colorLogoPNG.png" group-title="",Pluto TV Novelas (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde0cc2efd2700090b7ff4/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVNovelasDrama.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5e84dbf4a838b60007ffbba1/colorLogoPNG.png" group-title="Movies",Pluto TV Novelas Drama (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e84dbf4a838b60007ffbba1/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e84dbf4a838b60007ffbba1&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=942&terminate=false&userId=
@@ -1507,7 +1505,7 @@ http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e84db2db3
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e84db2db3851800077c871e/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e84db2db3851800077c871e&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=941&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVNovelasRomance.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5e84db2db3851800077c871e/colorLogoPNG.png" group-title="Movies",Pluto TV Novelas Romance (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e84db2db3851800077c871e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVNovelasThriller.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5e84dc59026b9b000766f9a2/colorLogoPNG.png" group-title="Movies",Pluto TV Novelas Thriller (684p)
+#EXTINF:-1 tvg-id="PlutoTVNovelasThriller.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5e84dc59026b9b000766f9a2/colorLogoPNG.png" group-title="Movies",Pluto TV Novelas Thriller (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e84dc59026b9b000766f9a2/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e84dc59026b9b000766f9a2&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=943&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVNovelasThriller.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5e84dc59026b9b000766f9a2/colorLogoPNG.png" group-title="Movies",Pluto TV Novelas Thriller (684p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e84dc59026b9b000766f9a2/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -1521,7 +1519,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f2acdab16f5b30007
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f7790b3ed0c88000720b241/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="Pac12Insider.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f84ce2ac265700008d48dcf/colorLogoPNG.png" group-title="Sports",Pluto TV Pac-12 Insider (720p) [Offline]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f84ce2ac265700008d48dcf/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVParamountMovieChannel.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cb0cae7a461406ffe3f5213/colorLogoPNG.png" group-title="Movies",Pluto TV Paramount Movie Channel (720p)
+#EXTINF:-1 tvg-id="PlutoTVParamountMovieChannel.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cb0cae7a461406ffe3f5213/colorLogoPNG.png" group-title="Movies",Pluto TV Paramount Movie Channel (684p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5cb0cae7a461406ffe3f5213/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5cb0cae7a461406ffe3f5213&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=100&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVParamountMovieChannel.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cb0cae7a461406ffe3f5213/colorLogoPNG.png" group-title="Movies",Pluto TV Paramount Movie Channel (684p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cb0cae7a461406ffe3f5213/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -1537,15 +1535,15 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f98487036af340008
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5adf96e3e738977e2c31cb04/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVParanormal.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8ed9461b35690007a0bc3a/colorLogoPNG.png" group-title="Series",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d4af2ffa9506ab29cf38c38/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVParanormal.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8ed9461b35690007a0bc3a/colorLogoPNG.png" group-title="Series",Pluto TV Paranormal (720p)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed9461b35690007a0bc3a/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVParanormal.us" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5f8ed9461b35690007a0bc3a/colorLogoPNG.png" group-title="Series",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f98487036af340008da1e37/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVParanormal.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/612ce5214bb5790007ad3016/colorLogoPNG.png" group-title="Series",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/612ce5214bb5790007ad3016/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&serverSideAds=false&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVParanormal.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8ed9461b35690007a0bc3a/colorLogoPNG.png" group-title="Series",Pluto TV Paranormal (480p)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed9461b35690007a0bc3a/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVParanormalEngland.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8ed9461b35690007a0bc3a/colorLogoPNG.png" group-title="Series",Pluto TV Paranormal (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d4af2ffa9506ab29cf38c38/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d4af2ffa9506ab29cf38c38&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=216&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVPeleas.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e98b0447665f200078caded/colorLogoPNG.png" group-title="",Pluto TV Peleas (480p)
+#EXTINF:-1 tvg-id="PlutoTVPeleas.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5e98b0447665f200078caded/colorLogoPNG.png" group-title="",Pluto TV Peleas (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e98b0447665f200078caded/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVPeopleareAwesome.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ebac65911406400078b8993/colorLogoPNG.png" group-title="Series",Pluto TV People are Awesome (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ebac65911406400078b8993/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
@@ -1627,7 +1625,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8bf0b06
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f21e831e9fe730007706acb/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f21e831e9fe730007706acb&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=277&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVRescue911.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f21e831e9fe730007706acb/colorLogoPNG.png" group-title="Series",Pluto TV Rescue 911 (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f21e831e9fe730007706acb/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVRetro.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f1212ad1728050007a523b8/colorLogoPNG.png" group-title="Classic",Pluto TV Retrô (684p)
+#EXTINF:-1 tvg-id="PlutoTVRetro.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f1212ad1728050007a523b8/colorLogoPNG.png" group-title="Classic",Pluto TV Retrô (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1212ad1728050007a523b8/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVRetroDrama.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dde47b63585b500099f74ec/colorLogoPNG.png" group-title="Classic",Pluto TV Retro Drama (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dde47b63585b500099f74ec/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5dde47b63585b500099f74ec&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=5204e9ec-0585-11eb-a18c-0242ac110002&terminate=false&userId=
@@ -1713,7 +1711,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f121262a
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f9853138d19af0007104a8d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVSeriesLatinas.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5dd837642c6e9300098ad484/colorLogoPNG.png" group-title="",Pluto TV Series Latinas (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd837642c6e9300098ad484/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
-#EXTINF:-1 tvg-id="PlutoTVSeriesRetro.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5de802659167b10009e7deba/colorLogoPNG.png" group-title="Classic",Pluto TV Series Retro (480p)
+#EXTINF:-1 tvg-id="PlutoTVSeriesRetro.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5de802659167b10009e7deba/colorLogoPNG.png" group-title="Classic",Pluto TV Series Retro (360p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5de802659167b10009e7deba/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVSherlock.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dc2c00abfed110009d97243/colorLogoPNG.png" group-title="Series",Pluto TV Sherlock (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc2c00abfed110009d97243/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -1743,7 +1741,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5317bfebff98025b32
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5317bfebff98025b3200ff99/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVSmithsonianChannelSelects.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f21ea08007a49000762d349/featuredImage.jpg" group-title="Science",Pluto TV Smithsonian Channel Selects (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f21ea08007a49000762d349/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVSpace.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dbc2f98777f2e0009934ae7/colorLogoPNG.png" group-title="Science",Pluto TV Space (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVSpace.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5dbc2f98777f2e0009934ae7/colorLogoPNG.png" group-title="Science",Pluto TV Space (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dbc2f98777f2e0009934ae7/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVSpikeAventura.us" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5d8d11baeb31c5a43b77bf59/colorLogoPNG.png" group-title="",Pluto TV Spike Aventura (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d8d11baeb31c5a43b77bf59/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d8d11baeb31c5a43b77bf59&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=950&terminate=false&userId=
@@ -1812,9 +1810,9 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d1ce51dbaca4afdb7
 #EXTINF:-1 tvg-id="PlutoTVSurf.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5d1ce51dbaca4afdb7abfe5f/colorLogoPNG.png" group-title="",Pluto TV Surf (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d1ce51dbaca4afdb7abfe5f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVSurvivor.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f21e7b24744c60007c1f6fc/colorLogoPNG.png" group-title="Series",Pluto TV Survivor (720p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f21e7b24744c60007c1f6fc/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f21e7b24744c60007c1f6fc&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=296&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVSurvivor.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f21e7b24744c60007c1f6fc/colorLogoPNG.png" group-title="Series",Pluto TV Survivor (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f21e7b24744c60007c1f6fc/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVSurvivor.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f21e7b24744c60007c1f6fc/colorLogoPNG.png" group-title="Series",Pluto TV Survivor (240p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f21e7b24744c60007c1f6fc/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f21e7b24744c60007c1f6fc&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=296&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVSuspense.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f15e281b0b8840007324b55/colorLogoPNG.png" group-title="",Pluto TV Suspense (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f15e281b0b8840007324b55/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f15e281b0b8840007324b55&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=149&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVSuspense.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f15e281b0b8840007324b55/colorLogoPNG.png" group-title="",Pluto TV Suspense (720p)
@@ -1831,15 +1829,15 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd6de52b991420009
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f0d668b872e4400073acc68/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5f0d668b872e4400073acc68&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=9c22837c-0715-11eb-9b92-0242ac110002&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVTeen.us" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5dd6de52b9914200091f047a/colorLogoPNG.png" group-title="Kids",Pluto TV Teen (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f0d668b872e4400073acc68/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVTEENSERIES.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8eb7e3d2ed18000746d09a/colorLogoPNG.png" group-title="Kids",Pluto TV TEEN SERIES (720p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eb7e3d2ed18000746d09a/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVTEENSERIES.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f8eb7e3d2ed18000746d09a/colorLogoPNG.png" group-title="Kids",Pluto TV TEEN SERIES (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8eb7e3d2ed18000746d09a/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
+#EXTINF:-1 tvg-id="PlutoTVTEENSERIES.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8eb7e3d2ed18000746d09a/colorLogoPNG.png" group-title="Kids",Pluto TV TEEN SERIES (480p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eb7e3d2ed18000746d09a/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVTeenStars.us" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/60016a60a8e3520008e0d331/colorLogoPNG.png" group-title="Kids",Pluto TV Teen Stars (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60016a60a8e3520008e0d331/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVTeenNick.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Kids",Pluto TV TeenNick (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f0d668b872e4400073acc68/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&serverSideAds=false&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVTelefeClasico.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5de91cf02fc07c0009910465/colorLogoPNG.png" group-title="",Pluto TV Telefe Clásico (480p)
+#EXTINF:-1 tvg-id="PlutoTVTelefeClasico.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5de91cf02fc07c0009910465/colorLogoPNG.png" group-title="",Pluto TV Telefe Clásico (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5de91cf02fc07c0009910465/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVTelefeNoticias.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f523aa5523ae000074745ec/colorLogoPNG.png" group-title="News",Pluto TV Telefe Noticias (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f523aa5523ae000074745ec/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
@@ -1936,6 +1934,8 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ef3977e5d77340007
 #EXTINF:-1 tvg-id="PlutoTVThreesCompany.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ef3977e5d773400077de284/colorLogoPNG.png" group-title="Series",Pluto TV Three's Company (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ef3977e5d773400077de284/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVThrillers.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e69e08291147bd04a9fd7/colorLogoPNG.png" group-title="Series",Pluto TV Thrillers (720p)
+https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b4e69e08291147bd04a9fd7/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b4e69e08291147bd04a9fd7&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=74&terminate=false&userId=
+#EXTINF:-1 tvg-id="PlutoTVThrillers.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e69e08291147bd04a9fd7/colorLogoPNG.png" group-title="Series",Pluto TV Thrillers (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e1efdbf90ba3e0009d99082/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5e1efdbf90ba3e0009d99082&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=b790e11f-0586-11eb-9b92-0242ac110002&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVThrillers.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e69e08291147bd04a9fd7/colorLogoPNG.png" group-title="Series",Pluto TV Thrillers (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b4e69e08291147bd04a9fd7/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@@ -1943,8 +1943,6 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b4e69e08
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e1efdbf90ba3e0009d99082/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVThrillers.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e69e08291147bd04a9fd7/colorLogoPNG.png" group-title="Series",Pluto TV Thrillers (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1ac8a87cd38d000745d7cf/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVThrillers.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e69e08291147bd04a9fd7/colorLogoPNG.png" group-title="Series",Pluto TV Thrillers (684p)
-https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b4e69e08291147bd04a9fd7/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b4e69e08291147bd04a9fd7&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=74&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVThrillers.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e69e08291147bd04a9fd7/colorLogoPNG.png" group-title="Series",Pluto TV Thrillers (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dbfedccc563080009b60f4a/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVTinyHouseNation.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/601a0342dcf4370007566891/colorLogoPNG.png" group-title="Series",Pluto TV Tiny House Nation (720p)
@@ -1978,9 +1976,9 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d0c16d68
 #EXTINF:-1 tvg-id="PlutoTVTravel.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/59c01b1953680139c6ae9d4d/colorLogoPNG.png" group-title="Travel",Pluto TV Travel (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/59c01b1953680139c6ae9d4d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVTravel.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/59c01b1953680139c6ae9d4d/colorLogoPNG.png" group-title="Travel",Pluto TV Travel (720p) [Not 24/7]
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc2c444bac1f70009ca756e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVTravel.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/59c01b1953680139c6ae9d4d/colorLogoPNG.png" group-title="Travel",Pluto TV Travel (480p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/59c01b1953680139c6ae9d4d/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=59c01b1953680139c6ae9d4d&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=678&terminate=false&userId=
+#EXTINF:-1 tvg-id="PlutoTVTravel.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/59c01b1953680139c6ae9d4d/colorLogoPNG.png" group-title="Travel",Pluto TV Travel (720p) [Not 24/7]
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc2c444bac1f70009ca756e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVTROL.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f8eb8a8b2619a000710605c/colorLogoPNG.png" group-title="Entertainment",Pluto TV TROL (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aae8c65727d0007d15a17/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVTROL.us" tvg-country="CH;FR" tvg-language="French" tvg-logo="https://images.pluto.tv/channels/5f8eb8a8b2619a000710605c/colorLogoPNG.png" group-title="Entertainment",Pluto TV TROL (480p)
@@ -2017,7 +2015,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f0dc00b1
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b4e96a0423e067bd6df6901/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b4e96a0423e067bd6df6901&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=379&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVUnsolvedMysteries.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e96a0423e067bd6df6901/colorLogoPNG.png" group-title="Series",Pluto TV Unsolved Mysteries (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b4e96a0423e067bd6df6901/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVUnsolvedMysteries.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e96a0423e067bd6df6901/colorLogoPNG.png" group-title="Series",Pluto TV Unsolved Mysteries (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVUnsolvedMysteries.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5b4e96a0423e067bd6df6901/colorLogoPNG.png" group-title="Series",Pluto TV Unsolved Mysteries (480p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5bd05b4694d45d266bc951f2/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVVayasemanita.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f28009b150b2500077766b8/colorLogoPNG.png" group-title="",Pluto TV Vaya semanita (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f28009b150b2500077766b8/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
@@ -2063,9 +2061,9 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/589aa03df9ba56a841
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/589aa03df9ba56a84197a560/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVVoyagerDocumentaries.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/589aa03df9ba56a84197a560/colorLogoPNG.png" group-title="Documentary",Pluto TV Voyager Documentaries (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad8d1e9e738977e2c310925/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="PlutoTVWeatherNation.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5bdce04659ee03633e758130/colorLogoPNG.png" group-title="Weather",Pluto TV WeatherNation (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVWeatherNation.us" tvg-country="US" tvg-language="English" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/1/18/WeatherNation_icon.png" group-title="Weather",Pluto TV WeatherNation (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5bdce04659ee03633e758130/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5bdce04659ee03633e758130&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=217&terminate=false&userId=
-#EXTINF:-1 tvg-id="PlutoTVWeatherNation.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5bdce04659ee03633e758130/colorLogoPNG.png" group-title="Weather",Pluto TV WeatherNation (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVWeatherNation.us" tvg-country="US" tvg-language="English" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/1/18/WeatherNation_icon.png" group-title="Weather",Pluto TV WeatherNation (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5bdce04659ee03633e758130/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVWeddings.us" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5877acecb16bb1e042ee453f/colorLogoPNG.png" group-title="Series",Pluto TV Weddings (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5877acecb16bb1e042ee453f/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5877acecb16bb1e042ee453f&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=632&terminate=false&userId=
diff --git a/channels/us_roku.m3u b/channels/us_roku.m3u
index 77240474f0..c36360709a 100644
--- a/channels/us_roku.m3u
+++ b/channels/us_roku.m3u
@@ -17,7 +17,7 @@ https://bnc-roku-us.amagi.tv/playlist.m3u8
 https://bloodydisgusting-ingest-roku-us.cinedigm.com/playlist.m3u8
 #EXTINF:-1 tvg-id="BloombergQuicktake.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.adweek.com/wp-content/uploads/2019/12/quicktake-bloomberg-tictoc-CONTENT-2019-640x360.jpg" group-title="General",Bloomberg Quicktake (1080p)
 https://bloomberg-quicktake-1.roku.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="bonappetit.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YhFFxlE.png" group-title="Cooking",bon appétit (1080p)
+#EXTINF:-1 tvg-id="bonappetit.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YhFFxlE.png" group-title="Cooking",bon appétit (1080p) [Offline]
 https://bonappetit-roku-us.amagi.tv/hls/amagi_hls_data_condenast-bonappetitroku/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="BratTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lhjj94a.png" group-title="Kids",Brat TV (1080p)
 https://brat-roku-us.amagi.tv/playlist.m3u8
@@ -69,7 +69,7 @@ https://euronews-euronews-world-1.roku.wurl.com/manifest/playlist.m3u8
 https://fidotv-roku.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="FoxSoul.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YIamDGn.png" group-title="Culture",Fox Soul (1080p)
 http://fox-foxsoul-roku.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="FoxSoul.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YIamDGn.png" group-title="Culture",Fox Soul (1080p)
+#EXTINF:-1 tvg-id="FoxSoul.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YIamDGn.png" group-title="Culture",Fox Soul (1080p) [Offline]
 https://fox-foxsoul-roku.amagi.tv/hls/amagi_hls_data_foxAAAAAA-foxsoul-roku/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="FTF.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/IRWahfD.png" group-title="Sports",FTF (720p)
 https://eleven-rebroadcast-samsung.roku.wurl.com/manifest/playlist.m3u8
@@ -84,9 +84,9 @@ https://haunttv-roku.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="HiYAH" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/uMPu5HU.png" group-title="Entertainment",Hi-YAH! (1080p)
 https://linear-59.frequency.stream/dist/roku/59/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="Horrify.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/NCbpYa4.png" group-title="Movies",Horrify (1080p)
-https://olympusamagi.amagi.tv/hls/amagi_hls_data_olympusat-horrify-roku/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="Horrify.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/NCbpYa4.png" group-title="Movies",Horrify (1080p)
 https://olympusamagi.pc.cdn.bitgravity.com/Horrify-roku/master.m3u8
+#EXTINF:-1 tvg-id="Horrify.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/NCbpYa4.png" group-title="Movies",Horrify (1080p) [Offline]
+https://olympusamagi.amagi.tv/hls/amagi_hls_data_olympusat-horrify-roku/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="iFoodTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GnmHLNB.png" group-title="Cooking",iFood.TV (1080p)
 https://ft-ifood-roku.amagi.tv/hls/amagi_hls_data_futuretod-ifood-roku/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="iFoodTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GnmHLNB.png" group-title="Cooking",iFood.TV (1080p)
@@ -101,7 +101,7 @@ https://vod365-ketchuptv-1.roku.wurl.com/manifest/playlist.m3u8
 https://studio71-roku-us.amagi.tv/hls/amagi_hls_data_studio71A-studio71roku/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Kidoodle.us" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/MaFtbM5.png" group-title="Kids",Kidoodle.TV (1080p) [Offline]
 http://kidoodletv-kdtv-3.roku.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="KidzBop.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/19namZP.jpg" group-title="Kids",Kidz Bop (1080p)
+#EXTINF:-1 tvg-id="KidzBop.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/19namZP.jpg" group-title="Kids",Kidz Bop (1080p) [Offline]
 https://kidzbop-rokuus.amagi.tv/hls/amagi_hls_data_kidzbopAA-kidzbop-roku-us/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="LegoChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xePwW13.png" group-title="Kids",Lego Channel (1080p)
 https://legochannel-roku.amagi.tv/playlist.m3u8
@@ -135,7 +135,7 @@ https://maverick-maverick-black-cinema-3.roku.wurl.com/manifest/playlist.m3u8
 https://mavtv-2.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="MidnightPulp.fr" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/K1kJf1s.png" group-title="",Midnight Pulp (1080p) [Offline]
 https://midnightpulp-samsung.roku.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="MoonBug.uk" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",MoonBug (1080p)
+#EXTINF:-1 tvg-id="MoonBug.uk" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",MoonBug (1080p) [Offline]
 https://moonbug-rokuus.amagi.tv/hls/amagi_hls_data_moonbugAA-moonbug-roku-us/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="MoonbugKids.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tv-plus/all-channels/07212020/circle_190x190.png?raw=true" group-title="Kids",Moonbug Kids (1080p)
 https://moonbug-rokuus.amagi.tv/playlist.m3u8
@@ -177,7 +177,7 @@ https://pocketwatch.roku.wurl.com/manifest/playlist.m3u8
 https://rtmtv-powernation-1.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Realnosey.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/eVB5iNV.png" group-title="",Real nosey (1080p) [Offline]
 https://nosey-realnosey-1.roku.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="Redbox1Spotlight.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OrGCnPg.jpg" group-title="",Redbox 1: Spotlight (1080p)
+#EXTINF:-1 tvg-id="Redbox1Spotlight.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OrGCnPg.jpg" group-title="",Redbox 1: Spotlight (1080p) [Offline]
 https://spotlight-rokuus.amagi.tv/hls/amagi_hls_data_redboxAAA-spotlight-roku/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="RetroCrush.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQwMDkzNDRf/RetroCrush_576x576.png" group-title="",RetroCrush TV (1080p) [Offline]
 https://digitalmediarights-retrocrush-1.roku.wurl.com/manifest/playlist.m3u8
@@ -212,24 +212,24 @@ https://tastemade-es8intl-roku.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TheCarolBurnettShow.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/dEmt8Fv.png" group-title="Classic",The Carol Burnett Show (1080p)
 https://carolburnett-roku.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TheCraftistry.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/KIzpKhL.png" group-title="Lifestyle",The Craftistry (1080p)
-https://studio71-craftistry-roku.amagi.tv/hls/amagi_hls_data_studio71A-craftistry-rokuA/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="TheCraftistry.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/KIzpKhL.png" group-title="Lifestyle",The Craftistry (1080p)
 https://studio71-craftistry-roku.amagi.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="TheCraftistry.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/KIzpKhL.png" group-title="Lifestyle",The Craftistry (1080p) [Offline]
+https://studio71-craftistry-roku.amagi.tv/hls/amagi_hls_data_studio71A-craftistry-rokuA/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="TheDesignNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LoUGscj.png" group-title="Lifestyle",The Design Network (1080p) [Offline]
 https://thedesignnetwork-tdn-2.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ThisOldHouse.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lbOPCEJ.png" group-title="Series",This Old House (1080p) [Offline]
 https://thisoldhouse-2.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="TopCine.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/DFEKx5N.png" group-title="Movies",Top Cine (1080p)
-https://olympusamagi.amagi.tv/hls/amagi_hls_data_olympusat-topcine-roku/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="TopCine.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/DFEKx5N.png" group-title="Movies",Top Cine (1080p)
 https://olympusamagi.pc.cdn.bitgravity.com/TopCine-roku/master.m3u8
+#EXTINF:-1 tvg-id="TopCine.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/DFEKx5N.png" group-title="Movies",Top Cine (1080p) [Offline]
+https://olympusamagi.amagi.tv/hls/amagi_hls_data_olympusat-topcine-roku/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Unbeaten.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LmkNt3v.png" group-title="Sports",Unbeaten (1080p)
 https://unbeaten-roku.amagi.tv/hls/amagi_hls_data_inverleig-unbeaten-roku/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Unbeaten.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LmkNt3v.png" group-title="Sports",Unbeaten (1080p)
 https://unbeaten-roku.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="VENN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zVoX1fM.jpg" group-title="Entertainment",VENN (1080p)
 https://venntv-roku.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="WeatherNation.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/X23p0GB.png" group-title="Weather",Weather Nation (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="WeatherNation.us" tvg-country="US" tvg-language="English" tvg-logo="https://static.wikia.nocookie.net/logopedia/images/1/18/WeatherNation_icon.png" group-title="Weather",WeatherNation (720p) [Geo-blocked]
 https://weathernationtv.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="WhistleSports.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/CNO8eQ7.png" group-title="Sports",Whistle Sports (1080p) [Offline]
 https://whistletv-roku-ingest.cinedigm.com/master.m3u8
diff --git a/channels/us_samsung.m3u b/channels/us_samsung.m3u
index faf1dd8288..4de97a8da0 100644
--- a/channels/us_samsung.m3u
+++ b/channels/us_samsung.m3u
@@ -31,7 +31,7 @@ https://circle-samsung.amagi.tv/playlist.m3u8
 https://contv.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Crime360.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/fYXChY0.png" group-title="Documentary",Crime 360 (720p)
 https://aenetworks-crime360-1.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="DangerTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4aTk45R.png" group-title="Documentary",Danger TV (720p)
+#EXTINF:-1 tvg-id="DangerTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4aTk45R.png" group-title="Documentary",Danger TV (720p) [Timeout]
 https://dangertv.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="DealorNoDeal.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SXWX2Wf.png" group-title="Series",Deal or No Deal (720p) [Offline]
 https://endemol-dealornodeal-1.samsung.wurl.com/manifest/playlist.m3u8
@@ -130,9 +130,9 @@ https://playerstv-samsungus.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="pocketwatch.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Fi3klzX.png" group-title="",pocket.watch (720p) [Offline]
 https://pocketwatch.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="PowerNation.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/iJmj6zC.png" group-title="Auto",Power Nation (720p)
-https://rtmtv-samsung.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="PowerNation.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/iJmj6zC.png" group-title="Auto",Power Nation (720p)
 https://rtmtv.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="PowerNation.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/iJmj6zC.png" group-title="Auto",Power Nation (720p) [Timeout]
+https://rtmtv-samsung.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="PursuitUp.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tv-plus/us-channel-lineup/Pursuit_Circle_190x190.png?raw=true" group-title="",Pursuit Up (720p)
 https://pursuitup.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Qubo.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ki7zVmW.png" group-title="Kids",Qubo (720p) [Offline]
@@ -179,7 +179,7 @@ https://aenetworks-tinyhousenation-1.samsung.wurl.com/manifest/playlist.m3u8
 https://toon-goggles.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="VENN.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zVoX1fM.jpg" group-title="Entertainment",VENN (1080p)
 https://venntv-rakuten-samsung.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="WaypointTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6r2YHtv.png" group-title="Outdoor",Waypoint TV (720p)
+#EXTINF:-1 tvg-id="WaypointTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6r2YHtv.png" group-title="Outdoor",Waypoint TV (720p) [Timeout]
 https://waypointtv.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="WeTVAbsoluteReality.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oOFjyYf.png" group-title="Entertainment",We TV Absolute Reality (720p) [Offline]
 https://amc-absolutereality-1.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/us_ssh101.m3u b/channels/us_ssh101.m3u
index e5540e2287..a0c20c43aa 100644
--- a/channels/us_ssh101.m3u
+++ b/channels/us_ssh101.m3u
@@ -44,7 +44,7 @@ https://tna5.bozztv.com/latacungatv2021/index.m3u8
 #EXTINF:-1 tvg-id="OnlyRadioTV.ar" tvg-country="AR" tvg-language="Spanish" tvg-logo="" group-title="",Only Radio TV (Olavarria | Buenos Aires) [Offline]
 #EXTVLCOPT:http-referrer=https://ssh101.com/
 https://tna5.bozztv.com/onlyTV1/index.m3u8
-#EXTINF:-1 tvg-id="OrbitaFM.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="" group-title="",Órbita FM (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="OrbitaFM.sv" tvg-country="SV" tvg-language="Spanish" tvg-logo="" group-title="",Órbita FM (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://ssh101.com/
 https://tna5.bozztv.com/OrbitaFM/index.m3u8
 #EXTINF:-1 tvg-id="RadioSistema.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/radiosistema/picture?width=320&height=320" group-title="Local",Radio Sistema (Ica) (720p) [Not 24/7]
@@ -62,3 +62,6 @@ https://tna5.bozztv.com/telemedellin/index.m3u8
 #EXTINF:-1 tvg-id="UchuTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="" group-title="",Uchu TV (Cusco) (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://ssh101.com/
 https://tna5.bozztv.com/Cusco/index.m3u8
+#EXTINF:-1 tvg-id="WORODT.pr" tvg-country="PR" tvg-language="Spanish" tvg-logo="https://i0.wp.com/unored.tv/wp-content/uploads/2015/08/WORO.jpg" group-title="",WORO-DT (720p) [Not 24/7]
+#EXTVLCOPT:http-referrer=https://ssh101.com/
+https://tna5.bozztv.com/worodt/playlist.m3u8
diff --git a/channels/us_stirr.m3u b/channels/us_stirr.m3u
index 61bec02eda..78f1b16b2f 100644
--- a/channels/us_stirr.m3u
+++ b/channels/us_stirr.m3u
@@ -31,7 +31,7 @@ https://dai.google.com/linear/hls/event/zcWPVCfURNSPxeidcckQLA/master.m3u8
 https://dai.google.com/linear/hls/event/VE8b4n-YStusEGv5Z2NmsQ/master.m3u8
 #EXTINF:-1 tvg-id="KTVTTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/0pDOolW.jpg" group-title="Local",CBSN 11 Dallas / Fort Worth TX (KTVT) (720p)
 https://dai.google.com/linear/hls/event/o5J3g4U9T16CvYnS7Qd86Q/master.m3u8
-#EXTINF:-1 tvg-id="CGTNEnglish.cn" tvg-country="CN" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/CGTN.svg/800px-CGTN.svg.png" group-title="News",CGTN English (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CGTNEnglish.cn" tvg-country="CN" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/CGTN.svg/800px-CGTN.svg.png" group-title="News",CGTN English (432p) [Not 24/7]
 https://dai.google.com/linear/hls/event/r4sa-f6GSN2XIvzKv5jVng/master.m3u8
 #EXTINF:-1 tvg-id="Charge.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/fuw0hHE.png" group-title="Movies",Charge! (720p) [Geo-blocked]
 https://usgeowall.sinclairstoryline.com/channel/37eb732888614810b512fdd82604244e.m3u8
@@ -59,7 +59,7 @@ https://endemol-dealornodeal-1.sinclair.wurl.com/manifest/playlist.m3u8
 https://dai.google.com/linear/hls/event/dfbBGQhPQQqypdEAjpUGlA/master.m3u8
 #EXTINF:-1 tvg-id="Dust.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FxYhME9.png" group-title="Movies",Dust (720p)
 https://dai.google.com/linear/hls/event/xuMJ1vhQQDGjEWlxK9Qh4w/master.m3u8
-#EXTINF:-1 tvg-id="DUSTx.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9Xc7Q7S.jpg" group-title="Movies",DUSTx (720p)
+#EXTINF:-1 tvg-id="DUSTx.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9Xc7Q7S.jpg" group-title="Movies",DUSTx (720p) [Timeout]
 https://dust.sinclair.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="EDGEsportSTIRR.uk" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/9661e155-c5b8-43f3-9e1c-0e87cb75ae94-small3x1_STIRR_Logo_0320_EdgeSport_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Sports",EDGEsport (STIRR) (1080p)
 https://dai.google.com/linear/hls/event/d4zeSI-dTuqizFrByjs3OA/master.m3u8
@@ -131,7 +131,7 @@ https://stirr.ott-channels.stingray.com/107/master.m3u8
 https://stirr.ott-channels.stingray.com/155/master.m3u8
 #EXTINF:-1 tvg-id="StingrayHotCountry.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/d2dac750-5e2b-4107-a037-6467fca68e93-small3x1_stirr_1219_epg_stingrayhotcountry_1920x1080.png?cb=eccbc87e4b5ce2fe28308fd9f2a7baf3" group-title="Music",Stingray Hot Country (1080p)
 https://stirr.ott-channels.stingray.com/108/master.m3u8
-#EXTINF:-1 tvg-id="StingrayKaraoke.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/wVVGZl9.png" group-title="Music",Stingray Karaoke (1080p)
+#EXTINF:-1 tvg-id="StingrayKaraoke.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/wVVGZl9.png" group-title="Music",Stingray Karaoke (720p)
 https://dai.google.com/linear/hls/event/5bqbG8j7T_6_qMONC1SDsg/master.m3u8
 #EXTINF:-1 tvg-id="StingrayNaturescape.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7XsqSSZ.png" group-title="Relax",Stingray Naturescape (1080p)
 https://dai.google.com/linear/hls/event/6RPZlzksTCyB1euPqLcBZQ/master.m3u8
@@ -139,7 +139,7 @@ https://dai.google.com/linear/hls/event/6RPZlzksTCyB1euPqLcBZQ/master.m3u8
 https://stirr.ott-channels.stingray.com/naturescape/master.m3u8
 #EXTINF:-1 tvg-id="STIRR2020Live.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="News",STIRR 2020 Live (720p) [Offline]
 https://dai.google.com/linear/hls/event/mMP0Ny8OTb2Ev2EvsiIlrg/master.m3u8
-#EXTINF:-1 tvg-id="STIRRAmericanClassics.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/207935e9-f81c-4e73-9166-0e75e41e7ac3-small3x1_stirr_1219_epg_americanclassics_1920x1080_v2.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Classic",STIRR American Classics (720p)
+#EXTINF:-1 tvg-id="STIRRAmericanClassics.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/207935e9-f81c-4e73-9166-0e75e41e7ac3-small3x1_stirr_1219_epg_americanclassics_1920x1080_v2.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Classic",STIRR American Classics (216p)
 https://dai.google.com/linear/hls/event/0e06oV-NTI2ygS2MRQk9ZA/master.m3u8
 #EXTINF:-1 tvg-id="STIRRBiographies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Documentary",STIRR Biographies (720p) [Offline]
 https://dai.google.com/linear/hls/event/OzhtmoTQQjSNOimI6ikGCQ/master.m3u8
@@ -245,7 +245,7 @@ https://dai.google.com/linear/hls/event/MqeaRgFBR2WJ_40ngbDruQ/master.m3u8
 https://dai.google.com/linear/hls/event/n3PVAFmPTJSVYjdSVf7XZw/master.m3u8
 #EXTINF:-1 tvg-id="STIRRCityLynchburgRoanoke.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",STIRR City Lynchburg Roanoke (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/Fwm4J95UQi67l2FEV7N5kQ/master.m3u8
-#EXTINF:-1 tvg-id="STIRRCityMacon.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",STIRR City Macon (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="STIRRCityMacon.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",STIRR City Macon (234p) [Not 24/7]
 https://dai.google.com/linear/hls/event/PPMxI7GZSRG6Kgkp2gSF1g/master.m3u8
 #EXTINF:-1 tvg-id="STIRRCityMedford.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",STIRR City Medford (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/1g9qH9IOSIGGwAqw8fPzmw/master.m3u8
@@ -295,7 +295,7 @@ https://dai.google.com/linear/hls/event/VGpvNIxIQRO7PXYRy7P0qw/master.m3u8
 https://dai.google.com/linear/hls/event/IaAlq3prS8Ghiq0FhLtzGQ/master.m3u8
 #EXTINF:-1 tvg-id="STIRRCityStLouis.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",STIRR City St. Louis (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/O5W1HC47QEKGc5tyscvsLw/master.m3u8
-#EXTINF:-1 tvg-id="STIRRCitySyracuse.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",STIRR City Syracuse (720p)
+#EXTINF:-1 tvg-id="STIRRCitySyracuse.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",STIRR City Syracuse (234p)
 https://dai.google.com/linear/hls/event/HSX_ZpxDQNy5aXzJHjhGGQ/master.m3u8
 #EXTINF:-1 tvg-id="STIRRCityToledo.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",STIRR City Toledo (720p)
 https://dai.google.com/linear/hls/event/1QSZA8OjS1y2Q64uTl5vWQ/master.m3u8
@@ -327,19 +327,19 @@ https://dai.google.com/linear/hls/event/83L2OqtGSZ6lbWt8ODomWg/master.m3u8
 https://dai.google.com/linear/hls/event/CHaUZsCfSyS2CVF7I-NktA/master.m3u8
 #EXTINF:-1 tvg-id="STIRRCOVID19News.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="News",STIRR COVID-19 News (720p) [Offline]
 https://dai.google.com/linear/hls/event/08ADpEIeQ8iZOjusLsZbCg/master.m3u8
-#EXTINF:-1 tvg-id="STIRRDealorNoDeal.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SXWX2Wf.png" group-title="Series",STIRR Deal or No Deal (720p)
+#EXTINF:-1 tvg-id="STIRRDealorNoDeal.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SXWX2Wf.png" group-title="Series",STIRR Deal or No Deal (1080p)
 https://dai.google.com/linear/hls/event/9cq79TtPR6WbyaQGeDlHjA/master.m3u8
 #EXTINF:-1 tvg-id="STIRRDocurama.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/5X5Z5eg.png" group-title="Documentary",STIRR Docurama (1080p)
 https://dai.google.com/linear/hls/event/Hx_PEMEsSzOCcZgy0Tq2YQ/master.m3u8
-#EXTINF:-1 tvg-id="STIRRElectricNow.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/6e9b5b43-d409-47a5-a13a-fdba785d466b-small3x1_STIRR_Logo_0320_ElectricNOW_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Entertainment",STIRR Electric Now (1080p)
+#EXTINF:-1 tvg-id="STIRRElectricNow.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/6e9b5b43-d409-47a5-a13a-fdba785d466b-small3x1_STIRR_Logo_0320_ElectricNOW_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Entertainment",STIRR Electric Now (360p)
 https://dai.google.com/linear/hls/event/KsvJAc81Qoewj6opYso6Fw/master.m3u8
 #EXTINF:-1 tvg-id="STIRRESR24x7eSportsNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/3e896322-56cd-4017-81aa-84d8962455fb-small3x1_STIRR_Logo_0320_ESR24x7eSportsChannel_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Entertainment",STIRR ESR 24x7 eSports Network (720p) [Offline]
 https://dai.google.com/linear/hls/event/7-91LhuBQNONHzAbrFQr-Q/master.m3u8
-#EXTINF:-1 tvg-id="STIRRevrgrn.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/84a96620-2c59-4a44-bfed-bdec3fdf7451-small3x1_STIRR_Logo_0520_EVRGRN_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Entertainment",STIRR evrgrn (720p)
+#EXTINF:-1 tvg-id="STIRRevrgrn.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/84a96620-2c59-4a44-bfed-bdec3fdf7451-small3x1_STIRR_Logo_0520_EVRGRN_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Entertainment",STIRR evrgrn (1080p)
 https://dai.google.com/linear/hls/event/TDUiZE57Q3-CS7Its4kLDQ/master.m3u8
 #EXTINF:-1 tvg-id="STIRRFailArmy.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/nbzbHum.png" group-title="Comedy",STIRR FailArmy (720p)
 https://dai.google.com/linear/hls/event/7tuuoX1wSsCTaki1HqJFYw/master.m3u8
-#EXTINF:-1 tvg-id="STIRRFilmRiseFreeMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/X7U7ikq.png" group-title="Movies",STIRR FilmRise Free Movies (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="STIRRFilmRiseFreeMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/X7U7ikq.png" group-title="Movies",STIRR FilmRise Free Movies (216p) [Not 24/7]
 https://dai.google.com/linear/hls/event/Va1QEor0SWO_x_SQNyaF0w/master.m3u8
 #EXTINF:-1 tvg-id="STIRRFit.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Lifestyle",STIRR Fit (720p) [Offline]
 https://dai.google.com/linear/hls/event/ZidoyK28TXyMRTZU7rFuEQ/master.m3u8
@@ -355,7 +355,7 @@ https://dai.google.com/linear/hls/event/zaW9PVeXQeamNt6SZ9FsOg/master.m3u8
 https://dai.google.com/linear/hls/event/tdSCy5u2R5WtCLXX4NwDtg/master.m3u8
 #EXTINF:-1 tvg-id="STIRRHellsKitchen.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/e9486527-1ffc-4031-8b91-c954076365f8-small3x1_stirr_1219_epg_hellskitchen_1920x1080.png?cb=eccbc87e4b5ce2fe28308fd9f2a7baf3" group-title="Cooking",STIRR Hell's Kitchen (720p) [Offline]
 https://dai.google.com/linear/hls/event/SynaOtTyTq2y_N7BrGTz9Q/master.m3u8
-#EXTINF:-1 tvg-id="STIRRHorrorMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/0a9b36ef-1240-47c1-a7e6-5ed04648ad72-small3x1_stirr_1219_epg_stirrhorror_1920x1080.png?cb=a87ff679a2f3e71d9181a67b7542122c" group-title="Movies",STIRR Horror Movies (720p)
+#EXTINF:-1 tvg-id="STIRRHorrorMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/0a9b36ef-1240-47c1-a7e6-5ed04648ad72-small3x1_stirr_1219_epg_stirrhorror_1920x1080.png?cb=a87ff679a2f3e71d9181a67b7542122c" group-title="Movies",STIRR Horror Movies (256p)
 https://dai.google.com/linear/hls/event/3NTKKQBuQtaIrcUBj20lyg/master.m3u8
 #EXTINF:-1 tvg-id="STIRRHSN.us" tvg-country="US" tvg-language="English" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/homeshop.png" group-title="Shop",STIRR HSN (720p)
 https://dai.google.com/linear/hls/event/akursTHNTo6qGf1TtlHNsw/master.m3u8
@@ -373,7 +373,7 @@ https://mavtv-1.sinclair.wurl.com/manifest/playlist.m3u8
 https://dai.google.com/linear/hls/event/1fO2zbpBRyy6S5yve_fnaw/master.m3u8
 #EXTINF:-1 tvg-id="STIRRMovieMix.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qcgXbuC.png" group-title="Movies",STIRR MovieMix (720p)
 https://dai.google.com/linear/hls/event/TSIJo6RCRZWuCD9WrKtRFg/master.m3u8
-#EXTINF:-1 tvg-id="STIRRMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Movies",STIRR Movies (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="STIRRMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Movies",STIRR Movies (216p) [Not 24/7]
 https://dai.google.com/linear/hls/event/f-zA7b21Squ7M1_sabGfjA/master.m3u8
 #EXTINF:-1 tvg-id="STIRRMusic.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Music",STIRR Music (720p) [Offline]
 https://dai.google.com/linear/hls/event/_e1csFnJR6W6y056PyiG6A/master.m3u8
@@ -397,7 +397,7 @@ https://dai.google.com/linear/hls/event/roEbn_l7Tzezwy22F1NSfA/master.m3u8
 https://dai.google.com/linear/hls/event/RoiVzG-4TJiJMSVUatDd4A/master.m3u8
 #EXTINF:-1 tvg-id="STIRRRetroCrush.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQwMDkzNDRf/RetroCrush_576x576.png" group-title="",STIRR RetroCrush TV (720p)
 https://dai.google.com/linear/hls/event/7LAMGFcmQN6iFJjNoHWXrg/master.m3u8
-#EXTINF:-1 tvg-id="STIRRRevry.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5fc81016d98cab623846a4f3" group-title="Lifestyle",STIRR Revry (720p)
+#EXTINF:-1 tvg-id="STIRRRevry.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5fc81016d98cab623846a4f3" group-title="Lifestyle",STIRR Revry (576p)
 https://dai.google.com/linear/hls/event/gvO6-Y6TTjCxRf1QALU4VQ/master.m3u8
 #EXTINF:-1 tvg-id="STIRRRingofHonor.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/154876f2-ed78-4a1e-959d-96aab12af9cd-small3x1_STIRR_Logo_0720_ROHBestofthePlanet_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",STIRR Ring of Honor (720p)
 https://dai.google.com/linear/hls/event/RNiQYO3aTjOqTe8od1zlqA/master.m3u8
@@ -405,7 +405,7 @@ https://dai.google.com/linear/hls/event/RNiQYO3aTjOqTe8od1zlqA/master.m3u8
 https://dai.google.com/linear/hls/event/8ZYru1fgSY6JL1Ejb6T5Ag/master.m3u8
 #EXTINF:-1 tvg-id="STIRRSOAR.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/2b6ed67f-5284-4622-8594-a956633c8383-small3x1_stirr_1219_epg_soartv_1920x1080.png?cb=eccbc87e4b5ce2fe28308fd9f2a7baf3" group-title="",STIRR SOAR (720p)
 https://dai.google.com/linear/hls/event/_PDxBUttQYqkxPnmh3VOZA/master.m3u8
-#EXTINF:-1 tvg-id="STIRRSpace1999.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/aaaa25c9-d98a-46b8-8dca-3851ab93d3ee-small3x1_STIRR_Logo_0320_SPACE1999_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",STIRR Space 1999 (720p)
+#EXTINF:-1 tvg-id="STIRRSpace1999.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/aaaa25c9-d98a-46b8-8dca-3851ab93d3ee-small3x1_STIRR_Logo_0320_SPACE1999_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",STIRR Space 1999 (256p)
 https://dai.google.com/linear/hls/event/NeKNJHuzSeCiN_7Fcuo83Q/master.m3u8
 #EXTINF:-1 tvg-id="STIRRSports.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Sports",STIRR Sports (720p) [Offline]
 https://dai.google.com/linear/hls/event/1B2yihdIR1mCL63rXzERag/master.m3u8
@@ -443,11 +443,11 @@ https://dai.google.com/linear/hls/event/-s-FtbzrQCaLMDSyM0ejyw/master.m3u8
 https://dai.google.com/linear/hls/event/0ZXyCbn9TYmrrAzcDfoU1w/master.m3u8
 #EXTINF:-1 tvg-id="STIRRTruly.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/ed531a2a-04cd-4845-a419-cc46ed05333b-small3x1_STIRR_Logo_0320_Truly_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",STIRR Truly (720p)
 https://dai.google.com/linear/hls/event/Xu-I6qGiSTKeu6glzS4BtQ/master.m3u8
-#EXTINF:-1 tvg-id="STIRRTVMix.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",STIRR TV Mix (720p)
+#EXTINF:-1 tvg-id="STIRRTVMix.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",STIRR TV Mix (234p)
 https://dai.google.com/linear/hls/event/ZP8ZMv95Q0Gm9EiyYOGHAA/master.m3u8
 #EXTINF:-1 tvg-id="STIRRUnsolvedMysteries.us" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/5cf60259-ce44-452f-a8a1-cb33585ea701-small3x1_stirr_1219_epg_unsolvedmysteries_1920x1080.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",STIRR Unsolved Mysteries (720p) [Offline]
 https://dai.google.com/linear/hls/event/iLjE1UKtRCiSNkFatA65bg/master.m3u8
-#EXTINF:-1 tvg-id="STIRRWesterns.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Movies",STIRR Westerns (720p)
+#EXTINF:-1 tvg-id="STIRRWesterns.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Movies",STIRR Westerns (432p)
 https://dai.google.com/linear/hls/event/YF2jfXh_QROPxoHEwp1Abw/master.m3u8
 #EXTINF:-1 tvg-id="STIRRWhistleSportsTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/CNO8eQ7.png" group-title="Sports",STIRR Whistle Sports (720p)
 https://dai.google.com/linear/hls/event/Wu11mwhnTKGNhwZimEK6Jg/master.m3u8
@@ -465,7 +465,7 @@ https://playoutengine.sinclairstoryline.com/playout/9f87522c-5a0e-4ff4-b82c-d556
 https://playoutengine.sinclairstoryline.com/playout/f2f8b269-dd85-4434-bdd3-b3a64ca9cd60.m3u8
 #EXTINF:-1 tvg-id="TennisChannelPlus2.us" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel+ 2 (720p) [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/e1838c44-dcb6-47b5-93d4-a0547833518f.m3u8
-#EXTINF:-1 tvg-id="TennisChannelPlus2.us" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel+ 2 [Geo-blocked]
+#EXTINF:-1 tvg-id="TennisChannelPlus2.us" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel+ 2 (720p) [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/e1838c44-dcb6-47b5-93d4-a0547833518f/g.m3u8
 #EXTINF:-1 tvg-id="TheAsylum.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1pxXEtP.png" group-title="Series",The Asylum (1080p)
 http://asylum-stirr.amagi.tv/playlist.m3u8
diff --git a/channels/us_tubi.m3u b/channels/us_tubi.m3u
index 5358fdfc6e..e885f5a766 100644
--- a/channels/us_tubi.m3u
+++ b/channels/us_tubi.m3u
@@ -19,51 +19,51 @@ https://cloudfront.tubi.video/5b97b1f5-a605-44a5-a192-12e10beece40/sd846jzc/stre
 https://lnc-black-news.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="BloombergQuicktake.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.adweek.com/wp-content/uploads/2019/12/quicktake-bloomberg-tictoc-CONTENT-2019-640x360.jpg" group-title="General",Bloomberg Quicktake (720p) [Offline]
 https://csm-e-eb.csm.tubi.video/csm/live/283326845.m3u8
-#EXTINF:-1 tvg-id="CBCNewsHighlights.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQ0OTQ3NTlf/Tubi_LiveNews_840x840.png" group-title="News",CBC News Highlights (720p)
+#EXTINF:-1 tvg-id="CBCNewsHighlights.ca" tvg-country="CA" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjQ0OTQ3NTlf/Tubi_LiveNews_840x840.png" group-title="News",CBC News Highlights (240p)
 https://csm-e-eb.csm.tubi.video/csm/live/243017997.m3u8
 #EXTINF:-1 tvg-id="EstrellaNews.us" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/f4Bec0i.png" group-title="News",Estrella News (720p)
 https://csm-e-eb.csm.tubi.video/csm/live/247083838.m3u8
-#EXTINF:-1 tvg-id="WJBK.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/EL9Bwtf.png" group-title="News",FOX 2 Detroit MI (WJBK) (720p) [Offline]
-https://lnc-wjbk-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KTVUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/18isSVd.png" group-title="News",FOX 2 San Francisco CA (KTVU) (720p) [Offline]
-https://lnc-ktvu-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KDFWTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/gjIKpMJ.png" group-title="News",FOX 4 Dallas / Fort Worth TX (KDFW) (720p) [Offline]
-https://lnc-kdfw-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WAGATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DcZoeGw.jpg" group-title="News",FOX 5 Atlanta GA (WAGA-TV) (720p) [Offline]
-https://lnc-waga-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WNYWTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OfGcsUO.png" group-title="Local",FOX 5 New York NY (WNYW) (720p) [Offline]
-https://lnc-wnyw-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WTTGTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ktLKla7.png" group-title="Local",FOX 5 Washington DC (WTTG) (720p) [Offline]
-https://lnc-wttg-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WITITV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qmOd9Yr.jpg" group-title="Local",FOX 6 Milwaukee WI (WITI) (720p) [Offline]
-https://lnc-witi-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KTBCTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ugLwGEY.png" group-title="News",FOX 7 Austin TX (KTBC) (720p) [Offline]
-https://lnc-ktbc-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KMSPTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WBgiaiB.jpg" group-title="News",FOX 9 ST Paul Minneapolis MN (KMSP) (720p) [Offline]
-https://lnc-kmsp-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KZAS.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/TCzjchS.jpg" group-title="News",FOX 10 Phoenix AZ (KZAS) (720p) [Offline]
-https://lnc-ksaz-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KTTVTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://live-tv-channels.org/pt-data/uploads/logo/us-fox-11-los-angeles.jpg" group-title="News",FOX 11 Los Angeles CA (KTTV) (720p) [Offline]
-https://lnc-kttv-fox-aws.tubi.video/index.m3u8
+#EXTINF:-1 tvg-id="WJBK.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/EL9Bwtf.png" group-title="News",FOX 2 Detroit MI (WJBK) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WJBK-Monetizer.m3u8
+#EXTINF:-1 tvg-id="KTVUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/18isSVd.png" group-title="News",FOX 2 San Francisco CA (KTVU) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-KTVU-Monetizer.m3u8
+#EXTINF:-1 tvg-id="KDFWTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/gjIKpMJ.png" group-title="News",FOX 4 Dallas / Fort Worth TX (KDFW) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-KDFW-Monetizer.m3u8
+#EXTINF:-1 tvg-id="WAGATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DcZoeGw.jpg" group-title="News",FOX 5 Atlanta GA (WAGA-TV) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WAGA-Monetizer.m3u8
+#EXTINF:-1 tvg-id="WNYWTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OfGcsUO.png" group-title="Local",FOX 5 New York NY (WNYW) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WNYW-Monetizer.m3u8
+#EXTINF:-1 tvg-id="WTTGTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ktLKla7.png" group-title="Local",FOX 5 Washington DC (WTTG) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WTTG-Monetizer.m3u8
+#EXTINF:-1 tvg-id="WITITV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qmOd9Yr.jpg" group-title="Local",FOX 6 Milwaukee WI (WITI) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WITI-Monetizer.m3u8
+#EXTINF:-1 tvg-id="KTBCTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ugLwGEY.png" group-title="News",FOX 7 Austin TX (KTBC) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-KTBC-Monetizer.m3u8
+#EXTINF:-1 tvg-id="KMSPTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WBgiaiB.jpg" group-title="News",FOX 9 ST Paul Minneapolis MN (KMSP) (720p)
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-KMSP-Monetizer.m3u8
+#EXTINF:-1 tvg-id="KZAS.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/TCzjchS.jpg" group-title="News",FOX 10 Phoenix AZ (KZAS) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-KSAZ-Monetizer.m3u8
+#EXTINF:-1 tvg-id="KTTVTV.us" tvg-country="US" tvg-language="English" tvg-logo="http://live-tv-channels.org/pt-data/uploads/logo/us-fox-11-los-angeles.jpg" group-title="News",FOX 11 Los Angeles CA (KTTV) (720p)
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-KTTV-Monetizer.m3u8
 #EXTINF:-1 tvg-id="WHBQTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/E9vX12j.jpg" group-title="Local",FOX 13 Memphis TN (WHBQ-TV) (720p)
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-WHBQ.m3u8
-#EXTINF:-1 tvg-id="WTVTTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bvkri2L.png" group-title="Local",FOX 13 Tampa Bay FL (WTVT) (720p) [Offline]
-https://lnc-wtvt-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KRIV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AZ8MWRp.jpg" group-title="News",FOX 26 Houston TX (KRIV) (720p) [Offline]
-https://lnc-kriv-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WTXFTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/fRjmk5r.png" group-title="Local",FOX 29 Philadelphia PA (WTXF-TV) (720p) [Offline]
-https://lnc-wtxf-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WFLDTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lf5sLNn.png" group-title="Local",FOX 32 Chicago IL (WFLD) (720p) [Offline]
-https://lnc-wfld-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WOFLTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/BOA8KKZ.jpg" group-title="Local",FOX 35 Orlando FL (WOFL) (720p) [Offline]
-https://lnc-wofl-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KCPQTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4xs5ERr.jpg" group-title="News",FOX Q13 Seattle WA (KCPQ) (720p) [Offline]
-https://lnc-kcpq-fox-aws.tubi.video/index.m3u8
+#EXTINF:-1 tvg-id="WTVTTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bvkri2L.png" group-title="Local",FOX 13 Tampa Bay FL (WTVT) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WTVT-Monetizer.m3u8
+#EXTINF:-1 tvg-id="KRIV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AZ8MWRp.jpg" group-title="News",FOX 26 Houston TX (KRIV) (720p)
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-KRIV-Monetizer.m3u8
+#EXTINF:-1 tvg-id="WTXFTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/fRjmk5r.png" group-title="Local",FOX 29 Philadelphia PA (WTXF-TV) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WTXF-Monetizer.m3u8
+#EXTINF:-1 tvg-id="WFLDTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lf5sLNn.png" group-title="Local",FOX 32 Chicago IL (WFLD) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WFLD-Monetizer.m3u8
+#EXTINF:-1 tvg-id="WOFLTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/BOA8KKZ.jpg" group-title="Local",FOX 35 Orlando FL (WOFL) (720p)
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WOFL-Monetizer.m3u8
+#EXTINF:-1 tvg-id="KCPQTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4xs5ERr.jpg" group-title="News",FOX Q13 Seattle WA (KCPQ) (720p) 
+https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-KCPQ-Monetizer.m3u8
 #EXTINF:-1 tvg-id="FoxSoul.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/YIamDGn.png" group-title="Culture",Fox Soul (720p)
 https://lnc-fox-soul-scte.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="WLWTTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7erOEZJ.gif" group-title="News",NBC 5 Cincinnati OH (WLWT) (720p)
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-WLWT.m3u8
-#EXTINF:-1 tvg-id="WDSUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/cB1bxJw.jpg" group-title="News",NBC 6 New Orleans LA (WDSU) (720p)
+#EXTINF:-1 tvg-id="WDSUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/cB1bxJw.jpg" group-title="News",NBC 6 New Orleans LA (WDSU) (576p)
 https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,Cloudfront-WDSU.m3u8
 #EXTINF:-1 tvg-id="News12NewYork.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5f9c57ad92cd1774a1091752" group-title="Local",News 12 New York (1080p)
 https://lnc-news12.tubi.video/index.m3u8
diff --git a/channels/us_vizio.m3u b/channels/us_vizio.m3u
index a8c4b1ebc7..8e71c0db76 100644
--- a/channels/us_vizio.m3u
+++ b/channels/us_vizio.m3u
@@ -99,7 +99,7 @@ https://latidomusic.vizio.wurl.com/manifest/playlist.m3u8
 https://vidaprimo-vizio.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="LEGOChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xePwW13.png" group-title="Kids",LEGO Channels (720p)
 https://legochannel-vizio.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="MagellanTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oIy673i.png" group-title="Documentary",Magellan TV (720p)
+#EXTINF:-1 tvg-id="MagellanTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oIy673i.png" group-title="Documentary",Magellan TV (1080p)
 https://magellantv-1.vizio.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="MaverickBlackCinema.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OEamqFg.png" group-title="Movies",Maverick Black Cinema (1080p)
 https://maverick-maverick-black-cinema-2.vizio.wurl.com/manifest/playlist.m3u8
@@ -145,7 +145,7 @@ https://shout-factory.vizio.wurl.com/manifest/playlist.m3u8
 https://sportsgrid-vizio.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Spotlight.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/g9zxqSd.jpg" group-title="",Spotlight (1080p)
 https://spotlight-vizio.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="SuperSimpleSongs.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9zRYK8n.jpg" group-title="Kids",Super Simple Songs (720p)
+#EXTINF:-1 tvg-id="SuperSimpleSongs.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9zRYK8n.jpg" group-title="Kids",Super Simple Songs (1080p)
 https://janson-supersimplesongs-1.vizio.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Tankee.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oMWbZ8n.png" group-title="Kids",Tankee (720p) [Offline]
 https://playworksdigital-tankee-1.vizio.wurl.com/manifest/playlist.m3u8
diff --git a/channels/us_xumo.m3u b/channels/us_xumo.m3u
index 96e71cd576..131232d062 100644
--- a/channels/us_xumo.m3u
+++ b/channels/us_xumo.m3u
@@ -5,7 +5,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-abcnews/CDN/master.m3u8
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-adventuresportsnetwork/CDN/master.m3u8
 #EXTINF:-1 tvg-id="AdventureSportsNetwork.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ZbPFZOV.png" group-title="Sports",Adventure Sports Network (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-vizioadventuresportsnetwork/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="Ameba.us" tvg-country="US" tvg-language="English" tvg-logo="https://images-na.ssl-images-amazon.com/images/I/612ZLob%2BSOL.png" group-title="Kids",Ameba (720p)
+#EXTINF:-1 tvg-id="Ameba.us" tvg-country="US" tvg-language="English" tvg-logo="https://images-na.ssl-images-amazon.com/images/I/612ZLob%2BSOL.png" group-title="Kids",Ameba (720p) [Offline]
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuameba/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="AmericasTestKitchen.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tv-plus/all-channels/10272020/Americas_Test_Kitchen_190x190.png?raw=true" group-title="Cooking",America's Test Kitchen (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxamericastestkitchen/CDN/playlist.m3u8
@@ -38,9 +38,9 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxcbcnews/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="CBCNewsXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6TmWzvk.jpg" group-title="News",CBC News (XUMO) (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-cbcnews/CDN/master.m3u8
 #EXTINF:-1 tvg-id="CheddarNews.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/607766d942e7e542aa73ddf2" group-title="News",Cheddar News (1080p)
-https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxcheddar/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="CheddarNews.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/607766d942e7e542aa73ddf2" group-title="News",Cheddar News (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo-host-cheddar/CDN/master.m3u8
+#EXTINF:-1 tvg-id="CheddarNews.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/607766d942e7e542aa73ddf2" group-title="News",Cheddar News (1080p)
+https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxcheddar/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="ChiveTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://yt3.ggpht.com/a-/AN66SAz6Ssqjkt5Zn__8q2-hhZEPzoma1h3_IshrpQ=s900-mo-c-c0xffffffff-rj-k-no" group-title="Outdoor",Chive TV (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxchive/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="CineRomantico.us" tvg-country="US" tvg-language="English" tvg-logo="https://odishaexpo.com/wp-content/uploads/2020/10/UP_Entertainment_Cine_Romantico_Logo.jpg" group-title="Movies",Cine Romantico (XUMO) (720p)
@@ -91,7 +91,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokufamilyfeud/CDN/playlist.m3u8
 https://live-content.xumo.com/170/content/XM00UVIHRILCPE/21427120/4.m3u8
 #EXTINF:-1 tvg-id="FilmHub.us" tvg-country="US" tvg-language="English" tvg-logo="http://cdn-images-1.medium.com/max/280/1*7zB_9kQDvR3fa_IIk8fhQg@2x.png" group-title="Movies",Film Hub (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxfilmhub/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="FilmRiseAction.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/FilmRise-Action_442x442.png?raw=true" group-title="",FilmRise Action (720p)
+#EXTINF:-1 tvg-id="FilmRiseAction.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/FilmRise-Action_442x442.png?raw=true" group-title="",FilmRise Action (720p) [Timeout]
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokufilmriseaction/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="FilmRiseClassicTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GvqmzPn.jpg" group-title="Classic",FilmRise Classic TV (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-filmriseclassictv/CDN/playlist.m3u8
@@ -105,7 +105,7 @@ http://dai2.xumo.com/xumocdn/p=roku/amagi_hls_data_xumo1212A-filmrisefamily/CDN/
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-filmrisefamily/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="FilmRiseFamily.us" tvg-country="US" tvg-language="English" tvg-logo="https://images-na.ssl-images-amazon.com/images/I/81VZaxj6a1L._SY355_.png" group-title="Family",FilmRise Family (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxfilmrisefamily/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="FilmRiseForensicFiles.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/FilmRise_ForensicFiles_398x398.png?raw=true" group-title="",FilmRise Forensic Files (360p)
+#EXTINF:-1 tvg-id="FilmRiseForensicFiles.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/FilmRise_ForensicFiles_398x398.png?raw=true" group-title="",FilmRise Forensic Files (432p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuforensicfiles/CDN/master.m3u8
 #EXTINF:-1 tvg-id="FilmRiseForensicFilesXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/fX1PNxl.png" group-title="",FilmRise Forensic Files (XUMO) (432p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxunsolvedmysteries/CDN/playlist.m3u8
@@ -115,19 +115,19 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-filmrisefreemovies/CDN/playlist.m
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-viziofilmrisefreemovies/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="FilmRiseFreeMoviesRedbox.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/X7U7ikq.png" group-title="Movies",FilmRise Free Movies (Redbox) (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxfilmrisefreemovies/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="FilmRiseHellsKitchen.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/H002ju5.png" group-title="Cooking",FilmRise Hell's Kitchen (720p)
+#EXTINF:-1 tvg-id="FilmRiseHellsKitchen.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/H002ju5.png" group-title="Cooking",FilmRise Hell's Kitchen (432p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-filmrisecooking/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="FilmRiseMysteriesXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FeWgF1h.png" group-title="Series",FilmRise Mysteries (XUMO) (720p)
-http://dai2.xumo.com/xumocdn/p=roku/amagi_hls_data_xumo1212A-filmrisecrime/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="FilmRiseMysteriesXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FeWgF1h.png" group-title="Series",FilmRise Mysteries (XUMO) (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokufilmrisemystery/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="FilmRiseSciFiXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://images-na.ssl-images-amazon.com/images/I/815Fp3E0LcL.png" group-title="",FilmRise Sci-Fi (XUMO) (720p)
+#EXTINF:-1 tvg-id="FilmRiseMysteriesXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FeWgF1h.png" group-title="Series",FilmRise Mysteries (XUMO) (432p)
+http://dai2.xumo.com/xumocdn/p=roku/amagi_hls_data_xumo1212A-filmrisecrime/CDN/playlist.m3u8
+#EXTINF:-1 tvg-id="FilmRiseSciFiXUMO.us" tvg-country="US" tvg-language="English" tvg-logo="https://images-na.ssl-images-amazon.com/images/I/815Fp3E0LcL.png" group-title="",FilmRise Sci-Fi (XUMO) (432p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokufilmrisesci-fi/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="FilmRiseTrueCrime.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/suxN191.png" group-title="Movies",FilmRise True Crime (720p)
+#EXTINF:-1 tvg-id="FilmRiseTrueCrime.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/suxN191.png" group-title="Movies",FilmRise True Crime (432p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-filmrisecrime/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="FilmRiseWestern.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7cTXYNk.png" group-title="",FilmRise Western (720p)
+#EXTINF:-1 tvg-id="FilmRiseWestern.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7cTXYNk.png" group-title="",FilmRise Western (432p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokufilmrisewestern/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="FiremanSam.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/umyEio1.jpg" group-title="Kids",Fireman Sam (432p)
+#EXTINF:-1 tvg-id="FiremanSam.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/umyEio1.jpg" group-title="Kids",Fireman Sam (432p) [Timeout]
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokufiremansam/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Food52.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/BVrMQch.png" group-title="Cooking",Food 52 (720p)
 https://cinedigm.vo.llnwd.net/conssui/amagi_hls_data_xumo1212A-redboxfood52A/CDN/master.m3u8
@@ -145,7 +145,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxfuse/CDN/playlist.m3u8
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxglamour/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Glamour.us" tvg-country="US" tvg-language="English" tvg-logo="http://www.ranklogos.com/wp-content/uploads/2014/11/Glamour-Logo.jpg" group-title="Lifestyle",Glamour (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuglamour/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="GlobalGotTalent.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QHiOf7Z.png" group-title="Entertainment",Global Got Talent (576p)
+#EXTINF:-1 tvg-id="GlobalGotTalent.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QHiOf7Z.png" group-title="Entertainment",Global Got Talent (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokugottalentglobal/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="GloryKickboxing.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AQbc1ER.jpg" group-title="Sports",Glory Kickboxing (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxglorykickboxing/CDN/playlist.m3u8
@@ -231,7 +231,7 @@ https://peopletvssai.akamaized.net/amagi_hls_data_peopletvA-peopletvxumo/CDN/mas
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-xumo-playerstv/CDN/master.m3u8
 #EXTINF:-1 tvg-id="pocketwatch.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Fi3klzX.png" group-title="",pocket.watch (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxpocketwatch/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="PongaloNovelaclub.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/vLSvJ7W.jpg" group-title="Series",Pongalo Novelaclub (720p)
+#EXTINF:-1 tvg-id="PongaloNovelaclub.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/vLSvJ7W.jpg" group-title="Series",Pongalo Novelaclub (720p) [Timeout]
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokunovelaclub/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="RainbowRuby.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LrunNdE.png" group-title="",Rainbow Ruby (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-roku-rainbow-ruby/CDN/playlist.m3u8
@@ -245,7 +245,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxreelzchannel/CDN/playlist.m
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokurev-and-roll/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Revry.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5fc81016d98cab623846a4f3" group-title="Lifestyle",Revry (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-revryxumo/CDN/master.m3u8
-#EXTINF:-1 tvg-id="SamuelGoldwynChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oCjZS0v.jpg" group-title="",Samuel Goldwyn Channel (720p)
+#EXTINF:-1 tvg-id="SamuelGoldwynChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oCjZS0v.jpg" group-title="",Samuel Goldwyn Channel (720p) [Offline]
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxsamuelgoldwyn/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="ShopLC.us" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/606f94fdf46bcb6017662744" group-title="Shop",Shop LC (1080p)
 https://cdn-shop-lc-01.akamaized.net/Content/HLS_HLS/Live/channel(xumo)/index.m3u8
@@ -309,7 +309,7 @@ https://xumo-redbox.ott-channels.stingray.com/134/master.m3u8
 https://tastemade-xumo.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16xumo/CDN/master.m3u8
 #EXTINF:-1 tvg-id="Teletubbies.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/FlCXGip.jpg" group-title="",Teletubbies (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuteletubbies/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="TheArchive.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjg0MDgzNDBf/TheArchive_300x300.png" group-title="Classic",The Archive (540p)
+#EXTINF:-1 tvg-id="TheArchive.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjg0MDgzNDBf/TheArchive_300x300.png" group-title="Classic",The Archive (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxthearchive/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="TheBobRossChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/BobRossChannel_275x275.png?raw=true" group-title="Culture",The Bob Ross Channel (1080p)
 https://bobross-xumous-ingest.cinedigm.com/master.m3u8
@@ -337,7 +337,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1234A-tmz/CDN/playlist.m3u8
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxtoongoggles/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="USAToday.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzIyMDM0MzNf/USAToday_480x480.png" group-title="News",USA Today (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxusatoday/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="USAToday.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzIyMDM0MzNf/USAToday_480x480.png" group-title="News",USA Today (432p)
+#EXTINF:-1 tvg-id="USAToday.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzIyMDM0MzNf/USAToday_480x480.png" group-title="News",USA Today (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-viziousatoday/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="USAToday.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzIyMDM0MzNf/USAToday_480x480.png" group-title="News",USA Today (432p) [Offline]
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuusatodaynews/CDN/playlist.m3u8
@@ -347,7 +347,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-viziousatodaysportswire/CDN/playl
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxvanityfair/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="VanityFair.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/KMUYfnz.jpg" group-title="Lifestyle",Vanity Fair (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuvanityfair/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="Vevo80s.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzE5OTIyMjBf/Redbox_512x512.png" group-title="Music",Vevo 80s (720p)
+#EXTINF:-1 tvg-id="Vevo80s.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMzE5OTIyMjBf/Redbox_512x512.png" group-title="Music",Vevo 80s (720p) [Timeout]
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxvevo80s/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="VevoPop.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Me1wLzi.jpg" group-title="Music",Vevo Pop (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxvevo/CDN/playlist.m3u8
@@ -369,7 +369,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxwired/CDN/playlist.m3u8
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxworldpokertour/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="XumoFreeMovies.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Sx10tvQ.png" group-title="Movies",Xumo Free Movies (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuxumofreemovies/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="XumoFreeWesterns.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/XumoFreeWesterns.png?raw=true" group-title="Movies",Xumo Free Westerns (540p)
+#EXTINF:-1 tvg-id="XumoFreeWesterns.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/XumoFreeWesterns.png?raw=true" group-title="Movies",Xumo Free Westerns (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuxumowesterns/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="YoGabbaGabba.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RwxgFfb.jpg" group-title="Kids",Yo Gabba Gabba! (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuyogabagaba/CDN/playlist.m3u8
diff --git a/channels/uy.m3u b/channels/uy.m3u
index e4137ae49b..c921aaf8db 100644
--- a/channels/uy.m3u
+++ b/channels/uy.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="canal10.uy" tvg-country="UY" tvg-language="Spanish;Castilian" tvg-logo="https://i.imgur.com/nmpOHwM.png" group-title="",Canal 10 (720p)
+#EXTINF:-1 tvg-id="canal10.uy" tvg-country="UY" tvg-language="Spanish;Castilian" tvg-logo="https://i.imgur.com/nmpOHwM.png" group-title="",Canal 10 (720p) [Offline]
 https://edge3-hr.cvattv.com.ar/live/c5eds/Canal10_URU/verimatrix_rotating_FTA/Canal10_URU.m3u8
 #EXTINF:-1 tvg-id="CANAL10.uy" tvg-country="UY" tvg-language="Spanish" tvg-logo="https://directostv.teleame.com/wp-content/uploads/2019/04/canal-10-uruguay-en-vivo.png" group-title="",CANAL 10 [Offline]
 http://edge2-ccast-sl.cvattv.com.ar/live/c5eds/Canal10_URU/verimatrix_rotating/Canal10_URU-video=1480000.m3u8
@@ -7,5 +7,5 @@ http://edge2-ccast-sl.cvattv.com.ar/live/c5eds/Canal10_URU/verimatrix_rotating/C
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/charruatvcanal
 #EXTINF:-1 tvg-id="LatinoKids.uy" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/LatinoKidsTvUruguay/picture?width=300&height=300" group-title="Entertainment",LatinoKids (540p)
 https://s14.ssl-stream.com:3335/live/latinokidsonlinelive.m3u8
-#EXTINF:-1 tvg-id="UCL.uy" tvg-country="UY;HISPAM" tvg-language="Spanish" tvg-logo="https://uclplay.com/wp-content/uploads/2020/04/logo-horizontal-white-1.png" group-title="",UCL TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="UCL.uy" tvg-country="UY;HISPAM" tvg-language="Spanish" tvg-logo="https://uclplay.com/wp-content/uploads/2020/04/logo-horizontal-white-1.png" group-title="",UCL TV (360p) [Not 24/7]
 https://livedelta.cdn.antel.net.uy/out/u/url_canalu_2.m3u8
diff --git a/channels/ve.m3u b/channels/ve.m3u
index 542f88071c..ae1b7b84dc 100644
--- a/channels/ve.m3u
+++ b/channels/ve.m3u
@@ -1,19 +1,19 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="123TV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",123 TV [Offline]
+#EXTINF:-1 tvg-id="123TV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",123 TV [Timeout]
 http://177.52.221.214:8000/play/a0ew/index.m3u8
-#EXTINF:-1 tvg-id="Canali.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/mJXBuAZ.png" group-title="",Canal i (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canali.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/mJXBuAZ.png" group-title="",Canal i (720p) [Not 24/7]
 https://vcp.myplaytv.com/canali/canali/playlist.m3u8
 #EXTINF:-1 tvg-id="CanalNubehTV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="http://play.myplaytv.com/uploads/images/channel_27_1536900830_thumb.png" group-title="",Canal Nubeh TV (720p) [Not 24/7]
 https://vcp.myplaytv.com/nubehtv/nubehtv/playlist.m3u8
-#EXTINF:-1 tvg-id="Colombeia.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",Colombeia [Offline]
+#EXTINF:-1 tvg-id="Colombeia.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",Colombeia [Timeout]
 http://177.52.221.214:8000/play/a0co/index.m3u8
 #EXTINF:-1 tvg-id="Globovision.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://i.postimg.cc/Dz3Wpqt8/Logo-de-globovision-desde-septiembre-2013-v2.png" group-title="",Globovision (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCfJtBtmhnIyfUB6RqXeImMw/live
-#EXTINF:-1 tvg-id="LaTeleTuya.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/LaTeleTuya/picture?width=350&height=350" group-title="",La Tele Tuya (TLT) (480p) [Geo-blocked]
+#EXTINF:-1 tvg-id="LaTeleTuya.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/LaTeleTuya/picture?width=350&height=350" group-title="",La Tele Tuya (TLT) (404p) [Geo-blocked]
 https://vcp.myplaytv.com/tlthd/tlthd/playlist.m3u8
-#EXTINF:-1 tvg-id="OxigenoTV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/IkHrVCL.jpg" group-title="Music",Oxigeno TV (230p) [Not 24/7]
+#EXTINF:-1 tvg-id="OxigenoTV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/IkHrVCL.jpg" group-title="Music",Oxigeno TV (360p) [Not 24/7]
 https://vcp.myplaytv.com/oxigenotv/oxigenotv/playlist.m3u8
-#EXTINF:-1 tvg-id="PromarTV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/IkHrVCL.jpg" group-title="General",PromarTV (Yaracuy) (404p) [Not 24/7]
+#EXTINF:-1 tvg-id="PromarTV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/IkHrVCL.jpg" group-title="General",PromarTV (Yaracuy) (486p) [Not 24/7]
 http://vcp1.myplaytv.com:1935/promar/promar/playlist.m3u8
 #EXTINF:-1 tvg-id="teleSUR.ve" tvg-country="HISPAM" tvg-language="Spanish" tvg-logo="https://i.imgur.com/x5Mdzwv.png" group-title="News",teleSUR (1080p)
 https://cdnesmain.telesur.ultrabase.net/mbliveMain/hd/playlist.m3u8
@@ -25,19 +25,19 @@ https://cdnesmain.telesur.ultrabase.net/mbliveMain/360p/playlist.m3u8
 https://cdnenmain.telesur.ultrabase.net/mblivev3/hd/playlist.m3u8
 #EXTINF:-1 tvg-id="Televen.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://cdn.mitvstatic.com/channels/gt_televen_m.png" group-title="",Televen (404p) [Not 24/7]
 https://cloud.streamingconnect.tv:455/televen/televenweb.m3u8
-#EXTINF:-1 tvg-id="TelevisoradeOriente.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",Televisora de Oriente (426p) [Not 24/7]
+#EXTINF:-1 tvg-id="TelevisoradeOriente.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",Televisora de Oriente (480p) [Not 24/7]
 http://vcp1.myplaytv.com:1935/tvo/tvo/playlist.m3u8
 #EXTINF:-1 tvg-id="TVFamilia.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/ixIePRp.png" group-title="",TV Familia (720p)
 https://cdn01.yowi.tv/KPFPGJU8A6/master.m3u8
 #EXTINF:-1 tvg-id="TVVenezuela.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",TV Venezuela (480p) [Not 24/7]
-http://d2fxrfbiedz1tm.cloudfront.net/livepaxtv/smil:PC.smil/playlist.m3u8
+https://d2fxrfbiedz1tm.cloudfront.net/livepaxtv/smil:PC.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ValeTV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://www.lyngsat-stream.com/logo/tv/vv/vale_tv_ve.png" group-title="",Vale TV (480p) [Not 24/7]
 http://vcp1.myplaytv.com/valetv/valetv/playlist.m3u8
 #EXTINF:-1 tvg-id="VePlus.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",Ve Plus (480p) [Not 24/7]
 http://190.122.96.187:8888/http/006
 #EXTINF:-1 tvg-id="Venevision.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="https://www.directv.com/images/logos/channels/dark/large/219.png" group-title="",Venevision [Offline]
 https://linkastream.co/headless?url=https://www.youtube.com/watch?v=YNNR0vDH6vA
-#EXTINF:-1 tvg-id="VenezolanadeTelevision.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",Venezolana de Televisión [Offline]
+#EXTINF:-1 tvg-id="VenezolanadeTelevision.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",Venezolana de Televisión [Timeout]
 http://177.52.221.214:8000/play/a0cj/index.m3u8
 #EXTINF:-1 tvg-id="VepacoTV.ve" tvg-country="VE" tvg-language="Spanish" tvg-logo="" group-title="",Vepaco TV (486p) [Not 24/7]
 http://vcp1.myplaytv.com:1935/tvepaco/tvepaco/playlist.m3u8
diff --git a/channels/vn.m3u b/channels/vn.m3u
index 4d447906ed..67f3c84f24 100644
--- a/channels/vn.m3u
+++ b/channels/vn.m3u
@@ -29,7 +29,7 @@ https://livefta.malimarcdn.com/ftaedge00/gooditv.sdp/playlist.m3u8
 http://hoabinhtvlive.746b3ddb.cdnviet.com/hoabinhtv/playlist.m3u8
 #EXTINF:-1 tvg-id="HmongStarTV.vn" tvg-country="VN" tvg-language="Vietnamese" tvg-logo="" group-title="",Hmong Star TV (720p)
 https://livefta.malimarcdn.com/ftaedge00/hmongstartv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="HmongUSATV.vn" tvg-country="VN" tvg-language="Vietnamese" tvg-logo="" group-title="",HmongUSA TV (720p)
+#EXTINF:-1 tvg-id="HmongUSATV.vn" tvg-country="VN" tvg-language="Vietnamese" tvg-logo="" group-title="",HmongUSA TV (360p)
 https://livefta.malimarcdn.com/ftaedge00/hmongusatv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="HoungFa.vn" tvg-country="VN" tvg-language="Vietnamese" tvg-logo="" group-title="",Houng Fa (720p)
 https://livefta.malimarcdn.com/ftaedge00/houngfa.sdp/playlist.m3u8
diff --git a/channels/xk.m3u b/channels/xk.m3u
index 4efcfb24bc..d05d02be11 100644
--- a/channels/xk.m3u
+++ b/channels/xk.m3u
@@ -16,20 +16,20 @@ http://stream2.rtkit.com:1935/rtk2stream/rtk2.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RTK3.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3 (720p)
 http://stream1.rtkit.com:1935/rtk3stream/rtk3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RTK3.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3 (720p)
-http://stream2.rtkit.com:1935/rtk3stream/rtk3.stream/chunklist.m3u8
-#EXTINF:-1 tvg-id="RTK3.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3 (720p)
 http://stream2.rtkit.com:1935/rtk3stream/rtk3.stream/chunklist_w2121045972.m3u8
 #EXTINF:-1 tvg-id="RTK3.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3 (720p)
+http://stream2.rtkit.com:1935/rtk3stream/rtk3.stream/chunklist.m3u8
+#EXTINF:-1 tvg-id="RTK3.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3 (720p)
 http://stream2.rtkit.com:1935/rtk3stream/rtk3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RTK4.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4 (720p) [Not 24/7]
 http://84.22.56.10:1935/rtk4stream/rtk4.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RTK4.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4 (720p) [Not 24/7]
 http://stream1.rtkit.com:1935/rtk4stream/rtk4.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RTK4.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4 (720p) [Not 24/7]
-http://stream2.rtkit.com:1935/rtk4stream/rtk4.stream/chunklist.m3u8
-#EXTINF:-1 tvg-id="RTK4.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4 (720p) [Not 24/7]
 http://stream2.rtkit.com:1935/rtk4stream/rtk4.stream/chunklist_w599618358.m3u8
 #EXTINF:-1 tvg-id="RTK4.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4 (720p) [Not 24/7]
+http://stream2.rtkit.com:1935/rtk4stream/rtk4.stream/chunklist.m3u8
+#EXTINF:-1 tvg-id="RTK4.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4 (720p) [Not 24/7]
 http://stream2.rtkit.com:1935/rtk4stream/rtk4.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TravelingoTV.xk" tvg-country="XK" tvg-language="Albanian" tvg-logo="https://i.imgur.com/PS0j4ic.png" group-title="Travel",Travelingo TV (1080p) [Offline]
 https://dracarys.gjirafa.com/live/ZvTsY6MH7RPPvXuUDjRjcEYkK7yryigW/ytkytq480/index.m3u8
diff --git a/channels/ye.m3u b/channels/ye.m3u
index c313260511..0a2027b5b3 100644
--- a/channels/ye.m3u
+++ b/channels/ye.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AdenTV.ye" tvg-country="YE" tvg-language="Arabic" tvg-logo="https://i.imgur.com/KJTEVbf.png" group-title="General",Aden TV [Offline]
 https://master.starmena-cloud.com/hls/aden.m3u8
-#EXTINF:-1 tvg-id="AICTV.ye" tvg-country="YE" tvg-language="Arabic" tvg-logo="" group-title="General",AIC TV [Offline]
+#EXTINF:-1 tvg-id="AICTV.ye" tvg-country="YE" tvg-language="Arabic" tvg-logo="" group-title="General",AIC TV [Timeout]
 http://195.35.85.115:8000/play/a0fr
 #EXTINF:-1 tvg-id="AlMahrah.ye" tvg-country="YE" tvg-language="Arabic" tvg-logo="https://www.lyngsat.com/logo/tv/aa/almahrah-tv-ye.png" group-title="General",Al Mahrah (576p) [Offline]
 http://82.212.74.99:8000/live/hls/8173.m3u8
diff --git a/channels/zm.m3u b/channels/zm.m3u
index 28728299b2..29ab4a7419 100644
--- a/channels/zm.m3u
+++ b/channels/zm.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="TV1.zm" tvg-country="ZM" tvg-language="English" tvg-logo="https://www.znbc.co.zm/wp-content/uploads/2018/10/cropped-ZNBC-logo-192x192.png" group-title="",TV1 (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="TV1.zm" tvg-country="ZM" tvg-language="English" tvg-logo="https://www.znbc.co.zm/wp-content/uploads/2018/10/cropped-ZNBC-logo-192x192.png" group-title="",TV1 (1080p) [Not 24/7]
 https://dcunilive159-lh.akamaihd.net/i/dclive_1@1013574/master.m3u8
-#EXTINF:-1 tvg-id="TV4.zm" tvg-country="ZM" tvg-language="English" tvg-logo="https://www.znbc.co.zm/wp-content/uploads/2018/10/cropped-ZNBC-logo-192x192.png" group-title="",TV4 (720p)
+#EXTINF:-1 tvg-id="TV4.zm" tvg-country="ZM" tvg-language="English" tvg-logo="https://www.znbc.co.zm/wp-content/uploads/2018/10/cropped-ZNBC-logo-192x192.png" group-title="",TV4 (720p) [Offline]
 https://dcunilive258-lh.akamaihd.net/i/dclive_1@348579/master.m3u8
diff --git a/m3u-linter.json b/m3u-linter.json
index 1c0f530a39..36fb99eccc 100644
--- a/m3u-linter.json
+++ b/m3u-linter.json
@@ -5,6 +5,7 @@
     "require-header": true,
     "attribute-quotes": true,
     "require-info": true,
+    "require-title": true,
     "no-trailing-spaces": false,
     "no-whitespace-before-title": true,
     "no-multi-spaces": true,
diff --git a/package-lock.json b/package-lock.json
index 79b5aac5e7..919968e9d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,52 +7,56 @@
       "name": "iptv",
       "license": "MIT",
       "dependencies": {
-        "axios": "^0.21.4",
+        "chunk": "^0.0.3",
         "commander": "^7.0.0",
-        "iptv-checker": "^0.21.0",
-        "iptv-playlist-parser": "^0.9.0",
-        "m3u-linter": "^0.2.2",
+        "crypto": "^1.0.1",
+        "dayjs": "^1.10.7",
+        "iptv-checker": "^0.22.0",
+        "iptv-playlist-parser": "^0.10.2",
+        "jest": "^27.4.3",
+        "lodash": "^4.17.21",
+        "m3u-linter": "^0.3.0",
         "markdown-include": "^0.4.3",
-        "natural-orderby": "^2.0.3",
+        "mz": "^2.7.0",
+        "nedb-promises": "^5.0.2",
         "normalize-url": "^6.1.0",
-        "pre-push": "^0.1.1",
-        "progress": "^2.0.3",
-        "transliteration": "^2.2.0"
+        "transliteration": "^2.2.0",
+        "winston": "^3.3.3"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+      "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "version": "7.16.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
+      "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
-      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
+      "integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helpers": "^7.14.8",
-        "@babel/parser": "^7.15.0",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0",
+        "@babel/code-frame": "^7.16.0",
+        "@babel/generator": "^7.16.0",
+        "@babel/helper-compilation-targets": "^7.16.0",
+        "@babel/helper-module-transforms": "^7.16.0",
+        "@babel/helpers": "^7.16.0",
+        "@babel/parser": "^7.16.0",
+        "@babel/template": "^7.16.0",
+        "@babel/traverse": "^7.16.0",
+        "@babel/types": "^7.16.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -77,11 +81,11 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz",
-      "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",
+      "integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",
       "dependencies": {
-        "@babel/types": "^7.15.0",
+        "@babel/types": "^7.16.0",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -98,13 +102,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz",
-      "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==",
+      "version": "7.16.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz",
+      "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==",
       "dependencies": {
-        "@babel/compat-data": "^7.15.0",
+        "@babel/compat-data": "^7.16.0",
         "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.17.5",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -115,86 +119,86 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz",
+      "integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==",
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-get-function-arity": "^7.16.0",
+        "@babel/template": "^7.16.0",
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz",
+      "integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz",
+      "integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz",
-      "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz",
+      "integrity": "sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==",
       "dependencies": {
-        "@babel/types": "^7.15.0"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz",
+      "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz",
-      "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz",
+      "integrity": "sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/helper-module-imports": "^7.16.0",
+        "@babel/helper-replace-supers": "^7.16.0",
+        "@babel/helper-simple-access": "^7.16.0",
+        "@babel/helper-split-export-declaration": "^7.16.0",
+        "@babel/helper-validator-identifier": "^7.15.7",
+        "@babel/template": "^7.16.0",
+        "@babel/traverse": "^7.16.0",
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz",
+      "integrity": "sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -209,45 +213,45 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz",
-      "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz",
+      "integrity": "sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/helper-member-expression-to-functions": "^7.16.0",
+        "@babel/helper-optimise-call-expression": "^7.16.0",
+        "@babel/traverse": "^7.16.0",
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
-      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz",
+      "integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==",
       "dependencies": {
-        "@babel/types": "^7.14.8"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz",
+      "integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "version": "7.15.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -261,24 +265,24 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
-      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
+      "version": "7.16.3",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz",
+      "integrity": "sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==",
       "dependencies": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
+        "@babel/template": "^7.16.0",
+        "@babel/traverse": "^7.16.3",
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
+      "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.15.7",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -323,14 +327,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/@babel/highlight/node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -351,9 +347,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz",
-      "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==",
+      "version": "7.16.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
+      "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -497,9 +493,9 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz",
-      "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz",
+      "integrity": "sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -511,30 +507,30 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz",
+      "integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==",
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/code-frame": "^7.16.0",
+        "@babel/parser": "^7.16.0",
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz",
-      "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==",
+      "version": "7.16.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",
+      "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.15.0",
-        "@babel/types": "^7.15.0",
+        "@babel/code-frame": "^7.16.0",
+        "@babel/generator": "^7.16.0",
+        "@babel/helper-function-name": "^7.16.0",
+        "@babel/helper-hoist-variables": "^7.16.0",
+        "@babel/helper-split-export-declaration": "^7.16.0",
+        "@babel/parser": "^7.16.3",
+        "@babel/types": "^7.16.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -543,11 +539,11 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz",
+      "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-validator-identifier": "^7.15.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -559,6 +555,16 @@
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
     },
+    "node_modules/@dabh/diagnostics": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
+      "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==",
+      "dependencies": {
+        "colorspace": "1.1.x",
+        "enabled": "2.0.x",
+        "kuler": "^2.0.0"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -583,15 +589,15 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.0.6.tgz",
-      "integrity": "sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz",
+      "integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-message-util": "^27.4.2",
+        "jest-util": "^27.4.2",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -599,36 +605,35 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.6.tgz",
-      "integrity": "sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.3.tgz",
+      "integrity": "sha512-V9ms3zSxUHxh1E/ZLAiXF7SLejsdFnjWTFizWotMOWvjho0lW5kSjZymhQSodNW0T0ZMQRiha7f8+NcFVm3hJQ==",
       "dependencies": {
-        "@jest/console": "^27.0.6",
-        "@jest/reporters": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/reporters": "^27.4.2",
+        "@jest/test-result": "^27.4.2",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.8.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.0.6",
-        "jest-config": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-resolve-dependencies": "^27.0.6",
-        "jest-runner": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
-        "jest-watcher": "^27.0.6",
+        "jest-changed-files": "^27.4.2",
+        "jest-config": "^27.4.3",
+        "jest-haste-map": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-resolve": "^27.4.2",
+        "jest-resolve-dependencies": "^27.4.2",
+        "jest-runner": "^27.4.3",
+        "jest-runtime": "^27.4.2",
+        "jest-snapshot": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
+        "jest-watcher": "^27.4.2",
         "micromatch": "^4.0.4",
-        "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
@@ -646,58 +651,59 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.0.6.tgz",
-      "integrity": "sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.2.tgz",
+      "integrity": "sha512-uSljKxh/rGlHlmhyeG4ZoVK9hOec+EPBkwTHkHKQ2EqDu5K+MaG9uJZ8o1CbRsSdZqSuhXvJCYhBWsORPPg6qw==",
       "dependencies": {
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/fake-timers": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
-        "jest-mock": "^27.0.6"
+        "jest-mock": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.6.tgz",
-      "integrity": "sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
+      "integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
-        "@sinonjs/fake-timers": "^7.0.2",
+        "@jest/types": "^27.4.2",
+        "@sinonjs/fake-timers": "^8.0.1",
         "@types/node": "*",
-        "jest-message-util": "^27.0.6",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6"
+        "jest-message-util": "^27.4.2",
+        "jest-mock": "^27.4.2",
+        "jest-util": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.0.6.tgz",
-      "integrity": "sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.2.tgz",
+      "integrity": "sha512-KkfaHEttlGpXYAQTZHgrESiEPx2q/DKAFLGLFda1uGVrqc17snd3YVPhOxlXOHIzVPs+lQ/SDB2EIvxyGzb3Ew==",
       "dependencies": {
-        "@jest/environment": "^27.0.6",
-        "@jest/types": "^27.0.6",
-        "expect": "^27.0.6"
+        "@jest/environment": "^27.4.2",
+        "@jest/types": "^27.4.2",
+        "expect": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.6.tgz",
-      "integrity": "sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.2.tgz",
+      "integrity": "sha512-sp4aqmdBJtjKetEakzDPcZggPcVIF6w9QLkYBbaWDV6e/SIsHnF1S4KtIH91eEc2fp7ep6V/e1xvdfEoho1d2w==",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/test-result": "^27.4.2",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
+        "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -708,15 +714,15 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-haste-map": "^27.4.2",
+        "jest-resolve": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "jest-worker": "^27.4.2",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.0.0"
+        "v8-to-istanbul": "^8.1.0"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
@@ -731,9 +737,9 @@
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.0.6.tgz",
-      "integrity": "sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
+      "integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
       "dependencies": {
         "callsites": "^3.0.0",
         "graceful-fs": "^4.2.4",
@@ -744,12 +750,12 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.0.6.tgz",
-      "integrity": "sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz",
+      "integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==",
       "dependencies": {
-        "@jest/console": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -758,34 +764,34 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz",
-      "integrity": "sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.2.tgz",
+      "integrity": "sha512-HmHp5mlh9f9GyNej5yCS1JZIFfUGnP9+jEOH5zoq5EmsuZeYD+dGULqyvGDPtuzzbyAFJ6R4+z4SS0VvnFwwGQ==",
       "dependencies": {
-        "@jest/test-result": "^27.0.6",
+        "@jest/test-result": "^27.4.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
-        "jest-runtime": "^27.0.6"
+        "jest-haste-map": "^27.4.2",
+        "jest-runtime": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/@jest/transform": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.0.6.tgz",
-      "integrity": "sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.2.tgz",
+      "integrity": "sha512-RTKcPZllfcmLfnlxBya7aypofhdz05+E6QITe55Ex0rxyerkgjmmpMlvVn11V0cP719Ps6WcDYCnDzxnnJUwKg==",
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-haste-map": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-util": "^27.4.2",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -797,9 +803,9 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz",
-      "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+      "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -811,6 +817,21 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
+    "node_modules/@seald-io/binary-search-tree": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@seald-io/binary-search-tree/-/binary-search-tree-1.0.2.tgz",
+      "integrity": "sha512-+pYGvPFAk7wUR+ONMOlc6A+LUN4kOCFwyPLjyaeS7wVibADPHWYJNYsNtyIAwjF1AXQkuaXElnIc4XjKt55QZA=="
+    },
+    "node_modules/@seald-io/nedb": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@seald-io/nedb/-/nedb-2.2.0.tgz",
+      "integrity": "sha512-whkcx3hpcowNhoSEbIsrfe8TXxDwyj8SJJut2EqF7DSX2GGqQlL7Ix/vzwwOo4FJolzDhZD2DaUTVKmTQS3Rog==",
+      "dependencies": {
+        "@seald-io/binary-search-tree": "^1.0.2",
+        "async": "0.2.10",
+        "localforage": "^1.9.0"
+      }
+    },
     "node_modules/@sinonjs/commons": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
@@ -820,9 +841,9 @@
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
-      "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
       "dependencies": {
         "@sinonjs/commons": "^1.7.0"
       }
@@ -836,9 +857,9 @@
       }
     },
     "node_modules/@types/babel__core": {
-      "version": "7.1.15",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz",
-      "integrity": "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==",
+      "version": "7.1.17",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.17.tgz",
+      "integrity": "sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A==",
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0",
@@ -902,14 +923,14 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "16.4.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz",
-      "integrity": "sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg=="
+      "version": "16.11.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz",
+      "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="
     },
     "node_modules/@types/prettier": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz",
-      "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog=="
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
+      "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA=="
     },
     "node_modules/@types/stack-utils": {
       "version": "2.0.1",
@@ -935,9 +956,9 @@
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
     },
     "node_modules/acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
+      "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -999,9 +1020,9 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
@@ -1015,8 +1036,16 @@
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
+    },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -1037,6 +1066,11 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -1051,15 +1085,15 @@
       }
     },
     "node_modules/babel-jest": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.6.tgz",
-      "integrity": "sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.2.tgz",
+      "integrity": "sha512-MADrjb3KBO2eyZCAc6QaJg6RT5u+6oEdDyHO5HEalnpwQ6LrhTsQF2Kj1Wnz2t6UPXIXPk18dSXXOT0wF5yTxA==",
       "dependencies": {
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^27.0.6",
+        "babel-preset-jest": "^27.4.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
@@ -1072,24 +1106,39 @@
       }
     },
     "node_modules/babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
+      "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz",
-      "integrity": "sha512-CewFeM9Vv2gM7Yr9n5eyyLVPRSiBnk6lKZRjgwYnGKSl9M14TMn2vkN02wTF04OGuSDLEzlWiMzvjXuW9mB6Gw==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
+      "integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -1123,11 +1172,11 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz",
-      "integrity": "sha512-WObA0/Biw2LrVVwZkF/2GqbOdzhKD6Fkdwhoy9ASIrOWr/zodcSpQh72JOkEn6NWyjmnPDjNSqaGN4KnpKzhXw==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
+      "integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
       "dependencies": {
-        "babel-plugin-jest-hoist": "^27.0.6",
+        "babel-plugin-jest-hoist": "^27.4.0",
         "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
@@ -1168,15 +1217,15 @@
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
     },
     "node_modules/browserslist": {
-      "version": "4.16.7",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
-      "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
+      "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001248",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.793",
+        "caniuse-lite": "^1.0.30001280",
+        "electron-to-chromium": "^1.3.896",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.73"
+        "node-releases": "^2.0.1",
+        "picocolors": "^1.0.0"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1219,9 +1268,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001249",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz",
-      "integrity": "sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw==",
+      "version": "1.0.30001285",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001285.tgz",
+      "integrity": "sha512-KAOkuUtcQ901MtmvxfKD+ODHH9YVDYnBt+TGYSz2KIfnq22CiArbUxXPN9067gNbgMlnNYRSwho8OPXZPALB9Q==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/browserslist"
@@ -1237,6 +1286,9 @@
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/char-regex": {
@@ -1247,10 +1299,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/chunk": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/chunk/-/chunk-0.0.3.tgz",
+      "integrity": "sha512-oGfwvhjGRW3Ks4GTdGoJhZWKEO1eomjOC26001R+5H0TIlP7vBCO+/XcNcPCA6ayYC7RQSq1/NsN4679Odcm5A=="
+    },
     "node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
+      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="
     },
     "node_modules/cjs-module-lexer": {
       "version": "1.2.2",
@@ -1281,6 +1338,15 @@
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
     },
+    "node_modules/color": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+      "dependencies": {
+        "color-convert": "^1.9.3",
+        "color-string": "^1.6.0"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1297,10 +1363,27 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+    "node_modules/color-string": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.7.4.tgz",
+      "integrity": "sha512-nVdUvPVgZMpRQad5dcsCMOSB5BXLljklTiaxS6ehhKxDsAI5sD7k5VmFuBt1y3Rlym8uulc/ANUN/bMWtBu6Sg==",
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "node_modules/colors": {
       "version": "1.4.0",
@@ -1310,6 +1393,15 @@
         "node": ">=0.1.90"
       }
     },
+    "node_modules/colorspace": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
+      "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
+      "dependencies": {
+        "color": "^3.1.3",
+        "text-hex": "1.0.x"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -1347,6 +1439,11 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -1360,6 +1457,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/crypto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
+      "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==",
+      "deprecated": "This package is no longer supported. It's now a built-in Node module. If you've depended on crypto, you should switch to the one that's built-in."
+    },
     "node_modules/cssom": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
@@ -1402,10 +1505,15 @@
         "node": "*"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+      "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+    },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -1429,9 +1537,9 @@
       "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
     },
     "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "node_modules/deepmerge": {
       "version": "4.2.2",
@@ -1458,9 +1566,9 @@
       }
     },
     "node_modules/diff-sequences": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz",
-      "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
+      "integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==",
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
@@ -1485,9 +1593,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.799",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz",
-      "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw=="
+      "version": "1.4.12",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.12.tgz",
+      "integrity": "sha512-zjfhG9Us/hIy8AlQ5OzfbR/C4aBv1Dg/ak4GX35CELYlJ4tDAtoEcQivXvyBdqdNQ+R6PhlgQqV8UNPJmhkJog=="
     },
     "node_modules/emittery": {
       "version": "0.8.1",
@@ -1505,6 +1613,11 @@
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
+    "node_modules/enabled": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
+      "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
+    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -1514,11 +1627,11 @@
       }
     },
     "node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.0"
       }
     },
     "node_modules/escodegen": {
@@ -1555,9 +1668,9 @@
       }
     },
     "node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "engines": {
         "node": ">=4.0"
       }
@@ -1601,16 +1714,16 @@
       }
     },
     "node_modules/expect": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz",
-      "integrity": "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
+      "integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "ansi-styles": "^5.0.0",
-        "jest-get-type": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-regex-util": "^27.0.6"
+        "jest-get-type": "^27.4.0",
+        "jest-matcher-utils": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-regex-util": "^27.4.0"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
@@ -1645,6 +1758,11 @@
         "bser": "2.1.1"
       }
     },
+    "node_modules/fecha": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
+      "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="
+    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -1668,6 +1786,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/fn.name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
+      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
+    },
     "node_modules/follow-redirects": {
       "version": "1.14.4",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
@@ -1780,6 +1903,9 @@
       },
       "engines": {
         "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/globals": {
@@ -1874,10 +2000,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
     "node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
+      "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -1912,9 +2043,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/iptv-checker": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.21.0.tgz",
-      "integrity": "sha512-qWqq8mLl+qRgV0/fmBpZm8/Cf7FwSnIA1gt9PFlYbzilRDFtPoTRDm0eP9fCWHVwwZZsImE1aMLx8qkikL5Aog==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.22.0.tgz",
+      "integrity": "sha512-94dnViRK9DaegiVkRR1BGzsDvfo+t4ZkQJgVvSrzbcpvKaNnMUHHtm2hlwKejfz+A/Ci/wBVWkcVe0pZB1KODQ==",
       "dependencies": {
         "axios": "^0.21.1",
         "colors": "^1.4.0",
@@ -1946,25 +2077,19 @@
       "integrity": "sha512-sgzJ83LFLJQX8RhnWvjxEyeYwelLf+vPdNLWYwlozkmSl8IxU/y2qBxyGCvyqCKpIQDdU35wkrZ3k1nMpI3KGQ=="
     },
     "node_modules/iptv-playlist-parser": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.9.0.tgz",
-      "integrity": "sha512-F+aGQv1uBu6iWWlYfFjMhdk8vUofkeCMIbzvYiPBwYQOQBHd/OhFHxNTCCsFRGas2CjOSxDa29FNr0EZSkK/uw=="
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.10.2.tgz",
+      "integrity": "sha512-Ls2mKaSgbLtW46KyFd0EVmzLV5lfZzU9lJZTOTrchTsF+sRVGziA6JthtgvhIhPDitruedZRlsa8RdSKGBtDfA=="
     },
-    "node_modules/is-ci": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
-      "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
-      "dependencies": {
-        "ci-info": "^3.1.1"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
+    "node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
     "node_modules/is-core-module": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -2017,15 +2142,20 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "node_modules/istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "engines": {
         "node": ">=8"
       }
@@ -2058,22 +2188,22 @@
       }
     },
     "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
         "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.1.tgz",
+      "integrity": "sha512-q1kvhAXWSsXfMjCdNHNPKZZv94OlspKnoGv+R9RGbnqOOQ0VbNfLFgQDVgi7hHenKsndGq3/o0OBdzDXthWcNw==",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -2083,13 +2213,13 @@
       }
     },
     "node_modules/jest": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.6.tgz",
-      "integrity": "sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.4.3.tgz",
+      "integrity": "sha512-jwsfVABBzuN3Atm+6h6vIEpTs9+VApODLt4dk2qv1WMOpb1weI1IIZfuwpMiWZ62qvWj78MvdvMHIYdUfqrFaA==",
       "dependencies": {
-        "@jest/core": "^27.0.6",
+        "@jest/core": "^27.4.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.0.6"
+        "jest-cli": "^27.4.3"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -2107,11 +2237,11 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.0.6.tgz",
-      "integrity": "sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
+      "integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "execa": "^5.0.0",
         "throat": "^6.0.1"
       },
@@ -2120,26 +2250,26 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.6.tgz",
-      "integrity": "sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.2.tgz",
+      "integrity": "sha512-2ePUSru1BGMyzxsMvRfu+tNb+PW60rUyMLJBfw1Nrh5zC8RoTPfF+zbE0JToU31a6ZVe4nnrNKWYRzlghAbL0A==",
       "dependencies": {
-        "@jest/environment": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.4.2",
+        "@jest/test-result": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
-        "expect": "^27.0.6",
+        "expect": "^27.4.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6",
+        "jest-each": "^27.4.2",
+        "jest-matcher-utils": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-runtime": "^27.4.2",
+        "jest-snapshot": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "pretty-format": "^27.4.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3",
         "throat": "^6.0.1"
@@ -2148,65 +2278,33 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-cli": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.6.tgz",
-      "integrity": "sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==",
-      "dependencies": {
-        "@jest/core": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "jest-config": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
-        "prompts": "^2.0.1",
-        "yargs": "^16.0.3"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jest-config": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.6.tgz",
-      "integrity": "sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.3.tgz",
+      "integrity": "sha512-DQ10HTSqYtC2pO7s9j2jw+li4xUnm2wLYWH2o7K1ftB8NyvToHsXoLlXxtsGh3AW9gUQR6KY/4B7G+T/NswJBw==",
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.0.6",
-        "@jest/types": "^27.0.6",
-        "babel-jest": "^27.0.6",
+        "@jest/test-sequencer": "^27.4.2",
+        "@jest/types": "^27.4.2",
+        "babel-jest": "^27.4.2",
         "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "is-ci": "^3.0.0",
-        "jest-circus": "^27.0.6",
-        "jest-environment-jsdom": "^27.0.6",
-        "jest-environment-node": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "jest-jasmine2": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-runner": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-circus": "^27.4.2",
+        "jest-environment-jsdom": "^27.4.3",
+        "jest-environment-node": "^27.4.2",
+        "jest-get-type": "^27.4.0",
+        "jest-jasmine2": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-resolve": "^27.4.2",
+        "jest-runner": "^27.4.3",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.4.2",
+        "slash": "^3.0.0"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
@@ -2221,23 +2319,23 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz",
-      "integrity": "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz",
+      "integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==",
       "dependencies": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "diff-sequences": "^27.4.0",
+        "jest-get-type": "^27.4.0",
+        "pretty-format": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-docblock": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.0.6.tgz",
-      "integrity": "sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
+      "integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
@@ -2246,31 +2344,31 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.0.6.tgz",
-      "integrity": "sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz",
+      "integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "jest-get-type": "^27.4.0",
+        "jest-util": "^27.4.2",
+        "pretty-format": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz",
-      "integrity": "sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.3.tgz",
+      "integrity": "sha512-x1AUVz3G14LpEJs7KIFUaTINT2n0unOUmvdAby3s/sldUpJJetOJifHo1O/EUQC5fNBowggwJbVulko18y6OWw==",
       "dependencies": {
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.4.2",
+        "@jest/fake-timers": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-mock": "^27.4.2",
+        "jest-util": "^27.4.2",
         "jsdom": "^16.6.0"
       },
       "engines": {
@@ -2278,44 +2376,44 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.6.tgz",
-      "integrity": "sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.2.tgz",
+      "integrity": "sha512-nzTZ5nJ+FabuZPH2YVci7SZIHpvtNRHPt8+vipLkCnAgXGjVzHm7XJWdnNqXbAkExIgiKeVEkVMNZOZE/LeiIg==",
       "dependencies": {
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.4.2",
+        "@jest/fake-timers": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6"
+        "jest-mock": "^27.4.2",
+        "jest-util": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-get-type": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz",
-      "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
+      "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.6.tgz",
-      "integrity": "sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.2.tgz",
+      "integrity": "sha512-foiyAEePORUN2eeJnOtcM1y8qW0ShEd9kTjWVL4sVaMcuCJM6gtHegvYPBRT0mpI/bs4ueThM90+Eoj2ncoNsA==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^27.0.6",
-        "jest-serializer": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-regex-util": "^27.4.0",
+        "jest-serializer": "^27.4.0",
+        "jest-util": "^27.4.2",
+        "jest-worker": "^27.4.2",
         "micromatch": "^4.0.4",
         "walker": "^1.0.7"
       },
@@ -2327,27 +2425,27 @@
       }
     },
     "node_modules/jest-jasmine2": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz",
-      "integrity": "sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.2.tgz",
+      "integrity": "sha512-VO/fyAJSH9u0THjbteFiL8qc93ufU+yW+bdieDc8tzTCWwlWzO53UHS5nFK1qmE8izb5Smkn+XHlVt6/l06MKQ==",
       "dependencies": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^27.0.6",
-        "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.4.2",
+        "@jest/source-map": "^27.4.0",
+        "@jest/test-result": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^27.0.6",
+        "expect": "^27.4.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6",
+        "jest-each": "^27.4.2",
+        "jest-matcher-utils": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-runtime": "^27.4.2",
+        "jest-snapshot": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "pretty-format": "^27.4.2",
         "throat": "^6.0.1"
       },
       "engines": {
@@ -2355,43 +2453,43 @@
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz",
-      "integrity": "sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz",
+      "integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==",
       "dependencies": {
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "jest-get-type": "^27.4.0",
+        "pretty-format": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz",
-      "integrity": "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz",
+      "integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==",
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "jest-diff": "^27.4.2",
+        "jest-get-type": "^27.4.0",
+        "pretty-format": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-message-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz",
-      "integrity": "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
+      "integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.0.6",
+        "pretty-format": "^27.4.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -2400,11 +2498,11 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.0.6.tgz",
-      "integrity": "sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
+      "integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/node": "*"
       },
       "engines": {
@@ -2428,26 +2526,27 @@
       }
     },
     "node_modules/jest-regex-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz",
-      "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
+      "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-resolve": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.6.tgz",
-      "integrity": "sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.2.tgz",
+      "integrity": "sha512-d/zqPjxCzMqHlOdRTg8cTpO9jY+1/T74KazT8Ws/LwmwxV5sRMWOkiLjmzUCDj/5IqA5XHNK4Hkmlq9Kdpb9Sg==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "chalk": "^4.0.0",
-        "escalade": "^3.1.1",
         "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^27.4.2",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
         "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2455,43 +2554,43 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz",
-      "integrity": "sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.2.tgz",
+      "integrity": "sha512-hb++cTpqvOWfU49MCP/JQkxmnrhKoAVqXWFjgYXswRSVGk8Q6bDTSvhbCeYXDtXaymY0y7WrrSIlKogClcKJuw==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-snapshot": "^27.0.6"
+        "@jest/types": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-snapshot": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-runner": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.6.tgz",
-      "integrity": "sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.3.tgz",
+      "integrity": "sha512-JgR6Om/j22Fd6ZUUIGTWNcCtuZVYbNrecb4k89W4UyFJoRtHpo2zMKWkmFFFJoqwWGrfrcPLnVBIgkJiTV3cyA==",
       "dependencies": {
-        "@jest/console": "^27.0.6",
-        "@jest/environment": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/environment": "^27.4.2",
+        "@jest/test-result": "^27.4.2",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.8.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-docblock": "^27.0.6",
-        "jest-environment-jsdom": "^27.0.6",
-        "jest-environment-node": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-leak-detector": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-docblock": "^27.4.0",
+        "jest-environment-jsdom": "^27.4.3",
+        "jest-environment-node": "^27.4.2",
+        "jest-haste-map": "^27.4.2",
+        "jest-leak-detector": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-resolve": "^27.4.2",
+        "jest-runtime": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "jest-worker": "^27.4.2",
         "source-map-support": "^0.5.6",
         "throat": "^6.0.1"
       },
@@ -2500,45 +2599,45 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.6.tgz",
-      "integrity": "sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.2.tgz",
+      "integrity": "sha512-eqPgcBaUNaw6j8T5M+dnfAEh6MIrh2YmtskCr9sl50QYpD22Sg+QqHw3J3nmaLzVMbBtOMHFFxLF0Qx8MsZVFQ==",
       "dependencies": {
-        "@jest/console": "^27.0.6",
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/globals": "^27.0.6",
-        "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/environment": "^27.4.2",
+        "@jest/globals": "^27.4.2",
+        "@jest/source-map": "^27.4.0",
+        "@jest/test-result": "^27.4.2",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/yargs": "^16.0.0",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-mock": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-haste-map": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-mock": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-resolve": "^27.4.2",
+        "jest-snapshot": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
-        "yargs": "^16.0.3"
+        "yargs": "^16.2.0"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-serializer": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.6.tgz",
-      "integrity": "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
+      "integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
       "dependencies": {
         "@types/node": "*",
         "graceful-fs": "^4.2.4"
@@ -2548,9 +2647,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.6.tgz",
-      "integrity": "sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.2.tgz",
+      "integrity": "sha512-DI7lJlNIu6WSQ+esqhnJzEzU70+dV+cNjoF1c+j5FagWEd3KtOyZvVliAH0RWNQ6KSnAAnKSU0qxJ8UXOOhuUQ==",
       "dependencies": {
         "@babel/core": "^7.7.2",
         "@babel/generator": "^7.7.2",
@@ -2558,23 +2657,23 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.0.6",
+        "expect": "^27.4.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-diff": "^27.4.2",
+        "jest-get-type": "^27.4.0",
+        "jest-haste-map": "^27.4.2",
+        "jest-matcher-utils": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-resolve": "^27.4.2",
+        "jest-util": "^27.4.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.0.6",
+        "pretty-format": "^27.4.2",
         "semver": "^7.3.2"
       },
       "engines": {
@@ -2596,15 +2695,15 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.0.6.tgz",
-      "integrity": "sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
+      "integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
         "graceful-fs": "^4.2.4",
-        "is-ci": "^3.0.0",
         "picomatch": "^2.2.3"
       },
       "engines": {
@@ -2612,25 +2711,25 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.0.6.tgz",
-      "integrity": "sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
+      "integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.0.6",
+        "jest-get-type": "^27.4.0",
         "leven": "^3.1.0",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.4.2"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
+      "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
       "engines": {
         "node": ">=10"
       },
@@ -2639,16 +2738,16 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.0.6.tgz",
-      "integrity": "sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz",
+      "integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==",
       "dependencies": {
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/test-result": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^27.0.6",
+        "jest-util": "^27.4.2",
         "string-length": "^4.0.1"
       },
       "engines": {
@@ -2656,9 +2755,9 @@
       }
     },
     "node_modules/jest-worker": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz",
-      "integrity": "sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz",
+      "integrity": "sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -2682,6 +2781,39 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/jest/node_modules/jest-cli": {
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.3.tgz",
+      "integrity": "sha512-zZSJBXNC/i8UnJPwcKWsqnhGgIF3uoTYP7th32Zej7KNQJdxzOMj+wCfy2Ox3kU7nXErJ36DtYyXDhfiqaiDRw==",
+      "dependencies": {
+        "@jest/core": "^27.4.3",
+        "@jest/test-result": "^27.4.2",
+        "@jest/types": "^27.4.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "jest-config": "^27.4.3",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
+        "prompts": "^2.0.1",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -2777,6 +2909,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/kuler": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
+      "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
+    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -2797,6 +2934,22 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/lie": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "node_modules/localforage": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
+      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+      "dependencies": {
+        "lie": "3.1.1"
+      }
+    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -2818,6 +2971,18 @@
       "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz",
       "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw="
     },
+    "node_modules/logform": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz",
+      "integrity": "sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ==",
+      "dependencies": {
+        "colors": "^1.2.1",
+        "fecha": "^4.2.0",
+        "ms": "^2.1.1",
+        "safe-stable-stringify": "^1.1.0",
+        "triple-beam": "^1.3.0"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -2830,9 +2995,9 @@
       }
     },
     "node_modules/m3u-linter": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.2.2.tgz",
-      "integrity": "sha512-2U6HOmt7MlQNuo3KASb/Z+INHMp+WFj2npUb9qfKRZludrPRzvtuJxjHZvFQuDUrwFFKp0yqzms2wVNTAYt5HQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.3.0.tgz",
+      "integrity": "sha512-/sRCXEVXCPXS6+tfyhBHuKRt0JSPGIE23yJDkbQNVePzWAc5FvGFsY2zS0c1VokWZxlp6fVgh0OEakHbl6YMRg==",
       "dependencies": {
         "chalk": "^4.1.1",
         "commander": "^7.2.0",
@@ -2860,11 +3025,11 @@
       }
     },
     "node_modules/makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dependencies": {
-        "tmpl": "1.0.x"
+        "tmpl": "1.0.5"
       }
     },
     "node_modules/markdown-include": {
@@ -2896,19 +3061,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
-      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.32",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
-      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "dependencies": {
-        "mime-db": "1.49.0"
+        "mime-db": "1.51.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -2943,17 +3108,27 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
-    "node_modules/natural-orderby": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz",
-      "integrity": "sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==",
-      "engines": {
-        "node": "*"
+    "node_modules/nedb-promises": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/nedb-promises/-/nedb-promises-5.0.2.tgz",
+      "integrity": "sha512-087g8JdsStXRWDxC9qqE4qMLqZGJrUnYF54pvOCDDfcLoptJUCqGb7j2WvWlaleeqft9rUjiJ9egvMJlUnJTmA==",
+      "dependencies": {
+        "@seald-io/nedb": "^2.2.0"
       }
     },
     "node_modules/node-int64": {
@@ -2961,18 +3136,10 @@
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
     },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -3009,6 +3176,14 @@
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
       "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -3017,6 +3192,14 @@
         "wrappy": "1"
       }
     },
+    "node_modules/one-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
+      "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
+      "dependencies": {
+        "fn.name": "1.x.x"
+      }
+    },
     "node_modules/onetime": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
@@ -3047,17 +3230,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/p-each-series": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
-      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -3125,6 +3297,11 @@
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
     "node_modules/picomatch": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
@@ -3137,12 +3314,9 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
+      "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
       "engines": {
         "node": ">= 6"
       }
@@ -3158,14 +3332,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/pre-push": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pre-push/-/pre-push-0.1.1.tgz",
-      "integrity": "sha1-Kip5gn0kOnbJEImJescH9F5xaqw=",
-      "dependencies": {
-        "shelljs": "0.3.x"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -3175,12 +3341,12 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz",
-      "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
+      "integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
       "dependencies": {
-        "@jest/types": "^27.0.6",
-        "ansi-regex": "^5.0.0",
+        "@jest/types": "^27.4.2",
+        "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
         "react-is": "^17.0.1"
       },
@@ -3188,6 +3354,14 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
+    "node_modules/pretty-format/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/pretty-format/node_modules/ansi-styles": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
@@ -3199,6 +3373,11 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -3208,9 +3387,9 @@
       }
     },
     "node_modules/prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -3246,6 +3425,19 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -3285,6 +3477,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/resolve.exports": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -3304,6 +3504,11 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
+    "node_modules/safe-stable-stringify": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz",
+      "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -3347,21 +3552,18 @@
         "node": ">=8"
       }
     },
-    "node_modules/shelljs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-      "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=",
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+      "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
+    },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
@@ -3385,9 +3587,9 @@
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -3398,10 +3600,18 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -3409,6 +3619,41 @@
         "node": ">=10"
       }
     },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -3517,15 +3762,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/text-hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
+    },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/throat": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
       "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
     },
     "node_modules/tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
@@ -3585,6 +3854,11 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/triple-beam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
+      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
+    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -3631,10 +3905,15 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
     "node_modules/v8-to-istanbul": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz",
-      "integrity": "sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
+      "integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.1",
         "convert-source-map": "^1.6.0",
@@ -3677,11 +3956,11 @@
       }
     },
     "node_modules/walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dependencies": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "node_modules/webidl-conversions": {
@@ -3732,6 +4011,64 @@
         "node": ">= 8"
       }
     },
+    "node_modules/winston": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
+      "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==",
+      "dependencies": {
+        "@dabh/diagnostics": "^2.0.2",
+        "async": "^3.1.0",
+        "is-stream": "^2.0.0",
+        "logform": "^2.2.0",
+        "one-time": "^1.0.0",
+        "readable-stream": "^3.4.0",
+        "stack-trace": "0.0.x",
+        "triple-beam": "^1.3.0",
+        "winston-transport": "^4.4.0"
+      },
+      "engines": {
+        "node": ">= 6.4.0"
+      }
+    },
+    "node_modules/winston-transport": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz",
+      "integrity": "sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==",
+      "dependencies": {
+        "readable-stream": "^2.3.7",
+        "triple-beam": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 6.4.0"
+      }
+    },
+    "node_modules/winston-transport/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/winston-transport/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/winston/node_modules/async": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
+      "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -3751,6 +4088,9 @@
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/wrappy": {
@@ -3770,9 +4110,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "version": "7.5.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+      "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -3840,32 +4180,32 @@
   },
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+      "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
       "requires": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.16.0"
       }
     },
     "@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="
+      "version": "7.16.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
+      "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="
     },
     "@babel/core": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
-      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
+      "integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helpers": "^7.14.8",
-        "@babel/parser": "^7.15.0",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0",
+        "@babel/code-frame": "^7.16.0",
+        "@babel/generator": "^7.16.0",
+        "@babel/helper-compilation-targets": "^7.16.0",
+        "@babel/helper-module-transforms": "^7.16.0",
+        "@babel/helpers": "^7.16.0",
+        "@babel/parser": "^7.16.0",
+        "@babel/template": "^7.16.0",
+        "@babel/traverse": "^7.16.0",
+        "@babel/types": "^7.16.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -3882,11 +4222,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz",
-      "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",
+      "integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",
       "requires": {
-        "@babel/types": "^7.15.0",
+        "@babel/types": "^7.16.0",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -3899,79 +4239,79 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz",
-      "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==",
+      "version": "7.16.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz",
+      "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==",
       "requires": {
-        "@babel/compat-data": "^7.15.0",
+        "@babel/compat-data": "^7.16.0",
         "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.17.5",
         "semver": "^6.3.0"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz",
+      "integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==",
       "requires": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-get-function-arity": "^7.16.0",
+        "@babel/template": "^7.16.0",
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz",
+      "integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==",
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz",
+      "integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==",
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz",
-      "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz",
+      "integrity": "sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==",
       "requires": {
-        "@babel/types": "^7.15.0"
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz",
+      "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==",
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz",
-      "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz",
+      "integrity": "sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==",
       "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/helper-module-imports": "^7.16.0",
+        "@babel/helper-replace-supers": "^7.16.0",
+        "@babel/helper-simple-access": "^7.16.0",
+        "@babel/helper-split-export-declaration": "^7.16.0",
+        "@babel/helper-validator-identifier": "^7.15.7",
+        "@babel/template": "^7.16.0",
+        "@babel/traverse": "^7.16.0",
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz",
+      "integrity": "sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==",
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-plugin-utils": {
@@ -3980,36 +4320,36 @@
       "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="
     },
     "@babel/helper-replace-supers": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz",
-      "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz",
+      "integrity": "sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==",
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/helper-member-expression-to-functions": "^7.16.0",
+        "@babel/helper-optimise-call-expression": "^7.16.0",
+        "@babel/traverse": "^7.16.0",
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
-      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz",
+      "integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==",
       "requires": {
-        "@babel/types": "^7.14.8"
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz",
+      "integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==",
       "requires": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="
+      "version": "7.15.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="
     },
     "@babel/helper-validator-option": {
       "version": "7.14.5",
@@ -4017,21 +4357,21 @@
       "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
     },
     "@babel/helpers": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
-      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
+      "version": "7.16.3",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz",
+      "integrity": "sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==",
       "requires": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
+        "@babel/template": "^7.16.0",
+        "@babel/traverse": "^7.16.3",
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
+      "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.15.7",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -4067,11 +4407,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
         },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-        },
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -4088,9 +4423,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz",
-      "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ=="
+      "version": "7.16.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
+      "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
@@ -4189,45 +4524,45 @@
       }
     },
     "@babel/plugin-syntax-typescript": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz",
-      "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz",
+      "integrity": "sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz",
+      "integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==",
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/code-frame": "^7.16.0",
+        "@babel/parser": "^7.16.0",
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/traverse": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz",
-      "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==",
+      "version": "7.16.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",
+      "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.15.0",
-        "@babel/types": "^7.15.0",
+        "@babel/code-frame": "^7.16.0",
+        "@babel/generator": "^7.16.0",
+        "@babel/helper-function-name": "^7.16.0",
+        "@babel/helper-hoist-variables": "^7.16.0",
+        "@babel/helper-split-export-declaration": "^7.16.0",
+        "@babel/parser": "^7.16.3",
+        "@babel/types": "^7.16.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz",
+      "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-validator-identifier": "^7.15.7",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -4236,6 +4571,16 @@
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
     },
+    "@dabh/diagnostics": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
+      "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==",
+      "requires": {
+        "colorspace": "1.1.x",
+        "enabled": "2.0.x",
+        "kuler": "^2.0.0"
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -4254,98 +4599,98 @@
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
     },
     "@jest/console": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.0.6.tgz",
-      "integrity": "sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz",
+      "integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-message-util": "^27.4.2",
+        "jest-util": "^27.4.2",
         "slash": "^3.0.0"
       }
     },
     "@jest/core": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.6.tgz",
-      "integrity": "sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.3.tgz",
+      "integrity": "sha512-V9ms3zSxUHxh1E/ZLAiXF7SLejsdFnjWTFizWotMOWvjho0lW5kSjZymhQSodNW0T0ZMQRiha7f8+NcFVm3hJQ==",
       "requires": {
-        "@jest/console": "^27.0.6",
-        "@jest/reporters": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/reporters": "^27.4.2",
+        "@jest/test-result": "^27.4.2",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.8.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.0.6",
-        "jest-config": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-resolve-dependencies": "^27.0.6",
-        "jest-runner": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
-        "jest-watcher": "^27.0.6",
+        "jest-changed-files": "^27.4.2",
+        "jest-config": "^27.4.3",
+        "jest-haste-map": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-resolve": "^27.4.2",
+        "jest-resolve-dependencies": "^27.4.2",
+        "jest-runner": "^27.4.3",
+        "jest-runtime": "^27.4.2",
+        "jest-snapshot": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
+        "jest-watcher": "^27.4.2",
         "micromatch": "^4.0.4",
-        "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       }
     },
     "@jest/environment": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.0.6.tgz",
-      "integrity": "sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.2.tgz",
+      "integrity": "sha512-uSljKxh/rGlHlmhyeG4ZoVK9hOec+EPBkwTHkHKQ2EqDu5K+MaG9uJZ8o1CbRsSdZqSuhXvJCYhBWsORPPg6qw==",
       "requires": {
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/fake-timers": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
-        "jest-mock": "^27.0.6"
+        "jest-mock": "^27.4.2"
       }
     },
     "@jest/fake-timers": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.6.tgz",
-      "integrity": "sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
+      "integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
       "requires": {
-        "@jest/types": "^27.0.6",
-        "@sinonjs/fake-timers": "^7.0.2",
+        "@jest/types": "^27.4.2",
+        "@sinonjs/fake-timers": "^8.0.1",
         "@types/node": "*",
-        "jest-message-util": "^27.0.6",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6"
+        "jest-message-util": "^27.4.2",
+        "jest-mock": "^27.4.2",
+        "jest-util": "^27.4.2"
       }
     },
     "@jest/globals": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.0.6.tgz",
-      "integrity": "sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.2.tgz",
+      "integrity": "sha512-KkfaHEttlGpXYAQTZHgrESiEPx2q/DKAFLGLFda1uGVrqc17snd3YVPhOxlXOHIzVPs+lQ/SDB2EIvxyGzb3Ew==",
       "requires": {
-        "@jest/environment": "^27.0.6",
-        "@jest/types": "^27.0.6",
-        "expect": "^27.0.6"
+        "@jest/environment": "^27.4.2",
+        "@jest/types": "^27.4.2",
+        "expect": "^27.4.2"
       }
     },
     "@jest/reporters": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.6.tgz",
-      "integrity": "sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.2.tgz",
+      "integrity": "sha512-sp4aqmdBJtjKetEakzDPcZggPcVIF6w9QLkYBbaWDV6e/SIsHnF1S4KtIH91eEc2fp7ep6V/e1xvdfEoho1d2w==",
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/test-result": "^27.4.2",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
+        "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -4356,21 +4701,21 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-haste-map": "^27.4.2",
+        "jest-resolve": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "jest-worker": "^27.4.2",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.0.0"
+        "v8-to-istanbul": "^8.1.0"
       }
     },
     "@jest/source-map": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.0.6.tgz",
-      "integrity": "sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
+      "integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
       "requires": {
         "callsites": "^3.0.0",
         "graceful-fs": "^4.2.4",
@@ -4378,42 +4723,42 @@
       }
     },
     "@jest/test-result": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.0.6.tgz",
-      "integrity": "sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz",
+      "integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==",
       "requires": {
-        "@jest/console": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz",
-      "integrity": "sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.2.tgz",
+      "integrity": "sha512-HmHp5mlh9f9GyNej5yCS1JZIFfUGnP9+jEOH5zoq5EmsuZeYD+dGULqyvGDPtuzzbyAFJ6R4+z4SS0VvnFwwGQ==",
       "requires": {
-        "@jest/test-result": "^27.0.6",
+        "@jest/test-result": "^27.4.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
-        "jest-runtime": "^27.0.6"
+        "jest-haste-map": "^27.4.2",
+        "jest-runtime": "^27.4.2"
       }
     },
     "@jest/transform": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.0.6.tgz",
-      "integrity": "sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.2.tgz",
+      "integrity": "sha512-RTKcPZllfcmLfnlxBya7aypofhdz05+E6QITe55Ex0rxyerkgjmmpMlvVn11V0cP719Ps6WcDYCnDzxnnJUwKg==",
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-haste-map": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-util": "^27.4.2",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -4422,9 +4767,9 @@
       }
     },
     "@jest/types": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz",
-      "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+      "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -4433,6 +4778,21 @@
         "chalk": "^4.0.0"
       }
     },
+    "@seald-io/binary-search-tree": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@seald-io/binary-search-tree/-/binary-search-tree-1.0.2.tgz",
+      "integrity": "sha512-+pYGvPFAk7wUR+ONMOlc6A+LUN4kOCFwyPLjyaeS7wVibADPHWYJNYsNtyIAwjF1AXQkuaXElnIc4XjKt55QZA=="
+    },
+    "@seald-io/nedb": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@seald-io/nedb/-/nedb-2.2.0.tgz",
+      "integrity": "sha512-whkcx3hpcowNhoSEbIsrfe8TXxDwyj8SJJut2EqF7DSX2GGqQlL7Ix/vzwwOo4FJolzDhZD2DaUTVKmTQS3Rog==",
+      "requires": {
+        "@seald-io/binary-search-tree": "^1.0.2",
+        "async": "0.2.10",
+        "localforage": "^1.9.0"
+      }
+    },
     "@sinonjs/commons": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
@@ -4442,9 +4802,9 @@
       }
     },
     "@sinonjs/fake-timers": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
-      "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
       "requires": {
         "@sinonjs/commons": "^1.7.0"
       }
@@ -4455,9 +4815,9 @@
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
     },
     "@types/babel__core": {
-      "version": "7.1.15",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz",
-      "integrity": "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==",
+      "version": "7.1.17",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.17.tgz",
+      "integrity": "sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A==",
       "requires": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0",
@@ -4521,14 +4881,14 @@
       }
     },
     "@types/node": {
-      "version": "16.4.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz",
-      "integrity": "sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg=="
+      "version": "16.11.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz",
+      "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="
     },
     "@types/prettier": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz",
-      "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog=="
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
+      "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA=="
     },
     "@types/stack-utils": {
       "version": "2.0.1",
@@ -4554,9 +4914,9 @@
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
     },
     "acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA=="
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
+      "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -4596,9 +4956,9 @@
       }
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "4.3.0",
@@ -4608,6 +4968,11 @@
         "color-convert": "^2.0.1"
       }
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
+    },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -4625,6 +4990,11 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -4639,36 +5009,50 @@
       }
     },
     "babel-jest": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.6.tgz",
-      "integrity": "sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.2.tgz",
+      "integrity": "sha512-MADrjb3KBO2eyZCAc6QaJg6RT5u+6oEdDyHO5HEalnpwQ6LrhTsQF2Kj1Wnz2t6UPXIXPk18dSXXOT0wF5yTxA==",
       "requires": {
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^27.0.6",
+        "babel-preset-jest": "^27.4.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
       }
     },
     "babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-instrument": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
+          "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        }
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz",
-      "integrity": "sha512-CewFeM9Vv2gM7Yr9n5eyyLVPRSiBnk6lKZRjgwYnGKSl9M14TMn2vkN02wTF04OGuSDLEzlWiMzvjXuW9mB6Gw==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
+      "integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
       "requires": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -4696,11 +5080,11 @@
       }
     },
     "babel-preset-jest": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz",
-      "integrity": "sha512-WObA0/Biw2LrVVwZkF/2GqbOdzhKD6Fkdwhoy9ASIrOWr/zodcSpQh72JOkEn6NWyjmnPDjNSqaGN4KnpKzhXw==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
+      "integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
       "requires": {
-        "babel-plugin-jest-hoist": "^27.0.6",
+        "babel-plugin-jest-hoist": "^27.4.0",
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
@@ -4732,15 +5116,15 @@
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
     },
     "browserslist": {
-      "version": "4.16.7",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
-      "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
+      "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001248",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.793",
+        "caniuse-lite": "^1.0.30001280",
+        "electron-to-chromium": "^1.3.896",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.73"
+        "node-releases": "^2.0.1",
+        "picocolors": "^1.0.0"
       }
     },
     "bser": {
@@ -4767,9 +5151,9 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
     },
     "caniuse-lite": {
-      "version": "1.0.30001249",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz",
-      "integrity": "sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw=="
+      "version": "1.0.30001285",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001285.tgz",
+      "integrity": "sha512-KAOkuUtcQ901MtmvxfKD+ODHH9YVDYnBt+TGYSz2KIfnq22CiArbUxXPN9067gNbgMlnNYRSwho8OPXZPALB9Q=="
     },
     "chalk": {
       "version": "4.1.1",
@@ -4785,10 +5169,15 @@
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
     },
+    "chunk": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/chunk/-/chunk-0.0.3.tgz",
+      "integrity": "sha512-oGfwvhjGRW3Ks4GTdGoJhZWKEO1eomjOC26001R+5H0TIlP7vBCO+/XcNcPCA6ayYC7RQSq1/NsN4679Odcm5A=="
+    },
     "ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
+      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="
     },
     "cjs-module-lexer": {
       "version": "1.2.2",
@@ -4815,6 +5204,30 @@
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
     },
+    "color": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+      "requires": {
+        "color-convert": "^1.9.3",
+        "color-string": "^1.6.0"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        }
+      }
+    },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -4828,16 +5241,29 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+    "color-string": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.7.4.tgz",
+      "integrity": "sha512-nVdUvPVgZMpRQad5dcsCMOSB5BXLljklTiaxS6ehhKxDsAI5sD7k5VmFuBt1y3Rlym8uulc/ANUN/bMWtBu6Sg==",
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
     },
     "colors": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
     },
+    "colorspace": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
+      "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
+      "requires": {
+        "color": "^3.1.3",
+        "text-hex": "1.0.x"
+      }
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -4869,6 +5295,11 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -4879,6 +5310,11 @@
         "which": "^2.0.1"
       }
     },
+    "crypto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
+      "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig=="
+    },
     "cssom": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
@@ -4914,10 +5350,15 @@
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
       "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="
     },
+    "dayjs": {
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+      "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+    },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -4933,9 +5374,9 @@
       "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
     },
     "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "deepmerge": {
       "version": "4.2.2",
@@ -4953,9 +5394,9 @@
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
     },
     "diff-sequences": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz",
-      "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ=="
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
+      "integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww=="
     },
     "domexception": {
       "version": "2.0.1",
@@ -4973,9 +5414,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.799",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz",
-      "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw=="
+      "version": "1.4.12",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.12.tgz",
+      "integrity": "sha512-zjfhG9Us/hIy8AlQ5OzfbR/C4aBv1Dg/ak4GX35CELYlJ4tDAtoEcQivXvyBdqdNQ+R6PhlgQqV8UNPJmhkJog=="
     },
     "emittery": {
       "version": "0.8.1",
@@ -4987,15 +5428,20 @@
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
+    "enabled": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
+      "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
+    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "2.0.0",
@@ -5015,9 +5461,9 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
     },
     "esutils": {
       "version": "2.0.3",
@@ -5046,16 +5492,16 @@
       "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw="
     },
     "expect": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz",
-      "integrity": "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
+      "integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "ansi-styles": "^5.0.0",
-        "jest-get-type": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-regex-util": "^27.0.6"
+        "jest-get-type": "^27.4.0",
+        "jest-matcher-utils": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-regex-util": "^27.4.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -5083,6 +5529,11 @@
         "bser": "2.1.1"
       }
     },
+    "fecha": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
+      "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -5100,6 +5551,11 @@
         "path-exists": "^4.0.0"
       }
     },
+    "fn.name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
+      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
+    },
     "follow-redirects": {
       "version": "1.14.4",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
@@ -5237,10 +5693,15 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
     "import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
+      "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
       "requires": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -5266,9 +5727,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "iptv-checker": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.21.0.tgz",
-      "integrity": "sha512-qWqq8mLl+qRgV0/fmBpZm8/Cf7FwSnIA1gt9PFlYbzilRDFtPoTRDm0eP9fCWHVwwZZsImE1aMLx8qkikL5Aog==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.22.0.tgz",
+      "integrity": "sha512-94dnViRK9DaegiVkRR1BGzsDvfo+t4ZkQJgVvSrzbcpvKaNnMUHHtm2hlwKejfz+A/Ci/wBVWkcVe0pZB1KODQ==",
       "requires": {
         "axios": "^0.21.1",
         "colors": "^1.4.0",
@@ -5296,22 +5757,19 @@
       }
     },
     "iptv-playlist-parser": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.9.0.tgz",
-      "integrity": "sha512-F+aGQv1uBu6iWWlYfFjMhdk8vUofkeCMIbzvYiPBwYQOQBHd/OhFHxNTCCsFRGas2CjOSxDa29FNr0EZSkK/uw=="
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.10.2.tgz",
+      "integrity": "sha512-Ls2mKaSgbLtW46KyFd0EVmzLV5lfZzU9lJZTOTrchTsF+sRVGziA6JthtgvhIhPDitruedZRlsa8RdSKGBtDfA=="
     },
-    "is-ci": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
-      "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
-      "requires": {
-        "ci-info": "^3.1.1"
-      }
+    "is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
     "is-core-module": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -5346,15 +5804,20 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
     },
     "istanbul-lib-instrument": {
       "version": "4.0.3",
@@ -5378,9 +5841,9 @@
       }
     },
     "istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "requires": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -5388,257 +5851,260 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.1.tgz",
+      "integrity": "sha512-q1kvhAXWSsXfMjCdNHNPKZZv94OlspKnoGv+R9RGbnqOOQ0VbNfLFgQDVgi7hHenKsndGq3/o0OBdzDXthWcNw==",
       "requires": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
       }
     },
     "jest": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.6.tgz",
-      "integrity": "sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.4.3.tgz",
+      "integrity": "sha512-jwsfVABBzuN3Atm+6h6vIEpTs9+VApODLt4dk2qv1WMOpb1weI1IIZfuwpMiWZ62qvWj78MvdvMHIYdUfqrFaA==",
       "requires": {
-        "@jest/core": "^27.0.6",
+        "@jest/core": "^27.4.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.0.6"
+        "jest-cli": "^27.4.3"
+      },
+      "dependencies": {
+        "jest-cli": {
+          "version": "27.4.3",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.3.tgz",
+          "integrity": "sha512-zZSJBXNC/i8UnJPwcKWsqnhGgIF3uoTYP7th32Zej7KNQJdxzOMj+wCfy2Ox3kU7nXErJ36DtYyXDhfiqaiDRw==",
+          "requires": {
+            "@jest/core": "^27.4.3",
+            "@jest/test-result": "^27.4.2",
+            "@jest/types": "^27.4.2",
+            "chalk": "^4.0.0",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.4",
+            "import-local": "^3.0.2",
+            "jest-config": "^27.4.3",
+            "jest-util": "^27.4.2",
+            "jest-validate": "^27.4.2",
+            "prompts": "^2.0.1",
+            "yargs": "^16.2.0"
+          }
+        }
       }
     },
     "jest-changed-files": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.0.6.tgz",
-      "integrity": "sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
+      "integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "execa": "^5.0.0",
         "throat": "^6.0.1"
       }
     },
     "jest-circus": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.6.tgz",
-      "integrity": "sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.2.tgz",
+      "integrity": "sha512-2ePUSru1BGMyzxsMvRfu+tNb+PW60rUyMLJBfw1Nrh5zC8RoTPfF+zbE0JToU31a6ZVe4nnrNKWYRzlghAbL0A==",
       "requires": {
-        "@jest/environment": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.4.2",
+        "@jest/test-result": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
-        "expect": "^27.0.6",
+        "expect": "^27.4.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6",
+        "jest-each": "^27.4.2",
+        "jest-matcher-utils": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-runtime": "^27.4.2",
+        "jest-snapshot": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "pretty-format": "^27.4.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3",
         "throat": "^6.0.1"
       }
     },
-    "jest-cli": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.6.tgz",
-      "integrity": "sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==",
-      "requires": {
-        "@jest/core": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "jest-config": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
-        "prompts": "^2.0.1",
-        "yargs": "^16.0.3"
-      }
-    },
     "jest-config": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.6.tgz",
-      "integrity": "sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.3.tgz",
+      "integrity": "sha512-DQ10HTSqYtC2pO7s9j2jw+li4xUnm2wLYWH2o7K1ftB8NyvToHsXoLlXxtsGh3AW9gUQR6KY/4B7G+T/NswJBw==",
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.0.6",
-        "@jest/types": "^27.0.6",
-        "babel-jest": "^27.0.6",
+        "@jest/test-sequencer": "^27.4.2",
+        "@jest/types": "^27.4.2",
+        "babel-jest": "^27.4.2",
         "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "is-ci": "^3.0.0",
-        "jest-circus": "^27.0.6",
-        "jest-environment-jsdom": "^27.0.6",
-        "jest-environment-node": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "jest-jasmine2": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-runner": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-circus": "^27.4.2",
+        "jest-environment-jsdom": "^27.4.3",
+        "jest-environment-node": "^27.4.2",
+        "jest-get-type": "^27.4.0",
+        "jest-jasmine2": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-resolve": "^27.4.2",
+        "jest-runner": "^27.4.3",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.4.2",
+        "slash": "^3.0.0"
       }
     },
     "jest-diff": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz",
-      "integrity": "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz",
+      "integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==",
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "diff-sequences": "^27.4.0",
+        "jest-get-type": "^27.4.0",
+        "pretty-format": "^27.4.2"
       }
     },
     "jest-docblock": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.0.6.tgz",
-      "integrity": "sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
+      "integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
       "requires": {
         "detect-newline": "^3.0.0"
       }
     },
     "jest-each": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.0.6.tgz",
-      "integrity": "sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz",
+      "integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "jest-get-type": "^27.4.0",
+        "jest-util": "^27.4.2",
+        "pretty-format": "^27.4.2"
       }
     },
     "jest-environment-jsdom": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz",
-      "integrity": "sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.3.tgz",
+      "integrity": "sha512-x1AUVz3G14LpEJs7KIFUaTINT2n0unOUmvdAby3s/sldUpJJetOJifHo1O/EUQC5fNBowggwJbVulko18y6OWw==",
       "requires": {
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.4.2",
+        "@jest/fake-timers": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-mock": "^27.4.2",
+        "jest-util": "^27.4.2",
         "jsdom": "^16.6.0"
       }
     },
     "jest-environment-node": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.6.tgz",
-      "integrity": "sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.2.tgz",
+      "integrity": "sha512-nzTZ5nJ+FabuZPH2YVci7SZIHpvtNRHPt8+vipLkCnAgXGjVzHm7XJWdnNqXbAkExIgiKeVEkVMNZOZE/LeiIg==",
       "requires": {
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.4.2",
+        "@jest/fake-timers": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
-        "jest-mock": "^27.0.6",
-        "jest-util": "^27.0.6"
+        "jest-mock": "^27.4.2",
+        "jest-util": "^27.4.2"
       }
     },
     "jest-get-type": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz",
-      "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg=="
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
+      "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ=="
     },
     "jest-haste-map": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.6.tgz",
-      "integrity": "sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.2.tgz",
+      "integrity": "sha512-foiyAEePORUN2eeJnOtcM1y8qW0ShEd9kTjWVL4sVaMcuCJM6gtHegvYPBRT0mpI/bs4ueThM90+Eoj2ncoNsA==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^27.0.6",
-        "jest-serializer": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-regex-util": "^27.4.0",
+        "jest-serializer": "^27.4.0",
+        "jest-util": "^27.4.2",
+        "jest-worker": "^27.4.2",
         "micromatch": "^4.0.4",
         "walker": "^1.0.7"
       }
     },
     "jest-jasmine2": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz",
-      "integrity": "sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.2.tgz",
+      "integrity": "sha512-VO/fyAJSH9u0THjbteFiL8qc93ufU+yW+bdieDc8tzTCWwlWzO53UHS5nFK1qmE8izb5Smkn+XHlVt6/l06MKQ==",
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^27.0.6",
-        "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/environment": "^27.4.2",
+        "@jest/source-map": "^27.4.0",
+        "@jest/test-result": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^27.0.6",
+        "expect": "^27.4.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "pretty-format": "^27.0.6",
+        "jest-each": "^27.4.2",
+        "jest-matcher-utils": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-runtime": "^27.4.2",
+        "jest-snapshot": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "pretty-format": "^27.4.2",
         "throat": "^6.0.1"
       }
     },
     "jest-leak-detector": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz",
-      "integrity": "sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz",
+      "integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==",
       "requires": {
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "jest-get-type": "^27.4.0",
+        "pretty-format": "^27.4.2"
       }
     },
     "jest-matcher-utils": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz",
-      "integrity": "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz",
+      "integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==",
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "pretty-format": "^27.0.6"
+        "jest-diff": "^27.4.2",
+        "jest-get-type": "^27.4.0",
+        "pretty-format": "^27.4.2"
       }
     },
     "jest-message-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz",
-      "integrity": "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
+      "integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.0.6",
+        "pretty-format": "^27.4.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       }
     },
     "jest-mock": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.0.6.tgz",
-      "integrity": "sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
+      "integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/node": "*"
       }
     },
@@ -5649,111 +6115,112 @@
       "requires": {}
     },
     "jest-regex-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz",
-      "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ=="
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
+      "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg=="
     },
     "jest-resolve": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.6.tgz",
-      "integrity": "sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.2.tgz",
+      "integrity": "sha512-d/zqPjxCzMqHlOdRTg8cTpO9jY+1/T74KazT8Ws/LwmwxV5sRMWOkiLjmzUCDj/5IqA5XHNK4Hkmlq9Kdpb9Sg==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "chalk": "^4.0.0",
-        "escalade": "^3.1.1",
         "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^27.4.2",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
         "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
         "slash": "^3.0.0"
       }
     },
     "jest-resolve-dependencies": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz",
-      "integrity": "sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.2.tgz",
+      "integrity": "sha512-hb++cTpqvOWfU49MCP/JQkxmnrhKoAVqXWFjgYXswRSVGk8Q6bDTSvhbCeYXDtXaymY0y7WrrSIlKogClcKJuw==",
       "requires": {
-        "@jest/types": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-snapshot": "^27.0.6"
+        "@jest/types": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-snapshot": "^27.4.2"
       }
     },
     "jest-runner": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.6.tgz",
-      "integrity": "sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ==",
+      "version": "27.4.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.3.tgz",
+      "integrity": "sha512-JgR6Om/j22Fd6ZUUIGTWNcCtuZVYbNrecb4k89W4UyFJoRtHpo2zMKWkmFFFJoqwWGrfrcPLnVBIgkJiTV3cyA==",
       "requires": {
-        "@jest/console": "^27.0.6",
-        "@jest/environment": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/environment": "^27.4.2",
+        "@jest/test-result": "^27.4.2",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.8.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-docblock": "^27.0.6",
-        "jest-environment-jsdom": "^27.0.6",
-        "jest-environment-node": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-leak-detector": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-runtime": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-worker": "^27.0.6",
+        "jest-docblock": "^27.4.0",
+        "jest-environment-jsdom": "^27.4.3",
+        "jest-environment-node": "^27.4.2",
+        "jest-haste-map": "^27.4.2",
+        "jest-leak-detector": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-resolve": "^27.4.2",
+        "jest-runtime": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "jest-worker": "^27.4.2",
         "source-map-support": "^0.5.6",
         "throat": "^6.0.1"
       }
     },
     "jest-runtime": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.6.tgz",
-      "integrity": "sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.2.tgz",
+      "integrity": "sha512-eqPgcBaUNaw6j8T5M+dnfAEh6MIrh2YmtskCr9sl50QYpD22Sg+QqHw3J3nmaLzVMbBtOMHFFxLF0Qx8MsZVFQ==",
       "requires": {
-        "@jest/console": "^27.0.6",
-        "@jest/environment": "^27.0.6",
-        "@jest/fake-timers": "^27.0.6",
-        "@jest/globals": "^27.0.6",
-        "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.0.6",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/console": "^27.4.2",
+        "@jest/environment": "^27.4.2",
+        "@jest/globals": "^27.4.2",
+        "@jest/source-map": "^27.4.0",
+        "@jest/test-result": "^27.4.2",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/yargs": "^16.0.0",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-mock": "^27.0.6",
-        "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-snapshot": "^27.0.6",
-        "jest-util": "^27.0.6",
-        "jest-validate": "^27.0.6",
+        "jest-haste-map": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-mock": "^27.4.2",
+        "jest-regex-util": "^27.4.0",
+        "jest-resolve": "^27.4.2",
+        "jest-snapshot": "^27.4.2",
+        "jest-util": "^27.4.2",
+        "jest-validate": "^27.4.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
-        "yargs": "^16.0.3"
+        "yargs": "^16.2.0"
       }
     },
     "jest-serializer": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.6.tgz",
-      "integrity": "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
+      "integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
       "requires": {
         "@types/node": "*",
         "graceful-fs": "^4.2.4"
       }
     },
     "jest-snapshot": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.6.tgz",
-      "integrity": "sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.2.tgz",
+      "integrity": "sha512-DI7lJlNIu6WSQ+esqhnJzEzU70+dV+cNjoF1c+j5FagWEd3KtOyZvVliAH0RWNQ6KSnAAnKSU0qxJ8UXOOhuUQ==",
       "requires": {
         "@babel/core": "^7.7.2",
         "@babel/generator": "^7.7.2",
@@ -5761,23 +6228,23 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/transform": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.0.6",
+        "expect": "^27.4.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.0.6",
-        "jest-get-type": "^27.0.6",
-        "jest-haste-map": "^27.0.6",
-        "jest-matcher-utils": "^27.0.6",
-        "jest-message-util": "^27.0.6",
-        "jest-resolve": "^27.0.6",
-        "jest-util": "^27.0.6",
+        "jest-diff": "^27.4.2",
+        "jest-get-type": "^27.4.0",
+        "jest-haste-map": "^27.4.2",
+        "jest-matcher-utils": "^27.4.2",
+        "jest-message-util": "^27.4.2",
+        "jest-resolve": "^27.4.2",
+        "jest-util": "^27.4.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.0.6",
+        "pretty-format": "^27.4.2",
         "semver": "^7.3.2"
       },
       "dependencies": {
@@ -5792,56 +6259,56 @@
       }
     },
     "jest-util": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.0.6.tgz",
-      "integrity": "sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
+      "integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
         "graceful-fs": "^4.2.4",
-        "is-ci": "^3.0.0",
         "picomatch": "^2.2.3"
       }
     },
     "jest-validate": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.0.6.tgz",
-      "integrity": "sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
+      "integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
       "requires": {
-        "@jest/types": "^27.0.6",
+        "@jest/types": "^27.4.2",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.0.6",
+        "jest-get-type": "^27.4.0",
         "leven": "^3.1.0",
-        "pretty-format": "^27.0.6"
+        "pretty-format": "^27.4.2"
       },
       "dependencies": {
         "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
+          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="
         }
       }
     },
     "jest-watcher": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.0.6.tgz",
-      "integrity": "sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz",
+      "integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==",
       "requires": {
-        "@jest/test-result": "^27.0.6",
-        "@jest/types": "^27.0.6",
+        "@jest/test-result": "^27.4.2",
+        "@jest/types": "^27.4.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^27.0.6",
+        "jest-util": "^27.4.2",
         "string-length": "^4.0.1"
       }
     },
     "jest-worker": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz",
-      "integrity": "sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz",
+      "integrity": "sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==",
       "requires": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -5924,6 +6391,11 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
     },
+    "kuler": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
+      "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
+    },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -5938,6 +6410,22 @@
         "type-check": "~0.3.2"
       }
     },
+    "lie": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "localforage": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
+      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+      "requires": {
+        "lie": "3.1.1"
+      }
+    },
     "locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -5956,6 +6444,18 @@
       "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz",
       "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw="
     },
+    "logform": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz",
+      "integrity": "sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ==",
+      "requires": {
+        "colors": "^1.2.1",
+        "fecha": "^4.2.0",
+        "ms": "^2.1.1",
+        "safe-stable-stringify": "^1.1.0",
+        "triple-beam": "^1.3.0"
+      }
+    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -5965,9 +6465,9 @@
       }
     },
     "m3u-linter": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.2.2.tgz",
-      "integrity": "sha512-2U6HOmt7MlQNuo3KASb/Z+INHMp+WFj2npUb9qfKRZludrPRzvtuJxjHZvFQuDUrwFFKp0yqzms2wVNTAYt5HQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.3.0.tgz",
+      "integrity": "sha512-/sRCXEVXCPXS6+tfyhBHuKRt0JSPGIE23yJDkbQNVePzWAc5FvGFsY2zS0c1VokWZxlp6fVgh0OEakHbl6YMRg==",
       "requires": {
         "chalk": "^4.1.1",
         "commander": "^7.2.0",
@@ -5983,11 +6483,11 @@
       }
     },
     "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "requires": {
-        "tmpl": "1.0.x"
+        "tmpl": "1.0.5"
       }
     },
     "markdown-include": {
@@ -6013,16 +6513,16 @@
       }
     },
     "mime-db": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
-      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
     },
     "mime-types": {
-      "version": "2.1.32",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
-      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "requires": {
-        "mime-db": "1.49.0"
+        "mime-db": "1.51.0"
       }
     },
     "mimic-fn": {
@@ -6048,30 +6548,38 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
-    "natural-orderby": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz",
-      "integrity": "sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="
+    "nedb-promises": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/nedb-promises/-/nedb-promises-5.0.2.tgz",
+      "integrity": "sha512-087g8JdsStXRWDxC9qqE4qMLqZGJrUnYF54pvOCDDfcLoptJUCqGb7j2WvWlaleeqft9rUjiJ9egvMJlUnJTmA==",
+      "requires": {
+        "@seald-io/nedb": "^2.2.0"
+      }
     },
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
     },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA="
-    },
     "node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -6096,6 +6604,11 @@
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
       "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
     },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -6104,6 +6617,14 @@
         "wrappy": "1"
       }
     },
+    "one-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
+      "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
+      "requires": {
+        "fn.name": "1.x.x"
+      }
+    },
     "onetime": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
@@ -6125,11 +6646,6 @@
         "word-wrap": "~1.2.3"
       }
     },
-    "p-each-series": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
-      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA=="
-    },
     "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -6176,18 +6692,20 @@
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
     "picomatch": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
     },
     "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
+      "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw=="
     },
     "pkg-dir": {
       "version": "4.2.0",
@@ -6197,30 +6715,27 @@
         "find-up": "^4.0.0"
       }
     },
-    "pre-push": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pre-push/-/pre-push-0.1.1.tgz",
-      "integrity": "sha1-Kip5gn0kOnbJEImJescH9F5xaqw=",
-      "requires": {
-        "shelljs": "0.3.x"
-      }
-    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "pretty-format": {
-      "version": "27.0.6",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz",
-      "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==",
+      "version": "27.4.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
+      "integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
       "requires": {
-        "@jest/types": "^27.0.6",
-        "ansi-regex": "^5.0.0",
+        "@jest/types": "^27.4.2",
+        "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
         "react-is": "^17.0.1"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
         "ansi-styles": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
@@ -6228,15 +6743,20 @@
         }
       }
     },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
     },
     "prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "requires": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -6262,6 +6782,16 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -6289,6 +6819,11 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
     },
+    "resolve.exports": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
+    },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -6302,6 +6837,11 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
+    "safe-stable-stringify": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz",
+      "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="
+    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -6333,15 +6873,18 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
-    "shelljs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-      "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E="
-    },
     "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+      "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      }
     },
     "sisteransi": {
       "version": "1.0.5",
@@ -6359,9 +6902,9 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -6372,12 +6915,39 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
+    },
     "stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
       "requires": {
         "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
       }
     },
     "string-length": {
@@ -6458,15 +7028,36 @@
         "minimatch": "^3.0.4"
       }
     },
+    "text-hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
+    },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
     "throat": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
       "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
     },
     "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -6507,6 +7098,11 @@
         "yargs": "^16.1.0"
       }
     },
+    "triple-beam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
+      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -6538,10 +7134,15 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
     "v8-to-istanbul": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz",
-      "integrity": "sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
+      "integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
         "convert-source-map": "^1.6.0",
@@ -6577,11 +7178,11 @@
       }
     },
     "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "requires": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "webidl-conversions": {
@@ -6620,6 +7221,62 @@
         "isexe": "^2.0.0"
       }
     },
+    "winston": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
+      "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==",
+      "requires": {
+        "@dabh/diagnostics": "^2.0.2",
+        "async": "^3.1.0",
+        "is-stream": "^2.0.0",
+        "logform": "^2.2.0",
+        "one-time": "^1.0.0",
+        "readable-stream": "^3.4.0",
+        "stack-trace": "0.0.x",
+        "triple-beam": "^1.3.0",
+        "winston-transport": "^4.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
+          "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="
+        }
+      }
+    },
+    "winston-transport": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz",
+      "integrity": "sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==",
+      "requires": {
+        "readable-stream": "^2.3.7",
+        "triple-beam": "^1.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -6652,9 +7309,9 @@
       }
     },
     "ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+      "version": "7.5.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+      "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
       "requires": {}
     },
     "xml-name-validator": {
diff --git a/package.json b/package.json
index f9d4990522..78d8eaf8df 100644
--- a/package.json
+++ b/package.json
@@ -1,25 +1,31 @@
 {
   "name": "iptv",
   "scripts": {
-    "lint": "npx m3u-linter -c m3u-linter.json"
+    "validate": "node scripts/commands/validate.js",
+    "lint": "npx m3u-linter -c m3u-linter.json",
+    "test": "jest --runInBand"
+  },
+  "jest": {
+    "testRegex": "tests/(.*?/)?.*test.js$"
   },
-  "pre-push": [
-    "lint"
-  ],
   "author": "Arhey",
   "private": true,
   "license": "MIT",
   "dependencies": {
-    "axios": "^0.21.4",
+    "chunk": "^0.0.3",
     "commander": "^7.0.0",
-    "iptv-checker": "^0.21.0",
-    "iptv-playlist-parser": "^0.9.0",
-    "m3u-linter": "^0.2.2",
+    "crypto": "^1.0.1",
+    "dayjs": "^1.10.7",
+    "iptv-checker": "^0.22.0",
+    "iptv-playlist-parser": "^0.10.2",
+    "jest": "^27.4.3",
+    "lodash": "^4.17.21",
+    "m3u-linter": "^0.3.0",
     "markdown-include": "^0.4.3",
-    "natural-orderby": "^2.0.3",
+    "mz": "^2.7.0",
+    "nedb-promises": "^5.0.2",
     "normalize-url": "^6.1.0",
-    "pre-push": "^0.1.1",
-    "progress": "^2.0.3",
-    "transliteration": "^2.2.0"
+    "transliteration": "^2.2.0",
+    "winston": "^3.3.3"
   }
 }
diff --git a/scripts/.gitignore b/scripts/.gitignore
new file mode 100644
index 0000000000..001a2070d1
--- /dev/null
+++ b/scripts/.gitignore
@@ -0,0 +1,2 @@
+logs/
+channels.db
\ No newline at end of file
diff --git a/scripts/commands/check-streams.js b/scripts/commands/check-streams.js
new file mode 100644
index 0000000000..9a74e7776f
--- /dev/null
+++ b/scripts/commands/check-streams.js
@@ -0,0 +1,50 @@
+const { program } = require('commander')
+const { db, logger, timer, checker, store, file, parser } = require('../core')
+
+const options = program
+  .requiredOption('-c, --cluster-id <cluster-id>', 'The ID of cluster to load', parser.parseNumber)
+  .option('-t, --timeout <timeout>', 'Set timeout for each request', parser.parseNumber, 60000)
+  .option('-d, --delay <delay>', 'Set delay for each request', parser.parseNumber, 0)
+  .option('--debug', 'Enable debug mode')
+  .parse(process.argv)
+  .opts()
+
+const config = {
+  timeout: options.timeout,
+  delay: options.delay,
+  debug: options.debug
+}
+
+const LOGS_PATH = process.env.LOGS_PATH || 'scripts/logs'
+
+async function main() {
+  logger.info('Starting...')
+  logger.info(`Timeout: ${options.timeout}ms`)
+  logger.info(`Delay: ${options.delay}ms`)
+  timer.start()
+
+  const clusterLog = `${LOGS_PATH}/check-streams/cluster_${options.clusterId}.log`
+  logger.info(`Loading cluster: ${options.clusterId}`)
+  logger.info(`Creating '${clusterLog}'...`)
+  await file.create(clusterLog)
+  const items = await db.find({ cluster_id: options.clusterId })
+  const total = items.length
+  logger.info(`Found ${total} links`)
+
+  logger.info('Checking...')
+  const results = {}
+  for (const [i, item] of items.entries()) {
+    const message = `[${i + 1}/${total}] ${item.filepath}: ${item.url}`
+    const result = await checker.check(item, config)
+    if (!result.error) {
+      logger.info(message)
+    } else {
+      logger.info(`${message} (${result.error})`)
+    }
+    await file.append(clusterLog, JSON.stringify(result) + '\n')
+  }
+
+  logger.info(`Done in ${timer.format('HH[h] mm[m] ss[s]')}`)
+}
+
+main()
diff --git a/scripts/commands/cleanup-database.js b/scripts/commands/cleanup-database.js
new file mode 100644
index 0000000000..d005c48078
--- /dev/null
+++ b/scripts/commands/cleanup-database.js
@@ -0,0 +1,24 @@
+const { db, logger } = require('../core')
+
+async function main() {
+  logger.info(`Loading database...`)
+  let streams = await db.find({})
+
+  logger.info(`Removing broken links...`)
+  let removed = 0
+  const buffer = []
+  for (const stream of streams) {
+    const duplicate = buffer.find(i => i.id === stream.id)
+    if (duplicate && ['offline', 'timeout'].includes(stream.status.code)) {
+      await db.remove({ _id: stream._id })
+      removed++
+    } else {
+      buffer.push(stream)
+    }
+  }
+  db.compact()
+
+  logger.info(`Removed ${removed} links`)
+}
+
+main()
diff --git a/scripts/commands/create-database.js b/scripts/commands/create-database.js
new file mode 100644
index 0000000000..ecbbc05973
--- /dev/null
+++ b/scripts/commands/create-database.js
@@ -0,0 +1,104 @@
+const { db, file, parser, store, logger } = require('../core')
+const transliteration = require('transliteration')
+const { program } = require('commander')
+const _ = require('lodash')
+
+const options = program
+  .option(
+    '--max-clusters <max-clusters>',
+    'Set maximum number of clusters',
+    parser.parseNumber,
+    200
+  )
+  .option('--input-dir <input-dir>', 'Set path to input directory', 'channels')
+  .parse(process.argv)
+  .opts()
+
+const links = []
+
+async function main() {
+  logger.info('Starting...')
+  logger.info(`Number of clusters: ${options.maxClusters}`)
+
+  await loadChannels()
+  await saveToDatabase()
+
+  logger.info('Done')
+}
+
+main()
+
+async function loadChannels() {
+  logger.info(`Loading links...`)
+
+  const files = await file.list(`${options.inputDir}/**/*.m3u`)
+  for (const filepath of files) {
+    const items = await parser.parsePlaylist(filepath)
+    for (const item of items) {
+      item.filepath = filepath
+      links.push(item)
+    }
+  }
+  logger.info(`Found ${links.length} links`)
+}
+
+async function saveToDatabase() {
+  logger.info('Saving to the database...')
+
+  await db.reset()
+  const chunks = split(_.shuffle(links), options.maxClusters)
+  for (const [i, chunk] of chunks.entries()) {
+    for (const item of chunk) {
+      const stream = store.create()
+      stream.set('name', { title: item.name })
+      stream.set('id', { id: item.tvg.id })
+      stream.set('filepath', { filepath: item.filepath })
+      stream.set('src_country', { filepath: item.filepath })
+      stream.set('tvg_country', { tvg_country: item.tvg.country })
+      stream.set('countries', { tvg_country: item.tvg.country })
+      stream.set('regions', { countries: stream.get('countries') })
+      stream.set('languages', { tvg_language: item.tvg.language })
+      stream.set('categories', { group_title: item.group.title })
+      stream.set('tvg_url', { tvg_url: item.tvg.url })
+      stream.set('guides', { tvg_url: item.tvg.url })
+      stream.set('logo', { logo: item.tvg.logo })
+      stream.set('resolution', { title: item.name })
+      stream.set('status', { title: item.name })
+      stream.set('url', { url: item.url })
+      stream.set('http', { http: item.http })
+      stream.set('is_nsfw', { categories: stream.get('categories') })
+      stream.set('is_broken', { status: stream.get('status') })
+      stream.set('updated', { updated: false })
+      stream.set('cluster_id', { cluster_id: i + 1 })
+
+      if (!stream.get('id')) {
+        const id = generateChannelId(stream.get('name'), stream.get('src_country'))
+        stream.set('id', { id })
+      }
+
+      await db.insert(stream.data())
+    }
+  }
+}
+
+function split(arr, n) {
+  let result = []
+  for (let i = n; i > 0; i--) {
+    result.push(arr.splice(0, Math.ceil(arr.length / i)))
+  }
+  return result
+}
+
+function generateChannelId(name, src_country) {
+  if (name && src_country) {
+    const slug = transliteration
+      .transliterate(name)
+      .replace(/\+/gi, 'Plus')
+      .replace(/[^a-z\d]+/gi, '')
+    const code = src_country.code.toLowerCase()
+
+    return `${slug}.${code}`
+  }
+
+  return null
+}
diff --git a/scripts/commands/create-matrix.js b/scripts/commands/create-matrix.js
new file mode 100644
index 0000000000..be639b0287
--- /dev/null
+++ b/scripts/commands/create-matrix.js
@@ -0,0 +1,15 @@
+const { logger, db } = require('../core')
+
+async function main() {
+  const docs = await db.find({}).sort({ cluster_id: 1 })
+  const cluster_id = docs.reduce((acc, curr) => {
+    if (!acc.includes(curr.cluster_id)) acc.push(curr.cluster_id)
+    return acc
+  }, [])
+
+  const matrix = { cluster_id }
+  const output = `::set-output name=matrix::${JSON.stringify(matrix)}`
+  logger.info(output)
+}
+
+main()
diff --git a/scripts/commands/generate-playlists.js b/scripts/commands/generate-playlists.js
new file mode 100644
index 0000000000..d8005a1ea2
--- /dev/null
+++ b/scripts/commands/generate-playlists.js
@@ -0,0 +1,321 @@
+const { db, logger, generator, file } = require('../core')
+const _ = require('lodash')
+
+let languages = []
+let countries = []
+let categories = []
+let regions = []
+
+const LOGS_PATH = process.env.LOGS_PATH || 'scripts/logs'
+const PUBLIC_PATH = process.env.PUBLIC_PATH || '.gh-pages'
+
+async function main() {
+  await setUp()
+
+  await generateCategories()
+  await generateCountries()
+  await generateLanguages()
+  await generateRegions()
+  await generateIndex()
+  await generateIndexNSFW()
+  await generateIndexCategory()
+  await generateIndexCountry()
+  await generateIndexLanguage()
+  await generateIndexRegion()
+
+  await generateChannelsJson()
+}
+
+main()
+
+async function generateCategories() {
+  logger.info(`Generating categories/...`)
+
+  for (const category of categories) {
+    const { count } = await generator.generate(
+      `${PUBLIC_PATH}/categories/${category.slug}.m3u`,
+      { categories: { $elemMatch: category } },
+      { saveEmpty: true, includeNSFW: true }
+    )
+
+    await log('categories', {
+      name: category.name,
+      slug: category.slug,
+      count
+    })
+  }
+
+  const { count: otherCount } = await generator.generate(
+    `${PUBLIC_PATH}/categories/other.m3u`,
+    { categories: { $size: 0 } },
+    { saveEmpty: true }
+  )
+
+  await log('categories', {
+    name: 'Other',
+    slug: 'other',
+    count: otherCount
+  })
+}
+
+async function generateCountries() {
+  logger.info(`Generating countries/...`)
+
+  for (const country of countries) {
+    const { count } = await generator.generate(
+      `${PUBLIC_PATH}/countries/${country.code.toLowerCase()}.m3u`,
+      {
+        countries: { $elemMatch: country }
+      }
+    )
+
+    await log('countries', {
+      name: country.name,
+      code: country.code,
+      count
+    })
+  }
+
+  const { count: intCount } = await generator.generate(`${PUBLIC_PATH}/countries/int.m3u`, {
+    tvg_country: 'INT'
+  })
+
+  await log('countries', {
+    name: 'International',
+    code: 'INT',
+    count: intCount
+  })
+
+  const { count: undefinedCount } = await generator.generate(
+    `${PUBLIC_PATH}/countries/undefined.m3u`,
+    {
+      countries: { $size: 0 }
+    }
+  )
+
+  await log('countries', {
+    name: 'Undefined',
+    code: 'UNDEFINED',
+    count: undefinedCount
+  })
+}
+
+async function generateLanguages() {
+  logger.info(`Generating languages/...`)
+
+  for (const language of _.uniqBy(languages, 'code')) {
+    const { count } = await generator.generate(`${PUBLIC_PATH}/languages/${language.code}.m3u`, {
+      languages: { $elemMatch: language }
+    })
+
+    await log('languages', {
+      name: language.name,
+      code: language.code,
+      count
+    })
+  }
+
+  const { count: undefinedCount } = await generator.generate(
+    `${PUBLIC_PATH}/languages/undefined.m3u`,
+    {
+      languages: { $size: 0 }
+    }
+  )
+
+  await log('languages', {
+    name: 'Undefined',
+    code: 'undefined',
+    count: undefinedCount
+  })
+}
+
+async function generateRegions() {
+  logger.info(`Generating regions/...`)
+
+  for (const region of regions) {
+    const { count } = await generator.generate(
+      `${PUBLIC_PATH}/regions/${region.code.toLowerCase()}.m3u`,
+      {
+        regions: { $elemMatch: region }
+      }
+    )
+
+    await log('regions', {
+      name: region.name,
+      code: region.code,
+      count
+    })
+  }
+
+  const { count: undefinedCount } = await generator.generate(
+    `${PUBLIC_PATH}/regions/undefined.m3u`,
+    { regions: { $size: 0 } },
+    { saveEmpty: true }
+  )
+
+  await log('regions', {
+    name: 'Undefined',
+    code: 'UNDEFINED',
+    count: undefinedCount
+  })
+}
+
+async function generateIndexNSFW() {
+  logger.info(`Generating index.nsfw.m3u...`)
+
+  await generator.generate(`${PUBLIC_PATH}/index.nsfw.m3u`, {}, { includeNSFW: true })
+}
+
+async function generateIndex() {
+  logger.info(`Generating index.m3u...`)
+
+  await generator.generate(`${PUBLIC_PATH}/index.m3u`, {})
+}
+
+async function generateIndexCategory() {
+  logger.info(`Generating index.category.m3u...`)
+
+  await generator.generate(
+    `${PUBLIC_PATH}/index.category.m3u`,
+    {},
+    { sortBy: item => item.group_title }
+  )
+}
+
+async function generateIndexCountry() {
+  logger.info(`Generating index.country.m3u...`)
+
+  await generator.generate(
+    `${PUBLIC_PATH}/index.country.m3u`,
+    {},
+    {
+      onLoad: function (items) {
+        let results = items
+          .filter(item => !item.countries.length)
+          .map(item => {
+            const newItem = _.cloneDeep(item)
+            newItem.group_title = ''
+            return newItem
+          })
+        for (const country of _.sortBy(Object.values(countries), ['name'])) {
+          let filtered = items
+            .filter(item => {
+              return item.countries.map(c => c.code).includes(country.code)
+            })
+            .map(item => {
+              const newItem = _.cloneDeep(item)
+              newItem.group_title = country.name
+              return newItem
+            })
+          results = results.concat(filtered)
+        }
+
+        return results
+      },
+      sortBy: item => item.group_title
+    }
+  )
+}
+
+async function generateIndexLanguage() {
+  logger.info(`Generating index.language.m3u...`)
+
+  await generator.generate(
+    `${PUBLIC_PATH}/index.language.m3u`,
+    {},
+    {
+      onLoad: function (items) {
+        let results = items
+          .filter(item => !item.languages.length)
+          .map(item => {
+            const newItem = _.cloneDeep(item)
+            newItem.group_title = ''
+            return newItem
+          })
+        for (const language of languages) {
+          let filtered = items
+            .filter(item => {
+              return item.languages.map(c => c.code).includes(language.code)
+            })
+            .map(item => {
+              const newItem = _.cloneDeep(item)
+              newItem.group_title = language.name
+              return newItem
+            })
+          results = results.concat(filtered)
+        }
+
+        return results
+      },
+      sortBy: item => item.group_title
+    }
+  )
+}
+
+async function generateIndexRegion() {
+  logger.info(`Generating index.region.m3u...`)
+
+  await generator.generate(
+    `${PUBLIC_PATH}/index.region.m3u`,
+    {},
+    {
+      onLoad: function (items) {
+        let results = items
+          .filter(item => !item.regions.length)
+          .map(item => {
+            const newItem = _.cloneDeep(item)
+            newItem.group_title = ''
+            return newItem
+          })
+        for (const region of regions) {
+          let filtered = items
+            .filter(item => {
+              return item.regions.map(c => c.code).includes(region.code)
+            })
+            .map(item => {
+              const newItem = _.cloneDeep(item)
+              newItem.group_title = region.name
+              return newItem
+            })
+          results = results.concat(filtered)
+        }
+
+        return results
+      },
+      sortBy: item => item.group_title
+    }
+  )
+}
+
+async function generateChannelsJson() {
+  logger.info('Generating channels.json...')
+
+  await generator.generate(`${PUBLIC_PATH}/channels.json`, {}, { format: 'json' })
+}
+
+async function setUp() {
+  logger.info(`Loading database...`)
+  const items = await db.find({})
+  categories = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.categories)), 'slug'), ['name'])
+  countries = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.countries)), 'code'), ['name'])
+  languages = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.languages)), 'code'), ['name'])
+  regions = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.regions)), 'code'), ['name'])
+
+  const categoriesLog = `${LOGS_PATH}/generate-playlists/categories.log`
+  const countriesLog = `${LOGS_PATH}/generate-playlists/countries.log`
+  const languagesLog = `${LOGS_PATH}/generate-playlists/languages.log`
+  const regionsLog = `${LOGS_PATH}/generate-playlists/regions.log`
+
+  logger.info(`Creating '${categoriesLog}'...`)
+  await file.create(categoriesLog)
+  logger.info(`Creating '${countriesLog}'...`)
+  await file.create(countriesLog)
+  logger.info(`Creating '${languagesLog}'...`)
+  await file.create(languagesLog)
+  logger.info(`Creating '${regionsLog}'...`)
+  await file.create(regionsLog)
+}
+
+async function log(type, data) {
+  await file.append(`${LOGS_PATH}/generate-playlists/${type}.log`, JSON.stringify(data) + '\n')
+}
diff --git a/scripts/commands/update-database.js b/scripts/commands/update-database.js
new file mode 100644
index 0000000000..1d3e720724
--- /dev/null
+++ b/scripts/commands/update-database.js
@@ -0,0 +1,241 @@
+const _ = require('lodash')
+const statuses = require('../data/statuses')
+const languages = require('../data/languages')
+const { db, store, parser, file, logger } = require('../core')
+
+let epgCodes = []
+let streams = []
+let checkResults = {}
+const origins = {}
+const items = []
+
+const LOGS_PATH = process.env.LOGS_PATH || 'scripts/logs'
+const EPG_CODES_FILEPATH = process.env.EPG_CODES_FILEPATH || 'scripts/data/codes.json'
+
+async function main() {
+  await setUp()
+  await loadDatabase()
+  await removeDuplicates()
+  await loadCheckResults()
+  await findStreamOrigins()
+  await updateStreams()
+  await updateDatabase()
+}
+
+main()
+
+async function loadDatabase() {
+  logger.info('Loading database...')
+
+  streams = await db.find({})
+
+  logger.info(`Found ${streams.length} streams`)
+}
+
+async function removeDuplicates() {
+  logger.info('Removing duplicates...')
+
+  const before = streams.length
+  streams = _.uniqBy(streams, 'id')
+  const after = streams.length
+
+  logger.info(`Removed ${before - after} links`)
+}
+
+async function loadCheckResults() {
+  logger.info('Loading check results from logs/...')
+
+  const files = await file.list(`${LOGS_PATH}/check-streams/cluster_*.log`)
+  for (const filepath of files) {
+    const results = await parser.parseLogs(filepath)
+    for (const result of results) {
+      checkResults[result._id] = result
+    }
+  }
+
+  logger.info(`Found ${Object.values(checkResults).length} results`)
+}
+
+async function findStreamOrigins() {
+  logger.info('Searching for stream origins...')
+
+  for (const { error, requests } of Object.values(checkResults)) {
+    if (error || !Array.isArray(requests) || !requests.length) continue
+
+    let origin = requests.shift()
+    origin = new URL(origin.url)
+    for (const request of requests) {
+      const curr = new URL(request.url)
+      const key = curr.href.replace(/(^\w+:|^)/, '')
+      if (!origins[key] && curr.host === origin.host) {
+        origins[key] = origin.href
+      }
+    }
+  }
+
+  logger.info(`Found ${_.uniq(Object.values(origins)).length} origins`)
+}
+
+async function updateStreams() {
+  logger.info('Updating streams...')
+
+  let updated = 0
+  for (const item of streams) {
+    const stream = store.create(item)
+    const result = checkResults[item._id]
+
+    if (result) {
+      const { error, streams, requests } = result
+      const resolution = parseResolution(streams)
+      const origin = findOrigin(requests)
+      let status = parseStatus(error)
+
+      if (status) {
+        const prevStatus = item.status
+        if (prevStatus.code === 'not_247') // not_247 -> * = not_247
+          status = item.status
+        else if (prevStatus.code === 'geo_blocked') // geo_blocked -> * = geo_blocked
+          status = item.status
+        else if(prevStatus.code === 'offline' && status.code === 'online') // offline -> online = not_247
+          status = statuses['not_247']
+
+
+        stream.set('status', { status })
+        stream.set('is_broken', { status: stream.get('status') })
+      }
+
+      if (resolution) {
+        stream.set('resolution', { resolution })
+      }
+
+      if (origin) {
+        stream.set('url', { url: origin })
+      }
+    }
+
+    if (!stream.has('logo')) {
+      const logo = findLogo(stream.get('id'))
+      stream.set('logo', { logo })
+    }
+
+    if (!stream.has('guides')) {
+      const guides = findGuides(stream.get('id'))
+      stream.set('guides', { guides })
+    }
+
+    if (!stream.has('countries') && stream.get('src_country')) {
+      const countries = [stream.get('src_country')]
+      stream.set('countries', { countries })
+    }
+
+    if (!stream.has('languages')) {
+      const languages = findLanguages(stream.get('countries'), stream.get('src_country'))
+      stream.set('languages', { languages })
+    }
+
+    if (stream.changed) {
+      stream.set('updated', true)
+      items.push(stream.data())
+      updated++
+    }
+  }
+
+  logger.info(`Updated ${updated} items`)
+}
+
+async function updateDatabase() {
+  logger.info('Updating database...')
+
+  for (const item of items) {
+    await db.update({ _id: item._id }, item)
+  }
+  db.compact()
+
+  logger.info('Done')
+}
+
+async function setUp() {
+  try {
+    const codes = await file.read(EPG_CODES_FILEPATH)
+    epgCodes = JSON.parse(codes)
+  } catch (err) {
+    logger.error(err.message)
+  }
+}
+
+function findLanguages(countries, src_country) {
+  if (countries && Array.isArray(countries)) {
+    let codes = countries.map(country => country.lang)
+    codes = _.uniq(codes)
+
+    return codes.map(code => languages.find(l => l.code === code)).filter(l => l)
+  }
+
+  if (src_country) {
+    const code = src_country.lang
+    const lang = languages.find(l => l.code === code)
+
+    return lang ? [lang] : []
+  }
+
+  return []
+}
+
+function findOrigin(requests) {
+  if (origins && Array.isArray(requests)) {
+    requests = requests.map(r => r.url.replace(/(^\w+:|^)/, ''))
+    for (const url of requests) {
+      if (origins[url]) {
+        return origins[url]
+      }
+    }
+  }
+
+  return null
+}
+
+function parseResolution(streams) {
+  const resolution = streams
+    .filter(s => s.codec_type === 'video')
+    .reduce(
+      (acc, curr) => {
+        if (curr.height > acc.height) return { width: curr.width, height: curr.height }
+        return acc
+      },
+      { width: 0, height: 0 }
+    )
+
+  if (resolution.width > 0 && resolution.height > 0) return resolution
+  return null
+}
+
+function parseStatus(error) {
+  if (error) {
+    if (error.includes('timed out')) {
+      return statuses['timeout']
+    } else if (error.includes('403')) {
+      return statuses['geo_blocked']
+    }
+    return statuses['offline']
+  }
+
+  return statuses['online']
+}
+
+function findLogo(id) {
+  const item = epgCodes.find(i => i.tvg_id === id)
+  if (item && item.logo) {
+    return item.logo
+  }
+
+  return null
+}
+
+function findGuides(id) {
+  const item = epgCodes.find(i => i.tvg_id === id)
+  if (item && Array.isArray(item.guides)) {
+    return item.guides
+  }
+
+  return []
+}
diff --git a/scripts/commands/update-playlists.js b/scripts/commands/update-playlists.js
new file mode 100644
index 0000000000..648c27ee94
--- /dev/null
+++ b/scripts/commands/update-playlists.js
@@ -0,0 +1,16 @@
+const _ = require('lodash')
+const { generator, db, logger } = require('../core')
+
+async function main() {
+  let items = await db
+    .find({})
+    .sort({ name: 1, 'status.level': 1, 'resolution.height': -1, url: 1 })
+  const files = _.groupBy(items, 'filepath')
+
+  for (const filepath in files) {
+    const items = files[filepath]
+    await generator.saveAsM3U(filepath, items, { includeGuides: false })
+  }
+}
+
+main()
diff --git a/scripts/commands/update-readme.js b/scripts/commands/update-readme.js
new file mode 100644
index 0000000000..6cc0f63584
--- /dev/null
+++ b/scripts/commands/update-readme.js
@@ -0,0 +1,142 @@
+const { file, markdown, parser, logger } = require('../core')
+const { program } = require('commander')
+
+let categories = []
+let countries = []
+let languages = []
+let regions = []
+
+const LOGS_PATH = process.env.LOGS_PATH || 'scripts/logs'
+
+const options = program
+  .option('-c, --config <config>', 'Set path to config file', '.readme/config.json')
+  .parse(process.argv)
+  .opts()
+
+async function main() {
+  await setUp()
+
+  await generateCategoryTable()
+  await generateLanguageTable()
+  await generateRegionTable()
+  await generateCountryTable()
+
+  await updateReadme()
+}
+
+main()
+
+async function generateCategoryTable() {
+  logger.info('Generating category table...')
+
+  const rows = []
+  for (const category of categories) {
+    rows.push({
+      category: category.name,
+      channels: category.count,
+      playlist: `<code>https://iptv-org.github.io/iptv/categories/${category.slug}.m3u</code>`
+    })
+  }
+
+  const table = markdown.createTable(rows, [
+    { name: 'Category', align: 'left' },
+    { name: 'Channels', align: 'right' },
+    { name: 'Playlist', align: 'left', nowrap: true }
+  ])
+
+  await file.create('./.readme/_categories.md', table)
+}
+
+async function generateCountryTable() {
+  logger.info('Generating country table...')
+
+  const rows = []
+  for (const country of countries) {
+    const flag = getCountryFlag(country.code)
+    const prefix = flag ? `${flag} ` : ''
+
+    rows.push({
+      country: prefix + country.name,
+      channels: country.count,
+      playlist: `<code>https://iptv-org.github.io/iptv/countries/${country.code.toLowerCase()}.m3u</code>`
+    })
+  }
+
+  const table = markdown.createTable(rows, [
+    { name: 'Country', align: 'left' },
+    { name: 'Channels', align: 'right' },
+    { name: 'Playlist', align: 'left', nowrap: true }
+  ])
+
+  await file.create('./.readme/_countries.md', table)
+}
+
+async function generateRegionTable() {
+  logger.info('Generating region table...')
+
+  const rows = []
+  for (const region of regions) {
+    rows.push({
+      region: region.name,
+      channels: region.count,
+      playlist: `<code>https://iptv-org.github.io/iptv/regions/${region.code.toLowerCase()}.m3u</code>`
+    })
+  }
+
+  const table = markdown.createTable(rows, [
+    { name: 'Region', align: 'left' },
+    { name: 'Channels', align: 'right' },
+    { name: 'Playlist', align: 'left', nowrap: true }
+  ])
+
+  await file.create('./.readme/_regions.md', table)
+}
+
+async function generateLanguageTable() {
+  logger.info('Generating language table...')
+
+  const rows = []
+  for (const language of languages) {
+    rows.push({
+      language: language.name,
+      channels: language.count,
+      playlist: `<code>https://iptv-org.github.io/iptv/languages/${language.code}.m3u</code>`
+    })
+  }
+
+  const table = markdown.createTable(rows, [
+    { name: 'Language', align: 'left' },
+    { name: 'Channels', align: 'right' },
+    { name: 'Playlist', align: 'left', nowrap: true }
+  ])
+
+  await file.create('./.readme/_languages.md', table)
+}
+
+async function updateReadme() {
+  logger.info('Updating README.md...')
+
+  const config = require(file.resolve(options.config))
+  await file.createDir(file.dirname(config.build))
+  await markdown.compile(options.config)
+}
+
+async function setUp() {
+  categories = await parser.parseLogs(`${LOGS_PATH}/generate-playlists/categories.log`)
+  countries = await parser.parseLogs(`${LOGS_PATH}/generate-playlists/countries.log`)
+  languages = await parser.parseLogs(`${LOGS_PATH}/generate-playlists/languages.log`)
+  regions = await parser.parseLogs(`${LOGS_PATH}/generate-playlists/regions.log`)
+}
+
+function getCountryFlag(code) {
+  switch (code) {
+    case 'UK':
+      return '🇬🇧'
+    case 'INT':
+      return '🌍'
+    case 'UNDEFINED':
+      return ''
+    default:
+      return code.replace(/./g, char => String.fromCodePoint(char.charCodeAt(0) + 127397))
+  }
+}
diff --git a/scripts/commands/validate.js b/scripts/commands/validate.js
new file mode 100644
index 0000000000..0d2b716558
--- /dev/null
+++ b/scripts/commands/validate.js
@@ -0,0 +1,55 @@
+const blocklist = require('../data/blocklist')
+const parser = require('iptv-playlist-parser')
+const { file, logger } = require('../core')
+const { program } = require('commander')
+
+const options = program
+  .option('--input-dir <input-dir>', 'Set path to input directory', 'channels')
+  .parse(process.argv)
+  .opts()
+
+async function main() {
+  const files = await file.list(`${options.inputDir}/**/*.m3u`)
+  const errors = []
+  for (const filepath of files) {
+    const content = await file.read(filepath)
+    const playlist = parser.parse(content)
+    const basename = file.basename(filepath)
+    const [_, country] = basename.match(/([a-z]{2})(|_.*)\.m3u/i) || [null, null]
+
+    const items = playlist.items
+      .map(item => {
+        const details = check(item, country)
+
+        return details ? { ...item, details } : null
+      })
+      .filter(i => i)
+
+    items.forEach(item => {
+      errors.push(
+        `${filepath}:${item.line}   '${item.details.name}' is on the blocklist due to claims of copyright holders (${item.details.reference})`
+      )
+    })
+  }
+
+  errors.forEach(error => {
+    logger.error(error)
+  })
+
+  if (errors.length) {
+    logger.info('')
+    process.exit(1)
+  }
+}
+
+function check(channel, country) {
+  return blocklist.find(item => {
+    const regexp = new RegExp(item.regex, 'i')
+    const hasSameName = regexp.test(channel.name)
+    const fromSameCountry = country === item.country.toLowerCase()
+
+    return hasSameName && fromSameCountry
+  })
+}
+
+main()
diff --git a/scripts/core/checker.js b/scripts/core/checker.js
new file mode 100644
index 0000000000..552110072a
--- /dev/null
+++ b/scripts/core/checker.js
@@ -0,0 +1,19 @@
+const IPTVChecker = require('iptv-checker')
+
+const checker = {}
+
+checker.check = async function (item, config) {
+  const ic = new IPTVChecker(config)
+  const result = await ic.checkStream({ url: item.url, http: item.http })
+
+  return {
+    _id: item._id,
+    url: item.url,
+    http: item.http,
+    error: !result.status.ok ? result.status.reason : null,
+    streams: result.status.ok ? result.status.metadata.streams : [],
+    requests: result.status.ok ? result.status.metadata.requests : []
+  }
+}
+
+module.exports = checker
diff --git a/scripts/core/db.js b/scripts/core/db.js
new file mode 100644
index 0000000000..27360a839f
--- /dev/null
+++ b/scripts/core/db.js
@@ -0,0 +1,61 @@
+const Database = require('nedb-promises')
+const file = require('./file')
+
+const DB_FILEPATH = process.env.DB_FILEPATH || './scripts/channels.db'
+
+const nedb = Database.create({
+  filename: file.resolve(DB_FILEPATH),
+  autoload: true,
+  onload(err) {
+    if (err) console.error(err)
+  },
+  compareStrings: (a, b) => {
+    a = a.replace(/\s/g, '_')
+    b = b.replace(/\s/g, '_')
+
+    return a.localeCompare(b, undefined, {
+      sensitivity: 'accent',
+      numeric: true
+    })
+  }
+})
+
+const db = {}
+
+db.removeIndex = function (field) {
+  return nedb.removeIndex(field)
+}
+
+db.addIndex = function (options) {
+  return nedb.ensureIndex(options)
+}
+
+db.compact = function () {
+  return nedb.persistence.compactDatafile()
+}
+
+db.reset = function () {
+  return file.clear(DB_FILEPATH)
+}
+
+db.count = function (query) {
+  return nedb.count(query)
+}
+
+db.insert = function (doc) {
+  return nedb.insert(doc)
+}
+
+db.update = function (query, update) {
+  return nedb.update(query, update)
+}
+
+db.find = function (query) {
+  return nedb.find(query)
+}
+
+db.remove = function (query, options) {
+  return nedb.remove(query, options)
+}
+
+module.exports = db
diff --git a/scripts/core/file.js b/scripts/core/file.js
new file mode 100644
index 0000000000..56da4db967
--- /dev/null
+++ b/scripts/core/file.js
@@ -0,0 +1,67 @@
+const path = require('path')
+const glob = require('glob')
+const fs = require('mz/fs')
+
+const file = {}
+
+file.list = function (pattern) {
+  return new Promise(resolve => {
+    glob(pattern, function (err, files) {
+      resolve(files)
+    })
+  })
+}
+
+file.getFilename = function (filepath) {
+  return path.parse(filepath).name
+}
+
+file.createDir = async function (dir) {
+  if (await file.exists(dir)) return
+
+  return fs.mkdir(dir, { recursive: true }).catch(console.error)
+}
+
+file.exists = function (filepath) {
+  return fs.exists(path.resolve(filepath))
+}
+
+file.read = function (filepath) {
+  return fs.readFile(path.resolve(filepath), { encoding: 'utf8' }).catch(console.error)
+}
+
+file.append = function (filepath, data) {
+  return fs.appendFile(path.resolve(filepath), data).catch(console.error)
+}
+
+file.create = function (filepath, data = '') {
+  filepath = path.resolve(filepath)
+  const dir = path.dirname(filepath)
+
+  return file
+    .createDir(dir)
+    .then(() => fs.writeFile(filepath, data, { encoding: 'utf8', flag: 'w' }))
+    .catch(console.error)
+}
+
+file.write = function (filepath, data = '') {
+  return fs.writeFile(path.resolve(filepath), data).catch(console.error)
+}
+
+file.clear = function (filepath) {
+  return file.write(filepath, '')
+}
+
+file.resolve = function (filepath) {
+  return path.resolve(filepath)
+}
+
+file.dirname = function (filepath) {
+  return path.dirname(filepath)
+}
+
+file.basename = function (filepath) {
+  return path.basename(filepath)
+}
+
+module.exports = file
diff --git a/scripts/core/generator.js b/scripts/core/generator.js
new file mode 100644
index 0000000000..046ac15fdb
--- /dev/null
+++ b/scripts/core/generator.js
@@ -0,0 +1,114 @@
+const { create: createPlaylist } = require('./playlist')
+const store = require('./store')
+const file = require('./file')
+const logger = require('./logger')
+const db = require('./db')
+const _ = require('lodash')
+
+const generator = {}
+
+generator.generate = async function (filepath, query = {}, options = {}) {
+  options = {
+    ...{
+      format: 'm3u',
+      saveEmpty: false,
+      includeNSFW: false,
+      includeGuides: true,
+      includeBroken: false,
+      onLoad: r => r,
+      uniqBy: item => item.id || _.uniqueId(),
+      sortBy: null
+    },
+    ...options
+  }
+
+  query['is_nsfw'] = options.includeNSFW ? { $in: [true, false] } : false
+  query['is_broken'] = options.includeBroken ? { $in: [true, false] } : false
+
+  let items = await db
+    .find(query)
+    .sort({ name: 1, 'status.level': 1, 'resolution.height': -1, url: 1 })
+
+  items = _.uniqBy(items, 'url')
+  if (!options.saveEmpty && !items.length) return { filepath, query, options, count: 0 }
+  if (options.uniqBy) items = _.uniqBy(items, options.uniqBy)
+
+  items = options.onLoad(items)
+
+  if (options.sortBy) items = _.sortBy(items, options.sortBy)
+
+  switch (options.format) {
+    case 'json':
+      await saveAsJSON(filepath, items, options)
+      break
+    case 'm3u':
+    default:
+      await saveAsM3U(filepath, items, options)
+      break
+  }
+
+  return { filepath, query, options, count: items.length }
+}
+
+async function saveAsM3U(filepath, items, options) {
+  const playlist = await createPlaylist(filepath)
+
+  const header = {}
+  if (options.includeGuides) {
+    let guides = items.map(item => item.guides)
+    guides = _.uniq(_.flatten(guides)).sort().join(',')
+
+    header['x-tvg-url'] = guides
+  }
+
+  await playlist.header(header)
+  for (const item of items) {
+    const stream = store.create(item)
+    await playlist.link(
+      stream.get('url'),
+      stream.get('title'),
+      {
+        'tvg-id': stream.get('tvg_id'),
+        'tvg-country': stream.get('tvg_country'),
+        'tvg-language': stream.get('tvg_language'),
+        'tvg-logo': stream.get('tvg_logo'),
+        // 'tvg-url': stream.get('tvg_url') || undefined,
+        'user-agent': stream.get('http.user-agent') || undefined,
+        'group-title': stream.get('group_title')
+      },
+      {
+        'http-referrer': stream.get('http.referrer') || undefined,
+        'http-user-agent': stream.get('http.user-agent') || undefined
+      }
+    )
+  }
+}
+
+async function saveAsJSON(filepath, items, options) {
+  const output = items.map(item => {
+    const stream = store.create(item)
+    const categories = stream.get('categories').map(c => ({ name: c.name, slug: c.slug }))
+    const countries = stream.get('countries').map(c => ({ name: c.name, code: c.code }))
+
+    return {
+      name: stream.get('name'),
+      logo: stream.get('logo'),
+      url: stream.get('url'),
+      categories,
+      countries,
+      languages: stream.get('languages'),
+      tvg: {
+        id: stream.get('tvg_id'),
+        name: stream.get('name'),
+        url: stream.get('tvg_url')
+      }
+    }
+  })
+
+  await file.create(filepath, JSON.stringify(output))
+}
+
+generator.saveAsM3U = saveAsM3U
+generator.saveAsJSON = saveAsJSON
+
+module.exports = generator
diff --git a/scripts/core/index.js b/scripts/core/index.js
new file mode 100644
index 0000000000..948ff6c6d0
--- /dev/null
+++ b/scripts/core/index.js
@@ -0,0 +1,10 @@
+exports.db = require('./db')
+exports.logger = require('./logger')
+exports.file = require('./file')
+exports.timer = require('./timer')
+exports.parser = require('./parser')
+exports.checker = require('./checker')
+exports.generator = require('./generator')
+exports.playlist = require('./playlist')
+exports.store = require('./store')
+exports.markdown = require('./markdown')
diff --git a/scripts/core/logger.js b/scripts/core/logger.js
new file mode 100644
index 0000000000..a109a050ba
--- /dev/null
+++ b/scripts/core/logger.js
@@ -0,0 +1,42 @@
+const { createLogger, format, transports, addColors } = require('winston')
+const { combine, timestamp, printf } = format
+
+const consoleFormat = ({ level, message, timestamp }) => {
+  if (typeof message === 'object') return JSON.stringify(message)
+  return message
+}
+
+const config = {
+  levels: {
+    error: 0,
+    warn: 1,
+    info: 2,
+    failed: 3,
+    success: 4,
+    http: 5,
+    verbose: 6,
+    debug: 7,
+    silly: 8
+  },
+  colors: {
+    info: 'white',
+    success: 'green',
+    failed: 'red'
+  }
+}
+
+const t = [
+  new transports.Console({
+    format: format.combine(format.printf(consoleFormat))
+  })
+]
+
+const logger = createLogger({
+  transports: t,
+  levels: config.levels,
+  level: 'verbose'
+})
+
+addColors(config.colors)
+
+module.exports = logger
diff --git a/scripts/core/markdown.js b/scripts/core/markdown.js
new file mode 100644
index 0000000000..32dc1110ec
--- /dev/null
+++ b/scripts/core/markdown.js
@@ -0,0 +1,39 @@
+const markdownInclude = require('markdown-include')
+const file = require('./file')
+
+const markdown = {}
+
+markdown.createTable = function (data, cols) {
+  let output = '<table>\n'
+
+  output += '  <thead>\n    <tr>'
+  for (let column of cols) {
+    output += `<th align="${column.align}">${column.name}</th>`
+  }
+  output += '</tr>\n  </thead>\n'
+
+  output += '  <tbody>\n'
+  for (let item of data) {
+    output += '    <tr>'
+    let i = 0
+    for (let prop in item) {
+      const column = cols[i]
+      let nowrap = column.nowrap
+      let align = column.align
+      output += `<td align="${align}"${nowrap ? ' nowrap' : ''}>${item[prop]}</td>`
+      i++
+    }
+    output += '</tr>\n'
+  }
+  output += '  </tbody>\n'
+
+  output += '</table>'
+
+  return output
+}
+
+markdown.compile = function (filepath) {
+  markdownInclude.compileFiles(file.resolve(filepath))
+}
+
+module.exports = markdown
diff --git a/scripts/core/parser.js b/scripts/core/parser.js
new file mode 100644
index 0000000000..b54fd8f5a0
--- /dev/null
+++ b/scripts/core/parser.js
@@ -0,0 +1,31 @@
+const ipp = require('iptv-playlist-parser')
+const logger = require('./logger')
+const file = require('./file')
+
+const parser = {}
+
+parser.parsePlaylist = async function (filepath) {
+  const content = await file.read(filepath)
+  const playlist = ipp.parse(content)
+
+  return playlist.items
+}
+
+parser.parseLogs = async function (filepath) {
+  const content = await file.read(filepath)
+  if (!content) return []
+  const lines = content.split('\n')
+
+  return lines.map(line => (line ? JSON.parse(line) : null)).filter(l => l)
+}
+
+parser.parseNumber = function (string) {
+  const parsed = parseInt(string)
+  if (isNaN(parsed)) {
+    throw new Error('scripts/core/parser.js:parseNumber() Input value is not a number')
+  }
+
+  return parsed
+}
+
+module.exports = parser
diff --git a/scripts/core/playlist.js b/scripts/core/playlist.js
new file mode 100644
index 0000000000..fb8077b27d
--- /dev/null
+++ b/scripts/core/playlist.js
@@ -0,0 +1,49 @@
+const file = require('./file')
+
+const playlist = {}
+
+playlist.create = async function (filepath) {
+  playlist.filepath = filepath
+  const dir = file.dirname(filepath)
+  file.createDir(dir)
+  await file.create(filepath, '')
+
+  return playlist
+}
+
+playlist.header = async function (attrs) {
+  let header = `#EXTM3U`
+  for (const name in attrs) {
+    const value = attrs[name]
+    header += ` ${name}="${value}"`
+  }
+  header += `\n`
+
+  await file.append(playlist.filepath, header)
+
+  return playlist
+}
+
+playlist.link = async function (url, title, attrs, vlcOpts) {
+  let link = `#EXTINF:-1`
+  for (const name in attrs) {
+    const value = attrs[name]
+    if (value !== undefined) {
+      link += ` ${name}="${value}"`
+    }
+  }
+  link += `,${title}\n`
+  for (const name in vlcOpts) {
+    const value = vlcOpts[name]
+    if (value !== undefined) {
+      link += `#EXTVLCOPT:${name}=${value}\n`
+    }
+  }
+  link += `${url}\n`
+
+  await file.append(playlist.filepath, link)
+
+  return playlist
+}
+
+module.exports = playlist
diff --git a/scripts/core/store.js b/scripts/core/store.js
new file mode 100644
index 0000000000..c415944039
--- /dev/null
+++ b/scripts/core/store.js
@@ -0,0 +1,56 @@
+const _ = require('lodash')
+const logger = require('./logger')
+const setters = require('../store/setters')
+const getters = require('../store/getters')
+
+module.exports = {
+  create(state = {}) {
+    return {
+      state,
+      changed: false,
+      set: function (prop, value) {
+        const prevState = JSON.stringify(this.state)
+
+        const setter = setters[prop]
+        if (typeof setter === 'function') {
+          try {
+            this.state[prop] = setter.bind()(value)
+          } catch (error) {
+            logger.error(`store/setters/${prop}.js: ${error.message}`)
+          }
+        } else if (typeof value === 'object') {
+          this.state[prop] = value[prop]
+        } else {
+          this.state[prop] = value
+        }
+
+        const newState = JSON.stringify(this.state)
+        if (prevState !== newState) {
+          this.changed = true
+        }
+
+        return this
+      },
+      get: function (prop) {
+        const getter = getters[prop]
+        if (typeof getter === 'function') {
+          try {
+            return getter.bind(this.state)()
+          } catch (error) {
+            logger.error(`store/getters/${prop}.js: ${error.message}`)
+          }
+        } else {
+          return prop.split('.').reduce((o, i) => (o ? o[i] : undefined), this.state)
+        }
+      },
+      has: function (prop) {
+        const value = this.get(prop)
+
+        return !_.isEmpty(value)
+      },
+      data: function () {
+        return this.state
+      }
+    }
+  }
+}
diff --git a/scripts/core/timer.js b/scripts/core/timer.js
new file mode 100644
index 0000000000..6e5f381d92
--- /dev/null
+++ b/scripts/core/timer.js
@@ -0,0 +1,29 @@
+const { performance } = require('perf_hooks')
+const dayjs = require('dayjs')
+const duration = require('dayjs/plugin/duration')
+const relativeTime = require('dayjs/plugin/relativeTime')
+
+dayjs.extend(relativeTime)
+dayjs.extend(duration)
+
+const timer = {}
+
+let t0 = 0
+
+timer.start = function () {
+  t0 = performance.now()
+}
+
+timer.format = function (f) {
+  let t1 = performance.now()
+
+  return dayjs.duration(t1 - t0).format(f)
+}
+
+timer.humanize = function (suffix = true) {
+  let t1 = performance.now()
+
+  return dayjs.duration(t1 - t0).humanize(suffix)
+}
+
+module.exports = timer
diff --git a/scripts/create-matrix.js b/scripts/create-matrix.js
deleted file mode 100644
index 6e306d42b3..0000000000
--- a/scripts/create-matrix.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const file = require('./helpers/file')
-
-file.list().then(files => {
-  files = files.filter(file => file !== 'channels/unsorted.m3u')
-  const country = files.map(file => file.replace(/channels\/|\.m3u/gi, ''))
-  const matrix = { country }
-  const output = `::set-output name=matrix::${JSON.stringify(matrix)}`
-  console.log(output)
-})
diff --git a/scripts/data/.gitignore b/scripts/data/.gitignore
new file mode 100644
index 0000000000..3063886eab
--- /dev/null
+++ b/scripts/data/.gitignore
@@ -0,0 +1 @@
+codes.json
\ No newline at end of file
diff --git a/scripts/data/blacklist.json b/scripts/data/blacklist.json
deleted file mode 100644
index f5c735d0e6..0000000000
--- a/scripts/data/blacklist.json
+++ /dev/null
@@ -1,632 +0,0 @@
-[
-  {
-    "name": "Animal Planet",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Animal Planet$"
-  },
-  {
-    "name": "Arena 4",
-    "country": "hu",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Arena( |)4$"
-  },
-  {
-    "name": "Asian Food Network",
-    "country": "sg",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Asian Food Network$"
-  },
-  {
-    "name": "Astro SuperSport",
-    "country": "my",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Astro SuperSport$"
-  },
-  {
-    "name": "Azteca 7",
-    "country": "mx",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Azteca 7$"
-  },
-  {
-    "name": "beIN Sports",
-    "country": "qa",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^beIN Sports"
-  },
-  {
-    "name": "Canal+ Sport",
-    "country": "fr",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Canal( |)+ Sport"
-  },
-  {
-    "name": "Cooking Channel",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Cooking Channel$"
-  },
-  {
-    "name": "DAZN",
-    "country": "uk",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^DAZN($| [1-4] .*)$"
-  },
-  {
-    "name": "Diema Sport",
-    "country": "bg",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Diema Sport($| [1-3])$"
-  },
-  {
-    "name": "Digi Sport",
-    "country": "ro",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Digi Sport($| [1-4].*)"
-  },
-  {
-    "name": "Discovery Asia",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Asia$"
-  },
-  {
-    "name": "Discovery Channel",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Channel$"
-  },
-  {
-    "name": "Discovery Civiliztion",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Civiliztion$"
-  },
-  {
-    "name": "Discovery en Espanol",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery en Espanol$"
-  },
-  {
-    "name": "Discovery Family",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Family$"
-  },
-  {
-    "name": "Discovery Historia",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Historia$"
-  },
-  {
-    "name": "Discovery History",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery History$"
-  },
-  {
-    "name": "Discovery Home and Health",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Home and Health$"
-  },
-  {
-    "name": "Discovery Life",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Life$"
-  },
-  {
-    "name": "Discovery Science",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Science$"
-  },
-  {
-    "name": "Discovery Shed",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Shed$"
-  },
-  {
-    "name": "Discovery Theater",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Theater$"
-  },
-  {
-    "name": "Discovery Travel and Living",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Travel and Living$"
-  },
-  {
-    "name": "Discovery Turbo Xtra",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery Turbo Xtra$"
-  },
-  {
-    "name": "Discovery World",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery World$"
-  },
-  {
-    "name": "Discovery",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Discovery$"
-  },
-  {
-    "name": "DIY Network",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^DIY Network$"
-  },
-  {
-    "name": "DKiss",
-    "country": "es",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^DKiss$"
-  },
-  {
-    "name": "DMax",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^DMax$"
-  },
-  {
-    "name": "Eleven Sports",
-    "country": "uk",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Eleven Sports($| [1-6] .*)$"
-  },
-  {
-    "name": "ESPN",
-    "country": "us",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^ESPN($|[1-3]| .*)$"
-  },
-  {
-    "name": "Eurosport",
-    "country": "fr",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Eurosport($| [1-2])$"
-  },
-  {
-    "name": "eve",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^eve$"
-  },
-  {
-    "name": "Familia Discovery",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Familia Discovery$"
-  },
-  {
-    "name": "Fatafeat",
-    "country": "eg",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Fatafeat$"
-  },
-  {
-    "name": "FEM",
-    "country": "no",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^FEM$"
-  },
-  {
-    "name": "Fine Living",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Fine Living$"
-  },
-  {
-    "name": "Flow Sports",
-    "country": "uk",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Flow Sports$"
-  },
-  {
-    "name": "Food Network",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Food Network$"
-  },
-  {
-    "name": "food tv",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^food( |)tv$"
-  },
-  {
-    "name": "Fox Sports",
-    "country": "us",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Fox Sports$"
-  },
-  {
-    "name": "Frisbee",
-    "country": "it",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Frisbee$"
-  },
-  {
-    "name": "Futbol",
-    "country": "tj",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^(Futbol|Football TV|ТВ Футбол|Футбол)$"
-  },
-  {
-    "name": "GTV Sports",
-    "country": "gh",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^GTV Sports"
-  },
-  {
-    "name": "Giallo",
-    "country": "it",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Giallo$"
-  },
-  {
-    "name": "GolfTV",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Golf( |)TV$"
-  },
-  {
-    "name": "HGTV",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^HGTV$"
-  },
-  {
-    "name": "Investigation Discovery",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^(Investigation Discovery|ID Investigation Discovery|ID Investigation|ID)$"
-  },
-  {
-    "name": "K2",
-    "country": "it",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^K2$"
-  },
-  {
-    "name": "Living Channel",
-    "country": "nz",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Living Channel$"
-  },
-  {
-    "name": "LookSport",
-    "country": "ro",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Look( |)Sport"
-  },
-  {
-    "name": "Mango",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Mango$"
-  },
-  {
-    "name": "Match!",
-    "country": "ru",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^(Match|Матч)"
-  },
-  {
-    "name": "Motortrend",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Motortrend$"
-  },
-  {
-    "name": "Mola TV",
-    "country": "id",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Mola TV($| .*)$"
-  },
-  {
-    "name": "Movistar Liga de Campeones",
-    "country": "es",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Movistar Liga de Campeones [1-8]$"
-  },
-  {
-    "name": "Nova Sport",
-    "country": "cz",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Nova Sport [1-3]$"
-  },
-  {
-    "name": "Nova Sports",
-    "country": "gr",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Nova Sports [1-6]$"
-  },
-  {
-    "name": "Nove",
-    "country": "it",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Nove($| .*)$"
-  },
-  {
-    "name": "PPTV HD 36",
-    "country": "th",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^PPTV($| HD)$"
-  },
-  {
-    "name": "One",
-    "country": "il",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^One$"
-  },
-  {
-    "name": "OWN",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^(OWN|Oprah)$"
-  },
-  {
-    "name": "Quest Red",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Quest Red$"
-  },
-  {
-    "name": "Quest",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Quest$"
-  },
-  {
-    "name": "Real Time",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Real Time$"
-  },
-  {
-    "name": "SABC Sport ",
-    "country": "za",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^SABC Sport"
-  },
-  {
-    "name": "Setanta Sports",
-    "country": "ie",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Setanta Sports($| .*)$"
-  },
-  {
-    "name": "Sky Sports",
-    "country": "uk",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Sky Sports$"
-  },
-  {
-    "name": "Sky Sport Bundesliga",
-    "country": "de",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Sky Sport Bundesliga [0-9]+$"
-  },
-  {
-    "name": "Sky TG24",
-    "country": "it",
-    "dmca_notice": "https://github.com/iptv-org/iptv/pull/2294",
-    "regex": "^Sky TG24$"
-  },
-  {
-    "name": "Sony Ten",
-    "country": "in",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Sony Ten [1-4]$"
-  },
-  {
-    "name": "Spíler TV",
-    "country": "hu",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Spíler( |[1-2] )TV$"
-  },
-  {
-    "name": "Šport TV",
-    "country": "si",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^(Šport|Sport) TV"
-  },
-  {
-    "name": "Sport Klub",
-    "country": "hu",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^(Sport Klub|SK[1-9])"
-  },
-  {
-    "name": "SportsNet",
-    "country": "ca",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^SportsNet$"
-  },
-  {
-    "name": "StarHub TV",
-    "country": "sg",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^StarHub TV$"
-  },
-  {
-    "name": "StarSat",
-    "country": "za",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^StarSat$"
-  },
-  {
-    "name": "StarTimes TV",
-    "country": "mz",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^StarTimes TV"
-  },
-  {
-    "name": "SuperSport",
-    "country": "al",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^SuperSport [1-7]$"
-  },
-  {
-    "name": "Tivibu Spor",
-    "country": "tr",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Tivibu Spor"
-  },
-  {
-    "name": "TLC",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TLC$"
-  },
-  {
-    "name": "Trvl Channel",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Trvl Channel$"
-  },
-  {
-    "name": "TSN",
-    "country": "mt",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^TSN$"
-  },
-  {
-    "name": "TTV",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TTV$"
-  },
-  {
-    "name": "TV Norge",
-    "country": "no",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TV Norge$"
-  },
-  {
-    "name": "TV Varzish",
-    "country": "tj",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^(TV Varzish|Varzish TV|Варзиш ТВ)$"
-  },
-  {
-    "name": "TV3 Sport",
-    "country": "dk",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^TV( |)3 Sport$"
-  },
-  {
-    "name": "tvN Asia",
-    "country": "kr",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^tvN($| Asia)$"
-  },
-  {
-    "name": "Tvn 24 Bis",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Tvn 24 Bis$"
-  },
-  {
-    "name": "TVN 24",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TVN 24$"
-  },
-  {
-    "name": "Tvn 7",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Tvn 7$"
-  },
-  {
-    "name": "TVN Extra",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TVN Extra$"
-  },
-  {
-    "name": "TVN Fabula",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TVN Fabula$"
-  },
-  {
-    "name": "TVN Meteo",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TVN Meteo$"
-  },
-  {
-    "name": "TVN Style",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TVN Style$"
-  },
-  {
-    "name": "TVN Turbo",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TVN Turbo$"
-  },
-  {
-    "name": "TVN Warszawa",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TVN Warszawa$"
-  },
-  {
-    "name": "TVN",
-    "country": "pl",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^TVN$"
-  },
-  {
-    "name": "V Sport",
-    "country": "no",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^V Sport"
-  },
-  {
-    "name": "Vox",
-    "country": "no",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^Vox$"
-  },
-  {
-    "name": "VTV Cab",
-    "country": "kr",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^VTV( |)Cab$"
-  },
-  {
-    "name": "World Discovery",
-    "country": "us",
-    "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831",
-    "regex": "^World Discovery$"
-  },
-  {
-    "name": "Xee",
-    "country": "dk",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^Xee$"
-  },
-  {
-    "name": "XtvN",
-    "country": "kr",
-    "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
-    "regex": "^X( |)tvN$"
-  }
-]
diff --git a/scripts/data/blocklist.json b/scripts/data/blocklist.json
new file mode 100644
index 0000000000..c1c91775d8
--- /dev/null
+++ b/scripts/data/blocklist.json
@@ -0,0 +1,632 @@
+[
+  {
+    "name": "Animal Planet",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Animal Planet\\b"
+  },
+  {
+    "name": "Arena 4",
+    "country": "HU",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Arena( |)4\\b"
+  },
+  {
+    "name": "Asian Food Network",
+    "country": "SG",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Asian Food Network\\b"
+  },
+  {
+    "name": "Astro SuperSport",
+    "country": "MY",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Astro SuperSport\\b"
+  },
+  {
+    "name": "Azteca 7",
+    "country": "MX",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Azteca 7\\b"
+  },
+  {
+    "name": "beIN Sports",
+    "country": "QA",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^beIN Sports\\b"
+  },
+  {
+    "name": "Canal+ Sport",
+    "country": "FR",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Canal( |)+ Sport\\b"
+  },
+  {
+    "name": "Cooking Channel",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Cooking Channel\\b"
+  },
+  {
+    "name": "DAZN",
+    "country": "UK",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^DAZN($| [1-4] .*)\\b"
+  },
+  {
+    "name": "Diema Sport",
+    "country": "BG",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Diema Sport\\b"
+  },
+  {
+    "name": "Digi Sport",
+    "country": "RO",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Digi Sport\\b"
+  },
+  {
+    "name": "Discovery Asia",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Asia\\b"
+  },
+  {
+    "name": "Discovery Channel",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Channel\\b"
+  },
+  {
+    "name": "Discovery Civiliztion",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Civiliztion\\b"
+  },
+  {
+    "name": "Discovery en Espanol",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery en Espanol\\b"
+  },
+  {
+    "name": "Discovery Family",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Family\\b"
+  },
+  {
+    "name": "Discovery Historia",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Historia\\b"
+  },
+  {
+    "name": "Discovery History",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery History\\b"
+  },
+  {
+    "name": "Discovery Home and Health",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Home and Health\\b"
+  },
+  {
+    "name": "Discovery Life",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Life\\b"
+  },
+  {
+    "name": "Discovery Science",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Science\\b"
+  },
+  {
+    "name": "Discovery Shed",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Shed\\b"
+  },
+  {
+    "name": "Discovery Theater",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Theater\\b"
+  },
+  {
+    "name": "Discovery Travel and Living",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Travel and Living\\b"
+  },
+  {
+    "name": "Discovery Turbo Xtra",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery Turbo Xtra\\b"
+  },
+  {
+    "name": "Discovery World",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery World\\b"
+  },
+  {
+    "name": "Discovery",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Discovery\\b"
+  },
+  {
+    "name": "DIY Network",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^DIY Network\\b"
+  },
+  {
+    "name": "DKiss",
+    "country": "ES",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^DKiss\\b"
+  },
+  {
+    "name": "DMax",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^DMax\\b"
+  },
+  {
+    "name": "Eleven Sports",
+    "country": "UK",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Eleven Sports($| [1-6] .*)\\b"
+  },
+  {
+    "name": "ESPN",
+    "country": "US",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^ESPN($|[1-3]| .*)\\b"
+  },
+  {
+    "name": "Eurosport",
+    "country": "FR",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Eurosport($| [1-2])\\b"
+  },
+  {
+    "name": "eve",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^eve\\b"
+  },
+  {
+    "name": "Familia Discovery",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Familia Discovery\\b"
+  },
+  {
+    "name": "Fatafeat",
+    "country": "EG",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Fatafeat\\b"
+  },
+  {
+    "name": "FEM",
+    "country": "NO",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^FEM\\b"
+  },
+  {
+    "name": "Fine Living",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Fine Living\\b"
+  },
+  {
+    "name": "Flow Sports",
+    "country": "UK",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Flow Sports\\b"
+  },
+  {
+    "name": "Food Network",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Food Network\\b"
+  },
+  {
+    "name": "food tv",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^food( |)tv\\b"
+  },
+  {
+    "name": "Fox Sports",
+    "country": "US",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Fox Sports\\b"
+  },
+  {
+    "name": "Frisbee",
+    "country": "IT",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Frisbee\\b"
+  },
+  {
+    "name": "Futbol",
+    "country": "TJ",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^(Futbol|Football TV|ТВ Футбол|Футбол)\\b"
+  },
+  {
+    "name": "GTV Sports",
+    "country": "GH",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^GTV Sports\\b"
+  },
+  {
+    "name": "Giallo",
+    "country": "IT",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Giallo\\b"
+  },
+  {
+    "name": "GolfTV",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Golf( |)TV\\b"
+  },
+  {
+    "name": "HGTV",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^HGTV\\b"
+  },
+  {
+    "name": "Investigation Discovery",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^(Investigation Discovery|ID Investigation Discovery|ID Investigation|ID)\\b"
+  },
+  {
+    "name": "K2",
+    "country": "IT",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^K2\\b"
+  },
+  {
+    "name": "Living Channel",
+    "country": "NZ",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Living Channel\\b"
+  },
+  {
+    "name": "LookSport",
+    "country": "RO",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Look( |)Sport\\b"
+  },
+  {
+    "name": "Mango",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Mango\\b"
+  },
+  {
+    "name": "Match!",
+    "country": "RU",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^(Match|Матч)\\b"
+  },
+  {
+    "name": "Motortrend",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Motortrend\\b"
+  },
+  {
+    "name": "Mola TV",
+    "country": "ID",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Mola TV($| .*)\\b"
+  },
+  {
+    "name": "Movistar Liga de Campeones",
+    "country": "ES",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Movistar Liga de Campeones [1-8]\\b"
+  },
+  {
+    "name": "Nova Sport",
+    "country": "CZ",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Nova Sport [1-3]\\b"
+  },
+  {
+    "name": "Nova Sports",
+    "country": "GR",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Nova Sports [1-6]\\b"
+  },
+  {
+    "name": "Nove",
+    "country": "IT",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Nove($| .*)\\b"
+  },
+  {
+    "name": "PPTV HD 36",
+    "country": "TH",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^PPTV($| HD)\\b"
+  },
+  {
+    "name": "One",
+    "country": "IL",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^One\\b"
+  },
+  {
+    "name": "OWN",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^(OWN|Oprah)\\b"
+  },
+  {
+    "name": "Quest Red",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Quest Red\\b"
+  },
+  {
+    "name": "Quest",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Quest\\b"
+  },
+  {
+    "name": "Real Time",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Real Time\\b"
+  },
+  {
+    "name": "SABC Sport ",
+    "country": "ZA",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^SABC Sport\\b"
+  },
+  {
+    "name": "Setanta Sports",
+    "country": "IE",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Setanta Sports($| .*)\\b"
+  },
+  {
+    "name": "Sky Sports",
+    "country": "UK",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Sky Sports\\b"
+  },
+  {
+    "name": "Sky Sport Bundesliga",
+    "country": "DE",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Sky Sport Bundesliga [0-9]+\\b"
+  },
+  {
+    "name": "Sky TG24",
+    "country": "IT",
+    "reference": "https://github.com/iptv-org/iptv/pull/2294",
+    "regex": "^Sky TG24\\b"
+  },
+  {
+    "name": "Sony Ten",
+    "country": "IN",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Sony Ten [1-4]\\b"
+  },
+  {
+    "name": "Spíler TV",
+    "country": "HU",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Spíler( |[1-2] )TV\\b"
+  },
+  {
+    "name": "Šport TV",
+    "country": "SI",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^(Šport|Sport) TV\\b"
+  },
+  {
+    "name": "Sport Klub",
+    "country": "HU",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^(Sport Klub|SK[1-9])\\b"
+  },
+  {
+    "name": "SportsNet",
+    "country": "CA",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^SportsNet\\b"
+  },
+  {
+    "name": "StarHub TV",
+    "country": "SG",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^StarHub TV\\b"
+  },
+  {
+    "name": "StarSat",
+    "country": "ZA",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^StarSat\\b"
+  },
+  {
+    "name": "StarTimes TV",
+    "country": "MZ",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^StarTimes TV\\b"
+  },
+  {
+    "name": "SuperSport",
+    "country": "AL",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^SuperSport [1-7]\\b"
+  },
+  {
+    "name": "Tivibu Spor",
+    "country": "TR",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Tivibu Spor\\b"
+  },
+  {
+    "name": "TLC",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TLC\\b"
+  },
+  {
+    "name": "Trvl Channel",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Trvl Channel\\b"
+  },
+  {
+    "name": "TSN",
+    "country": "MT",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^TSN\\b"
+  },
+  {
+    "name": "TTV",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TTV\\b"
+  },
+  {
+    "name": "TV Norge",
+    "country": "NO",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TV Norge\\b"
+  },
+  {
+    "name": "TV Varzish",
+    "country": "TJ",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^(TV Varzish|Varzish TV|Варзиш ТВ)\\b"
+  },
+  {
+    "name": "TV3 Sport",
+    "country": "DK",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^TV( |)3 Sport\\b"
+  },
+  {
+    "name": "tvN Asia",
+    "country": "KR",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^tvN($| Asia)\\b"
+  },
+  {
+    "name": "Tvn 24 Bis",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Tvn(| )24 Bis\\b"
+  },
+  {
+    "name": "TVN 24",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TVN 24\\b"
+  },
+  {
+    "name": "Tvn 7",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Tvn 7\\b"
+  },
+  {
+    "name": "TVN Extra",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TVN Extra\\b"
+  },
+  {
+    "name": "TVN Fabula",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TVN Fabula\\b"
+  },
+  {
+    "name": "TVN Meteo",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TVN Meteo\\b"
+  },
+  {
+    "name": "TVN Style",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TVN Style\\b"
+  },
+  {
+    "name": "TVN Turbo",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TVN Turbo\\b"
+  },
+  {
+    "name": "TVN Warszawa",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TVN Warszawa\\b"
+  },
+  {
+    "name": "TVN",
+    "country": "PL",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^TVN\\b"
+  },
+  {
+    "name": "V Sport",
+    "country": "NO",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^V Sport\\b"
+  },
+  {
+    "name": "Vox",
+    "country": "NO",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^Vox\\b"
+  },
+  {
+    "name": "VTV Cab",
+    "country": "KR",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^VTV( |)Cab\\b"
+  },
+  {
+    "name": "World Discovery",
+    "country": "US",
+    "reference": "https://github.com/iptv-org/iptv/issues/1831",
+    "regex": "^World Discovery\\b"
+  },
+  {
+    "name": "Xee",
+    "country": "DK",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^Xee\\b"
+  },
+  {
+    "name": "XtvN",
+    "country": "KR",
+    "reference": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md",
+    "regex": "^X( |)tvN\\b"
+  }
+]
diff --git a/scripts/data/categories.json b/scripts/data/categories.json
index f15b795c5c..41a23b1b44 100644
--- a/scripts/data/categories.json
+++ b/scripts/data/categories.json
@@ -1,147 +1,147 @@
-[
-  {
+{
+  "auto": {
     "name": "Auto",
-    "id": "auto",
+    "slug": "auto",
     "nsfw": false
   },
-  {
+  "animation": {
     "name": "Animation",
-    "id": "animation",
+    "slug": "animation",
     "nsfw": false
   },
-  {
+  "business": {
     "name": "Business",
-    "id": "business",
+    "slug": "business",
     "nsfw": false
   },
-  {
+  "classic": {
     "name": "Classic",
-    "id": "classic",
+    "slug": "classic",
     "nsfw": false
   },
-  {
+  "comedy": {
     "name": "Comedy",
-    "id": "comedy",
+    "slug": "comedy",
     "nsfw": false
   },
-  {
+  "cooking": {
     "name": "Cooking",
-    "id": "cooking",
+    "slug": "cooking",
     "nsfw": false
   },
-  {
+  "culture": {
     "name": "Culture",
-    "id": "culture",
+    "slug": "culture",
     "nsfw": false
   },
-  {
+  "documentary": {
     "name": "Documentary",
-    "id": "documentary",
+    "slug": "documentary",
     "nsfw": false
   },
-  {
+  "education": {
     "name": "Education",
-    "id": "education",
+    "slug": "education",
     "nsfw": false
   },
-  {
+  "entertainment": {
     "name": "Entertainment",
-    "id": "entertainment",
+    "slug": "entertainment",
     "nsfw": false
   },
-  {
+  "family": {
     "name": "Family",
-    "id": "family",
+    "slug": "family",
     "nsfw": false
   },
-  {
+  "general": {
     "name": "General",
-    "id": "general",
+    "slug": "general",
     "nsfw": false
   },
-  {
+  "kids": {
     "name": "Kids",
-    "id": "kids",
+    "slug": "kids",
     "nsfw": false
   },
-  {
+  "legislative": {
     "name": "Legislative",
-    "id": "legislative",
+    "slug": "legislative",
     "nsfw": false
   },
-  {
+  "lifestyle": {
     "name": "Lifestyle",
-    "id": "lifestyle",
+    "slug": "lifestyle",
     "nsfw": false
   },
-  {
+  "local": {
     "name": "Local",
-    "id": "local",
+    "slug": "local",
     "nsfw": false
   },
-  {
+  "movies": {
     "name": "Movies",
-    "id": "movies",
+    "slug": "movies",
     "nsfw": false
   },
-  {
+  "music": {
     "name": "Music",
-    "id": "music",
+    "slug": "music",
     "nsfw": false
   },
-  {
+  "news": {
     "name": "News",
-    "id": "news",
+    "slug": "news",
     "nsfw": false
   },
-  {
+  "outdoor": {
     "name": "Outdoor",
-    "id": "outdoor",
+    "slug": "outdoor",
     "nsfw": false
   },
-  {
+  "relax": {
     "name": "Relax",
-    "id": "relax",
+    "slug": "relax",
     "nsfw": false
   },
-  {
+  "religious": {
     "name": "Religious",
-    "id": "religious",
+    "slug": "religious",
     "nsfw": false
   },
-  {
+  "series": {
     "name": "Series",
-    "id": "series",
+    "slug": "series",
     "nsfw": false
   },
-  {
+  "science": {
     "name": "Science",
-    "id": "science",
+    "slug": "science",
     "nsfw": false
   },
-  {
+  "shop": {
     "name": "Shop",
-    "id": "shop",
+    "slug": "shop",
     "nsfw": false
   },
-  {
+  "sports": {
     "name": "Sports",
-    "id": "sports",
+    "slug": "sports",
     "nsfw": false
   },
-  {
+  "travel": {
     "name": "Travel",
-    "id": "travel",
+    "slug": "travel",
     "nsfw": false
   },
-  {
+  "weather": {
     "name": "Weather",
-    "id": "weather",
+    "slug": "weather",
     "nsfw": false
   },
-  {
+  "xxx": {
     "name": "XXX",
-    "id": "xxx",
+    "slug": "xxx",
     "nsfw": true
   }
-]
+}
diff --git a/scripts/data/countries.json b/scripts/data/countries.json
index 2e4f2b85f4..53286657c5 100644
--- a/scripts/data/countries.json
+++ b/scripts/data/countries.json
@@ -1,1002 +1,264 @@
 {
-  "AD": {
-    "name": "Andorra",
-    "languages": ["cat"]
-  },
-  "AE": {
-    "name": "United Arab Emirates",
-    "languages": ["ara"]
-  },
-  "AF": {
-    "name": "Afghanistan",
-    "languages": ["pus", "uzb", "tuk"]
-  },
-  "AG": {
-    "name": "Antigua and Barbuda",
-    "languages": ["eng"]
-  },
-  "AI": {
-    "name": "Anguilla",
-    "languages": ["eng"]
-  },
-  "AL": {
-    "name": "Albania",
-    "languages": ["sqi"]
-  },
-  "AM": {
-    "name": "Armenia",
-    "languages": ["hye", "rus"]
-  },
-  "AO": {
-    "name": "Angola",
-    "languages": ["por"]
-  },
-  "AQ": {
-    "name": "Antarctica",
-    "languages": []
-  },
-  "AR": {
-    "name": "Argentina",
-    "languages": ["spa", "grn"]
-  },
-  "AS": {
-    "name": "American Samoa",
-    "languages": ["eng", "smo"]
-  },
-  "AT": {
-    "name": "Austria",
-    "languages": ["deu"]
-  },
-  "AU": {
-    "name": "Australia",
-    "languages": ["eng"]
-  },
-  "AW": {
-    "name": "Aruba",
-    "languages": ["nld", "pan"]
-  },
-  "AX": {
-    "name": "Åland",
-    "languages": ["swe"]
-  },
-  "AZ": {
-    "name": "Azerbaijan",
-    "languages": ["aze"]
-  },
-  "BA": {
-    "name": "Bosnia and Herzegovina",
-    "languages": ["bos", "hrv", "srp"]
-  },
-  "BB": {
-    "name": "Barbados",
-    "languages": ["eng"]
-  },
-  "BD": {
-    "name": "Bangladesh",
-    "languages": ["ben"]
-  },
-  "BE": {
-    "name": "Belgium",
-    "languages": ["nld", "fra", "deu"]
-  },
-  "BF": {
-    "name": "Burkina Faso",
-    "languages": ["fra", "ful"]
-  },
-  "BG": {
-    "name": "Bulgaria",
-    "languages": ["bul"]
-  },
-  "BH": {
-    "name": "Bahrain",
-    "languages": ["ara"]
-  },
-  "BI": {
-    "name": "Burundi",
-    "languages": ["fra", "run"]
-  },
-  "BJ": {
-    "name": "Benin",
-    "languages": ["fra"]
-  },
-  "BL": {
-    "name": "Saint Barthélemy",
-    "languages": ["fra"]
-  },
-  "BM": {
-    "name": "Bermuda",
-    "languages": ["eng"]
-  },
-  "BN": {
-    "name": "Brunei",
-    "languages": ["msa"]
-  },
-  "BO": {
-    "name": "Bolivia",
-    "languages": ["spa", "aym", "que"]
-  },
-  "BQ": {
-    "name": "Bonaire",
-    "languages": ["nld"]
-  },
-  "BR": {
-    "name": "Brazil",
-    "languages": ["por"]
-  },
-  "BS": {
-    "name": "Bahamas",
-    "languages": ["eng"]
-  },
-  "BT": {
-    "name": "Bhutan",
-    "languages": ["dzo"]
-  },
-  "BV": {
-    "name": "Bouvet Island",
-    "languages": ["nor", "nob", "nno"]
-  },
-  "BW": {
-    "name": "Botswana",
-    "languages": ["eng", "tsn"]
-  },
-  "BY": {
-    "name": "Belarus",
-    "languages": ["bel", "rus"]
-  },
-  "BZ": {
-    "name": "Belize",
-    "languages": ["eng", "spa"]
-  },
-  "CA": {
-    "name": "Canada",
-    "languages": ["eng", "fra"]
-  },
-  "CC": {
-    "name": "Cocos [Keeling] Islands",
-    "languages": ["eng"]
-  },
+  "AD": { "name": "Andorra", "code": "AD", "lang": "cat" },
+  "AE": { "name": "United Arab Emirates", "code": "AE", "lang": "ara" },
+  "AF": { "name": "Afghanistan", "code": "AF", "lang": "pus" },
+  "AG": { "name": "Antigua and Barbuda", "code": "AG", "lang": "eng" },
+  "AI": { "name": "Anguilla", "code": "AI", "lang": "eng" },
+  "AL": { "name": "Albania", "code": "AL", "lang": "sqi" },
+  "AM": { "name": "Armenia", "code": "AM", "lang": "hye" },
+  "AO": { "name": "Angola", "code": "AO", "lang": "por" },
+  "AQ": { "name": "Antarctica", "code": "AQ", "lang": null },
+  "AR": { "name": "Argentina", "code": "AR", "lang": "spa" },
+  "AS": { "name": "American Samoa", "code": "AS", "lang": "eng" },
+  "AT": { "name": "Austria", "code": "AT", "lang": "deu" },
+  "AU": { "name": "Australia", "code": "AU", "lang": "eng" },
+  "AW": { "name": "Aruba", "code": "AW", "lang": "nld" },
+  "AX": { "name": "Åland", "code": "AX", "lang": "swe" },
+  "AZ": { "name": "Azerbaijan", "code": "AZ", "lang": "aze" },
+  "BA": { "name": "Bosnia and Herzegovina", "code": "BA", "lang": "bos" },
+  "BB": { "name": "Barbados", "code": "BB", "lang": "eng" },
+  "BD": { "name": "Bangladesh", "code": "BD", "lang": "ben" },
+  "BE": { "name": "Belgium", "code": "BE", "lang": "nld" },
+  "BF": { "name": "Burkina Faso", "code": "BF", "lang": "fra" },
+  "BG": { "name": "Bulgaria", "code": "BG", "lang": "bul" },
+  "BH": { "name": "Bahrain", "code": "BH", "lang": "ara" },
+  "BI": { "name": "Burundi", "code": "BI", "lang": "fra" },
+  "BJ": { "name": "Benin", "code": "BJ", "lang": "fra" },
+  "BL": { "name": "Saint Barthélemy", "code": "BL", "lang": "fra" },
+  "BM": { "name": "Bermuda", "code": "BM", "lang": "eng" },
+  "BN": { "name": "Brunei", "code": "BN", "lang": "msa" },
+  "BO": { "name": "Bolivia", "code": "BO", "lang": "spa" },
+  "BQ": { "name": "Bonaire", "code": "BQ", "lang": "nld" },
+  "BR": { "name": "Brazil", "code": "BR", "lang": "por" },
+  "BS": { "name": "Bahamas", "code": "BS", "lang": "eng" },
+  "BT": { "name": "Bhutan", "code": "BT", "lang": "dzo" },
+  "BV": { "name": "Bouvet Island", "code": "BV", "lang": "nor" },
+  "BW": { "name": "Botswana", "code": "BW", "lang": "eng" },
+  "BY": { "name": "Belarus", "code": "BY", "lang": "bel" },
+  "BZ": { "name": "Belize", "code": "BZ", "lang": "eng" },
+  "CA": { "name": "Canada", "code": "CA", "lang": "eng" },
+  "CC": { "name": "Cocos [Keeling] Islands", "code": "CC", "lang": "eng" },
   "CD": {
     "name": "Democratic Republic of the Congo",
-    "languages": ["fra", "lin", "kon", "swa", "lub"]
-  },
-  "CF": {
-    "name": "Central African Republic",
-    "languages": ["fra", "sag"]
-  },
-  "CG": {
-    "name": "Republic of the Congo",
-    "languages": ["fra", "lin"]
-  },
-  "CH": {
-    "name": "Switzerland",
-    "languages": ["deu", "fra", "ita"]
-  },
-  "CI": {
-    "name": "Ivory Coast",
-    "languages": ["fra"]
-  },
-  "CK": {
-    "name": "Cook Islands",
-    "languages": ["eng"]
-  },
-  "CL": {
-    "name": "Chile",
-    "languages": ["spa"]
-  },
-  "CM": {
-    "name": "Cameroon",
-    "languages": ["eng", "fra"]
-  },
-  "CN": {
-    "name": "China",
-    "languages": ["zho"]
-  },
-  "CO": {
-    "name": "Colombia",
-    "languages": ["spa"]
-  },
-  "CR": {
-    "name": "Costa Rica",
-    "languages": ["spa"]
-  },
-  "CU": {
-    "name": "Cuba",
-    "languages": ["spa"]
-  },
-  "CV": {
-    "name": "Cape Verde",
-    "languages": ["por"]
-  },
-  "CW": {
-    "name": "Curacao",
-    "languages": ["nld", "pan", "eng"]
-  },
-  "CX": {
-    "name": "Christmas Island",
-    "languages": ["eng"]
-  },
-  "CY": {
-    "name": "Cyprus",
-    "languages": ["ell", "tur", "hye"]
-  },
-  "CZ": {
-    "name": "Czech Republic",
-    "languages": ["ces", "slk"]
-  },
-  "DE": {
-    "name": "Germany",
-    "languages": ["deu"]
-  },
-  "DJ": {
-    "name": "Djibouti",
-    "languages": ["fra", "ara"]
-  },
-  "DK": {
-    "name": "Denmark",
-    "languages": ["dan"]
-  },
-  "DM": {
-    "name": "Dominica",
-    "languages": ["eng"]
-  },
-  "DO": {
-    "name": "Dominican Republic",
-    "languages": ["spa"]
-  },
-  "DZ": {
-    "name": "Algeria",
-    "languages": ["ara"]
-  },
-  "EC": {
-    "name": "Ecuador",
-    "languages": ["spa"]
-  },
-  "EE": {
-    "name": "Estonia",
-    "languages": ["est"]
-  },
-  "EG": {
-    "name": "Egypt",
-    "languages": ["ara"]
-  },
-  "EH": {
-    "name": "Western Sahara",
-    "languages": ["spa"]
-  },
-  "ER": {
-    "name": "Eritrea",
-    "languages": ["tir", "ara", "eng"]
-  },
-  "ES": {
-    "name": "Spain",
-    "languages": ["spa", "eus", "cat", "glg", "oci"]
-  },
-  "ET": {
-    "name": "Ethiopia",
-    "languages": ["amh"]
-  },
-  "FI": {
-    "name": "Finland",
-    "languages": ["fin", "swe"]
-  },
-  "FJ": {
-    "name": "Fiji",
-    "languages": ["eng", "fij", "hin", "urd"]
-  },
-  "FK": {
-    "name": "Falkland Islands",
-    "languages": ["eng"]
-  },
-  "FM": {
-    "name": "Micronesia",
-    "languages": ["eng"]
-  },
-  "FO": {
-    "name": "Faroe Islands",
-    "languages": ["fao"]
-  },
-  "FR": {
-    "name": "France",
-    "languages": ["fra"]
-  },
-  "GA": {
-    "name": "Gabon",
-    "languages": ["fra"]
-  },
-  "UK": {
-    "name": "United Kingdom",
-    "languages": ["eng"]
-  },
-  "GD": {
-    "name": "Grenada",
-    "languages": ["eng"]
-  },
-  "GE": {
-    "name": "Georgia",
-    "languages": ["kat"]
-  },
-  "GF": {
-    "name": "French Guiana",
-    "languages": ["fra"]
-  },
-  "GG": {
-    "name": "Guernsey",
-    "languages": ["eng", "fra"]
-  },
-  "GH": {
-    "name": "Ghana",
-    "languages": ["eng"]
-  },
-  "GI": {
-    "name": "Gibraltar",
-    "languages": ["eng"]
-  },
-  "GL": {
-    "name": "Greenland",
-    "languages": ["kal"]
-  },
-  "GM": {
-    "name": "Gambia",
-    "languages": ["eng"]
-  },
-  "GN": {
-    "name": "Guinea",
-    "languages": ["fra", "ful"]
-  },
-  "GP": {
-    "name": "Guadeloupe",
-    "languages": ["fra"]
-  },
-  "GQ": {
-    "name": "Equatorial Guinea",
-    "languages": ["spa", "fra"]
-  },
-  "GR": {
-    "name": "Greece",
-    "languages": ["ell"]
+    "code": "CD",
+    "lang": "fra"
   },
+  "CF": { "name": "Central African Republic", "code": "CF", "lang": "fra" },
+  "CG": { "name": "Republic of the Congo", "code": "CG", "lang": "fra" },
+  "CH": { "name": "Switzerland", "code": "CH", "lang": "deu" },
+  "CI": { "name": "Ivory Coast", "code": "CI", "lang": "fra" },
+  "CK": { "name": "Cook Islands", "code": "CK", "lang": "eng" },
+  "CL": { "name": "Chile", "code": "CL", "lang": "spa" },
+  "CM": { "name": "Cameroon", "code": "CM", "lang": "eng" },
+  "CN": { "name": "China", "code": "CN", "lang": "zho" },
+  "CO": { "name": "Colombia", "code": "CO", "lang": "spa" },
+  "CR": { "name": "Costa Rica", "code": "CR", "lang": "spa" },
+  "CU": { "name": "Cuba", "code": "CU", "lang": "spa" },
+  "CV": { "name": "Cape Verde", "code": "CV", "lang": "por" },
+  "CW": { "name": "Curacao", "code": "CW", "lang": "nld" },
+  "CX": { "name": "Christmas Island", "code": "CX", "lang": "eng" },
+  "CY": { "name": "Cyprus", "code": "CY", "lang": "ell" },
+  "CZ": { "name": "Czech Republic", "code": "CZ", "lang": "ces" },
+  "DE": { "name": "Germany", "code": "DE", "lang": "deu" },
+  "DJ": { "name": "Djibouti", "code": "DJ", "lang": "fra" },
+  "DK": { "name": "Denmark", "code": "DK", "lang": "dan" },
+  "DM": { "name": "Dominica", "code": "DM", "lang": "eng" },
+  "DO": { "name": "Dominican Republic", "code": "DO", "lang": "spa" },
+  "DZ": { "name": "Algeria", "code": "DZ", "lang": "ara" },
+  "EC": { "name": "Ecuador", "code": "EC", "lang": "spa" },
+  "EE": { "name": "Estonia", "code": "EE", "lang": "est" },
+  "EG": { "name": "Egypt", "code": "EG", "lang": "ara" },
+  "EH": { "name": "Western Sahara", "code": "EH", "lang": "spa" },
+  "ER": { "name": "Eritrea", "code": "ER", "lang": "tir" },
+  "ES": { "name": "Spain", "code": "ES", "lang": "spa" },
+  "ET": { "name": "Ethiopia", "code": "ET", "lang": "amh" },
+  "FI": { "name": "Finland", "code": "FI", "lang": "fin" },
+  "FJ": { "name": "Fiji", "code": "FJ", "lang": "eng" },
+  "FK": { "name": "Falkland Islands", "code": "FK", "lang": "eng" },
+  "FM": { "name": "Micronesia", "code": "FM", "lang": "eng" },
+  "FO": { "name": "Faroe Islands", "code": "FO", "lang": "fao" },
+  "FR": { "name": "France", "code": "FR", "lang": "fra" },
+  "GA": { "name": "Gabon", "code": "GA", "lang": "fra" },
+  "UK": { "name": "United Kingdom", "code": "UK", "lang": "eng" },
+  "GD": { "name": "Grenada", "code": "GD", "lang": "eng" },
+  "GE": { "name": "Georgia", "code": "GE", "lang": "kat" },
+  "GF": { "name": "French Guiana", "code": "GF", "lang": "fra" },
+  "GG": { "name": "Guernsey", "code": "GG", "lang": "eng" },
+  "GH": { "name": "Ghana", "code": "GH", "lang": "eng" },
+  "GI": { "name": "Gibraltar", "code": "GI", "lang": "eng" },
+  "GL": { "name": "Greenland", "code": "GL", "lang": "kal" },
+  "GM": { "name": "Gambia", "code": "GM", "lang": "eng" },
+  "GN": { "name": "Guinea", "code": "GN", "lang": "fra" },
+  "GP": { "name": "Guadeloupe", "code": "GP", "lang": "fra" },
+  "GQ": { "name": "Equatorial Guinea", "code": "GQ", "lang": "spa" },
+  "GR": { "name": "Greece", "code": "GR", "lang": "ell" },
   "GS": {
     "name": "South Georgia and the South Sandwich Islands",
-    "languages": ["eng"]
-  },
-  "GT": {
-    "name": "Guatemala",
-    "languages": ["spa"]
-  },
-  "GU": {
-    "name": "Guam",
-    "languages": ["eng", "cha", "spa"]
-  },
-  "GW": {
-    "name": "Guinea-Bissau",
-    "languages": ["por"]
-  },
-  "GY": {
-    "name": "Guyana",
-    "languages": ["eng"]
-  },
-  "HK": {
-    "name": "Hong Kong",
-    "languages": ["zho", "eng"]
-  },
-  "HM": {
-    "name": "Heard Island and McDonald Islands",
-    "languages": ["eng"]
-  },
-  "HN": {
-    "name": "Honduras",
-    "languages": ["spa"]
-  },
-  "HR": {
-    "name": "Croatia",
-    "languages": ["hrv"]
-  },
-  "HT": {
-    "name": "Haiti",
-    "languages": ["fra", "hat"]
-  },
-  "HU": {
-    "name": "Hungary",
-    "languages": ["hun"]
-  },
-  "ID": {
-    "name": "Indonesia",
-    "languages": ["ind"]
-  },
-  "IE": {
-    "name": "Ireland",
-    "languages": ["gle", "eng"]
-  },
-  "IL": {
-    "name": "Israel",
-    "languages": ["heb", "ara"]
-  },
-  "IM": {
-    "name": "Isle of Man",
-    "languages": ["eng", "glv"]
-  },
-  "IN": {
-    "name": "India",
-    "languages": ["hin", "eng"]
-  },
-  "IO": {
-    "name": "British Indian Ocean Territory",
-    "languages": ["eng"]
-  },
-  "IQ": {
-    "name": "Iraq",
-    "languages": ["ara", "kur"]
-  },
-  "IR": {
-    "name": "Iran",
-    "languages": ["fas"]
-  },
-  "IS": {
-    "name": "Iceland",
-    "languages": ["isl"]
-  },
-  "IT": {
-    "name": "Italy",
-    "languages": ["ita"]
-  },
-  "JE": {
-    "name": "Jersey",
-    "languages": ["eng", "fra"]
-  },
-  "JM": {
-    "name": "Jamaica",
-    "languages": ["eng"]
-  },
-  "JO": {
-    "name": "Jordan",
-    "languages": ["ara"]
-  },
-  "JP": {
-    "name": "Japan",
-    "languages": ["jpn"]
-  },
-  "KE": {
-    "name": "Kenya",
-    "languages": ["eng", "swa"]
-  },
-  "KG": {
-    "name": "Kyrgyzstan",
-    "languages": ["kir", "rus"]
-  },
-  "KH": {
-    "name": "Cambodia",
-    "languages": ["khm"]
-  },
-  "KI": {
-    "name": "Kiribati",
-    "languages": ["eng"]
-  },
-  "KM": {
-    "name": "Comoros",
-    "languages": ["ara", "fra"]
-  },
-  "KN": {
-    "name": "Saint Kitts and Nevis",
-    "languages": ["eng"]
-  },
-  "KP": {
-    "name": "North Korea",
-    "languages": ["kor"]
-  },
-  "KR": {
-    "name": "South Korea",
-    "languages": ["kor"]
-  },
-  "KW": {
-    "name": "Kuwait",
-    "languages": ["ara"]
-  },
-  "KY": {
-    "name": "Cayman Islands",
-    "languages": ["eng"]
-  },
-  "KZ": {
-    "name": "Kazakhstan",
-    "languages": ["kaz", "rus"]
-  },
-  "LA": {
-    "name": "Laos",
-    "languages": ["lao"]
-  },
-  "LB": {
-    "name": "Lebanon",
-    "languages": ["ara", "fra"]
-  },
-  "LC": {
-    "name": "Saint Lucia",
-    "languages": ["eng"]
-  },
-  "LI": {
-    "name": "Liechtenstein",
-    "languages": ["deu"]
-  },
-  "LK": {
-    "name": "Sri Lanka",
-    "languages": ["sin", "tam"]
-  },
-  "LR": {
-    "name": "Liberia",
-    "languages": ["eng"]
-  },
-  "LS": {
-    "name": "Lesotho",
-    "languages": ["eng", "sot"]
-  },
-  "LT": {
-    "name": "Lithuania",
-    "languages": ["lit"]
-  },
-  "LU": {
-    "name": "Luxembourg",
-    "languages": ["fra", "deu", "ltz"]
-  },
-  "LV": {
-    "name": "Latvia",
-    "languages": ["lav"]
-  },
-  "LY": {
-    "name": "Libya",
-    "languages": ["ara"]
-  },
-  "MA": {
-    "name": "Morocco",
-    "languages": ["ara"]
-  },
-  "MC": {
-    "name": "Monaco",
-    "languages": ["fra"]
-  },
-  "MD": {
-    "name": "Moldova",
-    "languages": ["ron"]
-  },
-  "ME": {
-    "name": "Montenegro",
-    "languages": ["srp", "bos", "sqi", "hrv"]
-  },
-  "MF": {
-    "name": "Saint Martin",
-    "languages": ["eng", "fra", "nld"]
-  },
-  "MG": {
-    "name": "Madagascar",
-    "languages": ["fra", "mlg"]
-  },
-  "MH": {
-    "name": "Marshall Islands",
-    "languages": ["eng", "mah"]
-  },
-  "MK": {
-    "name": "North Macedonia",
-    "languages": ["mkd"]
-  },
-  "ML": {
-    "name": "Mali",
-    "languages": ["fra"]
-  },
-  "MM": {
-    "name": "Myanmar [Burma]",
-    "languages": ["mya"]
-  },
-  "MN": {
-    "name": "Mongolia",
-    "languages": ["mon"]
-  },
-  "MO": {
-    "name": "Macao",
-    "languages": ["zho", "por"]
-  },
-  "MP": {
-    "name": "Northern Mariana Islands",
-    "languages": ["eng", "cha"]
-  },
-  "MQ": {
-    "name": "Martinique",
-    "languages": ["fra"]
-  },
-  "MR": {
-    "name": "Mauritania",
-    "languages": ["ara"]
-  },
-  "MS": {
-    "name": "Montserrat",
-    "languages": ["eng"]
-  },
-  "MT": {
-    "name": "Malta",
-    "languages": ["mlt", "eng"]
-  },
-  "MU": {
-    "name": "Mauritius",
-    "languages": ["eng"]
-  },
-  "MV": {
-    "name": "Maldives",
-    "languages": ["div"]
-  },
-  "MW": {
-    "name": "Malawi",
-    "languages": ["eng", "nya"]
-  },
-  "MX": {
-    "name": "Mexico",
-    "languages": ["spa"]
-  },
-  "MY": {
-    "name": "Malaysia",
-    "languages": ["msa"]
-  },
-  "MZ": {
-    "name": "Mozambique",
-    "languages": ["por"]
-  },
-  "NA": {
-    "name": "Namibia",
-    "languages": ["eng", "afr"]
-  },
-  "NC": {
-    "name": "New Caledonia",
-    "languages": ["fra"]
-  },
-  "NE": {
-    "name": "Niger",
-    "languages": ["fra"]
-  },
-  "NF": {
-    "name": "Norfolk Island",
-    "languages": ["eng"]
-  },
-  "NG": {
-    "name": "Nigeria",
-    "languages": ["eng"]
-  },
-  "NI": {
-    "name": "Nicaragua",
-    "languages": ["spa"]
-  },
-  "NL": {
-    "name": "Netherlands",
-    "languages": ["nld"]
-  },
-  "NO": {
-    "name": "Norway",
-    "languages": ["nor", "nob", "nno"]
-  },
-  "NP": {
-    "name": "Nepal",
-    "languages": ["nep"]
-  },
-  "NR": {
-    "name": "Nauru",
-    "languages": ["eng", "nau"]
-  },
-  "NU": {
-    "name": "Niue",
-    "languages": ["eng"]
-  },
-  "NZ": {
-    "name": "New Zealand",
-    "languages": ["eng", "mri"]
-  },
-  "OM": {
-    "name": "Oman",
-    "languages": ["ara"]
-  },
-  "PA": {
-    "name": "Panama",
-    "languages": ["spa"]
-  },
-  "PE": {
-    "name": "Peru",
-    "languages": ["spa"]
-  },
-  "PF": {
-    "name": "French Polynesia",
-    "languages": ["fra"]
-  },
-  "PG": {
-    "name": "Papua New Guinea",
-    "languages": ["eng"]
-  },
-  "PH": {
-    "name": "Philippines",
-    "languages": ["eng"]
-  },
-  "PK": {
-    "name": "Pakistan",
-    "languages": ["eng", "urd"]
-  },
-  "PL": {
-    "name": "Poland",
-    "languages": ["pol"]
-  },
-  "PM": {
-    "name": "Saint Pierre and Miquelon",
-    "languages": ["fra"]
-  },
-  "PN": {
-    "name": "Pitcairn Islands",
-    "languages": ["eng"]
-  },
-  "PR": {
-    "name": "Puerto Rico",
-    "languages": ["spa", "eng"]
-  },
-  "PS": {
-    "name": "Palestine",
-    "languages": ["ara"]
-  },
-  "PT": {
-    "name": "Portugal",
-    "languages": ["por"]
-  },
-  "PW": {
-    "name": "Palau",
-    "languages": ["eng"]
-  },
-  "PY": {
-    "name": "Paraguay",
-    "languages": ["spa", "grn"]
-  },
-  "QA": {
-    "name": "Qatar",
-    "languages": ["ara"]
-  },
-  "RE": {
-    "name": "Réunion",
-    "languages": ["fra"]
-  },
-  "RO": {
-    "name": "Romania",
-    "languages": ["ron"]
-  },
-  "RS": {
-    "name": "Serbia",
-    "languages": ["srp"]
-  },
-  "RU": {
-    "name": "Russia",
-    "languages": ["rus"]
-  },
-  "RW": {
-    "name": "Rwanda",
-    "languages": ["kin", "eng", "fra"]
-  },
-  "SA": {
-    "name": "Saudi Arabia",
-    "languages": ["ara"]
-  },
-  "SB": {
-    "name": "Solomon Islands",
-    "languages": ["eng"]
-  },
-  "SC": {
-    "name": "Seychelles",
-    "languages": ["fra", "eng"]
-  },
-  "SD": {
-    "name": "Sudan",
-    "languages": ["ara", "eng"]
-  },
-  "SE": {
-    "name": "Sweden",
-    "languages": ["swe"]
-  },
-  "SG": {
-    "name": "Singapore",
-    "languages": ["eng", "msa", "tam", "zho"]
-  },
-  "SH": {
-    "name": "Saint Helena",
-    "languages": ["eng"]
-  },
-  "SI": {
-    "name": "Slovenia",
-    "languages": ["slv"]
-  },
-  "SJ": {
-    "name": "Svalbard and Jan Mayen",
-    "languages": ["nor"]
-  },
-  "SK": {
-    "name": "Slovakia",
-    "languages": ["slk"]
-  },
-  "SL": {
-    "name": "Sierra Leone",
-    "languages": ["eng"]
-  },
-  "SM": {
-    "name": "San Marino",
-    "languages": ["ita"]
-  },
-  "SN": {
-    "name": "Senegal",
-    "languages": ["fra"]
-  },
-  "SO": {
-    "name": "Somalia",
-    "languages": ["som", "ara"]
-  },
-  "SR": {
-    "name": "Suriname",
-    "languages": ["nld"]
-  },
-  "SS": {
-    "name": "South Sudan",
-    "languages": ["eng"]
-  },
-  "ST": {
-    "name": "São Tomé and Príncipe",
-    "languages": ["por"]
-  },
-  "SV": {
-    "name": "El Salvador",
-    "languages": ["spa"]
-  },
-  "SX": {
-    "name": "Sint Maarten",
-    "languages": ["nld", "eng"]
-  },
-  "SY": {
-    "name": "Syria",
-    "languages": ["ara"]
-  },
-  "SZ": {
-    "name": "Swaziland",
-    "languages": ["eng", "ssw"]
-  },
-  "TC": {
-    "name": "Turks and Caicos Islands",
-    "languages": ["eng"]
-  },
-  "TD": {
-    "name": "Chad",
-    "languages": ["fra", "ara"]
-  },
-  "TF": {
-    "name": "French Southern Territories",
-    "languages": ["fra"]
-  },
-  "TG": {
-    "name": "Togo",
-    "languages": ["fra"]
-  },
-  "TH": {
-    "name": "Thailand",
-    "languages": ["tha"]
-  },
-  "TJ": {
-    "name": "Tajikistan",
-    "languages": ["tgk", "rus"]
-  },
-  "TK": {
-    "name": "Tokelau",
-    "languages": ["eng"]
-  },
-  "TL": {
-    "name": "East Timor",
-    "languages": ["por"]
-  },
-  "TM": {
-    "name": "Turkmenistan",
-    "languages": ["tuk", "rus"]
-  },
-  "TN": {
-    "name": "Tunisia",
-    "languages": ["ara"]
-  },
-  "TO": {
-    "name": "Tonga",
-    "languages": ["eng", "ton"]
-  },
-  "TR": {
-    "name": "Turkey",
-    "languages": ["tur"]
-  },
-  "TT": {
-    "name": "Trinidad and Tobago",
-    "languages": ["eng"]
-  },
-  "TV": {
-    "name": "Tuvalu",
-    "languages": ["eng"]
-  },
-  "TW": {
-    "name": "Taiwan",
-    "languages": ["zho"]
-  },
-  "TZ": {
-    "name": "Tanzania",
-    "languages": ["swa", "eng"]
-  },
-  "UA": {
-    "name": "Ukraine",
-    "languages": ["ukr"]
-  },
-  "UG": {
-    "name": "Uganda",
-    "languages": ["eng", "swa"]
-  },
-  "UM": {
-    "name": "U.S. Minor Outlying Islands",
-    "languages": ["eng"]
-  },
-  "US": {
-    "name": "United States",
-    "languages": ["eng"]
-  },
-  "UY": {
-    "name": "Uruguay",
-    "languages": ["spa"]
-  },
-  "UZ": {
-    "name": "Uzbekistan",
-    "languages": ["uzb", "rus"]
-  },
-  "VA": {
-    "name": "Vatican City",
-    "languages": ["ita", "lat"]
-  },
-  "VC": {
-    "name": "Saint Vincent and the Grenadines",
-    "languages": ["eng"]
-  },
-  "VE": {
-    "name": "Venezuela",
-    "languages": ["spa"]
-  },
-  "VG": {
-    "name": "British Virgin Islands",
-    "languages": ["eng"]
-  },
-  "VI": {
-    "name": "U.S. Virgin Islands",
-    "languages": ["eng"]
-  },
-  "VN": {
-    "name": "Vietnam",
-    "languages": ["vie"]
-  },
-  "VU": {
-    "name": "Vanuatu",
-    "languages": ["bis", "eng", "fra"]
-  },
-  "WF": {
-    "name": "Wallis and Futuna",
-    "languages": ["fra"]
-  },
-  "WS": {
-    "name": "Samoa",
-    "languages": ["smo", "eng"]
-  },
-  "XK": {
-    "name": "Kosovo",
-    "languages": ["sqi", "srp"]
-  },
-  "YE": {
-    "name": "Yemen",
-    "languages": ["ara"]
-  },
-  "YT": {
-    "name": "Mayotte",
-    "languages": ["fra"]
-  },
+    "code": "GS",
+    "lang": "eng"
+  },
+  "GT": { "name": "Guatemala", "code": "GT", "lang": "spa" },
+  "GU": { "name": "Guam", "code": "GU", "lang": "eng" },
+  "GW": { "name": "Guinea-Bissau", "code": "GW", "lang": "por" },
+  "GY": { "name": "Guyana", "code": "GY", "lang": "eng" },
+  "HK": { "name": "Hong Kong", "code": "HK", "lang": "zho" },
+  "HM": { "name": "Heard Island and McDonald Islands", "code": "HM", "lang": "eng" },
+  "HN": { "name": "Honduras", "code": "HN", "lang": "spa" },
+  "HR": { "name": "Croatia", "code": "HR", "lang": "hrv" },
+  "HT": { "name": "Haiti", "code": "HT", "lang": "fra" },
+  "HU": { "name": "Hungary", "code": "HU", "lang": "hun" },
+  "ID": { "name": "Indonesia", "code": "ID", "lang": "ind" },
+  "IE": { "name": "Ireland", "code": "IE", "lang": "gle" },
+  "IL": { "name": "Israel", "code": "IL", "lang": "heb" },
+  "IM": { "name": "Isle of Man", "code": "IM", "lang": "eng" },
+  "IN": { "name": "India", "code": "IN", "lang": "hin" },
+  "IO": { "name": "British Indian Ocean Territory", "code": "IO", "lang": "eng" },
+  "IQ": { "name": "Iraq", "code": "IQ", "lang": "ara" },
+  "IR": { "name": "Iran", "code": "IR", "lang": "fas" },
+  "IS": { "name": "Iceland", "code": "IS", "lang": "isl" },
+  "IT": { "name": "Italy", "code": "IT", "lang": "ita" },
+  "JE": { "name": "Jersey", "code": "JE", "lang": "eng" },
+  "JM": { "name": "Jamaica", "code": "JM", "lang": "eng" },
+  "JO": { "name": "Jordan", "code": "JO", "lang": "ara" },
+  "JP": { "name": "Japan", "code": "JP", "lang": "jpn" },
+  "KE": { "name": "Kenya", "code": "KE", "lang": "eng" },
+  "KG": { "name": "Kyrgyzstan", "code": "KG", "lang": "kir" },
+  "KH": { "name": "Cambodia", "code": "KH", "lang": "khm" },
+  "KI": { "name": "Kiribati", "code": "KI", "lang": "eng" },
+  "KM": { "name": "Comoros", "code": "KM", "lang": "ara" },
+  "KN": { "name": "Saint Kitts and Nevis", "code": "KN", "lang": "eng" },
+  "KP": { "name": "North Korea", "code": "KP", "lang": "kor" },
+  "KR": { "name": "South Korea", "code": "KR", "lang": "kor" },
+  "KW": { "name": "Kuwait", "code": "KW", "lang": "ara" },
+  "KY": { "name": "Cayman Islands", "code": "KY", "lang": "eng" },
+  "KZ": { "name": "Kazakhstan", "code": "KZ", "lang": "kaz" },
+  "LA": { "name": "Laos", "code": "LA", "lang": "lao" },
+  "LB": { "name": "Lebanon", "code": "LB", "lang": "ara" },
+  "LC": { "name": "Saint Lucia", "code": "LC", "lang": "eng" },
+  "LI": { "name": "Liechtenstein", "code": "LI", "lang": "deu" },
+  "LK": { "name": "Sri Lanka", "code": "LK", "lang": "sin" },
+  "LR": { "name": "Liberia", "code": "LR", "lang": "eng" },
+  "LS": { "name": "Lesotho", "code": "LS", "lang": "eng" },
+  "LT": { "name": "Lithuania", "code": "LT", "lang": "lit" },
+  "LU": { "name": "Luxembourg", "code": "LU", "lang": "fra" },
+  "LV": { "name": "Latvia", "code": "LV", "lang": "lav" },
+  "LY": { "name": "Libya", "code": "LY", "lang": "ara" },
+  "MA": { "name": "Morocco", "code": "MA", "lang": "ara" },
+  "MC": { "name": "Monaco", "code": "MC", "lang": "fra" },
+  "MD": { "name": "Moldova", "code": "MD", "lang": "ron" },
+  "ME": { "name": "Montenegro", "code": "ME", "lang": "srp" },
+  "MF": { "name": "Saint Martin", "code": "MF", "lang": "eng" },
+  "MG": { "name": "Madagascar", "code": "MG", "lang": "fra" },
+  "MH": { "name": "Marshall Islands", "code": "MH", "lang": "eng" },
+  "MK": { "name": "North Macedonia", "code": "MK", "lang": "mkd" },
+  "ML": { "name": "Mali", "code": "ML", "lang": "fra" },
+  "MM": { "name": "Myanmar [Burma]", "code": "MM", "lang": "mya" },
+  "MN": { "name": "Mongolia", "code": "MN", "lang": "mon" },
+  "MO": { "name": "Macao", "code": "MO", "lang": "zho" },
+  "MP": { "name": "Northern Mariana Islands", "code": "MP", "lang": "eng" },
+  "MQ": { "name": "Martinique", "code": "MQ", "lang": "fra" },
+  "MR": { "name": "Mauritania", "code": "MR", "lang": "ara" },
+  "MS": { "name": "Montserrat", "code": "MS", "lang": "eng" },
+  "MT": { "name": "Malta", "code": "MT", "lang": "mlt" },
+  "MU": { "name": "Mauritius", "code": "MU", "lang": "eng" },
+  "MV": { "name": "Maldives", "code": "MV", "lang": "div" },
+  "MW": { "name": "Malawi", "code": "MW", "lang": "eng" },
+  "MX": { "name": "Mexico", "code": "MX", "lang": "spa" },
+  "MY": { "name": "Malaysia", "code": "MY", "lang": "msa" },
+  "MZ": { "name": "Mozambique", "code": "MZ", "lang": "por" },
+  "NA": { "name": "Namibia", "code": "NA", "lang": "eng" },
+  "NC": { "name": "New Caledonia", "code": "NC", "lang": "fra" },
+  "NE": { "name": "Niger", "code": "NE", "lang": "fra" },
+  "NF": { "name": "Norfolk Island", "code": "NF", "lang": "eng" },
+  "NG": { "name": "Nigeria", "code": "NG", "lang": "eng" },
+  "NI": { "name": "Nicaragua", "code": "NI", "lang": "spa" },
+  "NL": { "name": "Netherlands", "code": "NL", "lang": "nld" },
+  "NO": { "name": "Norway", "code": "NO", "lang": "nor" },
+  "NP": { "name": "Nepal", "code": "NP", "lang": "nep" },
+  "NR": { "name": "Nauru", "code": "NR", "lang": "eng" },
+  "NU": { "name": "Niue", "code": "NU", "lang": "eng" },
+  "NZ": { "name": "New Zealand", "code": "NZ", "lang": "eng" },
+  "OM": { "name": "Oman", "code": "OM", "lang": "ara" },
+  "PA": { "name": "Panama", "code": "PA", "lang": "spa" },
+  "PE": { "name": "Peru", "code": "PE", "lang": "spa" },
+  "PF": { "name": "French Polynesia", "code": "PF", "lang": "fra" },
+  "PG": { "name": "Papua New Guinea", "code": "PG", "lang": "eng" },
+  "PH": { "name": "Philippines", "code": "PH", "lang": "eng" },
+  "PK": { "name": "Pakistan", "code": "PK", "lang": "eng" },
+  "PL": { "name": "Poland", "code": "PL", "lang": "pol" },
+  "PM": { "name": "Saint Pierre and Miquelon", "code": "PM", "lang": "fra" },
+  "PN": { "name": "Pitcairn Islands", "code": "PN", "lang": "eng" },
+  "PR": { "name": "Puerto Rico", "code": "PR", "lang": "spa" },
+  "PS": { "name": "Palestine", "code": "PS", "lang": "ara" },
+  "PT": { "name": "Portugal", "code": "PT", "lang": "por" },
+  "PW": { "name": "Palau", "code": "PW", "lang": "eng" },
+  "PY": { "name": "Paraguay", "code": "PY", "lang": "spa" },
+  "QA": { "name": "Qatar", "code": "QA", "lang": "ara" },
+  "RE": { "name": "Réunion", "code": "RE", "lang": "fra" },
+  "RO": { "name": "Romania", "code": "RO", "lang": "ron" },
+  "RS": { "name": "Serbia", "code": "RS", "lang": "srp" },
+  "RU": { "name": "Russia", "code": "RU", "lang": "rus" },
+  "RW": { "name": "Rwanda", "code": "RW", "lang": "kin" },
+  "SA": { "name": "Saudi Arabia", "code": "SA", "lang": "ara" },
+  "SB": { "name": "Solomon Islands", "code": "SB", "lang": "eng" },
+  "SC": { "name": "Seychelles", "code": "SC", "lang": "fra" },
+  "SD": { "name": "Sudan", "code": "SD", "lang": "ara" },
+  "SE": { "name": "Sweden", "code": "SE", "lang": "swe" },
+  "SG": { "name": "Singapore", "code": "SG", "lang": "eng" },
+  "SH": { "name": "Saint Helena", "code": "SH", "lang": "eng" },
+  "SI": { "name": "Slovenia", "code": "SI", "lang": "slv" },
+  "SJ": { "name": "Svalbard and Jan Mayen", "code": "SJ", "lang": "nor" },
+  "SK": { "name": "Slovakia", "code": "SK", "lang": "slk" },
+  "SL": { "name": "Sierra Leone", "code": "SL", "lang": "eng" },
+  "SM": { "name": "San Marino", "code": "SM", "lang": "ita" },
+  "SN": { "name": "Senegal", "code": "SN", "lang": "fra" },
+  "SO": { "name": "Somalia", "code": "SO", "lang": "som" },
+  "SR": { "name": "Suriname", "code": "SR", "lang": "nld" },
+  "SS": { "name": "South Sudan", "code": "SS", "lang": "eng" },
+  "ST": { "name": "São Tomé and Príncipe", "code": "ST", "lang": "por" },
+  "SV": { "name": "El Salvador", "code": "SV", "lang": "spa" },
+  "SX": { "name": "Sint Maarten", "code": "SX", "lang": "nld" },
+  "SY": { "name": "Syria", "code": "SY", "lang": "ara" },
+  "SZ": { "name": "Swaziland", "code": "SZ", "lang": "eng" },
+  "TC": { "name": "Turks and Caicos Islands", "code": "TC", "lang": "eng" },
+  "TD": { "name": "Chad", "code": "TD", "lang": "fra" },
+  "TF": { "name": "French Southern Territories", "code": "TF", "lang": "fra" },
+  "TG": { "name": "Togo", "code": "TG", "lang": "fra" },
+  "TH": { "name": "Thailand", "code": "TH", "lang": "tha" },
+  "TJ": { "name": "Tajikistan", "code": "TJ", "lang": "tgk" },
+  "TK": { "name": "Tokelau", "code": "TK", "lang": "eng" },
+  "TL": { "name": "East Timor", "code": "TL", "lang": "por" },
+  "TM": { "name": "Turkmenistan", "code": "TM", "lang": "tuk" },
+  "TN": { "name": "Tunisia", "code": "TN", "lang": "ara" },
+  "TO": { "name": "Tonga", "code": "TO", "lang": "eng" },
+  "TR": { "name": "Turkey", "code": "TR", "lang": "tur" },
+  "TT": { "name": "Trinidad and Tobago", "code": "TT", "lang": "eng" },
+  "TV": { "name": "Tuvalu", "code": "TV", "lang": "eng" },
+  "TW": { "name": "Taiwan", "code": "TW", "lang": "zho" },
+  "TZ": { "name": "Tanzania", "code": "TZ", "lang": "swa" },
+  "UA": { "name": "Ukraine", "code": "UA", "lang": "ukr" },
+  "UG": { "name": "Uganda", "code": "UG", "lang": "eng" },
+  "UM": { "name": "U.S. Minor Outlying Islands", "code": "UM", "lang": "eng" },
+  "US": { "name": "United States", "code": "US", "lang": "eng" },
+  "UY": { "name": "Uruguay", "code": "UY", "lang": "spa" },
+  "UZ": { "name": "Uzbekistan", "code": "UZ", "lang": "uzb" },
+  "VA": { "name": "Vatican City", "code": "VA", "lang": "ita" },
+  "VC": { "name": "Saint Vincent and the Grenadines", "code": "VC", "lang": "eng" },
+  "VE": { "name": "Venezuela", "code": "VE", "lang": "spa" },
+  "VG": { "name": "British Virgin Islands", "code": "VG", "lang": "eng" },
+  "VI": { "name": "U.S. Virgin Islands", "code": "VI", "lang": "eng" },
+  "VN": { "name": "Vietnam", "code": "VN", "lang": "vie" },
+  "VU": { "name": "Vanuatu", "code": "VU", "lang": "bis" },
+  "WF": { "name": "Wallis and Futuna", "code": "WF", "lang": "fra" },
+  "WS": { "name": "Samoa", "code": "WS", "lang": "smo" },
+  "XK": { "name": "Kosovo", "code": "XK", "lang": "sqi" },
+  "YE": { "name": "Yemen", "code": "YE", "lang": "ara" },
+  "YT": { "name": "Mayotte", "code": "YT", "lang": "fra" },
   "ZA": {
     "name": "South Africa",
-    "languages": ["afr", "eng", "nbl", "sot", "ssw", "tsn", "tso", "ven", "xho", "zul"]
+    "code": "ZA",
+    "lang": "afr"
   },
-  "ZM": {
-    "name": "Zambia",
-    "languages": ["eng"]
-  },
-  "ZW": {
-    "name": "Zimbabwe",
-    "languages": ["eng", "sna", "nde"]
-  }
+  "ZM": { "name": "Zambia", "code": "ZM", "lang": "eng" },
+  "ZW": { "name": "Zimbabwe", "code": "ZW", "lang": "eng" }
 }
diff --git a/scripts/data/regions.json b/scripts/data/regions.json
index eccab1abf3..101fdd70f0 100644
--- a/scripts/data/regions.json
+++ b/scripts/data/regions.json
@@ -1,7 +1,8 @@
 {
   "AFR": {
     "name": "Africa",
-    "codes": [
+    "code": "AFR",
+    "country_codes": [
       "AO",
       "BF",
       "BI",
@@ -65,7 +66,8 @@
   },
   "AMER": {
     "name": "Americas",
-    "codes": [
+    "code": "AMER",
+    "country_codes": [
       "AG",
       "AI",
       "AR",
@@ -126,7 +128,8 @@
   },
   "APAC": {
     "name": "Asia-Pacific",
-    "codes": [
+    "code": "APAC",
+    "country_codes": [
       "AF",
       "AS",
       "AU",
@@ -181,7 +184,8 @@
   },
   "ARAB": {
     "name": "Arab world",
-    "codes": [
+    "code": "ARAB",
+    "country_codes": [
       "AE",
       "BH",
       "DJ",
@@ -208,7 +212,8 @@
   },
   "ASIA": {
     "name": "Asia",
-    "codes": [
+    "code": "ASIA",
+    "country_codes": [
       "AE",
       "AF",
       "AM",
@@ -263,7 +268,8 @@
   },
   "CARIB": {
     "name": "Caribbean",
-    "codes": [
+    "code": "CARIB",
+    "country_codes": [
       "AG",
       "AI",
       "AW",
@@ -295,15 +301,18 @@
   },
   "CAS": {
     "name": "Central Asia",
-    "codes": ["KG", "KZ", "TJ", "TM", "UZ"]
+    "code": "CAS",
+    "country_codes": ["KG", "KZ", "TJ", "TM", "UZ"]
   },
   "CIS": {
     "name": "Commonwealth of Independent States",
-    "codes": ["AM", "AZ", "BY", "KG", "KZ", "MD", "RU", "TJ", "UZ"]
+    "code": "CIS",
+    "country_codes": ["AM", "AZ", "BY", "KG", "KZ", "MD", "RU", "TJ", "UZ"]
   },
   "EMEA": {
-    "name": "Europe, Middle East and Africa",
-    "codes": [
+    "name": "Europe, the Middle East and Africa",
+    "code": "EMEA",
+    "country_codes": [
       "AD",
       "AE",
       "AL",
@@ -430,7 +439,8 @@
   },
   "EUR": {
     "name": "Europe",
-    "codes": [
+    "code": "EUR",
+    "country_codes": [
       "AD",
       "AL",
       "AM",
@@ -485,7 +495,8 @@
   },
   "HISPAM": {
     "name": "Hispanic America",
-    "codes": [
+    "code": "HISPAM",
+    "country_codes": [
       "AR",
       "BO",
       "CL",
@@ -509,7 +520,8 @@
   },
   "LATAM": {
     "name": "Latin America",
-    "codes": [
+    "code": "LATAM",
+    "country_codes": [
       "AR",
       "BL",
       "BO",
@@ -538,90 +550,15 @@
       "VE"
     ]
   },
-  "MAGHRIB": {
-    "name": "Maghrib",
-    "codes": ["DZ", "LY", "MA", "MR", "TN"]
-  },
-  "MEA": {
-    "name": "Middle East and Africa",
-    "codes": [
-      "AE",
-      "AO",
-      "BF",
-      "BH",
-      "BI",
-      "BJ",
-      "BW",
-      "CD",
-      "CF",
-      "CG",
-      "CI",
-      "CM",
-      "CV",
-      "DJ",
-      "DZ",
-      "EG",
-      "EH",
-      "ER",
-      "ET",
-      "GA",
-      "GH",
-      "GM",
-      "GN",
-      "GQ",
-      "GW",
-      "IQ",
-      "IR",
-      "JO",
-      "KE",
-      "KM",
-      "KW",
-      "LB",
-      "LR",
-      "LS",
-      "LY",
-      "MA",
-      "MG",
-      "ML",
-      "MR",
-      "MU",
-      "MW",
-      "MZ",
-      "NA",
-      "NE",
-      "NG",
-      "OM",
-      "PS",
-      "QA",
-      "RE",
-      "RW",
-      "SA",
-      "SC",
-      "SD",
-      "SH",
-      "SL",
-      "SN",
-      "SO",
-      "SS",
-      "ST",
-      "SY",
-      "SZ",
-      "TD",
-      "TF",
-      "TG",
-      "TN",
-      "TZ",
-      "UG",
-      "YE",
-      "YT",
-      "ZA",
-      "ZM",
-      "ZW"
-    ]
+  "MAGHREB": {
+    "name": "Maghreb",
+    "code": "MAGHREB",
+    "country_codes": ["DZ", "LY", "MA", "MR", "TN"]
   },
   "MENA": {
     "name": "Middle East and North Africa",
-    "codes": [
+    "code": "MENA",
+    "country_codes": [
       "AE",
       "BH",
       "DJ",
@@ -645,43 +582,10 @@
       "YE"
     ]
   },
-  "NORD": {
-    "name": "Nordics",
-    "codes": ["AX", "DK", "FO", "FI", "IS", "NO", "SE"]
-  },
-  "OCE": {
-    "name": "Oceania",
-    "codes": [
-      "AS",
-      "AU",
-      "CK",
-      "FJ",
-      "FM",
-      "GU",
-      "KI",
-      "MH",
-      "MP",
-      "NC",
-      "NF",
-      "NR",
-      "NU",
-      "NZ",
-      "PF",
-      "PG",
-      "PN",
-      "PW",
-      "SB",
-      "TK",
-      "TO",
-      "TV",
-      "VU",
-      "WF",
-      "WS"
-    ]
-  },
   "MIDEAST": {
     "name": "Middle East",
-    "codes": [
+    "code": "MIDEAST",
+    "country_codes": [
       "AE",
       "BH",
       "CY",
@@ -703,7 +607,8 @@
   },
   "NORAM": {
     "name": "North America",
-    "codes": [
+    "code": "NORAM",
+    "country_codes": [
       "AG",
       "AI",
       "AW",
@@ -746,13 +651,51 @@
       "VI"
     ]
   },
+  "NORD": {
+    "name": "Nordics",
+    "code": "NORD",
+    "country_codes": ["AX", "DK", "FO", "FI", "IS", "NO", "SE"]
+  },
+  "OCE": {
+    "name": "Oceania",
+    "code": "OCE",
+    "country_codes": [
+      "AS",
+      "AU",
+      "CK",
+      "FJ",
+      "FM",
+      "GU",
+      "KI",
+      "MH",
+      "MP",
+      "NC",
+      "NF",
+      "NR",
+      "NU",
+      "NZ",
+      "PF",
+      "PG",
+      "PN",
+      "PW",
+      "SB",
+      "TK",
+      "TO",
+      "TV",
+      "VU",
+      "WF",
+      "WS"
+    ]
+  },
   "SAS": {
     "name": "South Asia",
-    "codes": ["AF", "BD", "BT", "IN", "LK", "MV", "NP", "PK"]
+    "code": "SAS",
+    "country_codes": ["AF", "BD", "BT", "IN", "LK", "MV", "NP", "PK"]
   },
   "SSA": {
     "name": "Sub-Saharan Africa",
-    "codes": [
+    "code": "SSA",
+    "country_codes": [
       "AO",
       "BF",
       "BI",
@@ -806,7 +749,8 @@
   },
   "WAFR": {
     "name": "West Africa",
-    "codes": [
+    "code": "WAFR",
+    "country_codes": [
       "BF",
       "BJ",
       "CI",
diff --git a/scripts/data/statuses.json b/scripts/data/statuses.json
new file mode 100644
index 0000000000..8e96c1409b
--- /dev/null
+++ b/scripts/data/statuses.json
@@ -0,0 +1,27 @@
+{
+  "online": {
+    "label": "",
+    "code": "online",
+    "level": 1
+  },
+  "geo_blocked": {
+    "label": "Geo-blocked",
+    "code": "geo_blocked",
+    "level": 2
+  },
+  "not_247": {
+    "label": "Not 24/7",
+    "code": "not_247",
+    "level": 3
+  },
+  "timeout": {
+    "label": "Timeout",
+    "code": "timeout",
+    "level": 4
+  },
+  "offline": {
+    "label": "Offline",
+    "code": "offline",
+    "level": 5
+  }
+}
diff --git a/scripts/filter.js b/scripts/filter.js
deleted file mode 100644
index f6676c9370..0000000000
--- a/scripts/filter.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const blacklist = require('./data/blacklist.json')
-const parser = require('./helpers/parser')
-const file = require('./helpers/file')
-const log = require('./helpers/log')
-
-async function main() {
-  log.start()
-
-  const files = await file.list()
-  if (!files.length) log.print(`No files is selected\n`)
-  for (const file of files) {
-    log.print(`\nProcessing '${file}'...`)
-    await parser
-      .parsePlaylist(file)
-      .then(removeBlacklisted)
-      .then(p => p.save())
-  }
-
-  log.print('\n')
-  log.finish()
-}
-
-function removeBlacklisted(playlist) {
-  const channels = playlist.channels.filter(channel => {
-    return !blacklist.find(item => {
-      const regexp = new RegExp(item.regex, 'i')
-      const hasSameName = regexp.test(channel.name)
-      const fromSameCountry = playlist.country.code === item.country
-
-      return hasSameName && fromSameCountry
-    })
-  })
-
-  if (playlist.channels.length !== channels.length) {
-    log.print(`updated`)
-    playlist.channels = channels
-    playlist.updated = true
-  }
-
-  return playlist
-}
-
-main()
diff --git a/scripts/format.js b/scripts/format.js
deleted file mode 100644
index 74bf3e276f..0000000000
--- a/scripts/format.js
+++ /dev/null
@@ -1,307 +0,0 @@
-const axios = require('axios')
-const { program } = require('commander')
-const normalize = require('normalize-url')
-const IPTVChecker = require('iptv-checker')
-const parser = require('./helpers/parser')
-const utils = require('./helpers/utils')
-const file = require('./helpers/file')
-const log = require('./helpers/log')
-const epg = require('./helpers/epg')
-
-const ignoreStatus = ['Geo-blocked']
-
-program
-  .usage('[OPTIONS]...')
-  .option('--debug', 'Enable debug mode')
-  .option('--offline', 'Enable offline mode')
-  .option('-d, --delay <delay>', 'Set delay for each request', parseNumber, 0)
-  .option('-t, --timeout <timeout>', 'Set timeout for each request', parseNumber, 5000)
-  .option('-c, --country <country>', 'Comma-separated list of country codes', '')
-  .option('-e, --exclude <exclude>', 'Comma-separated list of country codes to be excluded', '')
-  .parse(process.argv)
-
-const config = program.opts()
-const checker = new IPTVChecker({
-  timeout: config.timeout
-})
-
-let buffer, origins
-async function main() {
-  log.start()
-
-  const include = config.country.split(',').filter(i => i)
-  const exclude = config.exclude.split(',').filter(i => i)
-  let files = await file.list(include, exclude)
-  if (!files.length) log.print(`No files is selected\n`)
-  for (const file of files) {
-    await parser.parsePlaylist(file).then(updatePlaylist).then(savePlaylist)
-  }
-
-  log.finish()
-}
-
-function savePlaylist(playlist) {
-  if (file.read(playlist.url) !== playlist.toString()) {
-    log.print(`File '${playlist.url}' has been updated\n`)
-    playlist.updated = true
-  }
-
-  playlist.save()
-}
-
-async function updatePlaylist(playlist) {
-  const total = playlist.channels.length
-  log.print(`Processing '${playlist.url}'...\n`)
-
-  let channels = {}
-  let codes = {}
-  if (!config.offline) {
-    channels = await loadChannelsJson()
-    codes = await loadCodes()
-  }
-
-  buffer = {}
-  origins = {}
-  for (const [i, channel] of playlist.channels.entries()) {
-    const curr = i + 1
-    updateTvgName(channel)
-    updateTvgId(channel, playlist)
-    updateTvgCountry(channel)
-    normalizeUrl(channel)
-
-    const data = channels[channel.tvg.id]
-    const epgData = codes[channel.tvg.id]
-    updateLogo(channel, data, epgData)
-    updateGroupTitle(channel, data)
-    updateTvgLanguage(channel, data)
-
-    if (config.offline || ignoreStatus.includes(channel.status)) {
-      continue
-    }
-
-    await checker
-      .checkStream(channel.data)
-      .then(parseResult)
-      .then(result => {
-        updateStatus(channel, result.status)
-        if (result.status === 'online') {
-          buffer[i] = result
-          updateOrigins(channel, result.requests)
-          updateResolution(channel, result.resolution)
-        } else {
-          buffer[i] = null
-          if (config.debug) {
-            log.print(`  INFO: ${channel.url} (${result.error})\n`)
-          }
-        }
-      })
-      .catch(err => {
-        buffer[i] = null
-        if (config.debug) {
-          log.print(`  ERR: ${channel.data.url} (${err.message})\n`)
-        }
-      })
-  }
-
-  for (const [i, channel] of playlist.channels.entries()) {
-    if (!buffer[i]) continue
-    const { requests } = buffer[i]
-    updateUrl(channel, requests)
-  }
-
-  return playlist
-}
-
-function updateOrigins(channel, requests) {
-  if (!requests) return
-  const origin = new URL(channel.url)
-  const target = new URL(requests[0])
-  const type = origin.host === target.host ? 'origin' : 'redirect'
-  requests.forEach(url => {
-    const key = utils.removeProtocol(url)
-    if (!origins[key] && type === 'origin') {
-      origins[key] = channel.url
-    }
-  })
-}
-
-function updateStatus(channel, status) {
-  switch (status) {
-    case 'online':
-      if (channel.status !== 'Not 24/7')
-        channel.status = channel.status === 'Offline' ? 'Not 24/7' : null
-      break
-    case 'error_403':
-      if (!channel.status) channel.status = 'Geo-blocked'
-      break
-    case 'offline':
-      if (channel.status !== 'Not 24/7') channel.status = 'Offline'
-      break
-  }
-}
-
-function updateResolution(channel, resolution) {
-  if (!channel.resolution.height && resolution) {
-    channel.resolution = resolution
-  }
-}
-
-function updateUrl(channel, requests) {
-  for (const request of requests) {
-    let key = utils.removeProtocol(channel.url)
-    if (origins[key]) {
-      channel.updateUrl(origins[key])
-      break
-    }
-
-    key = utils.removeProtocol(request)
-    if (origins[key]) {
-      channel.updateUrl(origins[key])
-      break
-    }
-  }
-}
-
-function parseResult(result) {
-  return {
-    status: parseStatus(result.status),
-    resolution: result.status.ok ? parseResolution(result.status.metadata.streams) : null,
-    requests: result.status.ok ? parseRequests(result.status.metadata.requests) : [],
-    error: !result.status.ok ? result.status.reason : null
-  }
-}
-
-function parseStatus(status) {
-  if (status.ok) {
-    return 'online'
-  } else if (status.reason.includes('timed out')) {
-    return 'timeout'
-  } else if (status.reason.includes('403')) {
-    return 'error_403'
-  } else if (status.reason.includes('not one of 40{0,1,3,4}')) {
-    return 'error_40x' // 402, 451
-  } else {
-    return 'offline'
-  }
-}
-
-function parseResolution(streams) {
-  const resolution = streams
-    .filter(stream => stream.codec_type === 'video')
-    .reduce(
-      (acc, curr) => {
-        if (curr.height > acc.height) return { width: curr.width, height: curr.height }
-        return acc
-      },
-      { width: 0, height: 0 }
-    )
-
-  return resolution.width > 0 && resolution.height > 0 ? resolution : null
-}
-
-function parseRequests(requests) {
-  requests = requests.map(r => r.url)
-  requests.shift()
-
-  return requests
-}
-
-function updateTvgName(channel) {
-  if (!channel.tvg.name) {
-    channel.tvg.name = channel.name.replace(/\"/gi, '')
-  }
-}
-
-function updateTvgId(channel, playlist) {
-  const code = playlist.country.code
-  if (!channel.tvg.id && channel.tvg.name) {
-    const id = utils.name2id(channel.tvg.name)
-    channel.tvg.id = id ? `${id}.${code}` : ''
-  }
-}
-
-function updateTvgCountry(channel) {
-  if (!channel.countries.length && channel.tvg.id) {
-    const code = channel.tvg.id.split('.')[1] || null
-    const name = utils.code2name(code)
-    channel.countries = name ? [{ code, name }] : []
-    channel.tvg.country = channel.countries.map(c => c.code.toUpperCase()).join(';')
-  }
-}
-
-function updateLogo(channel, data, epgData) {
-  if (!channel.logo) {
-    if (data && data.logo) {
-      channel.logo = data.logo
-    } else if (epgData && epgData.logo) {
-      channel.logo = epgData.logo
-    }
-  }
-}
-
-function updateTvgLanguage(channel, data) {
-  if (!channel.tvg.language) {
-    if (data && data.languages.length) {
-      channel.tvg.language = data.languages.map(l => l.name).join(';')
-    } else if (channel.countries.length) {
-      const countryCode = channel.countries[0].code
-      channel.tvg.language = utils.country2language(countryCode)
-    }
-  }
-}
-
-function updateGroupTitle(channel, data) {
-  if (!channel.group.title) {
-    if (channel.category) {
-      channel.group.title = channel.category
-    } else if (data && data.category) {
-      channel.group.title = data.category
-    }
-  }
-}
-
-function normalizeUrl(channel) {
-  const normalized = normalize(channel.url, { stripWWW: false })
-  const decoded = decodeURIComponent(normalized).replace(/\s/g, '+')
-  channel.updateUrl(decoded)
-}
-
-function parseNumber(str) {
-  return parseInt(str)
-}
-
-function loadCodes() {
-  return epg.codes
-    .load()
-    .then(codes => {
-      let output = {}
-      codes.forEach(item => {
-        output[item['tvg_id']] = item
-      })
-      return output
-    })
-    .catch(console.log)
-}
-
-function loadChannelsJson() {
-  return axios
-    .get('https://iptv-org.github.io/iptv/channels.json')
-    .then(r => r.data)
-    .then(channels => {
-      let output = {}
-      channels.forEach(channel => {
-        const item = output[channel.tvg.id]
-        if (!item) {
-          output[channel.tvg.id] = channel
-        } else {
-          item.logo = item.logo || channel.logo
-          item.languages = item.languages.length ? item.languages : channel.languages
-          item.category = item.category || channel.category
-        }
-      })
-      return output
-    })
-    .catch(console.log)
-}
-
-main()
diff --git a/scripts/generate.js b/scripts/generate.js
deleted file mode 100644
index 07aaf7e1af..0000000000
--- a/scripts/generate.js
+++ /dev/null
@@ -1,232 +0,0 @@
-const file = require('./helpers/file')
-const log = require('./helpers/log')
-const db = require('./helpers/db')
-
-const ROOT_DIR = './.gh-pages'
-
-async function main() {
-  await loadDatabase()
-  createRootDirectory()
-  createNoJekyllFile()
-  generateIndex()
-  generateCategoryIndex()
-  generateCountryIndex()
-  generateLanguageIndex()
-  generateCategories()
-  generateCountries()
-  generateLanguages()
-  generateChannelsJson()
-  showResults()
-}
-
-async function loadDatabase() {
-  log.print('Loading database...\n')
-  await db.load()
-}
-
-function createRootDirectory() {
-  log.print('Creating .gh-pages folder...\n')
-  file.createDir(ROOT_DIR)
-}
-
-function createNoJekyllFile() {
-  log.print('Creating .nojekyll...\n')
-  file.create(`${ROOT_DIR}/.nojekyll`)
-}
-
-function generateIndex() {
-  log.print('Generating index.m3u...\n')
-  const channels = db.channels
-    .sortBy(['name', 'status', 'resolution.height', 'url'], ['asc', 'asc', 'desc', 'asc'])
-    .removeDuplicates()
-    .removeOffline()
-    .get()
-  const guides = channels.map(channel => channel.tvg.url)
-
-  const filename = `${ROOT_DIR}/index.m3u`
-  const urlTvg = generateUrlTvg(guides)
-  file.create(filename, `#EXTM3U url-tvg="${urlTvg}"\n`)
-
-  const nsfwFilename = `${ROOT_DIR}/index.nsfw.m3u`
-  file.create(nsfwFilename, `#EXTM3U url-tvg="${urlTvg}"\n`)
-
-  for (const channel of channels) {
-    if (!channel.isNSFW()) {
-      file.append(filename, channel.toString())
-    }
-    file.append(nsfwFilename, channel.toString())
-  }
-}
-
-function generateCategoryIndex() {
-  log.print('Generating index.category.m3u...\n')
-  const channels = db.channels
-    .sortBy(
-      ['category', 'name', 'status', 'resolution.height', 'url'],
-      ['asc', 'asc', 'asc', 'desc', 'asc']
-    )
-    .removeDuplicates()
-    .removeOffline()
-    .get()
-  const guides = channels.map(channel => channel.tvg.url)
-
-  const filename = `${ROOT_DIR}/index.category.m3u`
-  const urlTvg = generateUrlTvg(guides)
-  file.create(filename, `#EXTM3U url-tvg="${urlTvg}"\n`)
-
-  for (const channel of channels) {
-    file.append(filename, channel.toString())
-  }
-}
-
-function generateCountryIndex() {
-  log.print('Generating index.country.m3u...\n')
-
-  const guides = []
-  const lines = []
-  for (const country of [{ code: 'undefined' }, ...db.countries.sortBy(['name']).all()]) {
-    const channels = db.channels
-      .sortBy(['name', 'status', 'resolution.height', 'url'], ['asc', 'asc', 'desc', 'asc'])
-      .forCountry(country)
-      .removeDuplicates()
-      .removeNSFW()
-      .removeOffline()
-      .get()
-    for (const channel of channels) {
-      const groupTitle = channel.group.title
-      channel.group.title = country.name || ''
-      lines.push(channel.toString())
-      channel.group.title = groupTitle
-      guides.push(channel.tvg.url)
-    }
-  }
-
-  const filename = `${ROOT_DIR}/index.country.m3u`
-  const urlTvg = generateUrlTvg(guides)
-  file.create(filename, `#EXTM3U url-tvg="${urlTvg}"\n${lines.join('')}`)
-}
-
-function generateLanguageIndex() {
-  log.print('Generating index.language.m3u...\n')
-
-  const guides = []
-  const lines = []
-  for (const language of [{ code: 'undefined' }, ...db.languages.sortBy(['name']).all()]) {
-    const channels = db.channels
-      .sortBy(['name', 'status', 'resolution.height', 'url'], ['asc', 'asc', 'desc', 'asc'])
-      .forLanguage(language)
-      .removeDuplicates()
-      .removeNSFW()
-      .removeOffline()
-      .get()
-    for (const channel of channels) {
-      const groupTitle = channel.group.title
-      channel.group.title = language.name || ''
-      lines.push(channel.toString())
-      channel.group.title = groupTitle
-      guides.push(channel.tvg.url)
-    }
-  }
-
-  const filename = `${ROOT_DIR}/index.language.m3u`
-  const urlTvg = generateUrlTvg(guides)
-  file.create(filename, `#EXTM3U url-tvg="${urlTvg}"\n${lines.join('')}`)
-}
-
-function generateCategories() {
-  log.print(`Generating /categories...\n`)
-  const outputDir = `${ROOT_DIR}/categories`
-  file.createDir(outputDir)
-
-  for (const category of [...db.categories.all(), { id: 'other' }]) {
-    const channels = db.channels
-      .sortBy(['name', 'status', 'resolution.height', 'url'], ['asc', 'asc', 'desc', 'asc'])
-      .forCategory(category)
-      .removeDuplicates()
-      .removeOffline()
-      .get()
-    const guides = channels.map(channel => channel.tvg.url)
-
-    const filename = `${outputDir}/${category.id}.m3u`
-    const urlTvg = generateUrlTvg(guides)
-    file.create(filename, `#EXTM3U url-tvg="${urlTvg}"\n`)
-    for (const channel of channels) {
-      file.append(filename, channel.toString())
-    }
-  }
-}
-
-function generateCountries() {
-  log.print(`Generating /countries...\n`)
-  const outputDir = `${ROOT_DIR}/countries`
-  file.createDir(outputDir)
-
-  for (const country of [...db.countries.all(), { code: 'undefined' }]) {
-    const channels = db.channels
-      .sortBy(['name', 'status', 'resolution.height', 'url'], ['asc', 'asc', 'desc', 'asc'])
-      .forCountry(country)
-      .removeDuplicates()
-      .removeOffline()
-      .removeNSFW()
-      .get()
-    const guides = channels.map(channel => channel.tvg.url)
-
-    const filename = `${outputDir}/${country.code}.m3u`
-    const urlTvg = generateUrlTvg(guides)
-    file.create(filename, `#EXTM3U url-tvg="${urlTvg}"\n`)
-    for (const channel of channels) {
-      file.append(filename, channel.toString())
-    }
-  }
-}
-
-function generateLanguages() {
-  log.print(`Generating /languages...\n`)
-  const outputDir = `${ROOT_DIR}/languages`
-  file.createDir(outputDir)
-
-  for (const language of [...db.languages.all(), { code: 'undefined' }]) {
-    const channels = db.channels
-      .sortBy(['name', 'status', 'resolution.height', 'url'], ['asc', 'asc', 'desc', 'asc'])
-      .forLanguage(language)
-      .removeDuplicates()
-      .removeOffline()
-      .removeNSFW()
-      .get()
-    const guides = channels.map(channel => channel.tvg.url)
-
-    const filename = `${outputDir}/${language.code}.m3u`
-    const urlTvg = generateUrlTvg(guides)
-    file.create(filename, `#EXTM3U url-tvg="${urlTvg}"\n`)
-    for (const channel of channels) {
-      file.append(filename, channel.toString())
-    }
-  }
-}
-
-function generateChannelsJson() {
-  log.print('Generating channels.json...\n')
-  const filename = `${ROOT_DIR}/channels.json`
-  const channels = db.channels
-    .sortBy(['name', 'status', 'resolution.height', 'url'], ['asc', 'asc', 'desc', 'asc'])
-    .get()
-    .map(c => c.toObject())
-  file.create(filename, JSON.stringify(channels))
-}
-
-function showResults() {
-  log.print(
-    `Total: ${db.channels.count()} channels, ${db.countries.count()} countries, ${db.languages.count()} languages, ${db.categories.count()} categories.\n`
-  )
-}
-
-function generateUrlTvg(guides) {
-  const output = guides.reduce((acc, curr) => {
-    if (curr && !acc.includes(curr)) acc.push(curr)
-    return acc
-  }, [])
-
-  return output.sort().join(',')
-}
-
-main()
diff --git a/scripts/helpers/Channel.js b/scripts/helpers/Channel.js
deleted file mode 100644
index 3d177ad14b..0000000000
--- a/scripts/helpers/Channel.js
+++ /dev/null
@@ -1,162 +0,0 @@
-const categories = require('../data/categories')
-const utils = require('./utils')
-const file = require('./file')
-
-const sfwCategories = categories.filter(c => !c.nsfw).map(c => c.name)
-const nsfwCategories = categories.filter(c => c.nsfw).map(c => c.name)
-
-module.exports = class Channel {
-  constructor(data) {
-    this.data = data
-    this.raw = data.raw
-    this.tvg = data.tvg
-    this.http = data.http
-    this.url = data.url
-    this.logo = data.tvg.logo
-    this.group = data.group
-    this.name = this.parseName(data.name)
-    this.status = this.parseStatus(data.name)
-    this.resolution = this.parseResolution(data.name)
-    this.category = this.parseCategory(data.group.title)
-    this.countries = this.parseCountries(data.tvg.country)
-    this.languages = this.parseLanguages(data.tvg.language)
-    this.hash = this.generateHash()
-  }
-
-  generateHash() {
-    return `${this.tvg.id}:${this.tvg.country}:${this.tvg.language}:${this.logo}:${this.group.title}:${this.name}`.toLowerCase()
-  }
-
-  updateUrl(url) {
-    this.url = url
-    this.data.url = url
-  }
-
-  parseName(title) {
-    return title
-      .trim()
-      .split(' ')
-      .map(s => s.trim())
-      .filter(s => {
-        return !/\[|\]/i.test(s) && !/\((\d+)P\)/i.test(s)
-      })
-      .join(' ')
-  }
-
-  parseStatus(title) {
-    const match = title.match(/\[(.*)\]/i)
-    return match ? match[1] : null
-  }
-
-  parseResolution(title) {
-    const match = title.match(/\((\d+)P\)/i)
-    const height = match ? parseInt(match[1]) : null
-
-    return { width: null, height }
-  }
-
-  parseCategory(string) {
-    const category = categories.find(c => c.id === string.toLowerCase())
-    if (!category) return ''
-
-    return category.name
-  }
-
-  parseCountries(string) {
-    const list = string.split(';')
-    return list
-      .reduce((acc, curr) => {
-        const codes = utils.region2codes(curr)
-        if (codes.length) {
-          for (let code of codes) {
-            if (!acc.includes(code)) {
-              acc.push(code)
-            }
-          }
-        } else {
-          acc.push(curr)
-        }
-
-        return acc
-      }, [])
-      .map(code => {
-        const name = code ? utils.code2name(code) : null
-        if (!name) return null
-
-        return { code: code.toLowerCase(), name }
-      })
-      .filter(c => c)
-  }
-
-  parseLanguages(string) {
-    const list = string.split(';')
-    return list
-      .map(name => {
-        const code = name ? utils.language2code(name) : null
-        if (!code) return null
-
-        return { code, name }
-      })
-      .filter(l => l)
-  }
-
-  isSFW() {
-    return sfwCategories.includes(this.category)
-  }
-
-  isNSFW() {
-    return nsfwCategories.includes(this.category)
-  }
-
-  getInfo() {
-    let info = `-1 tvg-id="${this.tvg.id}" tvg-country="${this.tvg.country || ''}" tvg-language="${
-      this.tvg.language || ''
-    }" tvg-logo="${this.logo || ''}"`
-
-    if (this.http['user-agent']) {
-      info += ` user-agent="${this.http['user-agent']}"`
-    }
-
-    info += ` group-title="${this.group.title || ''}",${this.name}`
-
-    if (this.resolution.height) {
-      info += ` (${this.resolution.height}p)`
-    }
-
-    if (this.status) {
-      info += ` [${this.status}]`
-    }
-
-    if (this.http['referrer']) {
-      info += `\n#EXTVLCOPT:http-referrer=${this.http['referrer']}`
-    }
-
-    if (this.http['user-agent']) {
-      info += `\n#EXTVLCOPT:http-user-agent=${this.http['user-agent']}`
-    }
-
-    return info
-  }
-
-  toString(raw = false) {
-    if (raw) return this.raw + '\n'
-
-    return '#EXTINF:' + this.getInfo() + '\n' + this.url + '\n'
-  }
-
-  toObject() {
-    return {
-      name: this.name,
-      logo: this.logo || null,
-      url: this.url,
-      category: this.category || null,
-      languages: this.languages,
-      countries: this.countries,
-      tvg: {
-        id: this.tvg.id || null,
-        name: this.tvg.name || this.name.replace(/\"/gi, ''),
-        url: this.tvg.url || null
-      }
-    }
-  }
-}
diff --git a/scripts/helpers/Playlist.js b/scripts/helpers/Playlist.js
deleted file mode 100644
index 0df181a2da..0000000000
--- a/scripts/helpers/Playlist.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const Channel = require('./Channel')
-const file = require('./file')
-
-module.exports = class Playlist {
-  constructor({ header, items, url, name, country }) {
-    this.url = url
-    this.name = name
-    this.country = country
-    this.header = header
-    this.channels = items.map(item => new Channel(item)).filter(channel => channel.url)
-    this.updated = false
-  }
-
-  getHeader() {
-    let header = ['#EXTM3U']
-    for (let key in this.header.attrs) {
-      let value = this.header.attrs[key]
-      if (value) {
-        header.push(`${key}="${value}"`)
-      }
-    }
-
-    return header.join(' ')
-  }
-
-  toString(options = {}) {
-    const config = { raw: false, ...options }
-    let output = `${this.getHeader()}\n`
-    for (let channel of this.channels) {
-      output += channel.toString(config.raw)
-    }
-
-    return output
-  }
-
-  save() {
-    if (this.updated) {
-      file.create(this.url, this.toString())
-    }
-  }
-}
diff --git a/scripts/helpers/db.js b/scripts/helpers/db.js
deleted file mode 100644
index 52587ce387..0000000000
--- a/scripts/helpers/db.js
+++ /dev/null
@@ -1,237 +0,0 @@
-const categories = require('../data/categories')
-const parser = require('./parser')
-const utils = require('./utils')
-const file = require('./file')
-const epg = require('./epg')
-
-const db = {}
-
-db.load = async function () {
-  const files = await file.list()
-  const codes = await epg.codes.load()
-  for (const file of files) {
-    const playlist = await parser.parsePlaylist(file)
-    for (const channel of playlist.channels) {
-      const code = codes.find(ch => ch['tvg_id'] === channel.tvg.id)
-      if (code && Array.isArray(code.guides) && code.guides.length) {
-        channel.tvg.url = code.guides[0]
-      }
-
-      db.channels.add(channel)
-
-      for (const country of channel.countries) {
-        if (!db.countries.has(country)) {
-          db.countries.add(country)
-        }
-      }
-
-      for (const language of channel.languages) {
-        if (!db.languages.has(language)) {
-          db.languages.add(language)
-        }
-      }
-    }
-
-    db.playlists.add(playlist)
-  }
-}
-
-db.channels = {
-  list: [],
-  filter: null,
-  duplicates: true,
-  offline: true,
-  nsfw: true,
-  add(channel) {
-    this.list.push(channel)
-  },
-  get() {
-    let output
-    if (this.filter) {
-      switch (this.filter.field) {
-        case 'countries':
-          if (this.filter.value === 'undefined') {
-            output = this.list.filter(channel => !channel.countries.length)
-          } else {
-            output = this.list.filter(channel =>
-              channel.countries.map(c => c.code).includes(this.filter.value)
-            )
-          }
-          break
-        case 'languages':
-          if (this.filter.value === 'undefined') {
-            output = this.list.filter(channel => !channel.languages.length)
-          } else {
-            output = this.list.filter(channel =>
-              channel.languages.map(c => c.code).includes(this.filter.value)
-            )
-          }
-          break
-        case 'category':
-          if (this.filter.value === 'other') {
-            output = this.list.filter(channel => !channel.category)
-          } else {
-            output = this.list.filter(
-              channel => channel.category.toLowerCase() === this.filter.value
-            )
-          }
-          break
-      }
-    } else {
-      output = this.list
-    }
-
-    if (!this.duplicates) {
-      const buffer = []
-      output = output.filter(channel => {
-        if (buffer.includes(channel.hash)) return false
-        buffer.push(channel.hash)
-
-        return true
-      })
-    }
-
-    if (!this.nsfw) {
-      output = output.filter(channel => !channel.isNSFW())
-    }
-
-    if (!this.offline) {
-      output = output.filter(channel => channel.status !== 'Offline')
-    }
-
-    this.nsfw = true
-    this.duplicates = true
-    this.offline = true
-    this.filter = null
-
-    return output
-  },
-  removeDuplicates() {
-    this.duplicates = false
-
-    return this
-  },
-  removeNSFW() {
-    this.nsfw = false
-
-    return this
-  },
-  removeOffline() {
-    this.offline = false
-
-    return this
-  },
-  all() {
-    return this.list
-  },
-  forCountry(country) {
-    this.filter = {
-      field: 'countries',
-      value: country.code
-    }
-
-    return this
-  },
-  forLanguage(language) {
-    this.filter = {
-      field: 'languages',
-      value: language.code
-    }
-
-    return this
-  },
-  forCategory(category) {
-    this.filter = {
-      field: 'category',
-      value: category.id
-    }
-
-    return this
-  },
-  count() {
-    return this.get().length
-  },
-  sortBy(fields, order) {
-    this.list = utils.sortBy(this.list, fields, order)
-
-    return this
-  }
-}
-
-db.countries = {
-  list: [],
-  has(country) {
-    return this.list.map(c => c.code).includes(country.code)
-  },
-  add(country) {
-    this.list.push(country)
-  },
-  all() {
-    return this.list
-  },
-  count() {
-    return this.list.length
-  },
-  sortBy(fields, order) {
-    this.list = utils.sortBy(this.list, fields, order)
-
-    return this
-  }
-}
-
-db.languages = {
-  list: [],
-  has(language) {
-    return this.list.map(c => c.code).includes(language.code)
-  },
-  add(language) {
-    this.list.push(language)
-  },
-  all() {
-    return this.list
-  },
-  count() {
-    return this.list.length
-  },
-  sortBy(fields, order) {
-    this.list = utils.sortBy(this.list, fields, order)
-
-    return this
-  }
-}
-
-db.categories = {
-  list: categories,
-  all() {
-    return this.list
-  },
-  count() {
-    return this.list.length
-  }
-}
-
-db.playlists = {
-  list: [],
-  add(playlist) {
-    this.list.push(playlist)
-  },
-  all() {
-    return this.list
-  },
-  only(list = []) {
-    return this.list.filter(playlist => list.includes(playlist.filename))
-  },
-  except(list = []) {
-    return this.list.filter(playlist => !list.includes(playlist.filename))
-  },
-  sortBy(fields, order) {
-    this.list = utils.sortBy(this.list, fields, order)
-
-    return this
-  },
-  count() {
-    return this.list.length
-  }
-}
-
-module.exports = db
diff --git a/scripts/helpers/epg.js b/scripts/helpers/epg.js
deleted file mode 100644
index 202a89e894..0000000000
--- a/scripts/helpers/epg.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const axios = require('axios')
-
-module.exports = {
-  codes: {
-    async load() {
-      return await axios
-        .get('https://iptv-org.github.io/epg/codes.json')
-        .then(r => r.data)
-        .catch(console.log)
-    }
-  }
-}
diff --git a/scripts/helpers/file.js b/scripts/helpers/file.js
deleted file mode 100644
index 44ff351357..0000000000
--- a/scripts/helpers/file.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const markdownInclude = require('markdown-include')
-const path = require('path')
-const glob = require('glob')
-const fs = require('fs')
-
-const rootPath = path.resolve(__dirname) + '/../../'
-const file = {}
-
-file.list = function (include = [], exclude = []) {
-  return new Promise(resolve => {
-    glob('channels/**/*.m3u', function (err, files) {
-      if (include.length) {
-        include = include.map(filename => `channels/${filename}.m3u`)
-        files = files.filter(filename => include.includes(filename))
-      }
-
-      if (exclude.length) {
-        exclude = exclude.map(filename => `channels/${filename}.m3u`)
-        files = files.filter(filename => !exclude.includes(filename))
-      }
-
-      resolve(files)
-    })
-  })
-}
-
-file.getFilename = function (filename) {
-  return path.parse(filename).name
-}
-
-file.createDir = function (dir) {
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir)
-  }
-}
-
-file.read = function (filename) {
-  return fs.readFileSync(rootPath + filename, { encoding: 'utf8' })
-}
-
-file.append = function (filename, data) {
-  fs.appendFileSync(rootPath + filename, data)
-}
-
-file.create = function (filename, data = '') {
-  fs.writeFileSync(rootPath + filename, data)
-}
-
-file.compileMarkdown = function (filename) {
-  markdownInclude.compileFiles(rootPath + filename)
-}
-
-module.exports = file
diff --git a/scripts/helpers/log.js b/scripts/helpers/log.js
deleted file mode 100644
index 3120110b80..0000000000
--- a/scripts/helpers/log.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const log = {}
-
-log.print = function (message) {
-  if (typeof message === 'object') message = JSON.stringify(message, null, 2)
-  process.stdout.write(message)
-}
-
-log.start = function () {
-  this.print('Starting...\n')
-  console.time('Done in')
-}
-
-log.finish = function () {
-  console.timeEnd('Done in')
-}
-
-module.exports = log
diff --git a/scripts/helpers/parser.js b/scripts/helpers/parser.js
deleted file mode 100644
index 138af59073..0000000000
--- a/scripts/helpers/parser.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const playlistParser = require('iptv-playlist-parser')
-const Playlist = require('./Playlist')
-const utils = require('./utils')
-const file = require('./file')
-
-const parser = {}
-
-parser.parsePlaylist = async function (url) {
-  const content = file.read(url)
-  const result = playlistParser.parse(content)
-  const filename = file.getFilename(url)
-  const country = {
-    code: filename,
-    name: utils.code2name(filename)
-  }
-
-  return new Playlist({ header: result.header, items: result.items, url, filename, country })
-}
-
-module.exports = parser
diff --git a/scripts/helpers/utils.js b/scripts/helpers/utils.js
deleted file mode 100644
index 0a140ff673..0000000000
--- a/scripts/helpers/utils.js
+++ /dev/null
@@ -1,86 +0,0 @@
-const { orderBy } = require('natural-orderby')
-const transliteration = require('transliteration')
-const countries = require('../data/countries')
-const categories = require('../data/categories')
-const languages = require('../data/languages')
-const regions = require('../data/regions')
-
-const utils = {}
-const intlDisplayNames = new Intl.DisplayNames(['en'], {
-  style: 'narrow',
-  type: 'region'
-})
-
-utils.name2id = function (name) {
-  return transliteration
-    .transliterate(name)
-    .replace(/\+/gi, 'Plus')
-    .replace(/[^a-z\d]+/gi, '')
-}
-
-utils.code2flag = function (code) {
-  code = code.toUpperCase()
-  switch (code) {
-    case 'UK':
-      return '🇬🇧'
-    case 'INT':
-      return '🌍'
-    case 'UNDEFINED':
-      return ''
-    default:
-      return code.replace(/./g, char => String.fromCodePoint(char.charCodeAt(0) + 127397))
-  }
-}
-
-utils.region2codes = function (region) {
-  region = region.toUpperCase()
-
-  return regions[region] ? regions[region].codes : []
-}
-
-utils.code2name = function (code) {
-  try {
-    code = code.toUpperCase()
-    if (regions[code]) return regions[code].name
-    if (code === 'US') return 'United States'
-    if (code === 'INT') return 'International'
-    return intlDisplayNames.of(code)
-  } catch (e) {
-    return null
-  }
-}
-
-utils.language2code = function (name) {
-  const lang = languages.find(l => l.name === name)
-
-  return lang && lang.code ? lang.code : null
-}
-
-utils.country2language = function (code) {
-  const country = countries[code.toUpperCase()]
-  if (!country.languages.length) return ''
-  const language = languages.find(l => l.code === country.languages[0])
-
-  return language ? language.name : ''
-}
-
-utils.sortBy = function (arr, fields, order = null) {
-  fields = fields.map(field => {
-    if (field === 'resolution.height') return channel => channel.resolution.height || 0
-    if (field === 'status') return channel => channel.status || ''
-    return channel => channel[field]
-  })
-  return orderBy(arr, fields, order)
-}
-
-utils.removeProtocol = function (string) {
-  return string.replace(/(^\w+:|^)\/\//, '')
-}
-
-utils.sleep = function (ms) {
-  return function (x) {
-    return new Promise(resolve => setTimeout(() => resolve(x), ms))
-  }
-}
-
-module.exports = utils
diff --git a/scripts/remove-broken-links.js b/scripts/remove-broken-links.js
deleted file mode 100644
index a6fff7a85c..0000000000
--- a/scripts/remove-broken-links.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const parser = require('./helpers/parser')
-const file = require('./helpers/file')
-const log = require('./helpers/log')
-
-async function main() {
-  log.start()
-
-  let files = await file.list()
-  if (!files.length) log.print(`No files is selected\n`)
-  files = files.filter(file => file !== 'channels/unsorted.m3u')
-  for (const file of files) {
-    log.print(`\nProcessing '${file}'...`)
-    await parser
-      .parsePlaylist(file)
-      .then(removeBrokenLinks)
-      .then(p => p.save())
-  }
-
-  log.print('\n')
-  log.finish()
-}
-
-async function removeBrokenLinks(playlist) {
-  const buffer = []
-  const channels = playlist.channels.filter(channel => {
-    const sameHash = buffer.find(item => item.hash === channel.hash)
-    if (sameHash && channel.status === 'Offline') return false
-
-    buffer.push(channel)
-    return true
-  })
-
-  if (playlist.channels.length !== channels.length) {
-    log.print('updated')
-    playlist.channels = channels
-    playlist.updated = true
-  }
-
-  return playlist
-}
-
-main()
diff --git a/scripts/remove-duplicates.js b/scripts/remove-duplicates.js
deleted file mode 100644
index c75882f70c..0000000000
--- a/scripts/remove-duplicates.js
+++ /dev/null
@@ -1,81 +0,0 @@
-const parser = require('./helpers/parser')
-const utils = require('./helpers/utils')
-const file = require('./helpers/file')
-const log = require('./helpers/log')
-
-let globalBuffer = []
-
-async function main() {
-  log.start()
-
-  let files = await file.list()
-  if (!files.length) log.print(`No files is selected\n`)
-  files = files.filter(file => file !== 'channels/unsorted.m3u')
-  for (const file of files) {
-    log.print(`\nProcessing '${file}'...`)
-    await parser
-      .parsePlaylist(file)
-      .then(addToGlobalBuffer)
-      .then(removeDuplicates)
-      .then(p => p.save())
-  }
-
-  if (files.length) {
-    log.print(`\nProcessing 'channels/unsorted.m3u'...`)
-    await parser
-      .parsePlaylist('channels/unsorted.m3u')
-      .then(removeDuplicates)
-      .then(removeGlobalDuplicates)
-      .then(p => p.save())
-  }
-
-  log.print('\n')
-  log.finish()
-}
-
-async function addToGlobalBuffer(playlist) {
-  playlist.channels.forEach(channel => {
-    const url = utils.removeProtocol(channel.url)
-    globalBuffer.push(url)
-  })
-
-  return playlist
-}
-
-async function removeDuplicates(playlist) {
-  const buffer = []
-  const channels = playlist.channels.filter(channel => {
-    const sameUrl = buffer.find(item => {
-      return utils.removeProtocol(item.url) === utils.removeProtocol(channel.url)
-    })
-    if (sameUrl) return false
-
-    buffer.push(channel)
-    return true
-  })
-
-  if (playlist.channels.length !== channels.length) {
-    log.print('updated')
-    playlist.channels = channels
-    playlist.updated = true
-  }
-
-  return playlist
-}
-
-async function removeGlobalDuplicates(playlist) {
-  const channels = playlist.channels.filter(channel => {
-    const url = utils.removeProtocol(channel.url)
-    return !globalBuffer.includes(url)
-  })
-
-  if (channels.length !== playlist.channels.length) {
-    log.print('updated')
-    playlist.channels = channels
-    playlist.updated = true
-  }
-
-  return playlist
-}
-
-main()
diff --git a/scripts/sort.js b/scripts/sort.js
deleted file mode 100644
index c199bd5d18..0000000000
--- a/scripts/sort.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const parser = require('./helpers/parser')
-const utils = require('./helpers/utils')
-const file = require('./helpers/file')
-const log = require('./helpers/log')
-
-async function main() {
-  log.start()
-
-  let files = await file.list()
-  if (!files.length) log.print(`No files is selected\n`)
-  files = files.filter(file => file !== 'channels/unsorted.m3u')
-  for (const file of files) {
-    log.print(`\nProcessing '${file}'...`)
-    await parser
-      .parsePlaylist(file)
-      .then(sortChannels)
-      .then(p => p.save())
-  }
-
-  log.print('\n')
-  log.finish()
-}
-
-async function sortChannels(playlist) {
-  let channels = [...playlist.channels]
-  channels = utils.sortBy(
-    channels,
-    ['name', 'status', 'resolution.height', 'url'],
-    ['asc', 'asc', 'desc', 'asc']
-  )
-
-  if (JSON.stringify(channels) !== JSON.stringify(playlist.channels)) {
-    log.print('updated')
-    playlist.channels = channels
-    playlist.updated = true
-  }
-
-  return playlist
-}
-
-main()
diff --git a/scripts/store/getters/group_title.js b/scripts/store/getters/group_title.js
new file mode 100644
index 0000000000..ddae6ef2b6
--- /dev/null
+++ b/scripts/store/getters/group_title.js
@@ -0,0 +1,12 @@
+module.exports = function () {
+  if (this.group_title) return this.group_title
+
+  if (Array.isArray(this.categories)) {
+    return this.categories
+      .map(i => i.name)
+      .sort()
+      .join(';')
+  }
+
+  return ''
+}
diff --git a/scripts/store/getters/index.js b/scripts/store/getters/index.js
new file mode 100644
index 0000000000..df20631e05
--- /dev/null
+++ b/scripts/store/getters/index.js
@@ -0,0 +1,7 @@
+exports.group_title = require('./group_title')
+exports.title = require('./title')
+exports.tvg_country = require('./tvg_country')
+exports.tvg_id = require('./tvg_id')
+exports.tvg_language = require('./tvg_language')
+exports.tvg_logo = require('./tvg_logo')
+exports.tvg_url = require('./tvg_url')
diff --git a/scripts/store/getters/title.js b/scripts/store/getters/title.js
new file mode 100644
index 0000000000..7dc8304a67
--- /dev/null
+++ b/scripts/store/getters/title.js
@@ -0,0 +1,13 @@
+module.exports = function () {
+  let title = this.name
+
+  if (this.resolution.height) {
+    title += ` (${this.resolution.height}p)`
+  }
+
+  if (this.status.label) {
+    title += ` [${this.status.label}]`
+  }
+
+  return title
+}
diff --git a/scripts/store/getters/tvg_country.js b/scripts/store/getters/tvg_country.js
new file mode 100644
index 0000000000..7865e26b38
--- /dev/null
+++ b/scripts/store/getters/tvg_country.js
@@ -0,0 +1,5 @@
+module.exports = function () {
+  if (this.tvg_country) return this.tvg_country
+
+  return Array.isArray(this.countries) ? this.countries.map(i => i.code).join(';') : ''
+}
diff --git a/scripts/store/getters/tvg_id.js b/scripts/store/getters/tvg_id.js
new file mode 100644
index 0000000000..6b362cefe4
--- /dev/null
+++ b/scripts/store/getters/tvg_id.js
@@ -0,0 +1,3 @@
+module.exports = function () {
+  return this.id || ''
+}
diff --git a/scripts/store/getters/tvg_language.js b/scripts/store/getters/tvg_language.js
new file mode 100644
index 0000000000..2ad39c7fec
--- /dev/null
+++ b/scripts/store/getters/tvg_language.js
@@ -0,0 +1,3 @@
+module.exports = function () {
+  return Array.isArray(this.languages) ? this.languages.map(i => i.name).join(';') : ''
+}
diff --git a/scripts/store/getters/tvg_logo.js b/scripts/store/getters/tvg_logo.js
new file mode 100644
index 0000000000..e5d62bc9df
--- /dev/null
+++ b/scripts/store/getters/tvg_logo.js
@@ -0,0 +1,3 @@
+module.exports = function () {
+  return this.logo || ''
+}
diff --git a/scripts/store/getters/tvg_url.js b/scripts/store/getters/tvg_url.js
new file mode 100644
index 0000000000..9bd084c789
--- /dev/null
+++ b/scripts/store/getters/tvg_url.js
@@ -0,0 +1,3 @@
+module.exports = function () {
+  return this.guides.length ? this.guides[0] : ''
+}
diff --git a/scripts/store/setters/categories.js b/scripts/store/setters/categories.js
new file mode 100644
index 0000000000..8dc50974bb
--- /dev/null
+++ b/scripts/store/setters/categories.js
@@ -0,0 +1,8 @@
+const categories = require('../../data/categories')
+
+module.exports = function ({ group_title }) {
+  return group_title
+    .split(';')
+    .map(i => categories[i.toLowerCase()])
+    .filter(i => i)
+}
diff --git a/scripts/store/setters/countries.js b/scripts/store/setters/countries.js
new file mode 100644
index 0000000000..b193911b8a
--- /dev/null
+++ b/scripts/store/setters/countries.js
@@ -0,0 +1,25 @@
+const dataRegions = require('../../data/regions')
+const dataCountries = require('../../data/countries')
+
+module.exports = function ({ tvg_country, countries = [] }) {
+  if (tvg_country) {
+    return tvg_country
+      .split(';')
+      .reduce((acc, curr) => {
+        const region = dataRegions[curr]
+        if (region) {
+          for (let code of region.country_codes) {
+            if (!acc.includes(code)) acc.push(code)
+          }
+        } else {
+          acc.push(curr)
+        }
+
+        return acc
+      }, [])
+      .map(item => dataCountries[item])
+      .filter(i => i)
+  }
+
+  return countries
+}
diff --git a/scripts/store/setters/guides.js b/scripts/store/setters/guides.js
new file mode 100644
index 0000000000..0c0ff7296c
--- /dev/null
+++ b/scripts/store/setters/guides.js
@@ -0,0 +1,3 @@
+module.exports = function ({ tvg_url, guides = [] }) {
+  return tvg_url ? [tvg_url] : guides
+}
diff --git a/scripts/store/setters/index.js b/scripts/store/setters/index.js
new file mode 100644
index 0000000000..436bea49a6
--- /dev/null
+++ b/scripts/store/setters/index.js
@@ -0,0 +1,12 @@
+exports.categories = require('./categories')
+exports.countries = require('./countries')
+exports.guides = require('./guides')
+exports.is_broken = require('./is_broken')
+exports.is_nsfw = require('./is_nsfw')
+exports.languages = require('./languages')
+exports.name = require('./name')
+exports.regions = require('./regions')
+exports.resolution = require('./resolution')
+exports.src_country = require('./src_country')
+exports.status = require('./status')
+exports.url = require('./url')
diff --git a/scripts/store/setters/is_broken.js b/scripts/store/setters/is_broken.js
new file mode 100644
index 0000000000..cf4cea231b
--- /dev/null
+++ b/scripts/store/setters/is_broken.js
@@ -0,0 +1,7 @@
+module.exports = function ({ is_broken = false, status }) {
+  if (status) {
+    return status.level > 3 ? true : false
+  }
+
+  return is_broken
+}
diff --git a/scripts/store/setters/is_nsfw.js b/scripts/store/setters/is_nsfw.js
new file mode 100644
index 0000000000..886b850a69
--- /dev/null
+++ b/scripts/store/setters/is_nsfw.js
@@ -0,0 +1,3 @@
+module.exports = function ({ categories }) {
+  return Array.isArray(categories) ? categories.filter(c => c.nsfw).length > 0 : false
+}
diff --git a/scripts/store/setters/languages.js b/scripts/store/setters/languages.js
new file mode 100644
index 0000000000..a5ee56dcc3
--- /dev/null
+++ b/scripts/store/setters/languages.js
@@ -0,0 +1,12 @@
+const langs = require('../../data/languages')
+
+module.exports = function ({ tvg_language, languages = [] }) {
+  if (tvg_language) {
+    return tvg_language
+      .split(';')
+      .map(name => langs.find(l => l.name === name))
+      .filter(i => i)
+  }
+
+  return languages
+}
diff --git a/scripts/store/setters/name.js b/scripts/store/setters/name.js
new file mode 100644
index 0000000000..d566053371
--- /dev/null
+++ b/scripts/store/setters/name.js
@@ -0,0 +1,10 @@
+module.exports = function ({ title }) {
+  return title
+    .trim()
+    .split(' ')
+    .map(s => s.trim())
+    .filter(s => {
+      return !/\[|\]/i.test(s) && !/\((\d+)P\)/i.test(s)
+    })
+    .join(' ')
+}
diff --git a/scripts/store/setters/regions.js b/scripts/store/setters/regions.js
new file mode 100644
index 0000000000..7016eecd1b
--- /dev/null
+++ b/scripts/store/setters/regions.js
@@ -0,0 +1,22 @@
+const _ = require('lodash')
+
+let regions = require('../../data/regions')
+
+module.exports = function ({ countries }) {
+  if (!countries.length) return []
+
+  const output = []
+  regions = Object.values(regions)
+  countries.forEach(country => {
+    regions
+      .filter(region => region.country_codes.includes(country.code))
+      .forEach(found => {
+        output.push({
+          name: found.name,
+          code: found.code
+        })
+      })
+  })
+
+  return _.uniqBy(output, 'code')
+}
diff --git a/scripts/store/setters/resolution.js b/scripts/store/setters/resolution.js
new file mode 100644
index 0000000000..1722e6aa2e
--- /dev/null
+++ b/scripts/store/setters/resolution.js
@@ -0,0 +1,9 @@
+module.exports = function ({ title, resolution = {} }) {
+  if (title) {
+    const [_, h] = title.match(/\((\d+)P\)/i) || [null, null]
+
+    return h ? { height: parseInt(h), width: null } : resolution
+  }
+
+  return resolution
+}
diff --git a/scripts/store/setters/src_country.js b/scripts/store/setters/src_country.js
new file mode 100644
index 0000000000..6eaa9d4d30
--- /dev/null
+++ b/scripts/store/setters/src_country.js
@@ -0,0 +1,13 @@
+const { file } = require('../../core')
+const countries = require('../../data/countries')
+
+module.exports = function ({ filepath }) {
+  if (filepath) {
+    const basename = file.basename(filepath)
+    const [_, code] = basename.match(/([a-z]{2})(|_.*)\.m3u/i) || [null, null]
+
+    return code ? countries[code.toUpperCase()] : null
+  }
+
+  return null
+}
diff --git a/scripts/store/setters/status.js b/scripts/store/setters/status.js
new file mode 100644
index 0000000000..6452721344
--- /dev/null
+++ b/scripts/store/setters/status.js
@@ -0,0 +1,11 @@
+const statuses = require('../../data/statuses')
+
+module.exports = function ({ title, status = {} }) {
+  if (title) {
+    const [_, label] = title.match(/\[(.*)\]/i) || [null, null]
+
+    return Object.values(statuses).find(s => s.label === label) || statuses['online']
+  }
+
+  return status
+}
diff --git a/scripts/store/setters/url.js b/scripts/store/setters/url.js
new file mode 100644
index 0000000000..9951593992
--- /dev/null
+++ b/scripts/store/setters/url.js
@@ -0,0 +1,7 @@
+const normalize = require('normalize-url')
+
+module.exports = function ({ url }) {
+  const normalized = normalize(url, { stripWWW: false })
+
+  return decodeURIComponent(normalized).replace(/\s/g, '+')
+}
diff --git a/scripts/update-readme.js b/scripts/update-readme.js
deleted file mode 100644
index 5fa324039a..0000000000
--- a/scripts/update-readme.js
+++ /dev/null
@@ -1,142 +0,0 @@
-const utils = require('./helpers/utils')
-const file = require('./helpers/file')
-const log = require('./helpers/log')
-const db = require('./helpers/db')
-
-async function main() {
-  log.start()
-  await loadDatabase()
-  generateCategoriesTable()
-  generateCountriesTable()
-  generateLanguagesTable()
-  generateReadme()
-  log.finish()
-}
-
-async function loadDatabase() {
-  log.print('Loading database...\n')
-  await db.load()
-}
-
-function generateCategoriesTable() {
-  log.print('Generating categories table...\n')
-
-  const categories = []
-  for (const category of [...db.categories.all(), { name: 'Other', id: 'other' }]) {
-    categories.push({
-      category: category.name,
-      channels: db.channels.forCategory(category).removeOffline().removeDuplicates().count(),
-      playlist: `<code>https://iptv-org.github.io/iptv/categories/${category.id}.m3u</code>`
-    })
-  }
-
-  const table = generateTable(categories, {
-    columns: [
-      { name: 'Category', align: 'left' },
-      { name: 'Channels', align: 'right' },
-      { name: 'Playlist', align: 'left' }
-    ]
-  })
-
-  file.create('./.readme/_categories.md', table)
-}
-
-function generateCountriesTable() {
-  log.print('Generating countries table...\n')
-
-  const countries = []
-  for (const country of [
-    ...db.countries.sortBy(['name']).all(),
-    { name: 'Undefined', code: 'undefined' }
-  ]) {
-    let flag = utils.code2flag(country.code)
-    const prefix = flag ? `${flag}&nbsp;` : ''
-    countries.push({
-      country: prefix + country.name,
-      channels: db.channels
-        .forCountry(country)
-        .removeOffline()
-        .removeDuplicates()
-        .removeNSFW()
-        .count(),
-      playlist: `<code>https://iptv-org.github.io/iptv/countries/${country.code}.m3u</code>`
-    })
-  }
-
-  const table = generateTable(countries, {
-    columns: [
-      { name: 'Country', align: 'left' },
-      { name: 'Channels', align: 'right' },
-      { name: 'Playlist', align: 'left', nowrap: true }
-    ]
-  })
-
-  file.create('./.readme/_countries.md', table)
-}
-
-function generateLanguagesTable() {
-  log.print('Generating languages table...\n')
-  const languages = []
-
-  for (const language of [
-    ...db.languages.sortBy(['name']).all(),
-    { name: 'Undefined', code: 'undefined' }
-  ]) {
-    languages.push({
-      language: language.name,
-      channels: db.channels
-        .forLanguage(language)
-        .removeOffline()
-        .removeDuplicates()
-        .removeNSFW()
-        .count(),
-      playlist: `<code>https://iptv-org.github.io/iptv/languages/${language.code}.m3u</code>`
-    })
-  }
-
-  const table = generateTable(languages, {
-    columns: [
-      { name: 'Language', align: 'left' },
-      { name: 'Channels', align: 'right' },
-      { name: 'Playlist', align: 'left' }
-    ]
-  })
-
-  file.create('./.readme/_languages.md', table)
-}
-
-function generateTable(data, options) {
-  let output = '<table>\n'
-
-  output += '\t<thead>\n\t\t<tr>'
-  for (let column of options.columns) {
-    output += `<th align="${column.align}">${column.name}</th>`
-  }
-  output += '</tr>\n\t</thead>\n'
-
-  output += '\t<tbody>\n'
-  for (let item of data) {
-    output += '\t\t<tr>'
-    let i = 0
-    for (let prop in item) {
-      const column = options.columns[i]
-      let nowrap = column.nowrap
-      let align = column.align
-      output += `<td align="${align}"${nowrap ? ' nowrap' : ''}>${item[prop]}</td>`
-      i++
-    }
-    output += '</tr>\n'
-  }
-  output += '\t</tbody>\n'
-
-  output += '</table>'
-
-  return output
-}
-
-function generateReadme() {
-  log.print('Generating README.md...\n')
-  file.compileMarkdown('.readme/config.json')
-}
-
-main()
diff --git a/tests/__data__/.gitignore b/tests/__data__/.gitignore
new file mode 100644
index 0000000000..d0dea4f002
--- /dev/null
+++ b/tests/__data__/.gitignore
@@ -0,0 +1,2 @@
+output/
+temp/
\ No newline at end of file
diff --git a/tests/__data__/input/channels/ad_example.m3u b/tests/__data__/input/channels/ad_example.m3u
new file mode 100644
index 0000000000..52612ebde6
--- /dev/null
+++ b/tests/__data__/input/channels/ad_example.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF:-1 tvg-id="ATV.ad" tvg-country="AD" tvg-language="Catalan" tvg-logo="https://i.imgur.com/kJCjeQ4.png" group-title="General",ATV (720p) [Offline]
+https://iptv-all.lanesh4d0w.repl.co/andorra/atv
\ No newline at end of file
diff --git a/tests/__data__/input/channels/us_blocked.m3u b/tests/__data__/input/channels/us_blocked.m3u
new file mode 100644
index 0000000000..f08f25184e
--- /dev/null
+++ b/tests/__data__/input/channels/us_blocked.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF:-1 tvg-id="FoxSports2Asia.us" tvg-country="TH" tvg-language="Thai" tvg-logo="" group-title="Sports",Fox Sports 2 Asia (Thai) (720p)
+https://example.com/playlist.m3u8
diff --git a/tests/__data__/input/codes.json b/tests/__data__/input/codes.json
new file mode 100644
index 0000000000..3f8989427b
--- /dev/null
+++ b/tests/__data__/input/codes.json
@@ -0,0 +1 @@
+[{"tvg_id":"AndorraTV.ad","display_name":"Andorra TV","country":"ad","guides":["https://iptv-org.github.io/epg/guides/ad/andorradifusio.ad.epg.xml"],"logo":"https://www.andorradifusio.ad/images/logo/andorradifusio_logo_22122020091723.png"}]
\ No newline at end of file
diff --git a/tests/__data__/input/logs/check-streams/cluster_1.log b/tests/__data__/input/logs/check-streams/cluster_1.log
new file mode 100644
index 0000000000..2b11e5b96e
--- /dev/null
+++ b/tests/__data__/input/logs/check-streams/cluster_1.log
@@ -0,0 +1,5 @@
+{"_id":"I6cjG2xCBRFFP4sz","url":"https://iptv-all.lanesh4d0w.repl.co/andorra/atv","http":{"referrer":"","user-agent":""},"error":"Server returned 404 Not Found","streams":[],"requests":[]}
+{"_id":"3TbieV1ptnZVCIdn","url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","http":{"referrer":"","user-agent":""},"error":"Server returned 404 Not Found","streams":[],"requests":[]}
+{"_id":"2ST8btby3mmsgPF0","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","http":{"referrer":"","user-agent":""},"error":null,"streams":[{"index":0,"codec_name":"timed_id3","codec_long_name":"timed ID3 metadata","codec_type":"data","codec_tag_string":"ID3 ","codec_tag":"0x20334449","r_frame_rate":"0/0","avg_frame_rate":"0/0","time_base":"1/90000","disposition":{"default":0,"dub":0,"original":0,"comment":0,"lyrics":0,"karaoke":0,"forced":0,"hearing_impaired":0,"visual_impaired":0,"clean_effects":0,"attached_pic":0,"timed_thumbnails":0},"tags":{"variant_bitrate":"6527203"}},{"index":1,"codec_name":"h264","codec_long_name":"H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10","profile":"Main","codec_type":"video","codec_tag_string":"[27][0][0][0]","codec_tag":"0x001b","width":1920,"height":1080,"coded_width":1920,"coded_height":1080,"closed_captions":0,"has_b_frames":0,"sample_aspect_ratio":"1:1","display_aspect_ratio":"16:9","pix_fmt":"yuv420p","level":40,"chroma_location":"left","refs":1,"is_avc":"false","nal_length_size":"0","r_frame_rate":"50/1","avg_frame_rate":"50/1","time_base":"1/90000","start_pts":8171218184,"start_time":"90791.313156","bits_per_raw_sample":"8","disposition":{"default":0,"dub":0,"original":0,"comment":0,"lyrics":0,"karaoke":0,"forced":0,"hearing_impaired":0,"visual_impaired":0,"clean_effects":0,"attached_pic":0,"timed_thumbnails":0},"tags":{"variant_bitrate":"6527203"}},{"index":2,"codec_name":"aac","codec_long_name":"AAC (Advanced Audio Coding)","profile":"LC","codec_type":"audio","codec_tag_string":"[15][0][0][0]","codec_tag":"0x000f","sample_fmt":"fltp","sample_rate":"48000","channels":2,"channel_layout":"stereo","bits_per_sample":0,"r_frame_rate":"0/0","avg_frame_rate":"0/0","time_base":"1/90000","start_pts":8171229134,"start_time":"90791.434822","disposition":{"default":0,"dub":0,"original":0,"comment":0,"lyrics":0,"karaoke":0,"forced":0,"hearing_impaired":0,"visual_impaired":0,"clean_effects":0,"attached_pic":0,"timed_thumbnails":0},"tags":{"variant_bitrate":"6527203"}}],"requests":[{"method":"GET","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","headers":{"User-Agent":"Lavf/58.76.100","Accept":"*/*","Range":"bytes=0-","Connection":"close","Host":"46.46.143.222:1935","Icy-MetaData":"1"}},{"method":"GET","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/chunklist_w1629502765.m3u8","headers":{"User-Agent":"Lavf/58.76.100","Accept":"*/*","Range":"bytes=0-","Connection":"keep-alive","Host":"46.46.143.222:1935","Icy-MetaData":"1"}},{"method":"GET","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/media_w1629502765_1085323.ts","headers":{"User-Agent":"Lavf/58.76.100","Accept":"*/*","Range":"bytes=0-","Connection":"keep-alive","Host":"46.46.143.222:1935","Icy-MetaData":"1"}},{"method":"GET","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/media_w1629502765_1085324.ts","headers":{"User-Agent":"Lavf/58.76.100","Accept":"*/*","Range":"bytes=0-","Connection":"keep-alive","Host":"46.46.143.222:1935","Icy-MetaData":"1"}}]}
+{"_id":"cFFpFVzSn6xFMUF3","url":"http://208.93.117.113/live/Stream1/playlist.m3u8","http":{"referrer":"","user-agent":""},"error":"Operation timed out","streams":[],"requests":[]}
+{"_id":"u7iyA6cjtf1iWWAZ","url":"http://51.210.199.50/hls/stream.m3u8","http":{"referrer":"","user-agent":""},"error":"Server returned 404 Not Found","streams":[],"requests":[]}
diff --git a/tests/__data__/input/logs/generate-playlists/categories.log b/tests/__data__/input/logs/generate-playlists/categories.log
new file mode 100644
index 0000000000..5f4d99cf2b
--- /dev/null
+++ b/tests/__data__/input/logs/generate-playlists/categories.log
@@ -0,0 +1,3 @@
+{"name":"General","slug":"general","count":1}
+{"name":"News","slug":"news","count":1}
+{"name":"Other","slug":"other","count":0}
diff --git a/tests/__data__/input/logs/generate-playlists/countries.log b/tests/__data__/input/logs/generate-playlists/countries.log
new file mode 100644
index 0000000000..e8e3f180d1
--- /dev/null
+++ b/tests/__data__/input/logs/generate-playlists/countries.log
@@ -0,0 +1,5 @@
+{"name":"Andorra","code":"AD","count":0}
+{"name":"Russia","code":"RU","count":1}
+{"name":"United Kingdom","code":"UK","count":1}
+{"name":"International","code":"INT","count":0}
+{"name":"Undefined","code":"UNDEFINED","count":0}
diff --git a/tests/__data__/input/logs/generate-playlists/languages.log b/tests/__data__/input/logs/generate-playlists/languages.log
new file mode 100644
index 0000000000..4a5a060f85
--- /dev/null
+++ b/tests/__data__/input/logs/generate-playlists/languages.log
@@ -0,0 +1,4 @@
+{"name":"Catalan","code":"cat","count":0}
+{"name":"English","code":"eng","count":1}
+{"name":"Russian","code":"rus","count":1}
+{"name":"Undefined","code":"undefined","count":0}
diff --git a/tests/__data__/input/logs/generate-playlists/regions.log b/tests/__data__/input/logs/generate-playlists/regions.log
new file mode 100644
index 0000000000..8d78fde4fe
--- /dev/null
+++ b/tests/__data__/input/logs/generate-playlists/regions.log
@@ -0,0 +1,5 @@
+{"name":"Asia","code":"ASIA","count":1}
+{"name":"Commonwealth of Independent States","code":"CIS","count":1}
+{"name":"Europe","code":"EUR","count":2}
+{"name":"Europe, the Middle East and Africa","code":"EMEA","count":2}
+{"name":"Undefined","code":"UNDEFINED","count":0}
diff --git a/tests/__data__/input/readme.json b/tests/__data__/input/readme.json
new file mode 100644
index 0000000000..d226f0e660
--- /dev/null
+++ b/tests/__data__/input/readme.json
@@ -0,0 +1,4 @@
+{
+  "build" : "tests/__data__/output/readme.md",
+  "files" : ["./.readme/template.md"]
+}
\ No newline at end of file
diff --git a/tests/__data__/input/readme.md b/tests/__data__/input/readme.md
new file mode 100644
index 0000000000..06ee56f26a
--- /dev/null
+++ b/tests/__data__/input/readme.md
@@ -0,0 +1,182 @@
+# IPTV
+
+[![auto-update](https://github.com/iptv-org/iptv/actions/workflows/auto-update.yml/badge.svg)](https://github.com/iptv-org/iptv/actions/workflows/auto-update.yml)
+
+Collection of publicly available IPTV channels from all over the world.
+
+Internet Protocol television (IPTV) is the delivery of television content over Internet Protocol (IP) networks.
+
+## Usage
+
+To watch IPTV you just need to paste this link `https://iptv-org.github.io/iptv/index.m3u` to any player which supports M3U-playlists.
+
+![VLC Network Panel](.readme/preview.png)
+
+Also you can instead use one of these playlists:
+
+- `https://iptv-org.github.io/iptv/index.category.m3u` (grouped by category)
+- `https://iptv-org.github.io/iptv/index.language.m3u` (grouped by language)
+- `https://iptv-org.github.io/iptv/index.country.m3u` (grouped by country)
+- `https://iptv-org.github.io/iptv/index.region.m3u` (grouped by region)
+- `https://iptv-org.github.io/iptv/index.nsfw.m3u` (includes adult channels)
+
+Or select one of the playlists from the list below.
+
+### Playlists by category
+
+<details>
+<summary>Expand</summary>
+<br>
+
+<!-- prettier-ignore -->
+<table>
+  <thead>
+    <tr><th align="left">Category</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
+  </thead>
+  <tbody>
+    <tr><td align="left">General</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/categories/general.m3u</code></td></tr>
+    <tr><td align="left">News</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr>
+    <tr><td align="left">Other</td><td align="right">0</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/categories/other.m3u</code></td></tr>
+  </tbody>
+</table>
+
+</details>
+
+### Playlists by language
+
+<details>
+<summary>Expand</summary>
+<br>
+
+<!-- prettier-ignore -->
+<table>
+  <thead>
+    <tr><th align="left">Language</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
+  </thead>
+  <tbody>
+    <tr><td align="left">Catalan</td><td align="right">0</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/languages/cat.m3u</code></td></tr>
+    <tr><td align="left">English</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/languages/eng.m3u</code></td></tr>
+    <tr><td align="left">Russian</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/languages/rus.m3u</code></td></tr>
+    <tr><td align="left">Undefined</td><td align="right">0</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
+  </tbody>
+</table>
+
+</details>
+
+### Playlists by region
+
+<details>
+<summary>Expand</summary>
+<br>
+
+<!-- prettier-ignore -->
+<table>
+  <thead>
+    <tr><th align="left">Region</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
+  </thead>
+  <tbody>
+    <tr><td align="left">Asia</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/regions/asia.m3u</code></td></tr>
+    <tr><td align="left">Commonwealth of Independent States</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/regions/cis.m3u</code></td></tr>
+    <tr><td align="left">Europe</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/regions/eur.m3u</code></td></tr>
+    <tr><td align="left">Europe, the Middle East and Africa</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/regions/emea.m3u</code></td></tr>
+    <tr><td align="left">Undefined</td><td align="right">0</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/regions/undefined.m3u</code></td></tr>
+  </tbody>
+</table>
+
+</details>
+
+### Playlists by country
+
+<details>
+<summary>Expand</summary>
+<br>
+
+<!-- prettier-ignore -->
+<table>
+  <thead>
+    <tr><th align="left">Country</th><th align="right">Channels</th><th align="left">Playlist</th></tr>
+  </thead>
+  <tbody>
+    <tr><td align="left">🇦🇩 Andorra</td><td align="right">0</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ad.m3u</code></td></tr>
+    <tr><td align="left">🇷🇺 Russia</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ru.m3u</code></td></tr>
+    <tr><td align="left">🇬🇧 United Kingdom</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/uk.m3u</code></td></tr>
+    <tr><td align="left">🌍 International</td><td align="right">0</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/int.m3u</code></td></tr>
+    <tr><td align="left">Undefined</td><td align="right">0</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/undefined.m3u</code></td></tr>
+  </tbody>
+</table>
+
+</details>
+
+## For Developers
+
+In addition to the above methods, you can also get a list of all available channels in JSON format.
+
+To do this, you just have to make a GET request to:
+
+```
+https://iptv-org.github.io/iptv/channels.json
+```
+
+If successful, you should get the following response:
+
+<details>
+<summary>Expand</summary>
+<br>
+  
+```
+[
+  ...
+  {
+    "name": "CNN",
+    "logo": "https://i.imgur.com/ilZJT5s.png",
+    "url": "http://ott-cdn.ucom.am/s27/index.m3u8",
+    "categories": [
+      {
+        "name": "News",
+        "slug": "news"
+      }
+    ],
+    "countries": [
+      {
+        "code": "us",
+        "name": "United States"
+      },
+      {
+        "code": "ca",
+        "name": "Canada"
+      }
+    ],
+    "languages": [
+      {
+        "code": "eng",
+        "name": "English"
+      }
+    ],
+    "tvg": {
+      "id": "cnn.us",
+      "name": "CNN",
+      "url": "http://epg.streamstv.me/epg/guide-usa.xml.gz"
+    }
+  },
+  ...
+]
+```
+</details>
+
+## EPG
+
+Playlists already have a built-in list of EPG, so players that support the `url-tvg` tag should load it automatically. If not, you can find a list of available programs here:
+
+https://github.com/iptv-org/epg
+
+## Resources
+
+You can find links to various IPTV related resources in this repository [iptv-org/awesome-iptv](https://github.com/iptv-org/awesome-iptv).
+
+## Contribution
+
+Please make sure to read the [Contributing Guide](CONTRIBUTING.md) before sending an issue or making a pull request.
+
+## Legal
+
+No video files are stored in this repository. The repository simply contains user-submitted links to publicly available video stream URLs, which to the best of our knowledge have been intentionally made publicly by the copyright holders. If any links in these playlists infringe on your rights as a copyright holder, they may be removed by sending a pull request or opening an issue. However, note that we have **no control** over the destination of the link, and just removing the link from the playlist will not remove its contents from the web. Note that linking does not directly infringe copyright because no copy is made on the site providing the link, and thus this is **not** a valid reason to send a DMCA notice to GitHub. To remove this content from the web, you should contact the web host that's actually hosting the content (**not** GitHub, nor the maintainers of this repository).
diff --git a/tests/__data__/input/test.db b/tests/__data__/input/test.db
new file mode 100644
index 0000000000..331b770816
--- /dev/null
+++ b/tests/__data__/input/test.db
@@ -0,0 +1,4 @@
+{"name":"ЛДПР ТВ","id":"LDPRTV.ru","filepath":"tests/__data__/output/channels/ru.m3u","src_country":{"name":"Russia","code":"RU","lang":"rus"},"tvg_country":"RU","countries":[{"name":"Russia","code":"RU","lang":"rus"}],"regions":[{"name":"Asia","code":"ASIA"},{"name":"Commonwealth of Independent States","code":"CIS"},{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"Russian","code":"rus"}],"categories":[{"name":"General","slug":"general","nsfw":false}],"tvg_url":"","guides":["https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"],"logo":"https://iptvx.one/icn/ldpr-tv.png","resolution":{"height":1080,"width":null},"status":{"label":"","code":"online","level":1},"url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":1,"_id":"2ST8btby3mmsgPF0"}
+{"name":"BBC News HD","id":"BBCNews.uk","filepath":"tests/__data__/output/channels/uk.m3u","src_country":{"name":"United Kingdom","code":"UK","lang":"eng"},"tvg_country":"UK","countries":[{"name":"United Kingdom","code":"UK","lang":"eng"}],"regions":[{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"English","code":"eng"}],"categories":[{"name":"News","slug":"news","nsfw":false}],"tvg_url":"","guides":[],"logo":"https://i.imgur.com/eNPIQ9f.png","resolution":{"height":720,"width":null},"status":{"label":"Not 24/7","code":"not_247","level":3},"url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":3,"_id":"3TbieV1ptnZVCIdn"}
+{"name":"ATV","id":"AndorraTV.ad","filepath":"tests/__data__/output/channels/ad.m3u","src_country":{"name":"Andorra","code":"AD","lang":"cat"},"tvg_country":"AD","countries":[{"name":"Andorra","code":"AD","lang":"cat"}],"regions":[{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"Catalan","code":"cat"}],"categories":[{"name":"General","slug":"general","nsfw":false}],"tvg_url":"","guides":[],"logo":"https://i.imgur.com/kJCjeQ4.png","resolution":{"height":720,"width":null},"status":{"label":"Offline","code":"offline","level":5},"url":"https://iptv-all.lanesh4d0w.repl.co/andorra/atv","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":true,"updated":false,"cluster_id":1,"_id":"I6cjG2xCBRFFP4sz"}
+{"name":"BBC News HD","id":"AndorraTV.ad","filepath":"tests/__data__/output/channels/uk.m3u","src_country":{"name":"United Kingdom","code":"UK","lang":"eng"},"tvg_country":"UK","countries":[{"name":"United Kingdom","code":"UK","lang":"eng"}],"regions":[{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"English","code":"eng"}],"categories":[{"name":"News","slug":"news","nsfw":false}],"tvg_url":"","guides":[],"logo":"https://i.imgur.com/eNPIQ9f.png","resolution":{"height":720,"width":null},"status":{"label":"Not 24/7","code":"not_247","level":3},"url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":3,"_id":"WTbieV1ptnZVCIdn"}
diff --git a/tests/__data__/input/update.db b/tests/__data__/input/update.db
new file mode 100644
index 0000000000..33267072e2
--- /dev/null
+++ b/tests/__data__/input/update.db
@@ -0,0 +1,6 @@
+{"name":"ЛДПР ТВ","id":"LDPRTV.ru","filepath":"tests/__data__/output/channels/ru.m3u","src_country":{"name":"Russia","code":"RU","lang":"rus"},"tvg_country":"RU","countries":[{"name":"Russia","code":"RU","lang":"rus"}],"regions":[{"name":"Asia","code":"ASIA"},{"name":"Commonwealth of Independent States","code":"CIS"},{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"Russian","code":"rus"}],"categories":[{"name":"General","slug":"general","nsfw":false}],"tvg_url":"","guides":["https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"],"logo":"https://iptvx.one/icn/ldpr-tv.png","resolution":{"height":1080,"width":null},"status":{"label":"","code":"online","level":1},"url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":1,"_id":"2ST8btby3mmsgPF0"}
+{"name":"BBC News HD","id":"BBCNews.uk","filepath":"tests/__data__/output/channels/uk.m3u","src_country":{"name":"United Kingdom","code":"UK","lang":"eng"},"tvg_country":"UK","countries":[{"name":"United Kingdom","code":"UK","lang":"eng"}],"regions":[{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"English","code":"eng"}],"categories":[{"name":"News","slug":"news","nsfw":false}],"tvg_url":"","guides":[],"logo":"https://i.imgur.com/eNPIQ9f.png","resolution":{"height":720,"width":null},"status":{"label":"Not 24/7","code":"not_247","level":3},"url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":3,"_id":"3TbieV1ptnZVCIdn"}
+{"name":"ATV","id":"AndorraTV.ad","filepath":"tests/__data__/output/channels/ad.m3u","src_country":{"name":"Andorra","code":"AD","lang":"cat"},"tvg_country":"AD","countries":[{"name":"Andorra","code":"AD","lang":"cat"}],"regions":[{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"Catalan","code":"cat"}],"categories":[{"name":"General","slug":"general","nsfw":false}],"tvg_url":"","guides":[],"logo":"https://i.imgur.com/kJCjeQ4.png","resolution":{"height":720,"width":null},"status":{"label":"Offline","code":"offline","level":5},"url":"https://iptv-all.lanesh4d0w.repl.co/andorra/atv","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":true,"updated":false,"cluster_id":1,"_id":"I6cjG2xCBRFFP4sz"}
+{"name":"BBC News HD","id":"AndorraTV.ad","filepath":"tests/__data__/output/channels/uk.m3u","src_country":{"name":"United Kingdom","code":"UK","lang":"eng"},"tvg_country":"UK","countries":[{"name":"United Kingdom","code":"UK","lang":"eng"}],"regions":[{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"English","code":"eng"}],"categories":[{"name":"News","slug":"news","nsfw":false}],"tvg_url":"","guides":[],"logo":"https://i.imgur.com/eNPIQ9f.png","resolution":{"height":720,"width":null},"status":{"label":"Not 24/7","code":"not_247","level":3},"url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":3,"_id":"WTbieV1ptnZVCIdn"}
+{"name":"Kayhan TV","id":"KayhanTV.af","filepath":"channels/af.m3u","src_country":{"name":"Afghanistan","code":"AF","lang":"pus"},"tvg_country":"AF","countries":[{"name":"Afghanistan","code":"AF","lang":"pus"}],"regions":[{"name":"Asia-Pacific","code":"APAC"},{"name":"Asia","code":"ASIA"},{"name":"South Asia","code":"SAS"}],"languages":[{"name":"Pashto","code":"pus"}],"categories":[],"tvg_url":"","guides":[],"logo":"https://i.imgur.com/XpR1VvZ.png","resolution":{"height":720,"width":null},"status":{"label":"Geo-blocked","code":"geo_blocked","level":2},"url":"http://208.93.117.113/live/Stream1/playlist.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":1,"_id":"cFFpFVzSn6xFMUF3"}
+{"name":"Sharq","id":"Sharq.af","filepath":"channels/af.m3u","src_country":{"name":"Afghanistan","code":"AF","lang":"pus"},"tvg_country":"AF","countries":[{"name":"Afghanistan","code":"AF","lang":"pus"}],"regions":[{"name":"Asia-Pacific","code":"APAC"},{"name":"Asia","code":"ASIA"},{"name":"South Asia","code":"SAS"}],"languages":[{"name":"Pashto","code":"pus"}],"categories":[{"name":"General","slug":"general","nsfw":false}],"tvg_url":"","guides":[],"logo":"https://ws.shoutcast.com/images/contacts/b/b9f8/b9f811c5-d210-4d0b-ae32-f467823a913e/radios/0d677ea5-46b4-4129-9359-9e5783fb6a37/0d677ea5-46b4-4129-9359-9e5783fb6a37.png","resolution":{"height":576,"width":null},"status":{"label":"Offline","code":"offline","level":5},"url":"http://51.210.199.50/hls/stream.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":1,"_id":"u7iyA6cjtf1iWWAZ"}
diff --git a/tests/commands/check-streams.test.js b/tests/commands/check-streams.test.js
new file mode 100644
index 0000000000..250a2dc49b
--- /dev/null
+++ b/tests/commands/check-streams.test.js
@@ -0,0 +1,44 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+beforeEach(() => {
+  fs.rmdirSync('tests/__data__/output', { recursive: true })
+  fs.mkdirSync('tests/__data__/output')
+  fs.copyFileSync('tests/__data__/input/test.db', 'tests/__data__/temp/test.db')
+})
+
+afterEach(() => {
+  fs.rmdirSync('tests/__data__/temp', { recursive: true })
+  fs.mkdirSync('tests/__data__/temp')
+})
+
+it('return results if stream with error', () => {
+  const result = execSync(
+    'DB_FILEPATH=tests/__data__/temp/test.db LOGS_PATH=tests/__data__/output/logs node scripts/commands/check-streams.js --cluster-id=1 --timeout=1',
+    { encoding: 'utf8' }
+  )
+  const logs = fs.readFileSync(
+    path.resolve('tests/__data__/output/logs/check-streams/cluster_1.log'),
+    {
+      encoding: 'utf8'
+    }
+  )
+  const lines = logs.split('\n')
+  expect(JSON.parse(lines[0])).toMatchObject({
+    _id: '2ST8btby3mmsgPF0',
+    url: 'http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8',
+    http: { referrer: '', 'user-agent': '' },
+    error: 'Operation timed out',
+    streams: [],
+    requests: []
+  })
+  expect(JSON.parse(lines[1])).toMatchObject({
+    _id: 'I6cjG2xCBRFFP4sz',
+    url: 'https://iptv-all.lanesh4d0w.repl.co/andorra/atv',
+    http: { referrer: '', 'user-agent': '' },
+    error: 'Operation timed out',
+    streams: [],
+    requests: []
+  })
+})
diff --git a/tests/commands/cleanup-database.test.js b/tests/commands/cleanup-database.test.js
new file mode 100644
index 0000000000..bd541e8e7d
--- /dev/null
+++ b/tests/commands/cleanup-database.test.js
@@ -0,0 +1,25 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+beforeEach(() => {
+  fs.copyFileSync('tests/__data__/input/test.db', 'tests/__data__/temp/test.db')
+})
+
+afterEach(() => {
+  fs.rmdirSync('tests/__data__/temp', { recursive: true })
+  fs.mkdirSync('tests/__data__/temp')
+})
+
+it('can remove broken links from database', () => {
+  const result = execSync(
+    'DB_FILEPATH=tests/__data__/temp/test.db node scripts/commands/cleanup-database.js',
+    { encoding: 'utf8' }
+  )
+
+  const database = fs.readFileSync('tests/__data__/temp/test.db', { encoding: 'utf8' })
+  const lines = database.split('\n')
+  expect(lines[0]).toBe(
+    `{"name":"ЛДПР ТВ","id":"LDPRTV.ru","filepath":"tests/__data__/output/channels/ru.m3u","src_country":{"name":"Russia","code":"RU","lang":"rus"},"tvg_country":"RU","countries":[{"name":"Russia","code":"RU","lang":"rus"}],"regions":[{"name":"Asia","code":"ASIA"},{"name":"Commonwealth of Independent States","code":"CIS"},{"name":"Europe, the Middle East and Africa","code":"EMEA"},{"name":"Europe","code":"EUR"}],"languages":[{"name":"Russian","code":"rus"}],"categories":[{"name":"General","slug":"general","nsfw":false}],"tvg_url":"","guides":["https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"],"logo":"https://iptvx.one/icn/ldpr-tv.png","resolution":{"height":1080,"width":null},"status":{"label":"","code":"online","level":1},"url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","http":{"referrer":"","user-agent":""},"is_nsfw":false,"is_broken":false,"updated":false,"cluster_id":1,"_id":"2ST8btby3mmsgPF0"}`
+  )
+})
diff --git a/tests/commands/create-database.test.js b/tests/commands/create-database.test.js
new file mode 100644
index 0000000000..4a1a9c494c
--- /dev/null
+++ b/tests/commands/create-database.test.js
@@ -0,0 +1,45 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+beforeEach(() => {
+  fs.rmdirSync('tests/__data__/output', { recursive: true })
+  fs.mkdirSync('tests/__data__/output')
+})
+
+it('can create database', () => {
+  execSync(
+    'DB_FILEPATH=tests/__data__/output/test.db node scripts/commands/create-database.js --input-dir=tests/__data__/input/channels --max-clusters=1',
+    { encoding: 'utf8' }
+  )
+
+  const database = fs.readFileSync(path.resolve('tests/__data__/output/test.db'), {
+    encoding: 'utf8'
+  })
+  const item = database.split('\n').find(i => i.includes('ATV.ad'))
+  expect(JSON.parse(item)).toMatchObject({
+    name: 'ATV',
+    id: 'ATV.ad',
+    filepath: 'tests/__data__/input/channels/ad_example.m3u',
+    src_country: { name: 'Andorra', code: 'AD', lang: 'cat' },
+    tvg_country: 'AD',
+    countries: [{ name: 'Andorra', code: 'AD', lang: 'cat' }],
+    regions: [
+      { name: 'Europe, the Middle East and Africa', code: 'EMEA' },
+      { name: 'Europe', code: 'EUR' }
+    ],
+    languages: [{ name: 'Catalan', code: 'cat' }],
+    categories: [{ name: 'General', slug: 'general', nsfw: false }],
+    tvg_url: '',
+    guides: [],
+    logo: 'https://i.imgur.com/kJCjeQ4.png',
+    resolution: { height: 720, width: null },
+    status: { label: 'Offline', code: 'offline', level: 5 },
+    url: 'https://iptv-all.lanesh4d0w.repl.co/andorra/atv',
+    http: { referrer: '', 'user-agent': '' },
+    is_nsfw: false,
+    is_broken: true,
+    updated: false,
+    cluster_id: 1
+  })
+})
diff --git a/tests/commands/create-matrix.test.js b/tests/commands/create-matrix.test.js
new file mode 100644
index 0000000000..5310cd1df5
--- /dev/null
+++ b/tests/commands/create-matrix.test.js
@@ -0,0 +1,20 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+beforeEach(() => {
+  fs.copyFileSync('tests/__data__/input/test.db', 'tests/__data__/temp/test.db')
+})
+
+afterEach(() => {
+  fs.rmdirSync('tests/__data__/temp', { recursive: true })
+  fs.mkdirSync('tests/__data__/temp')
+})
+
+it('can create valid matrix', () => {
+  const result = execSync(
+    'DB_FILEPATH=tests/__data__/temp/test.db node scripts/commands/create-matrix.js',
+    { encoding: 'utf8' }
+  )
+  expect(result).toBe('::set-output name=matrix::{"cluster_id":[1,3]}\n')
+})
diff --git a/tests/commands/generate-playlists.test.js b/tests/commands/generate-playlists.test.js
new file mode 100644
index 0000000000..f68cf0f6bd
--- /dev/null
+++ b/tests/commands/generate-playlists.test.js
@@ -0,0 +1,204 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+function content(filepath) {
+  return fs.readFileSync(`tests/__data__/output/${filepath}`, {
+    encoding: 'utf8'
+  })
+}
+
+beforeEach(() => {
+  fs.rmdirSync('tests/__data__/output', { recursive: true })
+  fs.copyFileSync('tests/__data__/input/test.db', 'tests/__data__/temp/test.db')
+
+  execSync(
+    'DB_FILEPATH=tests/__data__/temp/test.db PUBLIC_PATH=tests/__data__/output/.gh-pages LOGS_PATH=tests/__data__/output/logs node scripts/commands/generate-playlists.js',
+    { encoding: 'utf8' }
+  )
+})
+
+afterEach(() => {
+  fs.rmdirSync('tests/__data__/temp', { recursive: true })
+  fs.mkdirSync('tests/__data__/temp')
+})
+
+it('can generate categories', () => {
+  expect(content('.gh-pages/categories/general.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+
+  expect(content('.gh-pages/categories/news.m3u')).toBe(`#EXTM3U x-tvg-url=""
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="News",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+`)
+})
+
+it('can generate countries', () => {
+  expect(content('.gh-pages/countries/ru.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+
+  expect(content('.gh-pages/countries/uk.m3u')).toBe(`#EXTM3U x-tvg-url=""
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="News",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+`)
+})
+
+it('can generate languages', () => {
+  expect(content('.gh-pages/languages/rus.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+
+  expect(content('.gh-pages/languages/eng.m3u')).toBe(`#EXTM3U x-tvg-url=""
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="News",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+`)
+})
+
+it('can generate regions', () => {
+  expect(content('.gh-pages/regions/asia.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+
+  expect(content('.gh-pages/regions/cis.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+
+  expect(content('.gh-pages/regions/emea.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="News",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+
+  expect(content('.gh-pages/regions/eur.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="News",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+})
+
+it('can generate channels.json', () => {
+  expect(content('.gh-pages/channels.json')).toBe(
+    `[{"name":"BBC News HD","logo":"https://i.imgur.com/eNPIQ9f.png","url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","categories":[{"name":"News","slug":"news"}],"countries":[{"name":"United Kingdom","code":"UK"}],"languages":[{"name":"English","code":"eng"}],"tvg":{"id":"BBCNews.uk","name":"BBC News HD","url":""}},{"name":"ЛДПР ТВ","logo":"https://iptvx.one/icn/ldpr-tv.png","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","categories":[{"name":"General","slug":"general"}],"countries":[{"name":"Russia","code":"RU"}],"languages":[{"name":"Russian","code":"rus"}],"tvg":{"id":"LDPRTV.ru","name":"ЛДПР ТВ","url":"https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"}}]`
+  )
+})
+
+it('can generate index.category.m3u', () => {
+  expect(content('.gh-pages/index.category.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="News",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+})
+
+it('can generate index.country.m3u', () => {
+  expect(content('.gh-pages/index.country.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russia",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="United Kingdom",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+`)
+})
+
+it('can generate index.language.m3u', () => {
+  expect(content('.gh-pages/index.language.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="English",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russian",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+})
+
+it('can generate index.region.m3u', () => {
+  expect(content('.gh-pages/index.region.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Asia",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Commonwealth of Independent States",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="Europe",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="Europe, the Middle East and Africa",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe, the Middle East and Africa",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+})
+
+it('can generate index.m3u', () => {
+  expect(content('.gh-pages/index.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="News",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+})
+
+it('can generate index.nsfw.m3u', () => {
+  expect(content('.gh-pages/index.nsfw.m3u'))
+    .toBe(`#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml"
+#EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eNPIQ9f.png" group-title="News",BBC News HD (720p) [Not 24/7]
+http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+})
+
+it('can generate logs categories', () => {
+  expect(content('logs/generate-playlists/categories.log'))
+    .toBe(`{"name":"General","slug":"general","count":1}
+{"name":"News","slug":"news","count":1}
+{"name":"Other","slug":"other","count":0}
+`)
+})
+
+it('can generate logs countries', () => {
+  expect(content('logs/generate-playlists/countries.log'))
+    .toBe(`{"name":"Andorra","code":"AD","count":0}
+{"name":"Russia","code":"RU","count":1}
+{"name":"United Kingdom","code":"UK","count":1}
+{"name":"International","code":"INT","count":0}
+{"name":"Undefined","code":"UNDEFINED","count":0}
+`)
+})
+
+it('can generate logs languages', () => {
+  expect(content('logs/generate-playlists/languages.log'))
+    .toBe(`{"name":"Catalan","code":"cat","count":0}
+{"name":"English","code":"eng","count":1}
+{"name":"Russian","code":"rus","count":1}
+{"name":"Undefined","code":"undefined","count":0}
+`)
+})
+
+it('can generate logs regions', () => {
+  expect(content('logs/generate-playlists/regions.log'))
+    .toBe(`{"name":"Asia","code":"ASIA","count":1}
+{"name":"Commonwealth of Independent States","code":"CIS","count":1}
+{"name":"Europe","code":"EUR","count":2}
+{"name":"Europe, the Middle East and Africa","code":"EMEA","count":2}
+{"name":"Undefined","code":"UNDEFINED","count":0}
+`)
+})
diff --git a/tests/commands/update-database.test.js b/tests/commands/update-database.test.js
new file mode 100644
index 0000000000..cfac43868f
--- /dev/null
+++ b/tests/commands/update-database.test.js
@@ -0,0 +1,109 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+beforeEach(() => {
+  fs.rmdirSync('tests/__data__/temp', { recursive: true })
+  fs.mkdirSync('tests/__data__/temp')
+  fs.copyFileSync('tests/__data__/input/update.db', 'tests/__data__/temp/test.db')
+})
+
+it('can update database', () => {
+  const result = execSync(
+    'DB_FILEPATH=tests/__data__/temp/test.db LOGS_PATH=tests/__data__/input/logs EPG_CODES_FILEPATH=tests/__data__/input/codes.json node scripts/commands/update-database.js',
+    { encoding: 'utf8' }
+  )
+  const database = fs.readFileSync('tests/__data__/temp/test.db', { encoding: 'utf8' })
+  const lines = database.split('\n')
+  expect(JSON.parse(lines[0])).toMatchObject({
+    name: 'ЛДПР ТВ',
+    id: 'LDPRTV.ru',
+    filepath: 'tests/__data__/output/channels/ru.m3u',
+    src_country: { name: 'Russia', code: 'RU', lang: 'rus' },
+    tvg_country: 'RU',
+    countries: [{ name: 'Russia', code: 'RU', lang: 'rus' }],
+    regions: [
+      { name: 'Asia', code: 'ASIA' },
+      { name: 'Commonwealth of Independent States', code: 'CIS' },
+      { name: 'Europe, the Middle East and Africa', code: 'EMEA' },
+      { name: 'Europe', code: 'EUR' }
+    ],
+    languages: [{ name: 'Russian', code: 'rus' }],
+    categories: [{ name: 'General', slug: 'general', nsfw: false }],
+    tvg_url: '',
+    guides: ['https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml'],
+    logo: 'https://iptvx.one/icn/ldpr-tv.png',
+    resolution: { height: 1080, width: 1920 },
+    status: { label: '', code: 'online', level: 1 },
+    url: 'http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8',
+    http: { referrer: '', 'user-agent': '' },
+    is_nsfw: false,
+    is_broken: false,
+    updated: true,
+    cluster_id: 1,
+    _id: '2ST8btby3mmsgPF0'
+  })
+  expect(JSON.parse(lines[1])).toMatchObject({
+    name: 'BBC News HD',
+    id: 'BBCNews.uk',
+    filepath: 'tests/__data__/output/channels/uk.m3u',
+    src_country: { name: 'United Kingdom', code: 'UK', lang: 'eng' },
+    tvg_country: 'UK',
+    countries: [{ name: 'United Kingdom', code: 'UK', lang: 'eng' }],
+    regions: [
+      { name: 'Europe, the Middle East and Africa', code: 'EMEA' },
+      { name: 'Europe', code: 'EUR' }
+    ],
+    languages: [{ name: 'English', code: 'eng' }],
+    categories: [{ name: 'News', slug: 'news', nsfw: false }],
+    tvg_url: '',
+    guides: [],
+    logo: 'https://i.imgur.com/eNPIQ9f.png',
+    resolution: { height: 720, width: null },
+    status: { label: 'Not 24/7', code: 'not_247', level: 3 },
+    url: 'http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8',
+    http: { referrer: '', 'user-agent': '' },
+    is_nsfw: false,
+    is_broken: false,
+    updated: false,
+    cluster_id: 3,
+    _id: '3TbieV1ptnZVCIdn'
+  })
+  expect(JSON.parse(lines[2])).toMatchObject({
+    name: 'ATV',
+    id: 'AndorraTV.ad',
+    filepath: 'tests/__data__/output/channels/ad.m3u',
+    src_country: { name: 'Andorra', code: 'AD', lang: 'cat' },
+    tvg_country: 'AD',
+    countries: [{ name: 'Andorra', code: 'AD', lang: 'cat' }],
+    regions: [
+      { name: 'Europe, the Middle East and Africa', code: 'EMEA' },
+      { name: 'Europe', code: 'EUR' }
+    ],
+    languages: [{ name: 'Catalan', code: 'cat' }],
+    categories: [{ name: 'General', slug: 'general', nsfw: false }],
+    tvg_url: '',
+    guides: ['https://iptv-org.github.io/epg/guides/ad/andorradifusio.ad.epg.xml'],
+    logo: 'https://i.imgur.com/kJCjeQ4.png',
+    resolution: { height: 720, width: null },
+    status: { label: 'Offline', code: 'offline', level: 5 },
+    url: 'https://iptv-all.lanesh4d0w.repl.co/andorra/atv',
+    http: { referrer: '', 'user-agent': '' },
+    is_nsfw: false,
+    is_broken: true,
+    updated: true,
+    cluster_id: 1
+  })
+  expect(JSON.parse(lines[4])).toMatchObject({
+    id: 'KayhanTV.af',
+    status: { label: 'Geo-blocked', code: 'geo_blocked', level: 2 },
+    is_broken: false,
+    updated: false
+  })
+  expect(JSON.parse(lines[5])).toMatchObject({
+    id: 'Sharq.af',
+    status: { label: 'Offline', code: 'offline', level: 5 },
+    is_broken: true,
+    updated: true
+  })
+})
diff --git a/tests/commands/update-playlists.test.js b/tests/commands/update-playlists.test.js
new file mode 100644
index 0000000000..1656f051d7
--- /dev/null
+++ b/tests/commands/update-playlists.test.js
@@ -0,0 +1,37 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+beforeEach(() => {
+  fs.copyFileSync('tests/__data__/input/test.db', 'tests/__data__/temp/test.db')
+})
+
+afterEach(() => {
+  fs.rmdirSync('tests/__data__/temp', { recursive: true })
+  fs.mkdirSync('tests/__data__/temp')
+})
+
+it('can update playlist', () => {
+  const result = execSync(
+    'DB_FILEPATH=tests/__data__/temp/test.db node scripts/commands/update-playlists.js',
+    { encoding: 'utf8' }
+  )
+
+  const adPlaylist = fs.readFileSync('tests/__data__/output/channels/ad.m3u', {
+    encoding: 'utf8'
+  })
+
+  expect(adPlaylist).toBe(`#EXTM3U
+#EXTINF:-1 tvg-id="AndorraTV.ad" tvg-country="AD" tvg-language="Catalan" tvg-logo="https://i.imgur.com/kJCjeQ4.png" group-title="General",ATV (720p) [Offline]
+https://iptv-all.lanesh4d0w.repl.co/andorra/atv
+`)
+
+  const ruPlaylist = fs.readFileSync('tests/__data__/output/channels/ru.m3u', {
+    encoding: 'utf8'
+  })
+
+  expect(ruPlaylist).toBe(`#EXTM3U
+#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
+http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
+`)
+})
diff --git a/tests/commands/update-readme.test.js b/tests/commands/update-readme.test.js
new file mode 100644
index 0000000000..716215473e
--- /dev/null
+++ b/tests/commands/update-readme.test.js
@@ -0,0 +1,23 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+beforeEach(() => {
+  fs.rmdirSync(path.resolve('tests/__data__/output'), { recursive: true })
+})
+
+it('can update readme.md', () => {
+  const result = execSync(
+    'LOGS_PATH=tests/__data__/input/logs node scripts/commands/update-readme.js --config=tests/__data__/input/readme.json',
+    { encoding: 'utf8' }
+  )
+
+  const readme = fs.readFileSync(path.resolve('tests/__data__/output/readme.md'), {
+    encoding: 'utf8'
+  })
+  const expected = fs.readFileSync(path.resolve('tests/__data__/input/readme.md'), {
+    encoding: 'utf8'
+  })
+
+  expect(readme).toBe(expected)
+})
diff --git a/tests/commands/validate.test.js b/tests/commands/validate.test.js
new file mode 100644
index 0000000000..7460b01589
--- /dev/null
+++ b/tests/commands/validate.test.js
@@ -0,0 +1,16 @@
+const fs = require('fs')
+const path = require('path')
+const { execSync } = require('child_process')
+
+it('can validate channels name', () => {
+  try {
+    execSync('node scripts/commands/validate.js --input-dir=tests/__data__/input/channels', {
+      encoding: 'utf8'
+    })
+  } catch (err) {
+    expect(err.status).toBe(1)
+    expect(err.stdout).toBe(
+      `tests/__data__/input/channels/us_blocked.m3u:2   'Fox Sports' is on the blocklist due to claims of copyright holders (https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md)\n\n`
+    )
+  }
+})