diff --git a/prosopopee/themes/light/templates/base.html b/prosopopee/themes/light/templates/base.html
index 3f11aa9..22b8f8e 100644
--- a/prosopopee/themes/light/templates/base.html
+++ b/prosopopee/themes/light/templates/base.html
@@ -4,9 +4,9 @@
         <meta charset="UTF-8">
         {% block css %}
         {% endblock %}
-        {% if settings.rss -%}
+        {% if settings.rss %}
         <link rel="alternate" type="application/rss+xml" title="{{ settings.title }}" href="{{ settings.url }}/feed.xml" />
-        {% endif -%}
+        {% endif %}
         <!--Let browser know website is optimized for mobile-->
         <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
         <title>{{ settings.title }}</title>
@@ -18,11 +18,11 @@
             {% block logo %}
             {% endblock %}
             <h1>{{ settings.title }}</h1>
-            {% if settings.sub_title -%}<h4>{{ settings.sub_title }}</h4>{% endif -%}
+            {% if settings.sub_title %}<h4>{{ settings.sub_title }}</h4>{% endif %}
             <hr>
-            {% if settings.menu -%}
+            {% if settings.menu %}
             {% include 'menu.html' %}
-            {% endif -%}
+            {% endif %}
         </div>
 
 
diff --git a/prosopopee/themes/light/templates/feed.xml b/prosopopee/themes/light/templates/feed.xml
index 0d685fe..ba5b2dd 100644
--- a/prosopopee/themes/light/templates/feed.xml
+++ b/prosopopee/themes/light/templates/feed.xml
@@ -7,14 +7,14 @@
         <atom:link href="{{ settings.url }}/feed.xml" rel="self" type="application/rss+xml" />
 
         {% for gallery in galleries %}
-        {% set absolute_url = settings.url + "/" + gallery.link -%}
+        {% set absolute_url = settings.url + "/" + gallery.link %}
 		<item>
 			<title>{{ gallery.title }}</title>
 			<link>{{ absolute_url }}</link>
             <guid>{{ gallery.link }}</guid>
-            {% if gallery.sub_title -%}
+            {% if gallery.sub_title %}
             <description>{{ gallery.sub_title }}</description>
-            {% endif -%}
+            {% endif %}
 			<pubDate>{{ gallery.date }}</pubDate>
 		</item>
 		{% endfor %}
diff --git a/prosopopee/themes/light/templates/footer.html b/prosopopee/themes/light/templates/footer.html
index 96451fe..a50cdbd 100644
--- a/prosopopee/themes/light/templates/footer.html
+++ b/prosopopee/themes/light/templates/footer.html
@@ -1,9 +1,9 @@
 {% if settings.licence is not defined %}
-{% set licence_url = 'https://creativecommons.org/licenses/by-sa/3.0/' -%}
-{% set licence_name = 'CC-BY-SA' -%}
+{% set licence_url = 'https://creativecommons.org/licenses/by-sa/3.0/' %}
+{% set licence_name = 'CC-BY-SA' %}
 {% else %}
-{% set licence_url = settings.licence.url -%}
-{% set licence_name = settings.licence.name -%}
+{% set licence_url = settings.licence.url %}
+{% set licence_name = settings.licence.name %}
 {% endif %}
 
 <footer>
diff --git a/prosopopee/themes/light/templates/gallery-index.html b/prosopopee/themes/light/templates/gallery-index.html
index 582cb79..c5b3ebd 100644
--- a/prosopopee/themes/light/templates/gallery-index.html
+++ b/prosopopee/themes/light/templates/gallery-index.html
@@ -1,10 +1,15 @@
+{% if settings.settings.light_mode %}
+{% set pathstatic = "." %}
+{% else %}
+{% set pathstatic = ".." %}
+{% endif %}
 <!DOCTYPE html>
 <html>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta charset="UTF-8">
-        <link type="text/css" rel="stylesheet" href="./static/css/fonts.css"  media="screen,projection"/>
-        <link type="text/css" rel="stylesheet" href="./static/css/style-page.css"  media="screen,projection"/>
+        <link type="text/css" rel="stylesheet" href="{{ pathstatic }}/static/css/fonts.css"  media="screen,projection"/>
+        <link type="text/css" rel="stylesheet" href="{{ pathstatic }}/static/css/style-page.css"  media="screen,projection"/>
 
         <!--Let browser know website is optimized for mobile-->
         <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
@@ -31,6 +36,5 @@
         </div>
         </div>
         {% include "footer.html" %}
-
     </body>
 </html>
diff --git a/prosopopee/themes/light/templates/index.html b/prosopopee/themes/light/templates/index.html
index ded46e6..6e15679 100644
--- a/prosopopee/themes/light/templates/index.html
+++ b/prosopopee/themes/light/templates/index.html
@@ -20,7 +20,7 @@
             <h2>{{ gallery.title }}</h2>
           {% if gallery.sub_title %}<h3>{{ gallery.sub_title }}</h3>{% endif %}
           {% if settings.show_date and gallery.date %}<div class="gallery-datetime">{{ gallery.date.strftime("%d %B %Y") }}</div>{% endif %}
