diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..6cfbfc73
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,39 @@
+---
+name: Bug Report
+about: If you encounter an issue whilst using our app, please use this template to help improve the app.
+title: "[BUG] "
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment Information**
+ - OS *(e.g. Linux/Mac/Windows)*:
+ - Application Version *(e.g. 2.5.0)*:
+
+**Additional context**
+Add any other context about the problem here.
+
+**Have you followed the troubleshooting guide and checked for any outstanding/pinned issues that can help?**
+*Troubleshooting guide can be found [here](https://github.com/Apple-Music-Electron/Apple-Music-Electron/wiki/Troubleshooting).*
+Yes/No
+
+**Log File**
+Follow [this](https://github.com/Apple-Music-Electron/Apple-Music-Electron/wiki/FAQs#2-how-to-find-the-log-file) to find your log file.
+Attach your log file to the post but make sure to remove any LastFM keys that are in the file.
\ 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 00000000..715514a3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Enhancement]"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.gitignore b/.gitignore
index 7f791b82..b0184fe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,16 @@
+# NodeJS
node_modules
+
+# Building
dist
-.idea
-yarn.lock
+*.lock
+yarn*
package-lock.json
-.DS_Store
-yarn-error.log
.yarnclean
+
+# Misc
+.idea
+.vscode
auth.json
-musickit.js
\ No newline at end of file
+musickit.js
+.DS_Store
\ No newline at end of file
diff --git a/README.md b/README.md
index 0daaa160..941ad929 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,15 @@
- 
- 
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
-
- 
-
-
@@ -56,6 +53,4 @@ for any legal concerns contact me at
-
-
-1 - Coming Soon
+
\ No newline at end of file
diff --git a/logobannercider.png b/resources/banner.png
similarity index 100%
rename from logobannercider.png
rename to resources/banner.png