diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9899b3a..ef7b4f8 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,17 +1,19 @@
-| Q            | A
-| ------------ | ---
-| Bug?         | no
-| Version Used | Specific tag or commit sha
-| New Feature? | no
+| Q              | A
+| -------------- | ---
+| Bug?           | no
+| New Feature?   | no
+| Version Used   | Specific tag or commit sha
+| FFmpeg Version | FFmpeg or AVConv and version
+| OS             | Your OS and version
+
+#### Actual Behavior
+
+How does PHP-FFMpeg behave at the moment?
 
 #### Expected Behavior
 
 What is the behavior you expect?
 
-#### Actual Behavior
-
-How does Sulu behave at the moment? 
-
 #### Steps to Reproduce
 
 What are the steps to reproduce this bug? Please add code examples,
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2a25088..49205d2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,9 @@
 | Q                  | A
 | ------------------ | ---
-| Bug fix?           | yes
-| New feature?       | yes
-| BC breaks?         | yes
-| Deprecations?      | yes
+| Bug fix?           | no
+| New feature?       | no
+| BC breaks?         | no
+| Deprecations?      | no
 | Fixed tickets      | fixes #issuenum
 | Related issues/PRs | #issuenum
 | License            | MIT
@@ -18,7 +18,7 @@ Which problem does the PR fix?
 
 #### Example Usage
 
-~~~php
+```php
 $foo = new Foo();
 
 // Now we can do