diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py
index 06b0c97..d0a72b1 100644
--- a/prosopopee/prosopopee.py
+++ b/prosopopee/prosopopee.py
@@ -41,7 +41,7 @@ class Video(object):
     def __init__(self, options):
         # assuming string
         if not isinstance(options, dict):
-            options = {"video": options}
+            options = {"name": options}
         # used for caching, if it's modified -> regenerate
         self.options = SETTINGS["ffmpeg"].copy()
         self.options.update(options)
diff --git a/prosopopee/themes/exposure/static/css/style.css b/prosopopee/themes/exposure/static/css/style.css
index d3e2a59..abead47 100644
--- a/prosopopee/themes/exposure/static/css/style.css
+++ b/prosopopee/themes/exposure/static/css/style.css
@@ -252,3 +252,8 @@ nav ul li > a.item-menu::before {
     letter-spacing: 3px;
     font-style: normal;
 }
+
+.gallery-cover video.fillWidth,
+.gallery-cover img.fillWidth {
+    height: 100%;
+}
diff --git a/prosopopee/themes/exposure/templates/index.html b/prosopopee/themes/exposure/templates/index.html
index 09adad0..128e027 100644
--- a/prosopopee/themes/exposure/templates/index.html
+++ b/prosopopee/themes/exposure/templates/index.html
@@ -32,11 +32,11 @@
       {% endif %}
       {% if video %}
       <div class="gallery-cover">
-          <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>
       </div>
+      {% set video = "" %}
       {% else %}
       <div class="gallery-cover" style="background-image: url('{{ cover.generate_thumbnail("x900") }}');"></div>
       {% endif %}
diff --git a/prosopopee/themes/exposure/templates/sections/full-picture.html b/prosopopee/themes/exposure/templates/sections/full-picture.html
index 24e9e8e..7367259 100644
--- a/prosopopee/themes/exposure/templates/sections/full-picture.html
+++ b/prosopopee/themes/exposure/templates/sections/full-picture.html
@@ -25,7 +25,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="lazy" src="{{ video.generate_thumbnail("2000") }}">
+        <img class="lazy full-picture" src="{{ video.generate_thumbnail("2000") }}">
     </div>
 </section>
 {% else %}
diff --git a/prosopopee/themes/exposure/templates/sections/pictures-group.html b/prosopopee/themes/exposure/templates/sections/pictures-group.html
index 8cfcefe..b0dc977 100644
--- a/prosopopee/themes/exposure/templates/sections/pictures-group.html
+++ b/prosopopee/themes/exposure/templates/sections/pictures-group.html
@@ -19,6 +19,7 @@
                 <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>
+                {% set video = "" %}
                 {% else %}
                 <a href="{{ image }}" {% if caption %}data-caption="{{ caption }}"{% endif %}>
                     <img class="lazy" src="" data-original="{{ image.generate_thumbnail("x600") }}" alt="">