8 files changed, 236 insertions, 137 deletions
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
index 1e2f4295..12fef6c8 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
Binary files differ
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
index 5d391452..98c6a3e8 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -37,6 +37,12 @@ msgstr "Read the documentation"
 msgid "download the extension"
 msgstr "Download the extension"
+msgid "Firefox Add-On"
+msgstr "Firefox Add-On"
+msgid "Chrome Extension"
+msgstr "Chrome Extension"
 msgid "via F-Droid"
 msgstr "via F-Droid"
@@ -140,14 +146,26 @@ msgstr "Repeat your new password:"
 msgid "Import"
 msgstr "Import"
+msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format."
+msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any fil in appropriate JSON or HTML format."
 msgid ""
 "Please execute the import script locally as it can take a very long time."
 msgstr ""
+msgid "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required."
+msgstr "Please select export file on your computer and press &ldquo;Import&rdquo; button below. wallabag will parse your file, insert all URLs and start fetching of articles if required."
 "Please execute the import script locally as it can take a very long time."
+msgid "You can click here to fetch content for articles with no content."
+msgstr "Fetch content for articles with no content"
 msgid "More info in the official documentation:"
 msgstr "More info in the official documentation:"
+msgid "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
 msgid "Import from Pocket"
 msgstr "Import from Pocket"
@@ -176,12 +194,18 @@ msgstr "to download your database."
 msgid "to export your wallabag data."
 msgstr "to export your wallabag data."
+msgid "Export JSON"
+msgstr "Export JSON"
 msgid "Cache"
 msgstr "Cache"
 msgid "to delete cache."
 msgstr "to delete cache."
+msgid "Delete Cache"
+msgstr "Delete Cache"
 msgid "You can enter multiple tags, separated by commas."
 msgstr "You can enter multiple tags, separated by commas."
@@ -417,6 +441,9 @@ msgstr "by filling this field"
 msgid "bookmarklet: drag & drop this link to your bookmarks bar"
 msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar"
+msgid "Drag &amp; drop this link to your bookmarks bar:"
+msgstr "Drag &amp; drop this link to your bookmarks bar:"
 msgid "your version"
 msgstr "your version"
@@ -435,6 +462,9 @@ msgstr "latest dev version"
 msgid "a more recent development version is available."
 msgstr "A more recent development version is available."
+msgid "You can clear cache to check the latest release."
+msgstr "You can <a href=\"#cache\">clear the cache</a> to check for the latest release."
 msgid "Please execute the import script locally, it can take a very long time."
 msgstr ""
 "Please execute the import script locally, it can take a very long time."
@@ -599,8 +629,8 @@ msgid ""
 "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
 "link</a> to get all your articles in one ebook (ePub 3 format)."
 msgstr ""
-"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
+"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate EPUB\">this "
-"link</a> to get all your articles in one ebook (ePub 3 format)."
+"link</a> to get all your articles in one ebook (EPUB 3 format)."
 msgid ""
 "This can <b>take a while</b> and can <b>even fail</b> if you have too many "
@@ -610,13 +640,13 @@ msgstr ""
 "articles, depending on your server configuration."
 msgid "Download the articles from this tag in an epub"
-msgstr "Download the articles from this tag in an epub"
+msgstr "Download the articles from this tag in an EPUB"
 msgid "Download the articles from this search in an epub"
-msgstr "Download the articles from this search in an epub"
+msgstr "Download the articles from this search in an EPUB"
 msgid "Download the articles from this category in an epub"
-msgstr "Download the articles from this category in an epub"
+msgstr "Download the articles from this category in an EPUB"
 #~ msgid "poche it!"
 #~ msgstr "poche it!"
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index fe59bd52..a09b4f37 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
Binary files differ
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index e8ca8f03..25c3aa26 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -37,6 +37,12 @@ msgstr "Read the documentation"
 msgid "download the extension"
 msgstr "Download the extension"
+msgid "Firefox Add-On"
+msgstr "Firefox Add-On"
+msgid "Chrome Extension"
+msgstr "Chrome Extension"
 msgid "via F-Droid"
 msgstr "via F-Droid"
@@ -79,6 +85,9 @@ msgstr "Latest dev version"
 msgid "A more recent development version is available."
 msgstr "A more recent development version is available."
