15 files changed, 126 insertions, 63 deletions

diff --git a/inc/3rdparty/site_config/standard/gist.github.com.txt b/inc/3rdparty/site_config/standard/gist.github.com.txt
index 90207862..f11b7b42 100755
--- a/inc/3rdparty/site_config/standard/gist.github.com.txt
+++ b/inc/3rdparty/site_config/standard/gist.github.com.txt
@@ -1,6 +1,4 @@
-body: //div[@class="highlight"]/pre
 
-prune: no
-tidy: no
-
-test_url: https://gist.github.com/1258908
\ No newline at end of file
+title: //div[contains(@class,'gist-description')]
+body: //div[contains(@class,'blob-wrapper')]
+test_url: https://gist.github.com/staltz/868e7e9bc2a7b8c1f754
diff --git a/inc/3rdparty/site_config/standard/jungle-world.com.txt b/inc/3rdparty/site_config/standard/jungle-world.com.txt
new file mode 100644
index 00000000..61e0087f
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/jungle-world.com.txt
@@ -0,0 +1,3 @@
+title: //h1
+body: //div[contains(@class,'story')]
+test_url: http://jungle-world.com/artikel/2015/02/51207.html
diff --git a/inc/3rdparty/site_config/standard/toolinux.com.txt b/inc/3rdparty/site_config/standard/toolinux.com.txt
new file mode 100755
index 00000000..3f1a8405
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/toolinux.com.txt
@@ -0,0 +1,5 @@
+title: //h2[contains(@class,'news')]
+body: //div[contains(@class,'articleContent')]
+date: substring-after(//div[@class = 'SupaDate']/text(), 'le')
+
+test_url: http://www.toolinux.com/Wi-Fi-Linksys-WRT-la-legende-de
diff --git a/install/index.php b/install/index.php
index 30bc2f6b..bd9e502d 100755
--- a/install/index.php
+++ b/install/index.php
@@ -49,6 +49,7 @@ else if (isset($_POST['install'])) {
         $errors[] = 'You must install twig before.';
     } else {
         $continue = true;
+        $final = false;
         $salt = generate_salt();
         $content = file_get_contents('inc/poche/config.inc.default.php');
 
@@ -142,7 +143,7 @@ else if (isset($_POST['install'])) {
         foreach ($moreQueries as $query) {
             executeQuery($handle, $query, array());
         }
-        $successes[] = 'wallabag is now installed. You can now <a href="index.php?clean=0">access it !</a>';
+        
 
     if (!copy('inc/poche/config.inc.default.php', 'inc/poche/config.inc.php')) {
         $errors[] = 'Installation aborted, impossible to create inc/poche/config.inc.php file. Maybe you don\'t have write access to create it.';
@@ -153,6 +154,7 @@ else if (isset($_POST['install'])) {
         }
         $content = str_replace("define ('SALT', '');", "define ('SALT', '".$salt."');", $content);
         file_put_contents('inc/poche/config.inc.php', $content);
+        $final = true;
     }
 }
 }
@@ -296,12 +298,12 @@ cursor: pointer;
 }
 .compatibity_result {
         margin: auto;
-        max-width: 300px;
+        max-width: 350px;
         min-height: 50px;
         line-height: 50px;
         text-align: center;
-    margin-bottom: 30px;
-    border-radius: 3px;
+   margin-bottom: 30px;
+   border-radius: 3px;
 }
 
 h2, legend {
@@ -329,6 +331,21 @@ border: 1px solid #000;
     background-color: #FFF;
     color: #000;
 }
+.final {
+   margin-top: 10%;
+   margin-left: 30%;
+   max-width: 400px;
+   text-align: center;
+   border-radius: 6px;
+}
+.final h1 {
+   line-height: 50px;
+}
+
+.final em {
+   margin-top: 40px;
+   font-size: 12px;
+}
 
 </style>
 
