diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 33ae67cc0e..8eb5664cf5 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,11 +6,9 @@ If you have found an issue with ACE3 please make sure that ACE3 really is the ca
 
 Indicate if the issue appears on stable or development version. In case it is the development version, please also include the commit SHA-1 hash.
 
-<div class="panel callout">
-    <h5>Please note:</h5>
-    <p>It's not a valid to simply remove <code>@ace</code> from the mod list to confirm that ACE3 is the culprit.</p>
-    <p>If the error happens when using a <b>third-party mod</b> contact the author of the appropriate mod and report the issue there.</p>
-</div>
+**Please note:**
+- It's not a valid to simply remove <code>@ace</code> from the mod list to confirm that ACE3 is the culprit.
+- If the error happens when using a <b>third-party mod</b> contact the author of the appropriate mod and report the issue there.
 
 ## Reporting the issue
 
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 92ba3070ce..e864049f93 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,25 +1,22 @@
-**Arma 3 Version:** `x.xx`
-*(indicate if stable, rc or dev*)
-
-**ACE3 Version:** `3.x.x`
-*(indicate if stable or dev, if dev indicate the commit the version is based on)*
+**Arma 3 Version:** `x.xx` (stable / rc / dev)
+**ACE3 Version:** `3.x.x` (stable / dev + commit hash)
 
 **Mods:**
-* `@CBA_A3`
-* `@ace`
-* ...
+- * `@CBA_A3`
+-  `@ace`
+-  ...
 
 **Placed Modules:**
-* *Add the list of modules you have placed on the map. Use 'None' if the error occurs without using any modules.*
+- Add the list of modules you have placed on the map. Use 'None' if the error occurs without any modules.
 
 **Description:**
-* *Add a detailed description of the error. This makes it easier for us to fix the issue.*
+- Add a detailed description of the error. This makes it easier for us to fix the issue.
 
 **Steps to reproduce:**
-* *Add the steps needed to reproduce the issue.*
+- Add the steps needed to reproduce the issue.
 
 **Where did the issue occur?**
-* *A possible answer might be "Dedicated Server", "Local Multiplayer", "Editor", or "Singleplayer"*
+- Dedicated / Self-Hosted Multiplayer / Singleplayer / Editor (Singleplayer) / Editor (Multiplayer) / Virtual Arsenal
 
 **RPT log file:**
-* *Add a link (pastebin.com) to the client and/or server RPT file. An instruction to find your RPT files can be [found here](https://community.bistudio.com/wiki/Crash_Files#Arma_3)*
+- Add a link ([gist](https://gist.github.com) or [pastebin](http://pastebin.com)) to the client and/or server RPT file. An instruction to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3).
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 982d6137ef..f96a900cb7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,4 @@
-### When merged this pull request will:
-
-1. *Describe what this pull request will do*
-2. *Each change in a seperate line*
-
----
-*Delete this line and everything below*
-
-- [Make sure to respect the file structure](http://ace3mod.com/wiki/development/modularity-and-pbo-structure.html)
-- [Make sure to respect the coding guidelines](http://ace3mod.com/wiki/development/coding-guidelines.html)
+**When merged this pull request will:**
+- Describe what this pull request will do
+- Each change in a separate line
+- Respect the [Development Guidelines](http://ace3mod.com/wiki/development/)