diff --git a/.github/ISSUE_TEMPLATE/__channels_add.yml b/.github/ISSUE_TEMPLATE/1_channels_add.yml
similarity index 63%
rename from .github/ISSUE_TEMPLATE/__channels_add.yml
rename to .github/ISSUE_TEMPLATE/1_channels_add.yml
index b3ab5bd0..f4591849 100644
--- a/.github/ISSUE_TEMPLATE/__channels_add.yml
+++ b/.github/ISSUE_TEMPLATE/1_channels_add.yml
@@ -62,24 +62,6 @@ body:
       description: Name of the city from which the channel is transmitted
       placeholder: 'Hefei'
 
-  - type: input
-    id: broadcast_area
-    attributes:
-      label: Broadcast Area
-      description: List of codes describing the broadcasting area of the channel separated by `;`. Any combination of `r/<region_code>`, `c/<country_code>`, `s/<subdivision_code>`
-      placeholder: 'c/CN;r/EUR'
-    validations:
-      required: true
-
-  - type: input
-    id: languages
-    attributes:
-      label: Languages
-      description: List of languages in which the channel is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](https://github.com/iptv-org/database/blob/master/data/languages.csv)
-      placeholder: 'zho;eng'
-    validations:
-      required: true
-
   - type: input
     id: categories
     attributes:
@@ -98,27 +80,6 @@ body:
     validations:
       required: true
 
-  - type: input
-    id: launched
-    attributes:
-      label: Launched (optional)
-      description: Launch date of the channel (`YYYY-MM-DD`)   
-      placeholder: '2016-07-28'
-
-  - type: input
-    id: closed
-    attributes:
-      label: Closed (optional)
-      description: Date on which the channel closed (`YYYY-MM-DD`)   
-      placeholder: '2020-05-31'
-
-  - type: input
-    id: replaced_by
-    attributes:
-      label: Replaced By (optional)
-      description: The ID of the channel that this channel was replaced by
-      placeholder: 'CCTV1.cn'
-
   - type: input
     id: website
     attributes:
@@ -135,7 +96,92 @@ body:
     validations:
       required: true
 
+  - type: markdown
+    attributes:
+      value: |
+        ## Main Feed
+        Description of the main feed of the channel
+
+  - type: input
+    id: feed_name
+    attributes:
+      label: Feed Name
+      description: "Name of the feed in English. May include: `a-z`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, `|`, `¡`"
+      placeholder: 'SD'
+      value: 'SD'
+    validations:
+      required: true
+
+  - type: input
+    id: broadcast_area
+    attributes:
+      label: Broadcast Area
+      description: "List of codes describing the broadcasting area of the feed separated by `;`. Any combination of `r/<region_code>`, `c/<country_code>`, `s/<subdivision_code>`. A full list of supported codes can be found here: [countries](https://github.com/iptv-org/database/blob/master/data/countries.csv), [subdivisions](https://github.com/iptv-org/database/blob/master/data/subdivisions.csv), [regions](https://github.com/iptv-org/database/blob/master/data/regions.csv)"
+      placeholder: 'c/CN'
+    validations:
+      required: true
+
+  - type: input
+    id: timezones
+    attributes:
+      label: Timezones
+      description: List of broadcast time zones separated by `;`. A list of all supported timezones and their codes can be found in [data/timezones.csv](https://github.com/iptv-org/database/blob/master/data/timezones.csv)
+      placeholder: 'Asia/Shanghai'
+    validations:
+      required: true
+
+  - type: input
+    id: languages
+    attributes:
+      label: Languages
+      description: List of languages in which the feed is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](https://github.com/iptv-org/database/blob/master/data/languages.csv)
+      placeholder: 'zho;eng'
+    validations:
+      required: true
+
+  - type: input
+    id: video_format
+    attributes:
+      label: Format
+      description: Video format of the broadcast
+      default: 6
+      options:
+        - '4320p'
+        - '2160p'
+        - '1080p'
+        - '1080i'
+        - '720p'
+        - '576p'
+        - '576i'
+        - '480p'
+        - '480i'
+        - '360p'
+        - '240p'
+    validations:
+      required: true
+
+  - type: input
+    id: launched
+    attributes:
+      label: Launched (optional)
+      description: Launch date of the feed (`YYYY-MM-DD`)   
+      placeholder: '2016-07-28'
+
+  - type: input
+    id: closed
+    attributes:
+      label: Closed (optional)
+      description: Date on which the feed closed (`YYYY-MM-DD`)   
+      placeholder: '2020-05-31'
+
+  - type: input
+    id: replaced_by
+    attributes:
+      label: Replaced By (optional)
+      description: "ID of the channel and feed this feed was replaced with. Possible values: `<channel_id>` or `<channel_id>@<feed_id>`"
+      placeholder: 'CCTV1.cn@SD'
+
   - type: textarea
     attributes:
       label: Notes
-      description: 'Anything else we should know about this channel?'
+      description: 'Anything else we should know?'
diff --git a/.github/ISSUE_TEMPLATE/__channels_edit.yml b/.github/ISSUE_TEMPLATE/2_channels_edit.yml
similarity index 74%
rename from .github/ISSUE_TEMPLATE/__channels_edit.yml
rename to .github/ISSUE_TEMPLATE/2_channels_edit.yml
index 91d247fa..65332c0e 100644
--- a/.github/ISSUE_TEMPLATE/__channels_edit.yml
+++ b/.github/ISSUE_TEMPLATE/2_channels_edit.yml
@@ -4,6 +4,11 @@ title: 'Edit: '
 labels: ['channels:edit']
 
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Please specify exactly what should be changed. To delete an existing value without replacement use the `~` symbol.
+  
   - type: input
     id: id
     attributes:
@@ -13,11 +18,6 @@ body:
     validations:
       required: true
 
-  - type: markdown
-    attributes:
-      value: |
-        Please specify exactly what should be changed. To delete an existing value without replacement use the `~` symbol.
-
   - type: input
     id: name
     attributes:
@@ -67,20 +67,6 @@ body:
       description: Name of the city from which the channel is transmitted
       placeholder: 'Hefei'
 
-  - type: input
-    id: broadcast_area
-    attributes:
-      label: Broadcast Area
-      description: List of codes describing the broadcasting area of the channel separated by `;`. Any combination of `r/<region_code>`, `c/<country_code>`, `s/<subdivision_code>`
-      placeholder: 'c/CN;r/EUR'
-
-  - type: input
-    id: languages
-    attributes:
-      label: Languages
-      description: List of languages in which the channel is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](https://github.com/iptv-org/database/blob/master/data/languages.csv)
-      placeholder: 'zho;eng'
-
   - type: input
     id: categories
     attributes:
@@ -97,27 +83,6 @@ body:
         - 'FALSE'
         - 'TRUE'
 
-  - type: input
-    id: launched
-    attributes:
-      label: Launched
-      description: Launch date of the channel (`YYYY-MM-DD`)   
-      placeholder: '2016-07-28'
-
-  - type: input
-    id: closed
-    attributes:
-      label: Closed
-      description: Date on which the channel closed (`YYYY-MM-DD`)   
-      placeholder: '2020-05-31'
-
-  - type: input
-    id: replaced_by
-    attributes:
-      label: Replaced By
-      description: The ID of the channel that this channel was replaced by
-      placeholder: 'CCTV1.cn'
-
   - type: input
     id: website
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/__channels_remove.yml b/.github/ISSUE_TEMPLATE/3_channels_remove.yml
similarity index 67%
rename from .github/ISSUE_TEMPLATE/__channels_remove.yml
rename to .github/ISSUE_TEMPLATE/3_channels_remove.yml
index fea7d866..d0ea7937 100644
--- a/.github/ISSUE_TEMPLATE/__channels_remove.yml
+++ b/.github/ISSUE_TEMPLATE/3_channels_remove.yml
@@ -4,9 +4,14 @@ title: 'Remove: '
 labels: ['channels:remove']
 
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Deleting a channel will also delete all associated feeds and records in the blocklist.
+
   - type: input
     attributes:
-      label: Channel ID (required)
+      label: Channel ID
       description: The ID of the channel that should be removed
       placeholder: 'AnhuiTV.cn'
     validations:
@@ -14,7 +19,7 @@ body:
 
   - type: dropdown
     attributes:
-      label: Reason (required)
+      label: Reason
       description: Select the reason for removal from the list below
       options:
         - 'Duplicate'
@@ -25,5 +30,5 @@ body:
 
   - type: textarea
     attributes:
-      label: Notes
-      description: 'Any additional information'
+      label: Notes (optional)
+      description: 'Anything else we should know?'
diff --git a/.github/ISSUE_TEMPLATE/4_feeds_add.yml b/.github/ISSUE_TEMPLATE/4_feeds_add.yml
new file mode 100644
index 00000000..a1b89bac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4_feeds_add.yml
@@ -0,0 +1,113 @@
+name: ➕ Add feed
+description: Request to add a channel feed into the database
+title: 'Add: '
+labels: ['feeds:add']
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the issue form as much as you can so we could efficiently process your request.
+
+  - type: input
+    id: channel_id
+    attributes:
+      label: Channel ID (required)
+      description: ID of the channel to which this feed belongs
+      placeholder: 'HBO.us'
+    validations:
+      required: true
+
+  - type: input
+    id: feed_name
+    attributes:
+      label: Feed Name
+      description: "Name of the feed in English. May include: `a-z`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, `|`, `¡`"
+      placeholder: 'SD'
+    validations:
+      required: true
+
+  - type: dropdown
+    id: is_main
+    attributes:
+      label: Main Feed
+      description: Indicates if this feed is the main for the channel
+      options:
+        - 'FALSE'
+        - 'TRUE'
+    validations:
+      required: true
+
+  - type: input
+    id: broadcast_area
+    attributes:
+      label: Broadcast Area
+      description: "List of codes describing the broadcasting area of the feed separated by `;`. Any combination of `r/<region_code>`, `c/<country_code>`, `s/<subdivision_code>`. A full list of supported codes can be found here: [data/countries.csv](https://github.com/iptv-org/database/blob/master/data/countries.csv), [data/subdivisions.csv](https://github.com/iptv-org/database/blob/master/data/subdivisions.csv), [data/regions.csv](https://github.com/iptv-org/database/blob/master/data/regions.csv)"
+      placeholder: 'c/CN'
+    validations:
+      required: true
+
+  - type: input
+    id: timezones
+    attributes:
+      label: Timezones
+      description: List of broadcast time zones separated by `;`. A list of all supported timezones and their codes can be found in [data/timezones.csv](https://github.com/iptv-org/database/blob/master/data/timezones.csv)
+      placeholder: 'Asia/Shanghai'
+    validations:
+      required: true
+
+  - type: input
+    id: languages
+    attributes:
+      label: Languages
+      description: List of languages in which the feed is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](https://github.com/iptv-org/database/blob/master/data/languages.csv)
+      placeholder: 'zho;eng'
+    validations:
+      required: true
+
+  - type: input
+    id: video_format
+    attributes:
+      label: Format
+      description: Video format of the broadcast
+      default: 6
+      options:
+        - '4320p'
+        - '2160p'
+        - '1080p'
+        - '1080i'
+        - '720p'
+        - '576p'
+        - '576i'
+        - '480p'
+        - '480i'
+        - '360p'
+        - '240p'
+    validations:
+      required: true
+
+  - type: input
+    id: launched
+    attributes:
+      label: Launched (optional)
+      description: Launch date of the feed (`YYYY-MM-DD`)   
+      placeholder: '2016-07-28'
+
+  - type: input
+    id: closed
+    attributes:
+      label: Closed (optional)
+      description: Date on which the feed closed (`YYYY-MM-DD`)   
+      placeholder: '2020-05-31'
+
+  - type: input
+    id: replaced_by
+    attributes:
+      label: Replaced By (optional)
+      description: "ID of the channel and feed this feed was replaced with. Possible values: `<channel_id>` or `<channel_id>@<feed_id>`"
+      placeholder: 'CCTV1.cn@SD'
+
+  - type: textarea
+    attributes:
+      label: Notes
+      description: 'Anything else we should know?'
diff --git a/.github/ISSUE_TEMPLATE/5_feeds_edit.yml b/.github/ISSUE_TEMPLATE/5_feeds_edit.yml
new file mode 100644
index 00000000..6042da04
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/5_feeds_edit.yml
@@ -0,0 +1,109 @@
+name: ✏️ Edit feed
+description: Request to edit feed description
+title: 'Edit: '
+labels: ['feeds:edit']
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please specify exactly what should be changed. To delete an existing value without replacement use the `~` symbol.
+
+  - type: input
+    id: channel_id
+    attributes:
+      label: Channel ID (required)
+      description: ID of the channel to which this feed belongs
+      placeholder: 'HBO.us'
+    validations:
+      required: true
+
+  - type: input
+    id: feed_id
+    attributes:
+      label: Feed ID (required)
+      description: The ID of the feed that should be updated
+      placeholder: 'West'
+    validations:
+      required: true
+
+  - type: input
+    id: feed_name
+    attributes:
+      label: Feed Name
+      description: "Name of the feed in English. May include: `a-z`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, `|`, `¡`"
+      placeholder: 'West HD'
+
+  - type: dropdown
+    id: is_main
+    attributes:
+      label: Main Feed
+      description: Indicates if this feed is the main for the channel
+      options:
+        - 'FALSE'
+        - 'TRUE'
+
+  - type: input
+    id: broadcast_area
+    attributes:
+      label: Broadcast Area
+      description: "List of codes describing the broadcasting area of the feed separated by `;`. Any combination of `r/<region_code>`, `c/<country_code>`, `s/<subdivision_code>`. A full list of supported codes can be found here: [countries](https://github.com/iptv-org/database/blob/master/data/countries.csv), [subdivisions](https://github.com/iptv-org/database/blob/master/data/subdivisions.csv), [regions](https://github.com/iptv-org/database/blob/master/data/regions.csv)"
+      placeholder: 'c/CN'
+
+  - type: input
+    id: timezones
+    attributes:
+      label: Timezones
+      description: List of broadcast time zones separated by `;`. A list of all supported timezones and their codes can be found in [data/timezones.csv](https://github.com/iptv-org/database/blob/master/data/timezones.csv)
+      placeholder: 'Asia/Shanghai'
+
+  - type: input
+    id: languages
+    attributes:
+      label: Languages
+      description: List of languages in which the feed is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](https://github.com/iptv-org/database/blob/master/data/languages.csv)
+      placeholder: 'zho;eng'
+
+  - type: input
+    id: video_format
+    attributes:
+      label: Format
+      description: Video format of the broadcast
+      options:
+        - '4320p'
+        - '2160p'
+        - '1080p'
+        - '1080i'
+        - '720p'
+        - '576p'
+        - '576i'
+        - '480p'
+        - '480i'
+        - '360p'
+        - '240p'
+
+  - type: input
+    id: launched
+    attributes:
+      label: Launched
+      description: Launch date of the feed (`YYYY-MM-DD`)   
+      placeholder: '2016-07-28'
+
+  - type: input
+    id: closed
+    attributes:
+      label: Closed
+      description: Date on which the feed closed (`YYYY-MM-DD`)   
+      placeholder: '2020-05-31'
+
+  - type: input
+    id: replaced_by
+    attributes:
+      label: Replaced By
+      description: "ID of the channel and feed this feed was replaced with. Possible values: `<channel_id>` or `<channel_id>@<feed_id>`"
+      placeholder: 'CCTV1.cn@SD'
+
+  - type: textarea
+    attributes:
+      label: Notes
+      description: 'Anything else we should know?'
diff --git a/.github/ISSUE_TEMPLATE/6_feeds_remove.yml b/.github/ISSUE_TEMPLATE/6_feeds_remove.yml
new file mode 100644
index 00000000..95e625f3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/6_feeds_remove.yml
@@ -0,0 +1,38 @@
+name: 🗑️ Remove feed
+description: Request to remove a feed from the database
+title: 'Remove: '
+labels: ['feeds:remove']
+
+body:
+  - type: input
+    id: channel_id
+    attributes:
+      label: Channel ID
+      description: ID of the channel to which this feed belongs
+      placeholder: 'HBO.us'
+    validations:
+      required: true
+
+  - type: input
+    id: feed_id
+    attributes:
+      label: Feed ID
+      description: The ID of the feed that should be updated
+      placeholder: 'West'
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Reason
+      description: Select the reason for removal from the list below
+      options:
+        - 'Duplicate'
+        - 'Other'
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Notes (optional)
+      description: 'Anything else we should know?'
diff --git a/.github/ISSUE_TEMPLATE/_blocklist_add.yml b/.github/ISSUE_TEMPLATE/7_blocklist_add.yml
similarity index 84%
rename from .github/ISSUE_TEMPLATE/_blocklist_add.yml
rename to .github/ISSUE_TEMPLATE/7_blocklist_add.yml
index d12e4311..a640ee9c 100644
--- a/.github/ISSUE_TEMPLATE/_blocklist_add.yml
+++ b/.github/ISSUE_TEMPLATE/7_blocklist_add.yml
@@ -5,7 +5,7 @@ labels: ['blocklist:add']
 
 body:
   - type: input
-    id: id
+    id: channel
     attributes:
       label: Channel ID
       description: The ID of the channel that should be blocked
@@ -28,7 +28,7 @@ body:
     id: ref
     attributes:
       label: Reference
-      description: Link to the official request for channel removal
+      description: Link to DMCA notice or approved channel removal request
       placeholder: 'https://github.com/iptv-org/iptv/issues/1831'
     validations:
       required: true
@@ -36,4 +36,4 @@ body:
   - type: textarea
     attributes:
       label: Notes (optional)
-      description: 'Any additional information'
+      description: 'Anything else we should know?'
diff --git a/.github/ISSUE_TEMPLATE/_blocklist_remove.yml b/.github/ISSUE_TEMPLATE/8_blocklist_remove.yml
similarity index 58%
rename from .github/ISSUE_TEMPLATE/_blocklist_remove.yml
rename to .github/ISSUE_TEMPLATE/8_blocklist_remove.yml
index 4e02b489..fe06c9b5 100644
--- a/.github/ISSUE_TEMPLATE/_blocklist_remove.yml
+++ b/.github/ISSUE_TEMPLATE/8_blocklist_remove.yml
@@ -5,24 +5,17 @@ labels: ['blocklist:remove']
 
 body:
   - type: input
+    id: channel
     attributes:
-      label: Channel ID (required)
+      label: Channel ID
       description: The ID of the channel that should be removed
       placeholder: 'AnhuiTV.cn'
     validations:
       required: true
 
-  - type: dropdown
-    attributes:
-      label: Reason (required)
-      description: Select the reason for removal from the list below
-      options:
-        - 'Invalid channel id'
-        - 'Other'
-    validations:
-      required: true
-
   - type: textarea
     attributes:
       label: Notes
-      description: 'Any additional information'
+      description: 'Describe in detail the reason for removing the channel from the blocklist'
+    validations:
+      required: true