diff --git a/prosopopee/themes/exposure/templates/index.html b/prosopopee/themes/exposure/templates/index.html
index 128e027..e289689 100644
--- a/prosopopee/themes/exposure/templates/index.html
+++ b/prosopopee/themes/exposure/templates/index.html
@@ -35,6 +35,7 @@
           <video autoplay loop muted class="fillWidth">
               <source src="{{ video }}" type="video/webm" data-source="{{ video }}" data-format="vp8" data-extension="webm">
           </video>
+          <img class="full-picture" src="{{ video.generate_thumbnail("900") }}">
       </div>
       {% set video = "" %}
       {% else %}
diff --git a/prosopopee/themes/material/static/css/styles.css b/prosopopee/themes/material/static/css/styles.css
index b8290f6..a0e03fc 100644
--- a/prosopopee/themes/material/static/css/styles.css
+++ b/prosopopee/themes/material/static/css/styles.css
@@ -151,12 +151,10 @@ div#bg-section {
     margin-top: 20px
 }
 
-.parallax video {
+video.fillWidth {
   position: absolute;
   z-index: 0;
   bottom: 0;
-}
-.parallax video.fillWidth {
   width: 100%;
 }
 
diff --git a/prosopopee/themes/material/templates/index.html b/prosopopee/themes/material/templates/index.html
index 76f6da6..9b5242a 100644
--- a/prosopopee/themes/material/templates/index.html
+++ b/prosopopee/themes/material/templates/index.html
@@ -8,70 +8,75 @@
 {% block content %}
 <div class="container">
     <div class="row">
-        {% for galleries_line in galleries|reverse|batch(3)|reverse %}
+        {% for galleries_line in galleries|reverse|batch(2)|reverse %}
         {% for gallery in galleries_line|reverse %}
-        {% if loop.length is divisibleby 2 %}
-        <div class="col s12 m12 l6">
-            {% else %}
-            {% if loop.last %}
-            <div class="col s12 m12 l6">
-                {% else %}
-                <div class="col s12 m12 l6">
-                    {% endif %}    
-                    {% endif %}
-                    <a href="{{ gallery.link }}">    
-                        <div class="card hoverable blue-grey lighten-5">
-                            <div class="card-image">
-                                {% set cover = Image(gallery.cover) %}
-                                {{ cover.copy() }}
-                                <img class="responsive-img hide-on-large-only" src="{{ cover.generate_thumbnail("x900") }}">
-                                <img class="small-card hide-on-med-and-down" src="{{ cover.generate_thumbnail("x900") }}">
-                                <span class="card-title truncate">{{ gallery.title }}
-                                    {% if gallery.sub_title %} : {{ gallery.sub_title }}{% endif %}
-                                </span>
-                            </div>
-                            <div class="card-action">
-                                <div class="left">
-                                    <a href="{{ gallery.link }}">Read more..</a>
-                                </div>
-                                {% if gallery.tags or gallery.date %}
-                                <div class="right">
-                                    {% if gallery.tags %}{% for tag in gallery.tags -%}
-                                    <div class="chip">
-                                        <div class="image">
-                                            <img class="grey">
-                                            <div class="tag white-text">
-                                                {{ tag[0].capitalize() }}
-                                            </div>
-                                            </img>
-                                            {{ tag }}
-                                        </div>
-                                    </div>
-                                    {% endfor -%}
-                                    {% endif %}
-                                    {% if gallery.date %}
-                                    <div class="chip">
-                                        {{ gallery.date.strftime("%d %B %Y") }}
-                                    </div>
-                                    {% endif %}
-                                </div>
-                                {% endif %}
-                            </div>
-                        </div>
-                    </a>    
-                </div>
-                {% endfor %}
-            </div>
-            {% endfor %}
-        </div>
+        <div class="col s12 m12 l{{ 12 // galleries_line|length }}">
+            <a href="{{ gallery.link }}">    
+                <div class="card hoverable blue-grey lighten-5">
+                    <div class="card-image">
+                        {% if gallery.cover_type == "video" %}
+                        {% set video = Video(gallery.cover) %}
+                        {{ video.copy() }}
+                        {% else %}
+                        {% set cover = Image(gallery.cover) %}
+                        {{ cover.copy() }}
+                        {% endif %}
+                        {% if video %}
+                        <img class="responsive-img" src="{{ video.generate_thumbnail("900") }}">
+                        <video autoplay loop muted class="fillWidth">
+                            <source src="{{ video }}" type="video/webm" data-source="{{ video }}" data-format="vp8" data-extension="webm">
+                        </video>
+                        {% set video = "" %}
+                        {% else %}
+                        <img src="{{ cover.generate_thumbnail("x900") }}">
+                        {% endif %}
 
-        <script type="text/javascript" src="static/js/jquery-2.1.4.min.js" charset="utf-8"></script>
-        <script type="text/javascript" src="static/js/materialize.min.js" charset="utf-8"></script>
-        <script type="text/javascript" charset="utf-8">
+                        <span class="card-title truncate">{{ gallery.title }}
+                            {% if gallery.sub_title %} : {{ gallery.sub_title }}{% endif %}
+                        </span>
+                    </div>
+                    <div class="card-action">
+                        <div class="left">
+                            <a href="{{ gallery.link }}">Read more..</a>
+                        </div>
+                        {% if gallery.tags or gallery.date %}
+                        <div class="right">
+                            {% if gallery.tags %}{% for tag in gallery.tags -%}
+                            <div class="chip">
+                                <div class="image">
+                                    <img class="grey">
+                                    <div class="tag white-text">
+                                        {{ tag[0].capitalize() }}
+                                    </div>
+                                    </img>
+                                    {{ tag }}
+                                </div>
+                            </div>
+                            {% endfor -%}
+                            {% endif %}
+                            {% if gallery.date %}
+                            <div class="chip">
+                                {{ gallery.date.strftime("%d %B %Y") }}
+                            </div>
+                            {% endif %}
+                        </div>
+                        {% endif %}
+                    </div>
+                </div>
+            </a>    
+        </div>
+        {% endfor %}
+    {% endfor %}
+    </div>
+</div>
+
+<script type="text/javascript" src="static/js/jquery-2.1.4.min.js" charset="utf-8"></script>
+<script type="text/javascript" src="static/js/materialize.min.js" charset="utf-8"></script>
+<script type="text/javascript" charset="utf-8">
 $('.button-collapse').sideNav();
 
 $(document).ready(function(){
     $('.scrollspy').scrollSpy();
 });
-        </script>
-        {% endblock %}
+</script>
+{% endblock %}
diff --git a/prosopopee/themes/material/templates/sections/bordered-picture.html b/prosopopee/themes/material/templates/sections/bordered-picture.html
index f4118cd..498299f 100644
--- a/prosopopee/themes/material/templates/sections/bordered-picture.html
+++ b/prosopopee/themes/material/templates/sections/bordered-picture.html
@@ -7,25 +7,25 @@
 {% endif %}
 {% if section.background %}
 <div style="padding: 1px 0px;background: {{ section.background }};">
-	{% endif %}
-	<div class="bordered-picture baguette caption">
-		{% if video %}
-		<img class="lazy" src="{{ video.generate_thumbnail("2000") }}">
-		<video class="lazy" id="video" poster="{{ video.generate_thumbnail("2000") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted="">
-			<source src="{{ video }}" type="video/webm" data-source="{{ video }}" data-format="vp8" data-extension="webm">
-		</video>
-		{% else %}
-		<a href="{{ image }}" {% if caption %}data-caption="{{ caption }}"{% endif %}>
-			<img class="responsive-img" src="{{ image.generate_thumbnail("x2000") }}">
-			{% if caption %}
-			<div class="caption__overlay card-panel center">
-				<h5 class="black-white">{{ caption }}</h5>
-			</div>
-			{% endif %}
-		</a>
-		{% endif %}
-	</div>
-	{% if section.background %}
+    {% endif %}
+    <div class="bordered-picture baguette caption">
+        {% if video %}
+        <img class="lazy" data-original="{{ video.generate_thumbnail("2000") }}" alt="">
+        <video class="lazy" poster="{{ video.generate_thumbnail("2000") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted="">
+            <source src="{{ video }}" type="video/webm" data-source="{{ video }}" data-format="vp8" data-extension="webm">
+        </video>
+        {% else %}
+        <a href="{{ image }}" {% if caption %}data-caption="{{ caption }}"{% endif %}>
+            <img class="responsive-img lazy" data-original="{{ image.generate_thumbnail("x2000") }}" alt="">
+            {% if caption %}
+            <div class="caption__overlay card-panel center">
+                <h5 class="black-white">{{ caption }}</h5>
+            </div>
+            {% endif %}
+        </a>
+        {% endif %}
+    </div>
+    {% if section.background %}
 </div>
 {% endif %}
 
diff --git a/prosopopee/themes/material/templates/sections/html.html b/prosopopee/themes/material/templates/sections/html.html
index eb1d8d0..7fe7a51 100644
--- a/prosopopee/themes/material/templates/sections/html.html
+++ b/prosopopee/themes/material/templates/sections/html.html
@@ -1,5 +1,5 @@
 {% if section.background or section.color %}
-<div style="{% if section.background -%}padding: 1px 0px;background: {{ section.background }};{% endif %}{% if section.color -%}color: {{ section.color }};{% endif %}">
+<div id="bg-section" style="{% if section.background -%}background: {{ section.background }};{% endif %}{% if section.color -%}color: {{ section.color }};{% endif %}">
 {% endif %}
 <section class="html">
 	<center>
diff --git a/prosopopee/themes/material/templates/sections/paragraph.html b/prosopopee/themes/material/templates/sections/paragraph.html
index cf8ebfd..f9fb252 100644
--- a/prosopopee/themes/material/templates/sections/paragraph.html
+++ b/prosopopee/themes/material/templates/sections/paragraph.html
@@ -1,5 +1,5 @@
 {% if section.background or section.color %}
-<div style="{% if section.background -%}padding: 1px 0px;background: {{ section.background }};{% endif %}{% if section.color -%}color: {{ section.color }};{% endif %}">
+<div id="bg-section" style="{% if section.background -%}background: {{ section.background }};{% endif %}{% if section.color -%}color: {{ section.color }};{% endif %}">
 {% endif %}
 <div class="container">
 	{% if section.title %}
diff --git a/prosopopee/themes/material/templates/sections/pictures-group.html b/prosopopee/themes/material/templates/sections/pictures-group.html
index d3cfc7a..19e2842 100644
--- a/prosopopee/themes/material/templates/sections/pictures-group.html
+++ b/prosopopee/themes/material/templates/sections/pictures-group.html
@@ -18,11 +18,12 @@
                     <div class="card">
                         {% if video %}
                         <div class="picture card-image">
-                            <img class="lazy" src="{{ video.generate_thumbnail("600") }}">
+                            <img class="lazy" data-original="{{ video.generate_thumbnail("600") }}">
                             <video class="lazy" id="video" poster="{{ video.generate_thumbnail("600") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted="">
                                 <source src="{{ video }}" type="video/webm" data-source="{{ video }}" data-format="vp8" data-extension="webm">
                             </video>
                         </div>
+                        {% set video = "" %}
                         {% else %}
                         <div class="picture card-image caption">
                             <a href="{{ image }}" {% if caption %}data-caption="{{ caption }}"{% endif %}>
diff --git a/prosopopee/themes/material/templates/sections/text.html b/prosopopee/themes/material/templates/sections/text.html
index 81366da..9df4b6d 100644
--- a/prosopopee/themes/material/templates/sections/text.html
+++ b/prosopopee/themes/material/templates/sections/text.html
@@ -1,5 +1,5 @@
 {% if section.background or section.color %}
-<div style="{% if section.background -%}padding: 1px 0px;background: {{ section.background }};{% endif %}{% if section.color -%}color: {{ section.color }};{% endif %}">
+<div id="bg-section" style="{% if section.background -%}background: {{ section.background }};{% endif %}{% if section.color -%}color: {{ section.color }};{% endif %}">
 {% endif %}
 <div class="container">
     <p class="flow-text">