16 files changed, 131 insertions, 55 deletions

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index be11673f..a88d4186 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -1,16 +1,39 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico" />
-        <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 rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico" sizes="16x16">
+
         <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">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print">
-        <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script>
-        <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
+
+        <script src="{{ poche_url }}themes/_global/js/jquery-2.0.3.min.js"></script>
+        <script src="{{ poche_url }}themes/_global/js/autoClose.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script>
-        <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
-        <script src="{{ poche_url }}themes/default/js/popupForm.js"></script>
+        <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script>
+        <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script>
diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig
index 7e19a900..110196a6 100755
--- a/themes/baggy/about.twig
+++ b/themes/baggy/about.twig
@@ -9,7 +9,7 @@
 
     <dl>
         <dt>{% trans "Project website" %}</dt>
-        <dd><a href="http://www.wallabag.org">http://www.wallabag.org</a></dd>
+        <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
 
         <dt>{% trans "Main developer" %}</dt>
         <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans "website" %}</a></dd>
@@ -18,7 +18,7 @@
         <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans "on Github" %}</a></dd>
 
         <dt>{% trans "Bug reports" %}</dt>
-        <dd><a href="http://support.wallabag.org">{% trans "On our support website" %}</a> {% trans "or" %} <a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd>
+        <dd><a href="https://support.wallabag.org">{% trans "On our support website" %}</a> {% trans "or" %} <a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd>
 
         <dt>{% trans "License" %}</dt>
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
@@ -29,14 +29,24 @@
 
     <p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
 
+    <h2>{% trans "Getting help" %}</h2>
+    
+    <dl>
+        <dt>{% trans "Documentation" %}</dt>
+        <dd><a href="docs/">Offline documentation</a> and <a href="https://doc.wallabag.org/">online documentation</a> (up to date)</dd>
+        
+        <dt>{% trans "Support" %}</dt>
+        <dd><a href="http://support.wallabag.org/">http://support.wallabag.org/</a></dd>
+    </dl>
+
     <h2>{% trans "Helping wallabag" %}</h2>
 
     <p>{% trans "wallabag is free and opensource. You can help us:" %}</p>
 
     <dl>
-        <dt><a href="http://www.wallabag.org">{% trans "via Paypal" %}</a></dt>
+        <dt><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb">{% trans "via Paypal" %}</a></dt>
 
-        <dt><a href="http://www.wallabag.org">{% trans "via Flattr" %}</a></dt>
+        <dt><a href="https://flattr.com/thing/1265480">{% trans "via Flattr" %}</a></dt>
     </dl>
 
     <h2>{% trans "Credits" %}</h2>
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 2b967cd4..a5a61559 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -106,8 +106,14 @@
             <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>