@@ -346,7 +363,8 @@ border: 1px solid #000;
                 <li><a href="http://doc.wallabag.org/" target="_blank">Online doc</a></li>
                 <li><a href="http://support.wallabag.org/" target="_blank">help</a></li>
                 <li><a href="http://www.wallabag.org/" target="_blank">wallabag.org</a></li>
-            </ul> 
+            </ul>
+            <?php if (!$final) : ?>
             <?php if (!empty($errors)) : ?>
                 <div class='messages error install'>
                     <p>Errors during installation:</p>
@@ -386,10 +404,10 @@ border: 1px solid #000;
                     <?php if (isOkay()) { ?>
                         <div class="compatibity_result detail good">All good</div>
                             <?php } elseif (isPassing()) { ?>
-                            <div class="compatibity_result detail pass">Some problems, but it's OK !</div>
+                            <div class="compatibity_result detail pass">Some warnings, but the minimum is here !</div>
                             <?php } else  { ?>
                             <div class="compatibity_result detail bad">Bad news : you can't run wallabag</div>
-                            <?php } $status = status(); ?>
+                            <?php } $status = status(); $pdo_drivers = pdoDrivers(); ?>
             </div>
 
             <div class="details">
@@ -569,38 +587,54 @@ php composer.phar install</code></pre>
                     <p>
                         Database engine:
                         <ul>
