diff --git a/sigal/themes/colorbox/templates/index.html b/sigal/themes/colorbox/templates/index.html
index bad0c7c..8981804 100644
--- a/sigal/themes/colorbox/templates/index.html
+++ b/sigal/themes/colorbox/templates/index.html
@@ -97,15 +97,15 @@
               <div class="four columns thumbnail
                           {% if loop.index % 3 == 1 %}alpha{% endif%}
                           {% if loop.index % 3 == 0 %}omega{% endif%}">
-                <a href="#{{ media.file|replace('.', '') }}" class="gallery"
-                  inline='yes' title="{{ media.file }}"
+                <a href="#{{ media.file|replace('.', '')|replace(' ', '') }}"
+                  class="gallery" inline='yes' title="{{ media.file }}"
                   {% if media.big %} data-big="{{ media.big }}"{% endif %}>
                   <img src="{{ media.thumb }}" alt="{{ media.file }}"
                       title="{{ media.file }}" /></a>
               </div>
               <!-- This contains the hidden content for the video -->
               <div style='display:none'>
-                <div id="{{ media.file|replace('.', '') }}">
+                <div id="{{ media.file|replace('.', '')|replace(' ', '') }}">
                   <video controls>
                   <source src='{{ media.file }}' type='video/webm' />
                   </video>
diff --git a/sigal/themes/galleria/templates/index.html b/sigal/themes/galleria/templates/index.html
index dc7a580..8b7471b 100644
--- a/sigal/themes/galleria/templates/index.html
+++ b/sigal/themes/galleria/templates/index.html
@@ -84,7 +84,7 @@
               <a href="{{ theme.url }}/img/empty.png">
                 <img src="{{ media.thumb }}" alt="{{ media.file }}"
                      data-layer="<video controls>
-                                   <source src={{ media.file }} type='video/webm' />
+                                   <source src='{{ media.file }}' type='video/webm' />
                                  </video>" />
               </a>
             {% endif %}
diff --git a/tests/sample/pictures/video/stallman-software-freedom-day-low.ogv b/tests/sample/pictures/video/stallman software-freedom-day-low.ogv
similarity index 100%
rename from tests/sample/pictures/video/stallman-software-freedom-day-low.ogv
rename to tests/sample/pictures/video/stallman software-freedom-day-low.ogv
diff --git a/tests/test_gallery.py b/tests/test_gallery.py
index c7b30d3..ea70932 100644
--- a/tests/test_gallery.py
+++ b/tests/test_gallery.py
@@ -41,8 +41,8 @@ REF = {
     },
     'video': {
         'title': 'Video',
-        'thumbnail': 'stallman-software-freedom-day-low.ogv',
-        'medias': ['stallman-software-freedom-day-low.ogv']
+        'thumbnail': 'stallman software-freedom-day-low.ogv',
+        'medias': ['stallman software-freedom-day-low.ogv']
     }
 }
 
diff --git a/tests/test_video.py b/tests/test_video.py
index 402bbd9..4937cda 100644
--- a/tests/test_video.py
+++ b/tests/test_video.py
@@ -7,7 +7,7 @@ import os
 from sigal.video import video_size, generate_video
 
 CURRENT_DIR = os.path.dirname(__file__)
-TEST_VIDEO = 'stallman-software-freedom-day-low.ogv'
+TEST_VIDEO = 'stallman software-freedom-day-low.ogv'
 SRCFILE = os.path.join(CURRENT_DIR, 'sample', 'pictures', 'video', TEST_VIDEO)