+msgid "You can clear cache to check the latest release."
+msgstr "You can <a href=\"#cache\">clear the cache</a> to check for the latest release."
 msgid "Feeds"
 msgstr "Feeds"
@@ -140,14 +149,26 @@ msgstr "Repeat your new password:"
 msgid "Import"
 msgstr "Import"
+msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format."
+msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any file in appropriate JSON or HTML format."
 msgid ""
 "Please execute the import script locally as it can take a very long time."
 msgstr ""
 "Please execute the import script locally as it can take a very long time."
+msgid "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required."
+msgstr "Please select export file on your computer and press &ldquo;Import&rdquo; button below. wallabag will parse your file, insert all URLs and start fetching of articles if required."
+msgid "You can click here to fetch content for articles with no content."
+msgstr "Fetch content for articles with no content"
 msgid "More info in the official documentation:"
 msgstr "More info in the official documentation:"
+msgid "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
 msgid "Import from Pocket"
 msgstr "Import from Pocket"
@@ -176,12 +197,18 @@ msgstr "to download your database."
 msgid "to export your wallabag data."
 msgstr "to export your wallabag data."
+msgid "Export JSON"
+msgstr "Export JSON"
 msgid "Cache"
 msgstr "Cache"
 msgid "to delete cache."
 msgstr "to delete cache."
+msgid "Delete Cache"
+msgstr "Delete Cache"
 msgid "You can enter multiple tags, separated by commas."
 msgstr "You can enter multiple tags, separated by commas."
@@ -417,6 +444,9 @@ msgstr "by filling this field"
 msgid "bookmarklet: drag & drop this link to your bookmarks bar"
 msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar"
+msgid "Drag &amp; drop this link to your bookmarks bar:"
+msgstr "Drag &amp; drop this link to your bookmarks bar:"
 msgid "your version"
 msgstr "your version"
@@ -576,14 +606,13 @@ msgid "Type here your password"
 msgstr "Enter your password"
 msgid "You are the only user, you cannot delete your own account."
-msgstr "You are the only user, you cannot delete your own account."
+msgstr "You cannot delete your account because you are the only user."
 msgid ""
 "To completely remove wallabag, delete the wallabag folder on your web server "
 "(and eventual databases)."
 msgstr ""
-"To completely remove wallabag, delete the wallabag folder on your web server "
+"To completely remove wallabag, delete the wallabag folder and database(s) from your web server."
-"(and eventual databases)."
 msgid "Enter your search here"
 msgstr "Enter your search here"
@@ -599,8 +628,8 @@ msgid ""
 "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
 "link</a> to get all your articles in one ebook (ePub 3 format)."
 msgstr ""
-"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
+"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate EPUB\">this "
-"link</a> to get all your articles in one ebook (ePub 3 format)."
+"link</a> to get all your articles in one ebook (EPUB 3 format)."
 msgid ""
 "This can <b>take a while</b> and can <b>even fail</b> if you have too many "
@@ -610,13 +639,13 @@ msgstr ""
 "articles, depending on your server configuration."
 msgid "Download the articles from this tag in an epub"
-msgstr "Download the articles from this tag in an epub"
+msgstr "Download the articles from this tag in an EPUB"
 msgid "Download the articles from this search in an epub"
-msgstr "Download the articles from this search in an epub"
+msgstr "Download the articles from this search in an EPUB"
 msgid "Download the articles from this category in an epub"
-msgstr "Download the articles from this category in an epub"
+msgstr "Download the articles from this category in an EPUB"
 #~ msgid "poche it!"
 #~ msgstr "poche it!"
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 3523cd08..2b967cd4 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -6,30 +6,29 @@
 {% endblock %}
 {% block content %}
            <h2>{% trans "Saving articles" %}</h2>
-            <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
+            <p>{% trans "There are several ways to save an article:" %} {% trans "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)" %}</p>
+            <p>
+                <form method="get" action="index.php">
+                    <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
+                    <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
+                    <input type="submit" value="{% trans "bag it!" %}" />
+                </form>
+            </p>
+            <h3>Browser Plugins</h3>
            <ul>
