diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index ec7a896dc..89c3bb2eb 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -130,13 +130,13 @@ For **Qt-UI files** (*.ui*): 2 spaces
 #include "MyWidget.h"
 #include "ui_MyWidget.h"
 
-// Global includes
-#include <QWidget>
-#include <stdin>
-
 // Application includes
 #include "core/Config.h"
 #include "core/FilePath.h"
+
+// Global includes
+#include <QWidget>
+#include <stdin>
 ```
 
 #### Classes
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index be6abf986..5850e30a3 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,5 @@
 [TIP]:  # ( Provide a general summary of the issue in the title above ^^ )
+[TIP]:  # ( Do not include screenshots of your actual database! )
 
 ## Expected Behavior
 [NOTE]: # ( If you're describing a bug, tell us what should happen )
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 244a4c477..89b548554 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,12 +15,12 @@
 
 
 ## Screenshots
-[TIP]:  # ( Do not include screenshots of your actual repository! )
+[TIP]:  # ( Do not include screenshots of your actual database! )
 
 
 ## Testing strategy
 [NOTE]: # ( Please describe in detail how you tested your changes. )
-[TIP]:  # ( We expect all new code to be covered by unit tests! )
+[TIP]:  # ( We expect new code to be covered by unit tests and documented with doc blocks! )
 
 
 ## Checklist: