diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 59%
rename from .github/PULL_REQUEST_TEMPLATE/bug_fix.md
rename to .github/PULL_REQUEST_TEMPLATE.md
index 44f46925..41013694 100644
--- a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,26 +1,26 @@
 ---
-name: Bugfix
-about: Thanks for the submission of a bugfix
-title: ''
-labels: bug
-assignees: ''
-
+Title
 ---
 
 **Important note**
 Please note that only PrestoN is able to merge Pull Requests into master.
 
+**Pull Request Type**
+Please select what type of pull request this is:
+- [ ] Bugfix
+- [ ] Feature Implementation
+
 **Related issue**
-Please link the issue your bugfix is referring to.
+Please link the issue your pull request is referring to.
 
 **Description**
-Please write a clear and concise description of what the bugfix does.
+Please write a clear and concise description of what the pull request does.
 
 **Screenshots (if appropriate)**
 Please add before and after screenshots if there is a visible change.
 
-**Testing (for fixes that are not easily understandable)**
-Has this bugfix been tested?
+**Testing (for code that is not small enough to be easily understandable)**
+Has this pull request been tested?
 Please describe shortly how you tested it and whether there are any ramifications remaining. 
 
 **Desktop (please complete the following information):**
diff --git a/.github/PULL_REQUEST_TEMPLATE/feature_implementation.md b/.github/PULL_REQUEST_TEMPLATE/feature_implementation.md
deleted file mode 100644
index e0240efc..00000000
--- a/.github/PULL_REQUEST_TEMPLATE/feature_implementation.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Feature implementation
-about: Thanks for the implementation of a new feature 
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**Important note**
-Please note that only PrestoN is able to merge Pull Requests into master.
-
-**Related issue**
-Please link the issue your feature is referring to.
-
-**Description**
-Please write a clear and concise description of what the implementation does.
-
-**Screenshots (if appropriate)**
-Please add before and after screenshots if there is a visible change.
-
-**Testing**
-Has this feature been tested?
-Please describe shortly how you tested it and whether there are any ramifications remaining. 
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - OS Version: [e.g. 22]
- - FreeTube version: [e.g. 0.8]
-
-**Additional context**
-Add any other context about the problem here.