diff --git a/index.php b/index.php
index 561ef73b61413ca5ea019349474dc7ce49358d17..b3a0e76b21f214b8f7a1f78ddd64b9e8137dec68 100644
--- a/index.php
+++ b/index.php
@@ -8,10 +8,10 @@ include "template.inc";
 
 $tpl = new Template("templates");
 $tpl->set_file("page","index.tpl");
-$tpl->set_var("HELLO", _("Hello and welcome to the Gajim project website"));
+$tpl->set_var("HELLO", _("Welcome to Gajim"));
 
 $array_line_begin = array(
-	0 => _("The goal of Gajim is to provide a full featured and easy to use XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas on how Gajim can be better, ")."<a href=\"https://dev.gajim.org/gajim/gajim/issues/\">"._("please send tickets")."</a>.");
+	0 => _("Gajim aims to be an easy to use and fully-featured XMPP client. It is open source and released under the GNU General Public License (GPL)."));
 
 $tpl->set_block("page","LINES_BEGIN","line");
 for ($i=0; $i<sizeof($array_line_begin); $i++) {
@@ -21,32 +21,54 @@ for ($i=0; $i<sizeof($array_line_begin); $i++) {
 
 $tpl->set_var("FEATURES_TITLE", _("FEATURES:"));
 $array_features = array(
-	0 => _("Tabbed chat window and single window modes"),
-	1 => _("Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation, minimize group chat to roster"),
-	2 => _("Emoticons, avatars, PEP (user activity, mood and tune)"),
-	3 => _("Audio / video conferences"),
-	4 => _("File transfer, room bookmarks"),
-	5 => _("Metacontacts support"),
-	6 => _("Trayicon, speller, extended chat history functionalities"),
-	7 => _("TLS, GPG and End-To-End encryption support (with SSL legacy support)"),
-	8 => _("Transport registration support"),
-	9 => _("Service discovery including nodes, user search"),
-	10 => _("Wikipedia, dictionary and search engine lookup"),
-	11 => _("Multiple accounts support"),
-	12 => _("DBus capabilities. Read")." <a href=\"https://dev.gajim.org/gajim/gajim/wikis/help/gajimdbus\">"._("more information")."</a>",
-	13 => _("XML console"),
-	14 => _("Link local (bonjour / zeroconf), BOSH"),
-	15 => _("Other features via plugins"),
-	16 => _("Gajim is available in 29 languages: Basque, Belarusian, Brasilian, British, Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, Esperanto, French, Galician, German, Hebrew, Hungarian, Italian, Japanese, Kazakh, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish, Turkish and Ukrainian"),
+	0 => _("Never miss a message, keep all your chat clients synchronized"),
+	1 => _("Invite friends to group chats or join one"),
+	2 => _("Simply send pictures, videos or other files to friends and groups"),
+	3 => _("Chat securely with End-to-End encryption via ")."<a href=\"https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin\">"._("OMEMO")."</a> "._("or ")."<a href=\"https://dev.gajim.org/gajim/gajim-plugins/wikis/pgpplugin\">"._("PGP")."</a>.",
+	4 => _("Use your favorite emoticons, set your own avatar"),
+	5 => _("Keep and manage all your chat history"),
+	6 => _("Organize your chats with tabs"),
+	7 => _("Automatic spell-checking for your messages"),
+	8 => _("Connect to other Messengers via Transports (Facebook, IRC, ...)"),
+	9 => _("Lookup things on Wikipedia, dictionaries or other search engines directly from the chat window"),
+	10 => _("What are you doing just now? Which music are you listing to this moment? How are you feeling lately? If you like, show your friends by setting your activity, tune, and mood"),
+	11 => _("Even more features via ")."<a href=\"https://dev.gajim.org/gajim/gajim-plugins/wikis/home\">"._("plugins")."</a>"._(", for example: Image Previews, Location Previews, Anti Spam, ..."),
 	);
 
-
 $tpl->set_block("page","FEATURES","features");
 for ($i=0; $i<sizeof($array_features); $i++) {
  $tpl->set_var("FEATURE", $array_features[$i]);
  $tpl->parse ("features", "FEATURES", true);
 }
 
+$tpl->set_var("ADVANCED_FEATURES_TITLE", _("ADVANCED FEATURES:"));
+$array_advanced_features = array(
+	0 => _("Support for multiple accounts"),
+	1 => _("One of your friends has accounts everywhere but you just want one contact you can easily write to? Group multiple contacts to one Meta-Contact"),
+	2 => _("XML console to see what's happening on the protocol layer"),
+	3 => _("Serverless messaging (Bonjour/Zeroconf), BOSH"),
+	4 => _("Support for Service discovery including nodes and search for users"),
+	5 => "<a href=\"https://dev.gajim.org/gajim/gajim/wikis/help/gajimdbus\">"._("DBus capabilities")."</a>",
+	);
+
+$tpl->set_block("page","ADVANCED_FEATURES","advanced_features");
+for ($i=0; $i<sizeof($array_advanced_features); $i++) {
+ $tpl->set_var("ADVANCED_FEATURE", $array_advanced_features[$i]);
+ $tpl->parse ("advanced_features", "ADVANCED_FEATURES", true);
+}
+
+$tpl->set_var("LANGUAGES_TITLE", _("LANGUAGES:"));
+$array_languages = array(
+	0 => _("Gajim is available in 29 languages: Basque, Belarusian, Brasilian, British, Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, Esperanto, French, Galician, German, Hebrew, Hungarian, Italian, Japanese, Kazakh, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Slovak, Spanish, Swedish, Turkish, and Ukrainian"),
+	1 => "<a href=\"https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate\">"._("Help translating Gajim")."</a>",
+	);
+
+$tpl->set_block("page","LANGUAGES","languages");
+for ($i=0; $i<sizeof($array_languages); $i++) {
+ $tpl->set_var("LANGUAGE", $array_languages[$i]);
+ $tpl->parse ("languages", "LANGUAGES", true);
+}
+
 $tpl->set_var("NEWS_MAIN", _("NEWS"));
 
 $array_news_title = array(
diff --git a/templates/index.tpl b/templates/index.tpl
index 49abb012caed0d3ee11fe04abfdacf3ca24cb511..8685b62e0278f3c76f2495adc0d1b1e882139f25 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -19,6 +19,26 @@
    <!-- END FEATURES -->
   </ul>
 
+    <br/>
+  <h4>{ADVANCED_FEATURES_TITLE}</h4>
+  <ul>
+   <!-- BEGIN ADVANCED_FEATURES -->
+   <li>
+    {ADVANCED_FEATURE}
+   </li>
+   <!-- END ADVANCED_FEATURES -->
+  </ul>
+
+    <br/>
+  <h4>{LANGUAGES_TITLE}</h4>
+  <ul>
+   <!-- BEGIN LANGUAGES -->
+   <li>
+    {LANGUAGE}
+   </li>
+   <!-- END LANGUAGES -->
+  </ul>
+
   <br/>
   <br/>
   <div id="news_title">