diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..1553010e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,2 @@
+* **Platform** [ Raspberry Pi 2/3, Windows, Mac OS X, Linux]:
+* **Node Version** [ 0.12.13 or later ]:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..35c40ef3
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+* Does the pull request solve a **related** issue? [yes | no]
+
+* If so, can you reference the issue?
+
+* What does the pull request accomplish? (please list)
diff --git a/README.md b/README.md
index 89d35354..60fba952 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![Dependency Status](https://david-dm.org/MichMich/MagicMirror/v2-beta.svg)](https://david-dm.org/MichMich/MagicMirror/v2-beta)
 [![devDependency Status](https://david-dm.org/MichMich/MagicMirror/v2-beta/dev-status.svg)](https://david-dm.org/MichMich/MagicMirror/v2-beta#info=devDependencies)
+[![Node Version](https://img.shields.io/badge/node-v5.10.1-brightgreen.svg)](https://nodejs.org/dist/latest)
 
 This version of the Magic Mirror software focusses on a modular plugin system. Besides that, the MagicMirror² software now also uses [Electron](http://electron.atom.io/), so no more webserver or browser installs necessary.
 
@@ -33,7 +34,7 @@ curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/v2-beta/installe
 
 **Important:** `npm start` does **not** work via SSH, use `DISPLAY=:0 nohup npm start &` instead. This starts the mirror on the remote display.
 
-#### Server only
+#### Server Only
 
 In some cases, you want to start the application without an actual app window. In this case, exectute the following command from the MagicMirror folder: `node serveronly`. This will start the server, after which you can open the application in your browser of choice.
 
diff --git a/issue_template.md b/issue_template.md
deleted file mode 100644
index a2cb168b..00000000
--- a/issue_template.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Platform: [Raspberry Pi 2, Raspberry Pi 3, Mac, Windows, ...]
-Operating System: [Jessie, OS X, Windows 10, ...]
-Node version: 
-
-