diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index dc8fa45..e68a3f1 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,6 +1,6 @@
 name: "🐛 Bug Report"
 description: Create a new ticket for a bug.
-title: "🐛 [BUG] - <title>"
+title: "🐛 <title>"
 labels: ["bug"]
 body:
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 69fce04..34587ae 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,32 +1,8 @@
 name: "💡 Feature Request"
 description: Create a new ticket for a new feature request
-title: "💡 [REQUEST] - <title>"
+title: "💡 <title>"
 labels: ["question"]
 body:
-  - type: input
-    id: start_date
-    attributes:
-      label: "Start Date"
-      description: Start of development
-      placeholder: "month/day/year"
-    validations:
-      required: false
-  - type: textarea
-    id: implementation_pr
-    attributes:
-      label: "Implementation PR"
-      description: Pull request used
-      placeholder: "#Pull Request ID"
-    validations:
-      required: false
-  - type: textarea
-    id: reference_issues
-    attributes:
-      label: "Reference Issues"
-      description: Common issues
-      placeholder: "#Issues IDs"
-    validations:
-      required: false
   - type: textarea
     id: summary
     attributes:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..3ce3947
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+## Pull Request Description
+
+<!--- Please describe what was changed -->
+
+## Issue Being Fixed
+
+<!-- Please describe the problem that is being fixed and, if applicable, reference a GitHub issue -->
+
+Issue Number: N/A
+
+## Screenshots / Recordings
+
+<!-- This section is optional but highly recommended to show off your changes! -->
+
+## Checklist
+
+- [ ] If a new package was added, did you ensure it works for all supported platforms? Is the package also well maintained?
+- [ ] Did you add localization for any text? If yes, did you sort the .arb file using ```arb_utils sort <INPUT_FILE>```?
+- [ ] Check that any changes are related to the issue at hand.
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index e888a9c..4e0401e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,12 +1,14 @@
 {
-  "cSpell.words": [
-    "Jellyfin"
-  ],
-  "dart.flutterSdkPath": ".fvm/versions/3.24.3",
-  "search.exclude": {
-    "**/.fvm": true
-  },
-  "files.watcherExclude": {
-    "**/.fvm": true
-  }
+	"cSpell.words": [
+		"Jellyfin"
+	],
+	"dart.flutterSdkPath": ".fvm/versions/3.24.3",
+	"search.exclude": {
+		"**/.fvm": true
+	},
+	"files.watcherExclude": {
+		"**/.fvm": true
+	},
+	"editor.detectIndentation": true,
+	"dart.lineLength": 120
 }
\ No newline at end of file