diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..6bda9334
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,12 @@
+---
+name: Bug report
+about: Create a report to help improve moor
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is. Please briefly describe what behavior you expected, what behavior you saw, and how the bug can be reproduced.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..cd7f86a5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - name: Discussions
+    url: https://github.com/simolus3/moor/discussions
+    about: "For questions on how to use moor, prefer a Q&A discussion over issues"
+  - name: Gitter community
+    url: https://gitter.im/moor-dart/community
+    about: "Chat room for quick questions"
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..6665601b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+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.
diff --git a/docs/content/en/_index.html b/docs/content/en/_index.html
index ce30c0e5..d1c09cdb 100644
--- a/docs/content/en/_index.html
+++ b/docs/content/en/_index.html
@@ -11,7 +11,7 @@ linkTitle: "Moor"
 		Learn moor <i class="fas fa-arrow-alt-circle-right ml-2"></i>
 	</a>
 	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://pub.dev/packages/moor_flutter">
-		Get fom pub <i class="fas fa-code ml-2 "></i>
+		Get from pub <i class="fas fa-code ml-2 "></i>
 	</a>
 
 	<p class="lead mt-5">
@@ -75,4 +75,4 @@ Here are some of the many ways moor helps you write awesome database code:
 	<li><b>Cross-Platform</b>: Moor works on iOS, Android, Linux, macOS, Windows and on the web. It doesn't even require Flutter. See <a href="{{<relref "docs/platforms.md">}}">supported platforms.</a></li>
 </ul>
 
-{{< /blocks/section >}}
\ No newline at end of file
+{{< /blocks/section >}}