diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 00000000..a1bcd202
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,32 @@
+## Submitting issues
+
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+  - Go to "Issues" and type any word in the top search/command bar.
+  - Consider to search on closed issues. To do that just remove "is:open" from the search field.
+  - More info on [search syntax within github](https://help.github.com/articles/searching-issues)
+* Report the issue using our [template][template], it includes all the information we need to track down the issue.
+
+Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
+
+[template]: https://github.com/saenzramiro/rambox/blob/master/.github/ISSUE_TEMPLATE.md
+
+## Share your Custom Services
+
+If you consider there are other users that can use your Custom Service, we have a repo for this: [Rambox Services Contrib][rambox-services-contrib].
+
+[rambox-services-contrib]: https://github.com/saenzramiro/rambox-services-contrib
+
+## Ask for help
+
+We have a great community in [Gitter][gitter] that can help you with any doubt or problem.
+
+[gitter]: https://gitter.im/saenzramiro/rambox
+
+## Contributing to Source Code
+
+Feel free to create pull requests to help us offer a great and complete software. :wink:
+
+## Translations
+Please submit translations via [Transifex][transifex].
+
+[transifex]: https://www.transifex.com/rambox/rambox-app/
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..b97779e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,25 @@
+<!-- Please complete the follow issue template. If is not an issue, feel free to remove the steps and behaviors -->
+
+### Steps to reproduce
+
+1. 
+2. 
+3. 
+
+### Expected behavior
+
+<!-- Write here -->
+
+### Actual behavior
+
+<!-- Write here -->
+
+### ENVIRONMENT
+
+<!-- Complete your environment -->
+
+> Rambox: v0.X.X
+
+> OS: XXXX
+
+> Arch: x64 or ia32
diff --git a/README.md b/README.md
index 8a595aa5..2db13eb1 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
 
 ![Rambox](https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/screenshots/mac.png)
 
-## Services available - 33
+## Services available - 44
 
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/whatsapp.png" alt="WhatsApp" title="WhatsApp">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/messenger.png" alt="Messenger" title="Messenger">
@@ -71,8 +71,13 @@
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/zinc.png" alt="Zinc" title="Zinc">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/freenode.png" alt="FreeNode" title="FreeNode">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/mightytext.png" alt="MightyText" title="MightyText">
+<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/zohoemail.png" alt="Zoho Email" title="Zoho Email">
+<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/zohochat.png" alt="Zoho Chat" title="Zoho Chat">
+<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/roundcube.png" alt="Roundcube" title="Roundcube">
+<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/horde.png" alt="Horde" title="Horde">
+<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/squirrelmail.png" alt="SquirrelMail" title="SquirrelMail">
 
-<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 
 ## Features
 
@@ -84,11 +89,17 @@
 - [x] Minimize to tray.
 - [x] Mute audio to specific service.
 - [x] Separate tabs floating to the right.
+- [x] Go Offline on specific service.
+- [x] Start automatically on system startup.
+- [x] Custom Code Injection.
+- [x] Keyboard Shortcuts.
 
 ## Privacy
 
 No personal information will be saved
 
+Sessions will persist using the [partition:persist](http://electron.atom.io/docs/api/web-view-tag/#partition) attribute for Webviews. So every time you open Rambox, your sessions will keep alive until you remove the service.
+
 Sync feature use Auth0 for Single Sign On & Token Based Authentication with the integration with Firebase to store the services that user is using (and the configuration for each service). You are always welcome to check the code! ;)
 
 ## [Install on Linux - Steps](https://github.com/saenzramiro/rambox/wiki/Install-on-Linux)