29 files changed, 147 insertions, 116 deletions
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 0079b228..206d5aae 100644
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -2,7 +2,6 @@
        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
-        <link href='http://fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">
@@ -10,4 +9,4 @@
        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
        <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
        <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
-\ No newline at end of file
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig
index 3e7a2cbf..e9cd9d4a 100644
--- a/themes/baggy/_menu.twig
+++ b/themes/baggy/_menu.twig
@@ -4,6 +4,9 @@
                <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
                <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
+                <li><a href="javascript: void(null);" id="pocheit">{% trans "save a link" %}</a></li>
                <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                <li><a class="icon icon-power" href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
-            </ul>
-\ No newline at end of file
+            </ul>
+            {% include '_pocheit-form.twig' %}
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 598409b9..b37ac115 100644
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -14,8 +14,8 @@
                <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
                <li>
                    <form method="get" action="index.php">
-                        <label class="addurl" for="plainurl">{% trans "By filling this field" %}:</label>
+                        <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
-                        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+                        <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
                        <input type="submit" value="{% trans "bag it!" %}" />
                    </form>
                </li>
@@ -69,7 +69,7 @@
                        <label class="col w150p" for="language">{% trans "Language:" %}</label>
                        <select class="col" id="language" name="language">
                            {% for language in languages %}
-                            <option value="{{ language.name }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
+                            <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
                            {% endfor %}
                        </select>
                    </div>
diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css
index e69de29b..7c02a16f 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/css/font.css
@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'PT Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff');
+}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 45211a87..3e128b08 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -254,6 +254,7 @@ footer {
  color: #999;
  font-size: 0.8em;
  font-style: italic;
+  z-index: 20;
 }
 footer a {
@@ -473,11 +474,11 @@ footer a {
   
 @font-face {
  font-family: 'icomoon';
-  src:url('../font/icomoon.eot?-s0mcsx');
+  src:url('../fonts/icomoon.eot?-s0mcsx');
-  src:url('../font/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
+  src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
-    url('../font/icomoon.woff?-s0mcsx') format('woff'),
+    url('../fonts/icomoon.woff?-s0mcsx') format('woff'),
-    url('../font/icomoon.ttf?-s0mcsx') format('truetype'),
+    url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'),
-    url('../font/icomoon.svg?-s0mcsx#icomoon') format('svg');
+    url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@@ -563,7 +564,8 @@ footer a {
   ========================================================================== */
 .messages {
-  text-align: center;
+  text-align: left;
+  margin-top: 1em;
 }
 .messages > * { display: inline-block;}
@@ -818,4 +820,4 @@ blockquote {
  #article_toolbar a {
    padding: 0.3em 0.4em 0.2em;
  }
-}
-\ No newline at end of file
+}
diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css
index 0cd89a9e..42da70b3 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/css/messages.css
@@ -1,19 +1,19 @@
-.messages.error {
+.messages.error.install {
    border: 1px solid #c42608;
    color: #c00 !important;
    background: #fff0ef;
    text-align: left;
 }
-.messages.notice {
+.messages.notice.install {
    border: 1px solid #ebcd41;
    color: #000;
    background: #fffcd3;
    text-align: left;
 }
-.messages.success {
+.messages.success.install {
    border: 1px solid #6dc70c;
-    background: #e0fbcc;
+    background: #e0fbcc !important;
    text-align: left;
 }
 \ No newline at end of file
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index 9f11a2c3..9e9012ee 100644
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -4,6 +4,9 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
+<div id="article">
+  <h2>{{ entry.title|raw }}</21>
+</div>
 {% if tags is empty %}
 <div class="notags">no tags</div>
 {% endif %}
@@ -11,10 +14,10 @@
 {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
 <form method="post" action="./?action=add_tag">
-    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
-    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
    <input type="hidden" name="entry_id" value="{{ entry_id }}" />
+    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
    <input type="submit" value="Tag" />
+    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
 </form>
 <a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
 {% endblock %}
diff --git a/themes/baggy/font/icomoon.eot b/themes/baggy/fonts/icomoon.eot
index 02f53b36..02f53b36 100755
--- a/themes/baggy/font/icomoon.eot
+++ b/themes/baggy/fonts/icomoon.eot
Binary files differ
diff --git a/themes/baggy/font/icomoon.svg b/themes/baggy/fonts/icomoon.svg
index d9c35b98..d9c35b98 100755
--- a/themes/baggy/font/icomoon.svg
+++ b/themes/baggy/fonts/icomoon.svg
diff --git a/themes/baggy/font/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf
index 3860dd04..3860dd04 100755
--- a/themes/baggy/font/icomoon.ttf
+++ b/themes/baggy/fonts/icomoon.ttf
Binary files differ
diff --git a/themes/baggy/font/icomoon.woff b/themes/baggy/fonts/icomoon.woff
index c3a91ed7..c3a91ed7 100755
--- a/themes/baggy/font/icomoon.woff
+++ b/themes/baggy/fonts/icomoon.woff
Binary files differ
diff --git a/themes/baggy/fonts/ptsans.woff b/themes/baggy/fonts/ptsans.woff
new file mode 100644
index 00000000..cf7c62e1
--- /dev/null
+++ b/themes/baggy/fonts/ptsans.woff
Binary files differ
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 33afdbbd..4f9db063 100644
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -12,6 +12,9 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
+            {% if tag %}
+                <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
+            {% endif %}
            {% if entries is empty %}
            <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
            {% else %}
@@ -40,7 +43,7 @@
                    </ul>
                    <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
                </div>
-            
                {% endfor %}
            </div>
            {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index e4751a41..645db376 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -24,7 +24,7 @@
                                                </div>
                                        </div>
                                        <div class="row mts txtcenter">
-                                                <button class="bouton" type="submit" tabindex="4">{% trans "Login" %}</button>
+                                                <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
                                        </div>
                </fieldset>
                <input type="hidden" name="returnurl" value="{{ referer }}">
diff --git a/themes/baggy/tag.twig b/themes/baggy/tag.twig
deleted file mode 100644
index 141ac909..00000000
--- a/themes/baggy/tag.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}tag {% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-    <h3>{% trans "Tag" %} {{ tag.value }}</h3>
-    {% if entries is empty %}
-    <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
-    {% else %}
-        {% block pager %}
-            {% if nb_results > 1 %}
-        <div class="results">
-            <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
-                {{ page_links | raw }}
-        </div>
-            {% endif %}
-        {% endblock %}
-    <div class="list-entries">    
-        {% for entry in entries %}
-            <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>
-                 <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>
-                    <li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
-                    <li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
-                    <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
-                </ul>
-                <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
-            </div>
-        {% endfor %}
-    </div>
-    {% endif %}
-{% endblock %}
-\ No newline at end of file
diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig
index 1367ebe8..416cfa43 100755
--- a/themes/courgette/home.twig
+++ b/themes/courgette/home.twig
@@ -14,8 +14,8 @@
 {% block precontent %}
            {% if entries|length > 1 %}
            <ul id="sort">
-                <li><a href="./?sort=ia&amp;view={{ view }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
+                <li><a href="./?sort=ia&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-                <li><a href="./?sort=ta&amp;view={{ view }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
+                <li><a href="./?sort=ta&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
            </ul>
            {% endif %}
 {% endblock %}
diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig
index 02bec1dc..55583b3d 100644
--- a/themes/default/_menu.twig
+++ b/themes/default/_menu.twig
@@ -3,6 +3,9 @@
                <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
                <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
+                <li><a href="javascript: void(null);" id="pocheit">{% trans "save a link" %}</a><span id="pocheit-arrow"></span></li>
                <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
-            </ul>
-\ No newline at end of file
+            </ul>
+            {% include '_pocheit-form.twig' %}
diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig
new file mode 100755
index 00000000..13096159
--- /dev/null
+++ b/themes/default/_pocheit-form.twig
@@ -0,0 +1,22 @@
+<div id="pocheit-form" class="messages info">
+    <center>
+    <form method="get" action="index.php">
+        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+        <input type="submit" value="{% trans "save link!" %}" />
+    </form>
+    </center>
+</div>
+<script type="text/javascript">
+    $(document).ready(function() {
+        $("#pocheit-form").hide();
+        $("#pocheit").click(function(){
+            $("#pocheit-form").toggle();
+            $("#pocheit").toggleClass("current");
+            $("#pocheit-arrow").toggleClass("arrow-down");
+        });
+    });
+</script>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index df62520a..cd4d074d 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -5,8 +5,8 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
-            <h2>{% trans "Poching links" %}</h2>
+            <h2>{% trans "Saving articles" %}</h2>
-            <p>{% trans "There are several ways to poche a link:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
+            <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
            <ul>
                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</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>
@@ -14,19 +14,19 @@
                <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
                <li>
                    <form method="get" action="index.php">
-                        <label class="addurl" for="plainurl">{% trans "By filling this field" %}:</label>
+                        <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
-                        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+                        <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
-                        <input type="submit" value="{% trans "poche it!" %}" />
+                        <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 "poche it!" %}</a></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>
-            <h2>{% trans "Updating poche" %}</h2>
+            <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 %}</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 %}
+                {% 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 %}
            </ul>
            <h2>{% trans "Feeds" %}</h2>
@@ -69,7 +69,7 @@
                        <label class="col w150p" for="language">{% trans "Language:" %}</label>
                        <select class="col" id="language" name="language">
                            {% for language in languages %}
-                            <option value="{{ language.name }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
+                            <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
                            {% endfor %}
                        </select>
                    </div>
@@ -104,16 +104,19 @@
            <h2>{% trans "Import" %}</h2>
            <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
-            <p>{% trans "More info in the official docs:" %} <a href="http://doc.wallabag.org/doku.php?id=users:migrate">wallabag.org</a></p>
+            <p>{% trans "More info in the official documentation:" %} <a href="http://doc.wallabag.org/doku.php?id=users:migrate">wallabag.org</a></p>
            <ul>
                <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
                <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
                <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
-                <li><a href="./?import&amp;from=poche">{% trans "Import from poche" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCHE_FILE')) }}</li>
+                <li><a href="./?import&amp;from=poche">{% trans "Import from wallabag" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCHE_FILE')) }}</li>
            </ul>
-            <h2>{% trans "Export your poche data" %}</h2>
+            <h2>{% trans "Export your wallabag data" %}</h2>
            {% if constant('STORAGE') == 'sqlite' %}
            <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
-            <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche data." %}</p>
+            <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>
 {% endblock %}
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 2088ee2e..28675907 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -334,3 +334,16 @@ a.bad-display span,
 a.reading-time span {
    background-repeat: no-repeat;
 }
+.arrow-down {
+    width: 0px;
+    height: 0px;
+    border-style: solid;
+    border-width: 10px 10px 0 10px;
+    border-color: #000 transparent transparent transparent;
+    position: absolute;
+    margin-top: 1.5em;
+    margin-left: -30px;
+}
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index 53852d39..83f04aa0 100644
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -4,6 +4,13 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
+<div id="article">
+  <header class="mbm">
+      <h1>{{ entry.title|raw }}</h1>
+  </header>
+</div>
 {% if tags is empty %}
 no tags
 {% endif %}
@@ -11,10 +18,12 @@ no tags
 {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
 <form method="post" action="./?action=add_tag">
-    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
-    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
    <input type="hidden" name="entry_id" value="{{ entry_id }}" />
+    <label for="value">Add tags: </label>
+    <input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
    <input type="submit" value="Tag" />
+    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
 </form>
-<a href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
+<a href="./?view=view&id={{ entry_id }}">&laquo; {% trans "return to article" %}</a>
 {% endblock %}
diff --git a/themes/default/home.twig b/themes/default/home.twig
index cbe8c62f..165fecc6 100644
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -14,12 +14,16 @@
 {% block precontent %}
            {% if entries|length > 1 %}
            <ul id="sort">
-                <li><a href="./?sort=ia&amp;view={{ view }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
+                <li><a href="./?sort=ia&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-                <li><a href="./?sort=ta&amp;view={{ view }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
+                <li><a href="./?sort=ta&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
            </ul>
            {% endif %}
 {% endblock %}
 {% block content %}
+            {% if tag %}
+                <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
+            {% endif %}
            {% if entries is empty %}
            <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
            {% else %}
@@ -46,4 +50,5 @@
                {% endfor %}
            {% endif %}
            {{ 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 %}
 {% endblock %}
diff --git a/themes/default/login.twig b/themes/default/login.twig
index bf685240..b9f8b497 100644
--- a/themes/default/login.twig
+++ b/themes/default/login.twig
@@ -24,7 +24,7 @@
                                                </div>
                                        </div>
                                        <div class="row mts txtcenter">
-                                                <button class="bouton" type="submit" tabindex="4">{% trans "Login" %}</button>
+                                                <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
                                        </div>
                </fieldset>
                <input type="hidden" name="returnurl" value="{{ referer }}">
diff --git a/themes/default/tag.twig b/themes/default/tag.twig
deleted file mode 100644
index 364c7cd4..00000000
--- a/themes/default/tag.twig
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}tag {% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-    <h3>{% trans "Tag" %} {{ tag.value }}</h3>
-    {% if entries is empty %}
-    <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
-    {% else %}
-        {% block pager %}
-            {% if nb_results > 1 %}
-        <div class="results">
-            <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
-                {{ page_links | raw }}
-        </div>
-            {% endif %}
-        {% endblock %}
-        {% for entry in entries %}
-    <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>
-        <ul class="tools">
-            <li><a title="{% trans "toggle mark as read" %}" class="tool {% 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>
-            <li><a title="{% trans "toggle favorite" %}" class="tool {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
-            <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
-            <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
-            <li><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="reading-time"><span>{{ entry.content| getReadingTime }} min</span></a></li>
-        </ul>
-        <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
-    </div>
-        {% endfor %}
-    {% endif %}
-{% endblock %}
-\ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
index 9858996f..916abe0d 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -20,12 +20,15 @@
            <header class="mbm">
                <h1>{{ entry.title|raw }}</h1>
            </header>
-            <aside class="tags">
+            {% block tags %}
-                {% trans "tags:" %} {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
+              <aside class="tags">
-            </aside>
+                  {% trans "tags:" %} {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
+              </aside>
+            {% endblock %}
            <article>
                {{ content | raw }}
            </article>
+            {{ block('tags') }}
        </div>
        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script>
        <script type="text/javascript">
@@ -50,5 +53,5 @@
                $('#article_toolbar .tool.top').parent().hide();
            }
        });
-        </script> 
+        </script>
 {% endblock %}
diff --git a/themes/dmagenta/theme.ini b/themes/dmagenta/theme.ini
index 24ff3c4a..78fa3a9c 100644
--- a/themes/dmagenta/theme.ini
+++ b/themes/dmagenta/theme.ini
@@ -1,2 +1,2 @@
-name = Dark Magenta
+name = Dmagenta
 requirements[] = default
diff --git a/themes/solarized-dark/css/style-solarized-dark.css b/themes/solarized-dark/css/style-solarized-dark.css
index 3b0feb2a..77a97d38 100644
--- a/themes/solarized-dark/css/style-solarized-dark.css
+++ b/themes/solarized-dark/css/style-solarized-dark.css
@@ -217,4 +217,16 @@ a.link span {
 a.bad-display span {
    background-image: url('../img/solarized-dark/bad-display.png');
+}
+.arrow-down {
+    width: 0px;
+    height: 0px;
+    border-style: solid;
+    border-width: 10px 10px 0 10px;
+    border-color: #586E75 transparent transparent transparent;
+    position: absolute;
+    margin-top: 1.5em;
+    margin-left: -30px;
 }
 \ No newline at end of file
diff --git a/themes/solarized-dark/theme.ini b/themes/solarized-dark/theme.ini
index 7b6b341e..c9948146 100644
--- a/themes/solarized-dark/theme.ini
+++ b/themes/solarized-dark/theme.ini
@@ -1,2 +1,2 @@
-name = Dark Solarized
+name = Solarized Dark
 requirements[] = default
diff --git a/themes/solarized/css/style-solarized.css b/themes/solarized/css/style-solarized.css
index 6058d056..cf16338f 100644
--- a/themes/solarized/css/style-solarized.css
+++ b/themes/solarized/css/style-solarized.css
@@ -217,4 +217,16 @@ a.link span {
 a.bad-display span {
    background-image: url('../img/solarized/bad-display.png');
+}
+.arrow-down {
+    width: 0px;
+    height: 0px;
+    border-style: solid;
+    border-width: 10px 10px 0 10px;
+    border-color: #93A1A1 transparent transparent transparent;
+    position: absolute;
+    margin-top: 1.5em;
+    margin-left: -30px;
 }
 \ No newline at end of file