+            <p>{% trans "Click to get all your articles in one ebook :" %}
+            <ul>
+            <li><a href="./?epub&amp;method=all" title="{% trans 'Generate ePub file' %}">ePub 3</a></li>
+            <li><a href="./?mobi&amp;method=all" title="{% trans 'Generate Mobi file' %}">Mobi</a></li>
+            <li><a href="./?pdf&amp;method=all" title="{% trans 'Generate PDF file' %}">PDF</a></li>
+            </ul>
+
+            <span class="more-info">{% 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>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 028c8b4e..1df82910 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -15,11 +15,11 @@ html {
 }
 
 body {
-  background: #EEE;
+  background-color: #EEE;
 }
 
 .login {
-  background: #333;
+  background-color: #333;
 }
 
 .login #main {
@@ -28,7 +28,7 @@ body {
 }
 
 .login form {
-  background: #FFF;
+  background-color: #FFF;
   padding: 1.5em;
   box-shadow: 0 1px 8px rgba(0,0,0,0.9);
   width: 20em;
@@ -51,7 +51,7 @@ body {
 
 ::selection { 
   color: #FFF;  
-  background: #000;
+  background-color: #000;
 } 
 
 .desktopHide {
@@ -129,7 +129,7 @@ form .row {
 
 form button, input[type="submit"] {
   cursor:pointer;
-  background: #000;
+  background-color: #000;
   color: #FFF;
   border:0;
   padding: 0.5em 1em;
@@ -138,7 +138,7 @@ form button, input[type="submit"] {
 }
 
   form button:hover, form button:focus, input[type="submit"]:hover, input[type="submit"]:focus {
-    background: #FFF;
+    background-color: #FFF;
     color: #000;
     -webkit-transition: all 0.5s ease;
      -moz-transition: all 0.5s ease;
@@ -155,7 +155,7 @@ h2:after {
   content: "";
   height: 4px;
   width: 70px;
-  background: #000;
+  background-color: #000;
   display: block;
 }
 
@@ -176,7 +176,7 @@ h2:after {
   width: 10em;
   left: 0;
   text-align: right;
-  background: #333;
+  background-color: #333;
   padding-top: 9.5em;
   height: 100%;
   box-shadow:inset -4px 0 20px rgba(0,0,0,0.6);
@@ -208,7 +208,7 @@ h2:after {
   }
 
   #links > li > a:hover, #links > li > a:focus {
-    background: #999;
+    background-color: #999;
     color: #000;
   }
 
@@ -344,7 +344,7 @@ footer a {
 }
 
 .entrie {
-  background: #FFF;
+  background-color: #FFF;
   letter-spacing:normal;
   box-shadow: 0 3px 7px rgba(0,0,0,0.3);
   display: inline-block;
@@ -391,7 +391,7 @@ footer a {
   width: 100%;
   bottom: 0;
   left: 0;
-  background: #000;
+  background-color: #000;
   -webkit-transition: all 0.5s ease;
      -moz-transition: all 0.5s ease;
       -ms-transition: all 0.5s ease;
@@ -557,7 +557,7 @@ footer a {
 }
 
         .popup-form form {
-                background: #FFF;
+                background-color: #FFF;
                 position: absolute;
                 top: 0;
                 left: 0;
@@ -574,7 +574,7 @@ footer a {
 
 .closeMessage,
 .close-button {
-  background: #000;
+  background-color: #000;
   color: #FFF;
         font-size: 1.2em;
         line-height: 1.6;
@@ -587,7 +587,7 @@ footer a {
         .closeMessage:focus,
         .close-button:hover,
         .close-button:focus {
-                background: #999;
+                background-color: #999;
                 color: #000;
         }
 
@@ -657,15 +657,16 @@ a.add-to-wallabag-link-after:after {
 @font-face {
   font-family: 'icomoon';
   src:url('../fonts/icomoon.eot?-s0mcsx');
-  src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
-    url('../fonts/icomoon.woff?-s0mcsx') format('woff'),
-    url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'),
-    url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
+  src:url('../fonts/icomoon.eot?#iefix-s0mcsx')   format('embedded-opentype'),
+      url('../fonts/icomoon.woff?-s0mcsx')        format('woff'),
+      url('../fonts/icomoon.ttf?-s0mcsx')         format('truetype'),
+      url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
-.icon span {
+.icon span,
+.icon-image span {
   position: absolute;
   top: -9999px;
 }
@@ -736,6 +737,28 @@ a.add-to-wallabag-link-after:after {
   content: "\e80d";
 }
 
+
+/* .icon-image class, for image-based icons
+         ========================================================================== */
+
+.icon-image {
+        background-size: 16px 16px;
+        background-repeat: no-repeat;
+        background-position: center;
+        padding-right: 1em !important;
+        padding-left: 1em !important;
+}
+
+/* Carrot (http://carrot.org) */
+.icon-image--carrot {
+        background-image: url('../../_global/img/icons/carrot-icon--white.png');
+}
+
+/* Diaspora */
+.icon-image--diaspora {
+        background-image: url('../../_global/img/icons/diaspora-icon--black.png');
+}}
+
 /* ==========================================================================
    Icon selected
    ========================================================================== */
@@ -805,7 +828,7 @@ a.add-to-wallabag-link-after:after {
 
 blockquote {
   border:1px solid #999;
-  background: #FFF;
+  background-color: #FFF;
   padding: 1em;
   margin: 0;
 }
@@ -838,14 +861,14 @@ blockquote {
 }
 
 #article_toolbar a {
-  background: #000;
+  background-color: #000;
   padding: 0.3em 0.5em 0.2em;
   color: #FFF;
   text-decoration: none;
 }
   
   #article_toolbar a:hover, #article_toolbar a:focus {
-    background: #999;
+    background-color: #999;
   }
 
 .shaarli:before {
@@ -868,7 +891,7 @@ blockquote {
 }
 
 .icon-rss {
-  background: #000;
+  background-color: #000;
   color: #FFF;
   padding: 0.2em 0.5em;
 }
@@ -883,7 +906,7 @@ blockquote {
 }
 
 .list-tags .icon-rss:hover, .list-tags .icon-rss:focus {
-  background: #FFF;
+  background-color: #FFF;
   color: #000;
   text-decoration: none;
 }
@@ -944,7 +967,7 @@ pre code {
     margin-left: 0;
   }
   body > header {
-    background: #333;
+    background-color: #333;
     position: fixed;
     top: 0;
     width: 100%;
@@ -990,11 +1013,11 @@ pre code {
     width: 2.5em;
     height: 2.5em;
     cursor: pointer;
-    background: #999;
+    background-color: #999;
     font-size: 1.2em;
   }
     .desktopHide:hover, .desktopHide:focus {
-      background: #FFF;
+      background-color: #FFF;
     }
   #links {
     display: none;
@@ -1046,4 +1069,3 @@ pre code {
     width: 100%;
   }
 }
-
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index d7c15033..15f15560 100755
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -5,9 +5,9 @@
 {% endblock %}
 {% block content %}
 
-<script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script>
-<script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script>
-<link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all">
+<script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script>
+<script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script>
+<link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all">
 
 <div id="article">
   <h2>{{ entry.title|raw }}</21>
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index dec848f2..93515080 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -58,13 +58,24 @@
             </div>
             {{ block('pager') }}
             {% 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 }}">{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}<br />
 
-            {% 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 }}</p></a>{% endif %}
-            
-            {% 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 %}<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 %}<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 %}
-            
+            {% if searchterm is defined %}<a title="{% trans "Delete results matching" %} {{ searchterm }}" href="./?action=delete&search={{ searchterm }}">{% trans "Delete results matching" %} {{ searchterm }}</a>{% endif %}<br />
+
+            {% if tag %}<a title="{% trans "Mark all articles from this tag as read" %}" href="./?action=toggle_archive&amp;tag_id={{ tag.id }}">{% trans "Mark all articles from this tag as read" %}</a><br />{% endif %}
+
+            {% if tag %}
+            {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %}
+            {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %}
+            {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this tag in a pdf file" %}" href="./?pdf&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as PDF" %}</a>{% endif %}
+            {% elseif searchterm is defined %}
+            {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as ePub3" %}</a>{% endif %}
+            {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this search in a mobi file" %}" href="./?mobi&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as Mobi" %}</a>{% endif %}
+            {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this search in a pdf file" %}" href="./?pdf&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as PDF" %}</a>{% endif %}
+            {% else %}
+            {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download as ePub3" %}</a>{% endif %}
+            {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this category in a mobi file" %}" href="./?mobi&amp;method=category&amp;value={{ view }}">{% trans "Download as Mobi" %}</a>{% endif %}
+            {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this category in a pdf file" %}" href="./?pdf&amp;method=category&amp;value={{ view }}">{% trans "Download as PDF" %}</a>{% endif %}
             {% endif %}
+{% endif %}
 {% endblock %}
diff --git a/themes/baggy/img/apple-touch-icon-114.png b/themes/baggy/img/apple-touch-icon-114.png
deleted file mode 100755
index 0e96edd5..00000000
--- a/themes/baggy/img/apple-touch-icon-114.png
+++ /dev/null
diff --git a/themes/baggy/img/apple-touch-icon-120.png b/themes/baggy/img/apple-touch-icon-120.png
deleted file mode 100755
index dc5aab1c..00000000
--- a/themes/baggy/img/apple-touch-icon-120.png
+++ /dev/null
diff --git a/themes/baggy/img/apple-touch-icon-144.png b/themes/baggy/img/apple-touch-icon-144.png
deleted file mode 100755
index 1d005db6..00000000
--- a/themes/baggy/img/apple-touch-icon-144.png
+++ /dev/null
diff --git a/themes/baggy/img/apple-touch-icon-152.png b/themes/baggy/img/apple-touch-icon-152.png
deleted file mode 100755
index f915231f..00000000
--- a/themes/baggy/img/apple-touch-icon-152.png
+++ /dev/null
diff --git a/themes/baggy/img/apple-touch-icon-57.png b/themes/baggy/img/apple-touch-icon-57.png
deleted file mode 100755
index 5aa19ed9..00000000
--- a/themes/baggy/img/apple-touch-icon-57.png
+++ /dev/null
diff --git a/themes/baggy/img/apple-touch-icon-72.png b/themes/baggy/img/apple-touch-icon-72.png
deleted file mode 100755
index b8b48e1b..00000000
--- a/themes/baggy/img/apple-touch-icon-72.png
+++ /dev/null
diff --git a/themes/baggy/img/apple-touch-icon-76.png b/themes/baggy/img/apple-touch-icon-76.png
deleted file mode 100755
index 9f9dba27..00000000
--- a/themes/baggy/img/apple-touch-icon-76.png
+++ /dev/null
diff --git a/themes/baggy/img/apple-touch-icon.png b/themes/baggy/img/apple-touch-icon.png
deleted file mode 100755
index 9cf29e2b..00000000
--- a/themes/baggy/img/apple-touch-icon.png
+++ /dev/null
diff --git a/themes/baggy/img/favicon.ico b/themes/baggy/img/favicon.ico
deleted file mode 100755
index 0346558b..00000000
--- a/themes/baggy/img/favicon.ico
+++ /dev/null
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index 53a9ee69..1afd9df6 100755
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -15,9 +15,13 @@
                 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
-                {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numflattrs }})</a></li>{% endif %}{% endif %}
+                {% if constant('SHARE_DIASPORA') == 1 %}<li><a href="{{ constant('DIASPORA_URL') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="{% trans "diaspora" %}"><span>{% trans "diaspora" %}</span></a></li>{% endif %}
+                {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %}
+                {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans "carrot" %}"><span>Carrot</span></a></li>{% endif %}
                 {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}
-                <li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate epub file">EPUB</a></li>
+                {% if constant('EPUB') == 1 %}<li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
+                {% if constant('MOBI') == 1 %}<li><a href="./?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
+                {% if constant('PDF') == 1 %}<li><a href="./?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}
                 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display icon icon-delete"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
             </ul>
         </div>
@@ -32,7 +36,7 @@
                 {{ content | raw }}
             </article>
         </div>
-        <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
+        <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script>
         <script type="text/javascript">
         $(document).ready(function() {