diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fd1978..bd3ba63 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,12 +32,12 @@
     <string name="title_activity_about">AboutActivity</string>
     <string name="title_activity_tap">TapActivity</string>
 
-    <string name="MailInfoTitle">Mail settings.</string>
-    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
-    <string name="CloudInfoTitle">Nextcloud settings.</string>
-    <string name="CloudInfo">Information about cloud.\nLike Nextcloud settings etc...\nAnd other stuff like:\nA button to how to page.</string>
+    <string name="MailInfoTitle">Mail Settings</string>
+    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
+    <string name="CloudInfoTitle">Nextcloud Settings</string>
+    <string name="CloudInfo">Sync and share your files, calendars, contacts and more.\nUsername: your_username@disroot.org\nPassword:you_disroot_password.</string>
     <string name="WelcomeTitle">Welcome</string>
-    <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your swiss knife to the Disroot platform, made by the community for the community.\nIf you don\'t have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:\nEtherpad, Ethercalc, Private bin, Upload, Poll, Searx and Diaspora (requires a Diaspora only account)\n\nThe app may require you to install additional apps, and not all apps can be found on the Play store, So we recommend you to install F-droid market on your device. If you haven\'t you can download it by tapping on the F-droid icon.\n</string>
+    <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your swiss knife to the Disroot platform, made by the community for the community.\nIf you don't have a Disroot account you can still use this app to access all the Disroot services that do not require one:\nEtherpad, Ethercalc, Private bin, Upload, Poll, Searx and Diaspora* (requires a Diaspora only account)\n\nThe app may require you to install additional apps, and not all apps can be found on the Play store, so we recommend you to install F-Droid app store on your device. If you haven't you can download it by tapping on the F-Droid icon.\n</string>
 
 
     <string name="help">Help</string>
@@ -54,14 +54,14 @@
     <string name="maintainersTitle">Maintainers</string>
     <string name="maintainersText">This app is currently being developed and maintained by\n\n</string>
     <string name="disrootUrl"><a href = "https://disroot.org">https://disroot.org</a></string>
-    <string name="disroot"> * Disroot community (Disroot):</string>
+    <string name="disroot"> * Disroot Community (Disroot):</string>
     <string name="contributorsTitle">Contributors</string>
-    <string name="contributors"><b>Massimiliano:</b>\n  Current developer of the Disroot app</string>
+    <string name="contributors"><b>Massimiliano:</b>\n Current developer of the Disroot app</string>
     <string name="fDroid">F-Droid</string>
     <string name="thirdparty">Third-Party Libraries</string>
     <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
     <string name="misc">Miscellaneous</string>
-    <string name="miscDio">We used Diolinx as our starting base to create this app. Go check it out, it\'s free software as well!</string>
+    <string name="miscDio">We used Diolinx as our starting base to create this app. Go check it out, it's free software as well!</string>
     <string name="miscDioBtn">Tell me more</string>
     <string name="AppSection">Application</string>
     <string name="AppVersion">App Version: %1$s</string>
@@ -70,7 +70,7 @@
     <string name="ContributeText">Disroot app is developed free as in Freedom and follows the ideas of the Disroot Foundation. If you want to contribute, go ahead! Currently we are a very small team, so we greatly appreciate any kind of help!</string>
     <string name="ContributeBtn">Get the source</string>
     <string name="Translate">Translate</string>
-    <string name="TranslateText">The app is not available in your language? You can change that! Why don\'t you help us by translating it?</string>
+    <string name="TranslateText">The app is not available in your language? You can change that! Why don't you help us by translating it?</string>
     <string name="TranslateBtn">Let me translate</string>
     <string name="Feedback">Give Feedback!</string>
     <string name="FeedbackText">Disroot app is still in development, so if you have suggestions or any kind of feedback, please let us know!</string>
@@ -82,34 +82,34 @@
     <string name="DisrootWeb">Disroot web</string>
     <string name="FirstTitle">I almost forgot</string>
     <string name="FirstInfo">You can do a long press on each icon to show you extra information…</string>