-                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
-                <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
+                <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
-                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
-                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
-                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li>
-                <li>
-                    <form method="get" action="index.php">
-                        <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
-                        <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
-                        <input type="submit" value="{% trans "bag it!" %}" />
-                    </form>
-                </li>
-                <li>{% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %} <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a></li>
            </ul>
+            <h3>Mobile Apps</h3>
-            <h2>{% trans "Upgrading wallabag" %}</h2>
            <ul>
-                <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li>
+                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
-                <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
+                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
-                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
+                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" target="_blank">{% trans "download the application" %}</a></li>
            </ul>
-            <p>{% trans "You can clear cache to check the latest release." %}</p>
+                <h3>{% trans "Bookmarklet" %}</h3>
+                <p>
+                {% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a>
+                </p>
            <h2>{% trans "Feeds" %}</h2>
            {% if token == '' %}
@@ -40,9 +39,11 @@
                <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
                <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
            </ul>
-            <p>{% trans "Your token:" %} <strong>{{token}}</strong></p>
+            <p class="more-info">
-            <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p>
+              {% trans "Your token:" %} <strong>{{token}}</strong><br>
-            <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
+              {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
+              {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
+            </p>
            {% endif %}
            <h2>{% trans "Change your theme" %}</h2>
@@ -83,6 +84,35 @@
                <input type="hidden" name="token" value="{{ token }}">
            </form>
+            <h2><a name="import"></a>{% trans "Import" %}</h2>
+            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
+            <p>{% trans "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required." %}</p>
+            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
+                <fieldset class="w500p">
+                    <div class="row">
+                        <label class="col w150p" for="file">{% trans "File:" %}</label>
+                        <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
+                    </div>
+                    <div class="row mts txtcenter">
+                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
+                    </div>
+                </fieldset>
+            </form>
+            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
+            <p class="more-info">{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
+            <h2>{% trans "Export your wallabag data" %}</h2>
+            <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
+            <span class="more-info">Data will be exported in a single JSON file.</span></p>
+            <h2>{% trans "Fancy an E-Book ?" %}</h2>
+            <p><a href="./?epub&amp;method=all" title="Generate ePub">Download E-Book</a><br>
+            <span class="more-info">{% trans "Articles will be exported as a single E-book file (EPUB 3 format)." %} {% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</span></p>
+            <h2><a name="cache"></a>{% trans "Cache" %}</h2>
+            <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
+            <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
            {% if http_auth == 0 %}
            <h2>{% trans "Change your password" %}</h2>
            <form method="post" action="?config" name="loginform">
@@ -104,34 +134,7 @@
            </form>
            {% endif %}
-            <h2>{% trans "Import" %}</h2>
-            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
-            <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
-            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
-                <fieldset class="w500p">
-                    <div class="row">
-                        <label class="col w150p" for="file">{% trans "File:" %}</label>
-                        <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
-                    </div>
-                </fieldset>
-            </form>
-            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
-            
-            <h2>{% trans "Export your wallabag data" %}</h2>
-            <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
-            
-            <h2>{% trans "Fancy an E-Book ?" %}</h2>
-            <p>{% trans "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
-            <br>{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</p>
-            <h2>{% trans "Cache" %}</h2>
-            <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
            <h2>{% trans 'Add user' %}</h2>
-            <p>{% trans 'Add a new user :' %}</p>
            <form method="post" action="?newuser">
                <fieldset class="w500p">
                <div class="row">
@@ -147,7 +150,7 @@
                    <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
                </div>
                <div class="row mts txtcenter">
-                    <button type="submit">{% trans "Send" %}</button>   
+                    <button type="submit">{% trans "Add user" %}</button>
                </div>
                </fieldset>
            </form>
@@ -161,9 +164,18 @@
                    <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
                </div>
            <div class="row mts txtcenter">
-                <button type="submit">{% trans "Send" %}</button>
+                <button type="submit">{% trans "Delete account" %}</button>
            </div>
            </form>
-            {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
+            {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
-            {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
+            <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
+            <h2>{% trans "Upgrading wallabag" %}</h2>
+            <ul>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
+                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
+            </ul>
+            <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
 {% endblock %}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 924ab5ef..028c8b4e 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -70,7 +70,7 @@ h2, h3, h4 {
  text-transform: uppercase;
 }
-p, li {
+p, li, label {
  color: #666;
 }
@@ -281,12 +281,12 @@ h2:after {
 #listmode a:hover {
  opacity: 1;
 }
-.tablemode {
+#listmode.tablemode {
  background-image: url("../img/baggy/table.png");
  background-repeat: no-repeat;
  background-position: bottom;
 }
-.listmode {
+#listmode.listmode {
  background-image: url("../img/baggy/list.png");
  background-repeat: no-repeat;
  background-position: bottom;
@@ -331,7 +331,7 @@ footer a {
  margin-bottom: 2em;
 }
-.estimatedTime a {
+.estimatedTime .reading-time {
  color: #999;
  font-style: italic;
  font-weight: normal;
@@ -418,6 +418,7 @@ footer a {
 .entrie h2 {
  text-transform: none;
  margin-bottom: 0;
+  line-height: 1.2;
 }
  .entrie h2:after {
@@ -774,6 +775,16 @@ a.add-to-wallabag-link-after:after {
  width: 100%;
 }
+.more-info {
+        font-size: 0.85em;
+  line-height: 1.5;
+        color: #aaa;
+}
+        .more-info a {
+                color: #aaa;
+        }
 /* ==========================================================================
   5 = Article
   ========================================================================== */
@@ -799,6 +810,10 @@ blockquote {
  margin: 0;
 }
+#article h1 {
+  text-align: left;
+}
 #article h2, #article h3, #article h4 {
  text-transform: none;
 }
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 03de6b9b..dec848f2 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -41,9 +41,9 @@
                <div id="entry-{{ entry.id|e }}" class="entrie">
                    <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
                    {% if entry.content| getReadingTime > 0 %}
-                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
+                        <div class="estimatedTime"><span class="tool reading-time">{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
                    {% else %}
-                        <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
+                        <div class="estimatedTime"><span class="tool reading-time">{% trans "estimated reading time :" %} <small class="inferieur">&lt;</small> 1 min</span></div>
                    {% endif %}
                    <ul class="tools links">
                        <li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
@@ -57,14 +57,14 @@
                {% endfor %}
            </div>
            {{ block('pager') }}
-            {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a>{% endif %}{% endif %}
+            {% if view == 'home' %}{% if nb_results > 1 %}<p><a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a></p>{% endif %}{% endif %}
-            {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
+            {% if searchterm is defined %}<p><a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
-{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}
+{% trans "Tag these results as" %} {{ searchterm }}</p></a>{% endif %}
            
-            {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
+            {% if tag %}<p><a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</p></a>
-            {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>
+            {% elseif search_term is defined %}<p><a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</p></a>
-            {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
+            {% else %}<p><a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a></p>{% endif %}
            
            {% endif %}
 {% endblock %}
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 36b66e88..082e179f 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -6,29 +6,29 @@
 {% endblock %}
 {% block content %}
            <h2>{% trans "Saving articles" %}</h2>
-            <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
+            <p>{% trans "There are several ways to save an article:" %} {% trans "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)" %}</p>
+            <p>
+                <form method="get" action="index.php">
+                    <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
+                    <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
+                    <input type="submit" value="{% trans "bag it!" %}" />
+                </form>
+            </p>
+            <h3>Browser Plugins</h3>
            <ul>
-                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
-                <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
+                <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
-                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
-                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
-                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li>
-                <li>
-                    <form method="get" action="index.php">
-                        <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
-                        <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
-                        <input type="submit" value="{% trans "bag it!" %}" />
-                    </form>
-                </li>
-                <li>{% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %} <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a></li>
            </ul>
+            <h3>Mobile Apps</h3>
-            <h2>{% trans "Upgrading wallabag" %}</h2>
            <ul>
-                <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li>
+                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
-                <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>
+                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
-                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>{% endif %}
+                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" target="_blank">{% trans "download the application" %}</a></li>
            </ul>
+                <h3>{% trans "Bookmarklet" %}</h3>
+                <p>
+                {% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a>
+                </p>
            <h2>{% trans "Feeds" %}</h2>
            {% if token == '' %}
@@ -39,14 +39,16 @@
                <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
                <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
            </ul>
-            <p>{% trans "Your token:" %} <strong>{{token}}</strong></p>
+            <p class="more-info">
-            <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p>
+              {% trans "Your token:" %} <strong>{{token}}</strong><br>
-            <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
+              {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
+              {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
+            </p>
            {% endif %}
            
            <h2>{% trans "Change your theme" %}</h2>
            <form method="post" action="?updatetheme" name="changethemeform">
-                <fieldset class="w500p">
+                <fieldset class="w500p inline">
                    <div class="row">
                        <label class="col w150p" for="theme">{% trans "Theme:" %}</label>
                        <select class="col" id="theme" name="theme">
@@ -65,7 +67,7 @@
            <h2>{% trans "Change your language" %}</h2>
            <form method="post" action="?updatelanguage" name="changelanguageform">
-                <fieldset class="w500p">
+                <fieldset class="w500p inline">
                    <div class="row">
                        <label class="col w150p" for="language">{% trans "Language:" %}</label>
                        <select class="col" id="language" name="language">
@@ -82,6 +84,35 @@
                <input type="hidden" name="token" value="{{ token }}">
            </form>
+            <h2><a name="import"></a>{% trans "Import" %}</h2>
+            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
+            <p>{% trans "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required." %}</p>
+            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
+                <fieldset class="w500p">
+                    <div class="row">
+                        <label class="col w150p" for="file">{% trans "File:" %}</label>
+                        <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
+                    </div>
+                    <div class="row mts txtcenter">
+                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
+                    </div>
+                </fieldset>
+            </form>
+            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
+            <p class="more-info">{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
+            <h2>{% trans "Export your wallabag data" %}</h2>
+            <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
+            <span class="more-info">Data will be exported in a single JSON file.</span></p>
+            <h2>{% trans "Fancy an E-Book ?" %}</h2>
+            <p><a href="./?epub&amp;method=all" title="Generate ePub">Download E-Book</a><br>
+            <span class="more-info">{% trans "Articles will be exported as a single E-book file (EPUB 3 format)." %} {% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</span></p>
+            <h2><a name="cache"></a>{% trans "Cache" %}</h2>
+            <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
+            <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
            {% if http_auth == 0 %}
            <h2>{% trans "Change your password" %}</h2>
            <form method="post" action="?config" name="loginform">
@@ -102,55 +133,28 @@
                <input type="hidden" name="token" value="{{ token }}">
            </form>
            {% endif %}
-            <h2>{% trans "Import" %}</h2>
-            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
-            <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
-            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
-                <fieldset class="w500p">
-                    <div class="row">
-                        <label class="col w150p" for="file">{% trans "File:" %}</label>
-                        <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
-                    </div>
-                </fieldset>
-            </form>
-            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
-            <h2>{% trans "Export your wallabag data" %}</h2>
-            <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
-            <h2>{% trans "Cache" %}</h2>
-            <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
-            
-            <h2>{% trans "Fancy an E-Book ?" %}</h2>
-            <p>{% trans "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
-            <br>{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</p>
            
            <h2>{% trans 'Add user' %}</h2>
-            <p>{% trans 'Add a new user :' %}</p>
            <form method="post" action="?newuser">
                <fieldset class="w500p">
                <div class="row">
                    <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
-                    <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}">
+                    <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
                </div>
                <div class="row">
                    <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
-                    <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
+                    <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
                </div>
                <div class="row">
                    <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
                    <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
                </div>
                <div class="row mts txtcenter">
-                    <button type="submit">{% trans "Send" %}</button>   
+                    <button type="submit">{% trans "Add user" %}</button>
                </div>
                </fieldset>
            </form>
-            
            <h2>{% trans "Delete account" %}</h2>
            {% if not only_user %}<form method="post" action="?deluser">
            <p>{% trans "You can delete your account by entering your password and validating." %}<br /><b>{% trans "Be careful, data will be erased forever (that is a very long time)." %}</b></p>
@@ -160,9 +164,18 @@
                    <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
                </div>
            <div class="row mts txtcenter">
-                <button type="submit">{% trans "Send" %}</button>
+                <button type="submit">{% trans "Delete account" %}</button>
            </div>
            </form>
-            {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
+            {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
-            {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
+            <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
+            <h2>{% trans "Upgrading wallabag" %}</h2>
+            <ul>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
+                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
+            </ul>
+            <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
 {% endblock %}