diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index a574b92..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-(`[x]` becomes a filled in checkbox, `[ ]` is an empty one)
-
-- [ ] I have verified there are [no duplicate active or recent bugs, questions, or requests](https://github.com/afollestad/nock-nock/issues?q=is%3Aissue+is%3Aclosed)
-- [ ] I have given my issue a non-generic title.
-
----
-
-If this is a improvement or feature request, you can remove everything below. 
-Also, please consider making a pull request if you are capable of contributing.
-
-###### Include the following:
-
- - Nock Nock version: `0.x.x`
- - Affected device: Google Pixel 3 XL with Android 9.0
- 
----
- 
-###### Reproduction Steps
-
-1.
-
----
-
-###### Expected Result
-
----
-
-###### Actual Result
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 0000000..2d7d09f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Something is crashing or not working as intended
+
+---
+
+*Please consider making a Pull Request if you are capable of doing so.*
+
+**App Version:**
+
+x.x.x
+ 
+**Affected Device(s):**
+ 
+Google Pixel 3 XL with Android 9.0
+ 
+**Describe the Bug:**
+
+A clear description of what is the bug is.
+
+**To Reproduce:**
+1. 
+2. 
+3. 
+
+**Expected Behavior:**
+
+A clear description of what you expected to happen.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000..77310ae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+*Please consider making a Pull Request if you are capable of doing so.*
+
+**Description what you'd like to happen:**
+
+A clear description if the feature or behavior you'd like implemented.
+
+**Describe alternatives you've considered:**
+
+A clear description of any alternative solutions you've considered.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/pull_request_template.md
similarity index 78%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to .github/pull_request_template.md
index b4035a9..6307e10 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/pull_request_template.md
@@ -1,9 +1,8 @@
-
 ### Guidelines 
 
-1. You must run the `spotlessApply` task before commiting, either through Android Studio or with `./gradlew spotlessApply`.
+1. You must run the `spotlessApply` task before committing, either through Android Studio or with `./gradlew spotlessApply`.
 2. A PR should be focused and contained. If you are changing multiple unrelated things, they should be in separate PRs.
 3. A PR should fix a bug or solve a problem - something that only you would use is not necessarily something that should be published.
 4. Give your PR a detailed title and description - look over your code one last time before actually creating the PR. Give it a self-review.
 
-**If you do not follow the guidelines, your PR will be rejected.**
\ No newline at end of file
+**If you do not follow the guidelines, your PR will be rejected.**
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9d1e235..50f0406 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -40,7 +40,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">