diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 83%
rename from .github/ISSUE_TEMPLATE/bug_report.yaml
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index 2bd07ac..86583a5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,7 @@
-name: Bug report
+name: 🐛 Bug Report
 description: Create a report to help us improve streamrip
 labels: bug
+title: "[BUG] <title>"
 body:
   # types: dropdown, textarea, input
   # - type: dropdown
@@ -26,13 +27,8 @@ body:
       label: Command Used
       description: |
         The command that you typed that caused the error
-      placeholder: |
-        For example:
-          `rip url https://example.com`
-
-  - type: markdown
-    attributes:
-      value: "```\n"
+      placeholder: e.g. rip url https://example.com
+      render: "bash"
 
   - type: textarea
     validations:
@@ -44,14 +40,8 @@ body:
         For example, if the problematic command was `rip url https://example.com`, then
         you would run `rip url https://example.com -vvv` to get the debug logs.
         Make sure to check the logs for any personal information such as emails and remove them.
-
-  - type: markdown
-    attributes:
-      value: "```"
-
-  - type: markdown
-    attributes:
-      value: "```toml\n"
+      render: "text"
+      placeholder: Logs printed to terminal screen
 
   - type: textarea
     validations:
@@ -61,10 +51,8 @@ body:
       description: |
         Find the config file using `rip config --open` and paste the contents here. 
         Make sure you REMOVE YOUR CREDENTIALS!
-
-  - type: markdown
-    attributes:
-      value: "```"
+      render: toml
+      placeholder: Contents of config.toml
 
   - type: input
     validations:
@@ -73,10 +61,6 @@ body:
       label: Operating System
       placeholder: e.g. Windows, Linux, macOS...
 
-  - type: markdown
-    attributes:
-      value: "```\n"
-
   - type: input
     validations:
       required: true
@@ -85,10 +69,6 @@ body:
       description: Run `rip --version` to check.
       placeholder: e.g. 1.5
 
-  - type: markdown
-    attributes:
-      value: "```"
-
   - type: textarea
     attributes:
       label: Screenshots and recordings
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/config.yaml
rename to .github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 807c7d9..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: "\U0001F680 Feature Request"
-about: "I have a suggestion (and may want to implement it \U0001F642)!"
-title: 'Feature Request: '
-labels: enhancement
-assignees: ''
-
----
-
-## Feature Request
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I have an issue when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen. Add any considered drawbacks.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..f3b84ea
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,25 @@
+name: 🚀 Feature Request
+description: Suggest a feature that would improve streamrip
+labels: enhancement
+title: "[FEATURE] <title>"
+body:
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Is the feature request related to a problem. Please describe it.
+      placeholder: I have an issue when...
+
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the solution you would like. 
+      description: A clear and concise description of what you want to happen. Add any considered drawbacks.
+      placeholder: I would like streamrip to...
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered.
+      description: A clear and concise description of any alternative solutions or features you've considered.
+      placeholder: '"I have already tried X" or "I do Y as a temporary solution"'
diff --git a/README.md b/README.md
index abb1860..95395e0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # streamrip
 
-[![Downloads](https://img.shields.io/pypi/dm/streamrip)](https://pypistats.org/packages/streamrip)
+[![Downloads](https://pepy.tech/badge/streamrip)](https://pepy.tech/project/streamrip)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
 
 A scriptable stream downloader for Qobuz, Tidal, Deezer and SoundCloud.