-                            <li><label for="sqlite">SQLite</label> <input name="db_engine" type="radio" checked="" id="sqlite" value="sqlite" />
-                            <div id="pdo_sqlite" class='messages error install'>
-                                <p>You have to enable <a href="http://php.net/manual/ref.pdo-sqlite.php">pdo_sqlite extension</a>.</p>
-                            </div>
-                            </li>
-                            <li>
-                                <label for="mysql">MySQL</label> <input name="db_engine" type="radio" id="mysql" value="mysql" />
-                                <div id="pdo_mysql" class='messages notice install'>
-                                    <p>All fields have to be filled.</p>
-                                </div>
-                                <ul id="mysql_infos">
-                                    <li><label for="mysql_server">Server</label> <input type="text" placeholder="localhost" id="mysql_server" name="mysql_server" /></li>
-                                    <li><label for="mysql_database">Database</label> <input type="text" placeholder="wallabag" id="mysql_database" name="mysql_database" /></li>
-                                    <li><label for="mysql_user">User</label> <input type="text" placeholder="user" id="mysql_user" name="mysql_user" /></li>
-                                    <li><label for="mysql_password">Password</label> <input type="password" placeholder="p4ssw0rd" id="mysql_password" name="mysql_password" /></li>
-                                    <li><label for="mysql_utf8_mb4">Use UTF-8 MB4</label> <input id="mysql_utf8_mb4" type="checkbox" name="mysql_utf8_mb4">
-                                    <div id="utf8_mb4_infos"><em>Warning :</em> UTF-8 MB4 is used to fully support unicode characters. It is available only with MySQL starting with version 5.5.3. 
+                           <li>
+                              <?php if ($pdo_drivers['sqlite']) { ?>
+                                <label for="sqlite">SQLite</label> <input name="db_engine" type="radio" checked="" id="sqlite" value="sqlite" />
+                                <?php } else { ?>
+                                 <div class="messages notice">
+                                           <p>You have to enable <a href="http://php.net/manual/ref.pdo-sqlite.php">pdo_sqlite extension</a> to use SQLite.</p>
+                                    </div>
+                              <?php } ?>
+                           </li>
+                           <li>
+                              <?php if ($pdo_drivers['mysql']) { ?>
+                              <label for="mysql">MySQL</label> <input name="db_engine" type="radio" id="mysql" value="mysql" />
+                              <div id="pdo_mysql" class='messages notice install'>
+                                 <p>All fields have to be filled.</p>
+                              </div>
+                              <ul id="mysql_infos">
+                                 <li><label for="mysql_server">Server</label> <input type="text" placeholder="localhost" id="mysql_server" name="mysql_server" /></li>
+                                 <li><label for="mysql_database">Database</label> <input type="text" placeholder="wallabag" id="mysql_database" name="mysql_database" /></li>
+                                 <li><label for="mysql_user">User</label> <input type="text" placeholder="user" id="mysql_user" name="mysql_user" /></li>
+                                 <li><label for="mysql_password">Password</label> <input type="password" placeholder="p4ssw0rd" id="mysql_password" name="mysql_password" /></li>
+                                 <li><label for="mysql_utf8_mb4">Use UTF-8 MB4</label> <input id="mysql_utf8_mb4" type="checkbox" name="mysql_utf8_mb4">
+                                 <div id="utf8_mb4_infos"><em>Warning :</em> UTF-8 MB4 is used to fully support unicode characters. It is available only with MySQL starting with version 5.5.3. 
                                     Install will failed if you check this while using an older MySQL server.</div></li>
-                                </ul>
-                            </li>
-                            <li>
-                                <label for="postgres">PostgreSQL</label> <input name="db_engine" type="radio" id="postgres" value="postgres" />
-                                <div id="pdo_postgres" class='messages notice install'>
+                              </ul>
+                              <?php } else { ?>
+                                 <div class="messages notice">
+                                    <p>You have to enable <a href="http://php.net/manual/ref.pdo-mysql.php">pdo_mysql extension</a> to use MySQL.</p>
+                                 </div>
+                              <?php } ?>
+                           </li>
+                           <li>
+                              <?php if ($pdo_drivers['postgres']) { ?>
+                                 <label for="postgres">PostgreSQL</label> <input name="db_engine" type="radio" id="postgres" value="postgres" />
+                                 <div id="pdo_postgres" class='messages notice install'>
                                     <p>All fields have to be filled.</p>
-                                </div>
-                                <ul id="pg_infos">
+                                 </div>
+                                 <ul id="pg_infos">
                                     <li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li>
                                     <li><label for="pg_database">Database</label> <input type="text" placeholder="wallabag" id="pg_database" name="pg_database" /></li>
                                     <li><label for="pg_user">User</label> <input type="text" placeholder="user" id="pg_user" name="pg_user" /></li>
                                     <li><label for="pg_password">Password</label> <input type="password" placeholder="p4ssw0rd" id="pg_password" name="pg_password" /></li>
-                                </ul>
-                            </li>
+                                 </ul>
+                              <?php } else { ?>
+                                 <div class="messages notice">
+                                    <p>You have to enable <a href="https://php.net/manual/ref.pdo-pgsql.php">pdo_pgsql extension</a> to use PostgreSQL.</p>
+                                 </div>
+                              <?php } ?>
+                           </li>
                         </ul>
                     </p>
                 </fieldset>
@@ -638,6 +672,12 @@ php composer.phar install</code></pre>
                 </div>
             </form>
         </div>
+     <?php else : ?>
+         <div class="final good">
+            <h1>wallabag is now installed ! :-) </h1>
+            <a href="index.php?clean=0">Click here to access the login form</a><br />
+            <em>The installation will now try to delete the install directory. If this fails, delete it manually.</em></div>
+     <?php endif; ?>
         <script>
             <?php if (!is_dir('vendor')) : ?>
             $(".database_info").hide();
@@ -672,17 +712,6 @@ php composer.phar install</code></pre>
             endif;
             ?>
 
-            <?php
-            if (!extension_loaded('pdo_sqlite')) : ?>
-            $("#install_button").hide();
-            <?php
-            else :
-            ?>
-            $("#pdo_sqlite").hide();
-            <?php
-            endif;
-            ?>
-
             $("#mysql_utf8_mb4").click(function() {
                 $("#utf8_mb4_infos").toggle();
             });