-          {% if gallery.tags %}<div class="gallery-tag">IN {% for tag in gallery.tags -%} <span> {{ tag }}</span> {% endfor -%}</div>{% endif %}
+          {% if gallery.tags %}<div class="gallery-tag">IN {% for tag in gallery.tags %} <span> {{ tag }}</span> {% endfor %}</div>{% endif %}
         </div>
       </a>
       {% if gallery.cover_type == "video" %}
diff --git a/prosopopee/themes/light/templates/menu.html b/prosopopee/themes/light/templates/menu.html
index f871b84..cc898e0 100644
--- a/prosopopee/themes/light/templates/menu.html
+++ b/prosopopee/themes/light/templates/menu.html
@@ -1,19 +1,19 @@
 <nav>
   <div class="nav-wrapper">
     <ul>
-      {%- for line in settings.menu -%}
+      {% for line in settings.menu %}
       {% set file_name, menu_name = line.items()[0] %}
       {% if file_name.startswith('http') %}
         {% set file_name = file_name %}
       {% elif gallery %}
         {% set file_name = "../"+file_name %}
-      {%- endif -%}
-      {%- if loop.first -%}
+      {% endif %}
+      {% if loop.first %}
       <li><a href={{ file_name }} class=first-item-menu>{{ menu_name  }}</a></li>
       {% else %}
       <li><a href={{ file_name }} class=item-menu>{{ menu_name }}</a></li>
-      {%- endif -%}
-      {%- endfor -%}
+      {% endif %}
+      {% endfor %}
     </ul>
   </div>
 </nav>
diff --git a/prosopopee/themes/light/templates/page.html b/prosopopee/themes/light/templates/page.html
index 71e8757..18c2d10 100644
--- a/prosopopee/themes/light/templates/page.html
+++ b/prosopopee/themes/light/templates/page.html
@@ -1,9 +1,15 @@
 {% extends "base.html" %}
 
+{% if settings.settings.light_mode %}
+{% set pathstatic = "../" %}
+{% else %}
+{% set pathstatic = "" %}
+{% endif %}
+
 {% block css %}
-<link type="text/css" rel="stylesheet" href="../static/css/fonts.css"  media="screen,projection"/>
-<link type="text/css" rel="stylesheet" href="../static/css/style.css"  media="screen,projection"/>
-<link type="text/css" rel="stylesheet" href="../static/css/style-page.css"  media="screen,projection"/>
+<link type="text/css" rel="stylesheet" href="{{ pathstatic }}static/css/fonts.css"  media="screen,projection"/>
+<link type="text/css" rel="stylesheet" href="{{ pathstatic }}static/css/style.css"  media="screen,projection"/>
+<link type="text/css" rel="stylesheet" href="{{ pathstatic }}static/css/style-page.css"  media="screen,projection"/>
 {% endblock %}
 
 {% block logo %}
@@ -22,11 +28,11 @@
 <div class="back-to-home">
   <hr>
   <a href="../index.html">
-      <div id="logo" src="../static/img/logo.svg"/>
+    <div id="logo" src="{{ pathstatic  }}/static/img/logo.svg"/>
           HOME
       </div>
   </a>
 </div>
 
-<script type="text/javascript" src="../static/js/jquery-2.1.4.min.js" charset="utf-8"></script>
+<script type="text/javascript" src="{{ pathstatic  }}static/js/jquery-2.1.4.min.js" charset="utf-8"></script>
 {% endblock %}
diff --git a/prosopopee/themes/light/templates/sections/bordered-picture.html b/prosopopee/themes/light/templates/sections/bordered-picture.html
index 6f91e80..3d23ffa 100644
--- a/prosopopee/themes/light/templates/sections/bordered-picture.html
+++ b/prosopopee/themes/light/templates/sections/bordered-picture.html
@@ -1,3 +1,8 @@
+{% if settings.settings.light_mode %}
+{% set pathstatic = ".." %}
+{% else %}
+{% set pathstatic = "." %}
+{% endif %}
 {% if section.image.type == "video" %}
 {% set video = Video(section.image) %}
 {{ video.copy() }}
@@ -8,13 +13,13 @@
 {% endif %}
 {% if video %}
 <section class="bordered-picture">
-    <video class="lazy" id="video" poster="../{{ video.generate_thumbnail("800") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
-        <source src="../{{ video }}" type="video/webm" data-source="{{ video }}" data-format="vp8" data-extension="webm">
+  <video class="lazy" id="video" poster="{{ pathstatic }}/{{ video.generate_thumbnail("800") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
+    <source src="{{ pathstatic }}/{{ video }}" type="video/webm" data-source="{{ video }}" data-format="vp8" data-extension="webm">
     </video>
 </section>
 {% else %}
 <section class="bordered-picture">
-    <img src="../{{ image.generate_thumbnail("x800") }}" alt="{% if caption %}{{ caption }}{% endif %}">
+  <img src="{{ pathstatic }}/{{ image.generate_thumbnail("x800") }}" alt="{% if caption %}{{ caption }}{% endif %}">
 </section>
 {% endif %}
 
