diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ac049b92..d9892f4a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,53 +1,25 @@
 #### General information
-
-
-* **Android Device:**
-* **Android API Version:** 
-* **App version:**
-* **App source:**
-* **Pod version:**
-
+<!-- App version can be e.g. v0.1.1
+     System e.g. Android 7.0.1, Nexus 5X
+     Pod e.g. pod.geraspora.de, v0.7.1.1 -->
 
 <!--
 I have:
 
-- At least version 0.2.0 installed, see About-> Debug. If it is not visible you have an very old version, and 
+- At least version 1.0.6 installed, see About-> Debug. If it is not visible you have an very old version, and 
   your issue will be closed.
 - searched open and closed issues for duplicates
 - read <https://github.com/Diaspora-for-Android/dandelion/blob/master/CONTRIBUTING.md>
 - not submitted translations - see [Crowdin](https://crowdin.com/project/diaspora-for-android/invite)  
 -->
 
-#### Steps to reproduce
+* **App version:** 
+* **System:** 
+* **Pod:**
 
-1. …
-2. …
-3. …
+#### Description
+What this is about, what happens and how. What needs to be done for it to happen.
 
 
-#### Expected result
-**What is the expected output?** 
-
-**What do you see instead?**
-
-
-Upload screenshots via drag&drop if needed and apply resizing:
-`<img width="30%" height="30%" src="https://cloud.githubusercontent.com/assets/67..b55.jpg">`
-
-
-#### Debug output
-
-Please post the output of adb logcat. The log should begin with the start of dandelion* and include all the steps it takes to reproduce the problem.
-IMPORTANT: In-App debug log must be activated and the app restarted first!
-
-````
-adb logcat -s com.github.dfa.diaspora_android
-````
-
-#### In-App debug log
-
-This is useful for visual bugs without application crashes
-
-````
-You can long click on the in-app debug log in order to copy it to the clipboard
-````
+#### Log
+<!-- adb logcat -s com.github.dfa.diaspora_android -->
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
new file mode 100644
index 00000000..c9066316
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,26 @@
+<!-- Hello, and thanks for contributing! -->
+
+Fixes issue #
+
+Proposed changes in this pull request:
+
+-
+-
+
+
+
+
+
+<!--
+## Contributors document
+Add yourself! When adding your information to the `CONTRIBUTORS.md` file, please use the following format:
+
+Schema:  **[Name](Reference)**<br/>~° Text 
+Where: 
+  * Name: username, first/lastname 
+  * Reference: E-Mail, Webpage 
+  * Text: Information about / kind of contribution 
+Example:
+* **[Nice Guy](http://niceguy.web)**<br/>~° German localization 
+
+-->
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index b39651e1..7969e4cd 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -28,4 +28,5 @@ Where:
 * **[Âng Iōngchun](https://pubpod.alqualonde.org/u/iongchun)**<br/>~° Chinese traditional translation
 * **[Mikkel Kirkgaard Nielsen](http://www.mikini.dk)**<br/>~° Danish translation
 * **[Jean Lucas](jean AT 4ray DOT co)**<br/>~° Spanish translation
-* **[asereze](https://github.com/asereze)**<br/>~° Sardinian translation 
+* **[asereze](https://github.com/asereze)**<br/>~° Sardinian translation
+* **[Xosé M. Lamas](http://xmgz.eu)**<br />~° Galician translation