-    <string name="DiasporaTitle">Diaspora settings</string>
-    <string name="DiasporaInfo">Needs info...</string>
-    <string name="PadInfo">Pad Needs info...</string>
-    <string name="PadTitle">Etherpad info</string>
-    <string name="ChatTitle">XMPP settings</string>
-    <string name="ChatInfo">Jabber ID : Your full Disroot email address\nPassword : Your Disroot password</string>
-    <string name="CalcInfo">EtherCalc needs Info</string>
-    <string name="CalcTitle">Ethercalc Info</string>
-    <string name="BinTitle">PrivateBin Info</string>
-    <string name="BinInfo">PrivateBin needs info...</string>
-    <string name="UploadTitle">Upload Info</string>
-    <string name="UploadInfo">Upload needs Info</string>
-    <string name="SearxTitle">Searx Info</string>
-    <string name="SearxInfo">Anonymous multi search engine platform aggregating the results of other search engines while not storing information about its users.</string>
-    <string name="PollsTitle">Polls Info</string>
+    <string name="DiasporaTitle">Diaspora* Settings</string>
+    <string name="DiasporaInfo">Distribuited and descentralized social network. Post, share, like, create communities.\nUsername: your_diaspora_username@pod.disroot.org\nPassword: your_diaspora_password</string>
+    <string name="PadInfo">EtherPad</string>
+    <string name="PadTitle">Etherpad:\nWrite articles, press releases, to-do lists, etc. together with friends, fellow students or colleagues, all working on the same document at the same time.</string>
+    <string name="ChatTitle">XMPP Settings\n</string>
+    <string name="ChatInfo">Decentralized and federated instant messaging.\nJabber ID: your_Disroot_email@disroot.org\nPassword: your_Disroot_password</string>
+    <string name="CalcInfo">EtherCalc</string>
+    <string name="CalcTitle">EtherCalc: work together on inventories, survey forms, list management, brainstorming sessions and more!</string>
+    <string name="BinTitle">PrivateBin</string>
+    <string name="BinInfo">Open-source online pastebin and discussion board. Data is encrypted/decrypted in the browser so that the server has zero knowledge of hosted data. Just paste a text, click “Send”, set expiration (and other features) and share the URL.</string>
+    <string name="UploadTitle">Upload (powered by Lufi)</string>
+    <string name="UploadInfo">Upload is a file hosting software that temporarily stores encrypted files so you can share them with others using a link.</string>
+    <string name="SearxTitle">Searx</string>
+    <string name="SearxInfo"> Searx is an anonymous multi search engine platform, aggregating the results of other search engines while not storing information about its users.</string>
+    <string name="PollsTitle">Polls</string>
     <string name="PollsInfo">Framadate is an online service for planning an appointment or making a decision quickly and easily. No registration is required.</string>
-    <string name="BoardTitle">Project board Info</string>
+    <string name="BoardTitle">Project Management Board</string>
     <string name="BoardInfo">Taiga is a project management tool, developed for programmers, designers and startups working with agile methodology in mind. It can however be applied to virtually any project or group, even outside of IT realm.</string>
-    <string name="UserTitle">User Self Service Center - Info</string>
-    <string name="UserInfo">Needs Info</string>
-    <string name="StateTitle">State Info</string>
-    <string name="StateInfo">Page to see the current stare of Disroot services</string>
-    <string name="state_help">State on xmpp</string>
-    <string name="HowToTitle">How to Info</string>
-    <string name="HowToInfo">This site is dedicated to Howtos and tutorials to help you find your way around the various Disroot services.</string>
+    <string name="UserTitle">User Password Management</string>
+    <string name="UserInfo">Use our User Self Service Center to manage your user and password data</string>
+    <string name="StateTitle">State: current state of Disroot services.</string>
+    <string name="StateInfo">Here you can see if any service has a problem, if there are any performance issues, as well as get to know when we shcedule maintenance in which time some services might be unavailable</string>
+    <string name="state_help">State on XMPP</string>
+    <string name="HowToTitle">Howto Page</string>
+    <string name="HowToInfo">Our page with howtos and tutorials to help you find your way around the various Disroot services.</string>
     <string name="AboutTitle">About Info</string>
     <string name="AboutInfo">This is the about page of this app</string>
-    <string name="ForumTitle">Forum Info</string>
+    <string name="ForumTitle">Forum: create your communication platform</string>
     <string name="ForumInfo">Discourse is a fully open-source modern approach to discussion forums. It offers everything your community, group or collective needs to create their communication platform.</string>
     <string name="LogoTitle">Did you really just try the long press on the logo?</string>
     <string name="LogoInfo">Why? It\'s just a logo.\nDon\'t be too courious ;-)</string>