diff --git a/prosopopee/themes/light/templates/sections/full-picture.html b/prosopopee/themes/light/templates/sections/full-picture.html
index baf5896..309e067 100644
--- a/prosopopee/themes/light/templates/sections/full-picture.html
+++ b/prosopopee/themes/light/templates/sections/full-picture.html
@@ -1,3 +1,8 @@
+{% if settings.settings.light_mode %}
+{% set pathstatic = ".." %}
+{% else %}
+{% set pathstatic = "." %}
+{% endif %}
 {% if section.image.type == "video" %}
 {% set video = Video(section.image) %}
 {{ video.copy() }}
@@ -9,10 +14,10 @@
     <div class="image">
         {% if video %}
         <video autoplay loop muted class="fillWidth">
-            <source src="../{{ video }}" type="video/webm" data-source="../{{ video }}" data-format="vp8" data-extension="webm">
+          <source src="{{ pathstatic }}/{{ video }}" type="video/webm" data-source="{{ pathstatic }}/{{ video }}" data-format="vp8" data-extension="webm">
         </video>
         {% else %}
-        <img  src="../{{ image.generate_thumbnail("x800") }}">
+        <img  src="{{ pathstatic }}/{{ image.generate_thumbnail("x800") }}">
         {% endif %}
     </div>
     {% if section.text %}
diff --git a/prosopopee/themes/light/templates/sections/panorama.html b/prosopopee/themes/light/templates/sections/panorama.html
index b28c68b..224ecd3 100644
--- a/prosopopee/themes/light/templates/sections/panorama.html
+++ b/prosopopee/themes/light/templates/sections/panorama.html
@@ -1,5 +1,10 @@
+{% if settings.settings.light_mode %}
+{% set pathstatic = ".." %}
+{% else %}
+{% set pathstatic = "." %}
+{% endif %}
 {% set image = Image(section.image) %}
 {{ image.copy() }}
 <section class="panorama">
-    <img src="../{{ image.generate_thumbnail("x800") }}">
+  <img src="{{ pathstatic }}/{{ image.generate_thumbnail("x800") }}">
 </section>
diff --git a/prosopopee/themes/light/templates/sections/pictures-group.html b/prosopopee/themes/light/templates/sections/pictures-group.html
index 3883a89..e557afc 100644
--- a/prosopopee/themes/light/templates/sections/pictures-group.html
+++ b/prosopopee/themes/light/templates/sections/pictures-group.html
@@ -1,3 +1,8 @@
+{% if settings.settings.light_mode %}
+{% set pathstatic = ".." %}
+{% else %}
+{% set pathstatic = "." %}
+{% endif %}
 <section class="pictures-group">
     {% for line in section.images %}
     {% for image in line %}
@@ -12,12 +17,12 @@
     {% endif %}
     <div class="image">
         {% if video %}
-        <video id="video" poster="../{{ video.generate_thumbnail("800") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
-            <source src="../{{ video }}" type="video/webm" data-source="../{{ video }}" data-format="vp8" data-extension="webm">
+        <video id="video" poster="{{ pathstatic }}/{{ video.generate_thumbnail("800") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
+          <source src="{{ pathstatic }}/{{ video }}" type="video/webm" data-source="{{ pathstatic }}/{{ video }}" data-format="vp8" data-extension="webm">
         </video>
         {% set video = "" %}
         {% else %}
-        <img src="../{{ image.generate_thumbnail("x800") }}" alt="{% if caption %}{{ caption }}{% endif %}">
+        <img src="{{ pathstatic }}/{{ image.generate_thumbnail("x800") }}" alt="{% if caption %}{{ caption }}{% endif %}">
         {% endif %}
     </div>
     {% endfor %}
diff --git a/prosopopee/themes/light/templates/share.html b/prosopopee/themes/light/templates/share.html
index 6626c49..4e81c86 100644
--- a/prosopopee/themes/light/templates/share.html
+++ b/prosopopee/themes/light/templates/share.html
@@ -1,9 +1,9 @@
-{% set absolute_url = settings.url + "/" + link -%}
+{% set absolute_url = settings.url + "/" + link %}
 <div class=share>
 <h5>Share this story</h5>
 <ul class="icon">
     <li>
-        <a class="twitter" href="https://twitter.com/share?text={{ gallery.name }}&url={{absolute_url}}{%if gallery.tags %}&hashtags={% for tag in gallery.tags -%}{{ tag }}{% if not loop.lirst and not loop.last %},{% endif %}{% endfor -%}{% endif -%}"  target="_blank">Twitter</a>
+        <a class="twitter" href="https://twitter.com/share?text={{ gallery.name }}&url={{absolute_url}}{%if gallery.tags %}&hashtags={% for tag in gallery.tags %}{{ tag }}{% if not loop.lirst and not loop.last %},{% endif %}{% endfor %}{% endif %}"  target="_blank">Twitter</a>
     </li>
     <li>
     <a class="facebook" href="http://www.facebook.com/share.php?u={{absolute_url}}" target="_blank">Facebook</a>
