Iteration on issue and PR templates
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index f326139ba4afad..34c023c44108f6 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -1,5 +1,5 @@
 ---
-name: Bug report
+name: Report a bug with Home Assistant 
 about: Report an issue with Home Assistant
 ---
 <!-- READ THIS FIRST:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 19dd772c4e6c50..de21025840d139 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,7 +3,7 @@ contact_links:
   - name: Report a bug with the UI, Frontend or Lovelace
     url: https://github.com/home-assistant/home-assistant-polymer/issues
     about: This is the issue tracker for our backed. Please report issues with the UI in the frontend repository.
-  - name: Report incorrect/missing information on our website
+  - name: Report incorrect or missing information on our website
     urls: https://github.com/home-assistant/home-assistant.io/issues
     about: Our documentation has its own issue tracker. Please report issues with the website there.
   - name: I have a question or need support
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4951ae1a0c0aff..1ada6d3af86cd8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,7 @@
+<!--
+  You are amazing! Thanks for contributing to our project!
+  Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
+-->
 ## Breaking change
 <!--
   If your PR contains a breaking change for existing users, it is important
@@ -10,42 +14,45 @@
 
 ## Proposed change
 <!-- 
-    Describe the big picture of your changes here to communicate to the
-    maintainers why we should accept this pull request. If it fixes a bug
-    or resolves a feature request, be sure to link to that issue in the 
-    additional information section.
+  Describe the big picture of your changes here to communicate to the
+  maintainers why we should accept this pull request. If it fixes a bug
+  or resolves a feature request, be sure to link to that issue in the
+  additional information section.
 -->
 
 
 ## Type of change
 <!--
-    What types of changes does your PR introduce to our documention/website?
-    Put an `x` in the boxes that apply. You can also fill these out after
-    creating the PR.
+  What type of change does your PR introduce to Home Assistant?
+  NOTE: Please, check only 1! box! 
+  If your PR requires multiple boxes to be checked, you'll most likely need to
+  split it into multiple PRs. This makes things easier and faster to code review.
 -->
 
+- [ ] Dependency upgrade
 - [ ] Bugfix (non-breaking change which fixes an issue)
 - [ ] New integration (thank you!)
 - [ ] New feature (which adds functionality to an existing integration)
-- [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected)
+- [ ] Breaking change (fix/feature causing existing functionality to break)
 - [ ] Code quality improvements to existing code or addition of tests
 
 ## Example entry for `configuration.yaml`:
 <!--
-    Supplying a configuration snippet, makes it easier for a maintainer to test
-    your PR. Furthermore, for new integrations, it gives an impression of how
-    the configuration would look like.
-    Note: Remove this section if this PR does not have an example entry.
+  Supplying a configuration snippet, makes it easier for a maintainer to test
+  your PR. Furthermore, for new integrations, it gives an impression of how
+  the configuration would look like.
+  Note: Remove this section if this PR does not have an example entry.
 -->
 
 ```yaml
+# Example configuration.yaml
 
 ```
 
 ## Additional information
 <!--
-    Details are important, and help maintainers processing your PR.
-    Please be sure to fill out additional details, if applicable.
+  Details are important, and help maintainers processing your PR.
+  Please be sure to fill out additional details, if applicable.
 -->
 
 - This PR fixes or closes issue: fixes #
@@ -54,10 +61,10 @@
 
 ## Checklist
 <!--
-    Put an `x` in the boxes that apply. You can also fill these out after
-    creating the PR. If you're unsure about any of them, don't hesitate to ask.
-    We're here to help! This is simply a reminder of what we are going to look
-    for before merging your code.
+  Put an `x` in the boxes that apply. You can also fill these out after
+  creating the PR. If you're unsure about any of them, don't hesitate to ask.
+  We're here to help! This is simply a reminder of what we are going to look
+  for before merging your code.
 -->
 
 - [ ] The code change is tested and works locally.
@@ -69,22 +76,33 @@
 
 If user exposed functionality or configuration variables are added/changed:
 
-- [ ] Documentation added/updated in [home-assistant.io][docs-repository]
+- [ ] Documentation added/updated for [www.home-assistant.io][docs-repository]
 
 If the code communicates with devices, web services, or third-party tools:
 
-- [ ] [_The manifest file_][manifest-docs] has all fields filled out correctly. Update and include derived files by running `python3 -m script.hassfest`.
-- [ ] New or updated dependencies have been added to `requirements_all.txt` by running `python3 -m script.gen_requirements_all`.
+- [ ] The [manifest file][manifest-docs] has all fields filled out correctly.  
+      Updated and included derived files by running: `python3 -m script.hassfest`.
+- [ ] New or updated dependencies have been added to `requirements_all.txt`.  
+      Updated by running `python3 -m script.gen_requirements_all`.
 - [ ] Untested files have been added to `.coveragerc`.
 
-The integration reached or maintains the following Integration Quality Scale:
-<!-- https://developers.home-assistant.io/docs/en/next/integration_quality_scale_index.html -->
+The integration reached or maintains the following [Integration Quality Scale][quality-scale]:
+<!--
+  The Integration Quality Scale scores an integration on the code quality
+  and user experience. Each level of the quality scale consists of a list
+  of requirements. We highly recommend getting your integration scored!
+-->
 
 - [ ] No score or internal
 - [ ] 🥈 Silver
 - [ ] 🥇 Gold
 - [ ] 🏆 Platinum
 
+<!--
+  Thank you for contributing <3
+
+  Below, some useful links you could explore:
+-->
 [dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
 [manifest-docs]: https://developers.home-assistant.io/docs/en/creating_integration_manifest.html
 [quality-scale]: https://developers.home-assistant.io/docs/en/next/integration_quality_scale_index.html

## Proposed change
<!-- 
    Describe the big picture of your changes here to communicate to the
    maintainers why we should accept this pull request. If it fixes a bug
    or resolves a feature request, be sure to link to that issue in the 
    additional information section.
-->

Small iteration on the new PR & Issue templates:

- Changed title of issue template, to make it more consistent in the template chooser.
- Adjusted title of the docs bug report, apparently having a `/` in the title doesn't work.
- Improved the PR template on how it looks when editting it, also added more info to the Quality Scale and a friendly footnote 😄 

## Type of change
<!--
    What types of changes does your PR introduce to our documention/website?
    Put an `x` in the boxes that apply. You can also fill these out after
    creating the PR.
-->

- [x] Bugfix (non-breaking change which fixes an issue)
- [ ] New integration (thank you!)
- [ ] New feature (which adds functionality to an existing integration)
- [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected)
- [ ] Code quality improvements to existing code or addition of tests

## Additional information
<!--
    Details are important, and help maintainers processing your PR.
    Please be sure to fill out additional details, if applicable.
-->

- This PR fixes or closes issue: fixes #
- This PR is related to issue: 
- Link to documentation pull request: 

## Checklist
<!--
    Put an `x` in the boxes that apply. You can also fill these out after
    creating the PR. If you're unsure about any of them, don't hesitate to ask.
    We're here to help! This is simply a reminder of what we are going to look
    for before merging your code.
-->

- [x] There is no commented out code in this PR.
- [x] I have followed the [development checklist][dev-checklist]

[dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
[manifest-docs]: https://developers.home-assistant.io/docs/en/creating_integration_manifest.html
[quality-scale]: https://developers.home-assistant.io/docs/en/next/integration_quality_scale_index.html
[docs-repository]: https://github.com/home-assistant/home-assistant.io
