diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b246d143..4db0e4f8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,8 @@
 ---
-name: Bug report
-about: Create a bug report to improve SecLists
-title: ''
-labels: ''
+name: 'Bug report'
+about: 'Create a bug report to improve SecLists'
+title: '[Bug report]: TITLE'
+labels: 'bug'
 assignees: ''
 
 ---
@@ -10,20 +10,20 @@ assignees: ''
 <!--- Hello! Thank you for taking the time to fill out the bug report. Please do note that the bug report form is for broken/incorrect wordlists and not for requesting wordlists to be added/modified. If you want to submit suggestions, you should submit it in the feature request form. -->
 
 **Describe the bug**
-<!--- A clear and concise description of what the bug is(Missing entry in file, wonky script behavior, etc) -->
+<!--- A clear and concise description of what the bug is. (Missing entry in file, wonky script behavior, etc) -->
 
 **To Reproduce**
-<!--- This section only applies if you are reporting a broken a script. If you are not, delete this section -->
+<!--- This section only applies if you are reporting a broken a script. If it does not, delete this section. -->
 
 **Expected behavior**
-<!--- This section is the same as above -->
+<!--- This section is the same as above. -->
 
 **Screenshots**
 <!--- If applicable, add screenshots to help explain your problem. -->
 
 **Additional context**
-<!--- Add any other context about the problem here that will help us solve the issue 
-If you have any sources please add them here -->
+<!--- Add any other context about the problem here that will help us solve the issue.
+If you have any sources please add them here. -->
 
 **Checklist**
 <!-- Tick if applicable -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 13e74923..880873a1 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,8 @@
 ---
 name: Feature request
-about: Suggest a feature/wordlist to be added to SecLists
-title: ''
-labels: ''
+about: 'Suggest a feature/wordlist to be added to SecLists'
+title: '[Feature request]: TITLE'
+labels: 'proposal'
 assignees: ''
 
 ---
@@ -13,10 +13,10 @@ assignees: ''
 <!--- A clear and concise description of what should be added to the repository. -->
 
 **Additional context**
-<!--- Add any other context about the problem/missing feature here that will help us fix the problem or add the missing features
-If you have any sources please add them here -->
+<!--- Add any other context about the problem/missing feature here that will help us fix the problem or add the missing features.
+If you have any sources please add them here. -->
 
 **Checklist**
-<!-- Tick if applicable -->
+<!-- Tick if applicable. -->
 
 - [ ] I intend to refer to this issue in a pull request that I wil open later.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/pull_request_template.md b/.github/ISSUE_TEMPLATE/pull_request_template.md
index ab5f325b..8a852f1c 100644
--- a/.github/ISSUE_TEMPLATE/pull_request_template.md
+++ b/.github/ISSUE_TEMPLATE/pull_request_template.md
@@ -1,8 +1,8 @@
 ---
-name: Pull request
-about: Create a pull request to improve SecLists
-title: ''
-labels: ''
+name: 'Pull request'
+about: 'Create a pull request to improve SecLists'
+title: '[Pull request]: TITLE'
+labels: 'enhancement'
 assignees: ''
 
 ---
@@ -12,6 +12,12 @@ assignees: ''
 **Describe the added commits**
 <!--- A clear and concise description of what is being added to the repository. -->
 
+**Purpose of pull request**
+<!--- Tell us what made you decide to open a pull request. --->
+
+**Source**
+<!--- Put/link the source here. -->
+
 **Additional context**
-<!--- Add any other context about the problem/missing feature that you are fixing/solving here 
-Tag the issue here if applicable-->
+<!--- Add any other context about the problem/missing feature that you are fixing/solving here. 
+Tag the issue here if applicable. -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..bc0ba6cb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,17 @@
+---
+name: 'Question'
+about: 'Ask a question about the project'
+title: '[Question]: TITLE'
+labels: 'question'
+assignees: ''
+
+---
+
+<!--- Hello! Thank you for taking the time to ask a question. Please make sure that the question you are asking has not been asked before. -->
+
+**Describe the question/problem**
+<!--- Ask anything here. -->
+
+**Additional context**
+<!--- If you have any additional details that you want to add here to clarify the question add them here! -->
+