@@ -720,13 +749,6 @@ php composer.phar install</code></pre>
                             $("#sqlite_description").show();
                             $("#mysql_description").hide();
                             $("#postgres_description").hide();
-                            <?php
-                            if (!extension_loaded('pdo_sqlite')) : ?>
-                            $("#pdo_sqlite").show();
-                            $("#install_button").hide();
-                            <?php
-                            endif;
-                            ?>
                         }
                     }
                 });
diff --git a/install/install_functions.php b/install/install_functions.php
index 3b465851..4a18d7d8 100644
--- a/install/install_functions.php
+++ b/install/install_functions.php
@@ -26,7 +26,10 @@ $allow_url_fopen_ok = (bool)ini_get('allow_url_fopen');
 $filter_ok = extension_loaded('filter');
 $gettext_ok = function_exists("gettext");
 $gd_ok = extension_loaded('gd');
-$pdo_drivers_passing = extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql');
+$pdo_drivers = pdoDrivers();
+$pdo_drivers_passing = $pdo_drivers['sqlite'] || $pdo_drivers['mysql'] || $pdo_drivers['postgres'];
+
+
 
 if (extension_loaded('xmlreader')) {
         $xml_ok = true;
@@ -39,7 +42,11 @@ if (extension_loaded('xmlreader')) {
         $xml_ok = false;
 }
 
-$status = array('app_name' => $app_name, 'php' => $php_ok, 'pdo' => $pdo_ok, 'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok, 'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok, 'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok, 'gettext' => $gettext_ok, 'gd' => $gd_ok);
+$status = array('app_name' => $app_name, 'php' => $php_ok, 'pdo' => $pdo_ok, 
+  'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok,
+  'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok,
+   'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok,
+    'gettext' => $gettext_ok, 'gd' => $gd_ok);
 
 return $status;
 }
@@ -53,6 +60,17 @@ function isPassing() {
         return !in_array(false, $status);
 }
 
+function pdoDrivers() {
+    $pdo_driver_sqlite = extension_loaded('pdo_sqlite');
+    $pdo_driver_mysql = extension_loaded('pdo_mysql');
+    $pdo_driver_postgres = extension_loaded('pdo_pgsql');
+
+    $pdo_drivers = array('sqlite' => $pdo_driver_sqlite, 'mysql' => $pdo_driver_mysql,
+        'postgres' => $pdo_driver_postgres);
+
+    return $pdo_drivers;
+}
+
 /* Function taken from at http://php.net/manual/en/function.rmdir.php#110489
  * Idea : nbari at dalmp dot com
  * Rights unknown
diff --git a/themes/_global/img/icons/evernote-icon--black.svg b/themes/_global/img/icons/evernote-icon--black.svg
new file mode 100644
index 00000000..1336648c
--- /dev/null
+++ b/themes/_global/img/icons/evernote-icon--black.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="640" height="640" viewBox="0 0 640 640"><g id="icomoon-ignore">
+</g>
+<path d="M554.848 137.824c0-36.8-55.424-40.864-55.424-40.864l-130.208-8.192c0 0-2.784-35.424-29.088-47.744-26.304-12.256-55.232-8.512-76.032-8.32-20.8 0.224-25.696 26.72-25.696 51.744 0 24.992 0.448 53.888 0.448 72 0 32.576-14.304 46.368-50.112 46.368h-73.824c-20.64-1.312-36.704 2.048-36.704 18.752 0 16.736 24.288 159.136 57.632 192 19.36 19.072 137.76 32.448 162.688 32.448s16.608-73.632 23.552-73.632c6.944 0 14.528 41.568 53.824 51.296 39.232 9.824 91.648 8 94.432 35.936 3.616 36.864 6.944 84.544-17.312 87.936l-54.912 2.176c-37.632-2.688-27.52-43.808-10.912-43.808s24.928-0.608 24.928-0.608l2.080-44.992c0 0-86.176-10.176-89.824 47.936-3.36 53.12 5.76 78.176 12.448 83.616 6.688 5.504 18.272 16.128 123.808 16.128 148.704 0 94.208-433.376 94.208-470.176zM494.080 330.24c-5.824 6.272-26.944-10.24-47.104-10.24-20.192 0-41.952 10.688-47.072 3.616-5.12-7.008 4.672-63.68 42.688-63.68s57.376 64.128 51.488 70.304z" fill="rgb(68, 68, 68)"></path>
+<path d="M185.728 133.312c0-7.328 1.856-95.488 1.856-95.488l-112.16 110.080c0 0 77.504 0 92.736 0 15.232-0.032 17.568-7.328 17.568-14.592z" fill="rgb(68, 68, 68)"></path>
+</svg>
diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig
index 110196a6..93c96df2 100755
--- a/themes/baggy/about.twig
+++ b/themes/baggy/about.twig
@@ -7,6 +7,8 @@
 {% block content %}
     <h2>{% trans "About wallabag" %}</h2>
 
+    <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>
+
     <dl>
         <dt>{% trans "Project website" %}</dt>
         <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
@@ -27,8 +29,6 @@
         <dd>{{ constant('POCHE') }}</dd>
     </dl>
 
-    <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>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 90d546fc..54622cfc 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -742,6 +742,9 @@ a.add-to-wallabag-link-after:after {
 .icon-reload:before {
   content: "\ea2e";
 }
+.icon-evernote:before {
+  content: "\e603";
+}
 
 
 /* .icon-image class, for image-based icons
diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/fonts/icomoon.eot
index 784ac198..3d4d14ae 100644
--- a/themes/baggy/fonts/icomoon.eot
+++ b/themes/baggy/fonts/icomoon.eot
diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/fonts/icomoon.svg
index 2e2f16f7..19fcfa1f 100644
--- a/themes/baggy/fonts/icomoon.svg
+++ b/themes/baggy/fonts/icomoon.svg
@@ -10,6 +10,7 @@
 <glyph unicode="&#xe600;" d="M512 778.666c-188.544 0-341.334-152.832-341.334-341.332s152.788-341.334 341.334-341.334 341.334 152.832 341.334 341.334-152.788 341.332-341.334 341.332zM670.164 339.498c16.682-16.682 16.682-43.648 0-60.332-8.32-8.32-19.244-12.5-30.164-12.5s-21.846 4.182-30.164 12.5l-97.836 97.836-97.834-97.836c-8.32-8.32-19.242-12.5-30.166-12.5s-21.846 4.182-30.166 12.5c-16.682 16.682-16.682 43.648 0 60.332l97.834 97.836-97.834 97.834c-16.682 16.682-16.682 43.648 0 60.332s43.648 16.682 60.332 0l97.834-97.834 97.836 97.834c16.682 16.682 43.648 16.682 60.332 0s16.682-43.648 0-60.332l-97.836-97.834 97.836-97.836z" />
 <glyph unicode="&#xe601;" d="M490.666 146.218c-74.070 0-143.7 28.842-196.096 81.196-52.352 52.394-81.236 122.028-81.236 196.14s28.884 143.744 81.236 196.14c16.682 16.682 43.648 16.682 60.332 0s16.682-43.648 0-60.332c-36.266-36.308-56.236-84.522-56.236-135.808s19.968-99.542 56.236-135.808c36.266-36.268 84.438-56.192 135.764-56.192s99.498 19.968 135.766 56.192c36.308 36.268 56.236 84.48 56.236 135.808s-19.968 99.542-56.236 135.808c-16.682 16.682-16.682 43.648 0 60.332s43.648 16.682 60.332 0c52.352-52.438 81.236-122.070 81.236-196.14s-28.884-143.744-81.236-196.14c-52.394-52.352-122.028-81.194-196.096-81.194zM490.666 469.334c-23.594 0-42.666 19.116-42.666 42.666v213.334c0 23.552 19.072 42.666 42.668 42.666s42.668-19.116 42.668-42.666v-213.334c0-23.552-19.072-42.666-42.668-42.666z" />
 <glyph unicode="&#xe602;" d="M512 803.328l-273.664-273.664c-33.324-33.322-33.324-87.34 0-120.662s87.338-33.322 120.662 0l67.668 67.67v-308.992c0-47.104 38.188-85.332 85.334-85.332 47.104 0 85.332 38.23 85.332 85.332v308.992l67.668-67.67c16.682-16.682 38.486-25.004 60.332-25.004s43.648 8.32 60.332 25.004c33.322 33.322 33.322 87.34 0 120.662l-273.664 273.664z" />
+<glyph unicode="&#xe603;" d="M887.757 752.282c0 58.88-88.678 65.382-88.678 65.382l-208.333 13.107c0 0-4.454 56.678-46.541 76.39-42.086 19.61-88.371 13.619-121.651 13.312-33.28-0.358-41.114-42.752-41.114-82.79 0-39.987 0.717-86.221 0.717-115.2 0-52.122-22.886-74.189-80.179-74.189h-118.118c-33.024 2.099-58.726-3.277-58.726-30.003 0-26.778 38.861-254.618 92.211-307.2 30.976-30.515 220.416-51.917 260.301-51.917s26.573 117.811 37.683 117.811c11.11 0 23.245-66.509 86.118-82.074 62.771-15.718 146.637-12.8 151.091-57.498 5.786-58.982 11.11-135.27-27.699-140.698l-87.859-3.482c-60.211 4.301-44.032 70.093-17.459 70.093s39.885 0.973 39.885 0.973l3.328 71.987c0 0-137.882 16.282-143.718-76.698-5.376-84.992 9.216-125.082 19.917-133.786 10.701-8.806 29.235-25.805 198.093-25.805 237.926 0 150.733 693.402 150.733 752.282zM790.528 444.416c-9.318-10.035-43.11 16.384-75.366 16.384-32.307 0-67.123-17.101-75.315-5.786-8.192 11.213 7.475 101.888 68.301 101.888s91.802-102.605 82.381-112.486zM297.165 759.501c0 11.725 2.97 152.781 2.97 152.781l-179.456-176.128c0 0 124.006 0 148.378 0 24.371 0.051 28.109 11.725 28.109 23.347z" />
 <glyph unicode="&#xe800;" d="M0 51.712v526.336q0 183.296 87.040 284.672t265.216 101.376h561.152q-5.12-5.12-53.248-54.272t-102.4-103.424-111.616-111.616-97.28-95.232-43.008-37.888q-15.36 0-15.36 16.384v159.744h-49.152q-60.416 0-96.256-6.144t-64.512-26.624-39.936-58.368-12.288-98.304v-268.288zM68.608-68.096q5.12 5.12 54.272 54.272t102.4 103.424 111.616 112.64 97.28 95.232 41.984 36.864q15.36 0 15.36-16.384v-159.744h49.152q118.784 0 165.888 36.864t46.080 152.576v268.288l229.376 228.352v-526.336q0-183.296-86.016-284.672t-266.24-101.376h-561.152z" horiz-adv-x="982" />
 <glyph unicode="&#xe801;" d="M301.056 208.384q14.336 14.336 34.816 14.336t36.864-14.336q32.768-34.816 0-71.68l-43.008-40.96q-57.344-57.344-135.168-57.344-79.872 0-137.216 57.344t-57.344 135.168q0 79.872 57.344 137.216l151.552 151.552q71.68 69.632 147.456 78.848t131.072-44.032q16.384-16.384 16.384-36.864t-16.384-36.864q-36.864-32.768-71.68 0-51.2 49.152-135.168-34.816l-151.552-149.504q-26.624-26.624-26.624-65.536t26.624-63.488q26.624-26.624 64.512-26.624t64.512 26.624zM761.856 796.16q57.344-57.344 57.344-135.168 0-79.872-57.344-137.216l-161.792-161.792q-75.776-73.728-153.6-73.728-63.488 0-114.688 51.2-14.336 14.336-14.336 34.816t14.336 36.864q14.336 14.336 35.84 14.336t35.84-14.336q51.2-49.152 124.928 24.576l161.792 159.744q28.672 28.672 28.672 65.536 0 38.912-28.672 63.488-24.576 26.624-57.344 31.744t-61.44-21.504l-51.2-51.2q-16.384-14.336-36.864-14.336t-34.816 14.336q-34.816 34.816 0 71.68l51.2 51.2q55.296 55.296 130.048 52.224t132.096-62.464z" horiz-adv-x="820" />
 <glyph unicode="&#xe802;" d="M877.568 192v-72.704q0-15.36-10.24-25.6t-26.624-11.264h-803.84q-15.36 0-25.6 11.264t-11.264 25.6v72.704q0 15.36 11.264 25.6t25.6 11.264h803.84q15.36 0 26.624-11.264t10.24-25.6zM877.568 484.864v-73.728q0-14.336-10.24-25.6t-26.624-10.24h-803.84q-15.36 0-25.6 10.24t-11.264 25.6v73.728q0 14.336 11.264 25.6t25.6 10.24h803.84q15.36 0 26.624-10.24t10.24-25.6zM877.568 776.704v-72.704q0-15.36-10.24-25.6t-26.624-11.264h-803.84q-15.36 0-25.6 11.264t-11.264 25.6v72.704q0 15.36 11.264 26.624t25.6 10.24h803.84q15.36 0 26.624-10.24t10.24-26.624z" horiz-adv-x="878" />
diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf
index b4fb95bc..923f56d8 100644
--- a/themes/baggy/fonts/icomoon.ttf
+++ b/themes/baggy/fonts/icomoon.ttf
diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/fonts/icomoon.woff
index 158108f1..a2e86d36 100644
--- a/themes/baggy/fonts/icomoon.woff
+++ b/themes/baggy/fonts/icomoon.woff
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index 473e3695..0d0a4438 100755
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -15,7 +15,7 @@
                 {% 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('SHARE_EVERNOTE') == 1 %}<li><a href="https://www.evernote.com/clip.action?url={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool evernote" title="{% trans "evernote" %}"><span>{% trans "evernote" %}</span></a></li>{% endif %}
+                {% if constant('SHARE_EVERNOTE') == 1 %}<li><a href="https://www.evernote.com/clip.action?url={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool evernote icon icon-evernote" title="{% trans "evernote" %}"><span>{% trans "evernote" %}</span></a></li>{% 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 %}
diff --git a/themes/default/about.twig b/themes/default/about.twig
index 5ca3217c..bab9b5eb 100755
--- a/themes/default/about.twig
+++ b/themes/default/about.twig
@@ -7,6 +7,8 @@
 {% block content %}
     <h2>{% trans "About wallabag" %}</h2>
 
+    <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>
+    
     <dl>
         <dt>{% trans "Project website" %}</dt>
         <dd><a href="http://www.wallabag.org">http://www.wallabag.org</a></dd>
@@ -27,8 +29,6 @@
         <dd>{{ constant('POCHE') }}</dd>
     </dl>
 
-    <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 "Helping wallabag" %}</h2>
 
     <p>{% trans "wallabag is free and opensource. You can help us:" %}</p>
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 666c4a28..39a4df90 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -43,6 +43,11 @@ a.carrot span {
     background-size: 16px 16px;
 }
 
+a.evernote span {
+    background-image: url('../../_global/img/icons/evernote-icon--black.svg');
+    background-size: 16px 16px;
+}
+
 a.diaspora span {
     background-image: url('../../_global/img/icons/diaspora-icon--black.png');
     background-size: 16px 16px;