diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..894c473
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: aristocratos
+
+---
+
+**Describe the bug**
+
+[A clear and concise description of what the bug is.]
+
+**To Reproduce**
+
+[Steps to reproduce the behavior:]
+
+**Expected behavior**
+
+[A clear and concise description of what you expected to happen.]
+
+**Screenshots**
+
+[If applicable, add screenshots to help explain your problem.]
+
+**Info (please complete the following information):**
+ - bpytop version: `bpytop -v`
+ - psutil version: `bpytop -v`
+ - (Linux) Linux distribution and version:
+ - (OSX/FreeBSD) Os release version:
+ - Terminal used:
+ - Font used:
+ - Python version, `python3 --version` (version 3.6 or above is required):
+
+**Additional context**
+
+contents of `~/.config/bpytop/error.log`
+
+(try running bpytop with `--debug` flag if error.log is empty)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..93fb3ff
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[REQUEST]"
+labels: enhancement
+assignees: aristocratos
+
+---
+
+**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/README.md b/README.md
index d5a3dfa..fbe50e9 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Also needs a UTF8 locale and a font that covers:
 
 #### Notice
 
-Dropbear seems to not be able to set correct locale. So if accessing bashtop over ssh, OpenSSH is recommended.
+Dropbear seems to not be able to set correct locale. So if accessing bpytop over ssh, OpenSSH is recommended.
 
 ## Dependencies
 
@@ -256,7 +256,7 @@ show_init=True
 #* Enable check for new version from github.com/aristocratos/bpytop at start.
 update_check=True
 
-#* Enable start in mini mode, can be toggled with ctrl+m at any time.
+#* Enable start in mini mode, can be toggled with shift+m at any time.
 mini_mode=False
 
 #* Set loglevel for "~/.config/bpytop/error.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".