diff --git a/sigal/themes/colorbox/static/css/style.css b/sigal/themes/colorbox/static/css/style.css
index ce48612..707f47c 100644
--- a/sigal/themes/colorbox/static/css/style.css
+++ b/sigal/themes/colorbox/static/css/style.css
@@ -32,6 +32,9 @@ header h1 a {
   position: absolute;
   bottom: 40px;
 }
+.sidebar footer span {
+  display: block;
+}
 
 .thumbnail {
   text-align: center;
diff --git a/sigal/themes/default/templates/footer.html b/sigal/themes/default/templates/footer.html
index c1b7c68..44d23fd 100644
--- a/sigal/themes/default/templates/footer.html
+++ b/sigal/themes/default/templates/footer.html
@@ -1,7 +1,16 @@
-      <footer>
-        <p>{% if album.author %}&copy; {{ album.author }} - {% endif %}
-          Generated by <a href="{{ sigal_link }}">sigal</a>
-          {% if 'sigal.plugins.feeds' in settings.plugins %}
-          {% if settings.rss_feed %}<br><a href={{ settings.rss_feed.feed_url }}>RSS Feed</a>{% endif %}
-          {% if settings.atom_feed %}<br><a href={{ settings.atom_feed.feed_url }}>Atom Feed</a>{% endif %}{% endif %}</p>
-      </footer>
+<footer>
+  <p>
+    {% if album.author %}
+      <span>&copy; {{ album.author }}</span>
+    {% endif %}
+    <span>Generated by <a href="{{ sigal_link }}">sigal</a></span>
+    {% if 'sigal.plugins.feeds' in settings.plugins %}
+      {% if settings.rss_feed %}
+        <span><a href={{ settings.rss_feed.feed_url }}>RSS Feed</a></span>
+      {% endif %}
+      {% if settings.atom_feed %}
+        <span><a href={{ settings.atom_feed.feed_url }}>Atom Feed</a></span>
+      {% endif %}
+    {% endif %}
+  </p>
+</footer>
diff --git a/sigal/themes/galleria/static/css/style.css b/sigal/themes/galleria/static/css/style.css
index 837ccd2..3d50220 100644
--- a/sigal/themes/galleria/static/css/style.css
+++ b/sigal/themes/galleria/static/css/style.css
@@ -172,6 +172,9 @@ footer a:hover {
   border-bottom: 1px solid;
   text-decoration: none;
 }
+footer span:not(:last-child):after {
+  content: ' - ';
+}
 
 @media only screen and (min-width: 980px) {
   .container {
diff --git a/sigal/themes/photoswipe/static/styles.css b/sigal/themes/photoswipe/static/styles.css
index 9cacc1a..42a3c38 100644
--- a/sigal/themes/photoswipe/static/styles.css
+++ b/sigal/themes/photoswipe/static/styles.css
@@ -204,6 +204,9 @@ footer {
 footer p {
   text-align: center;
 }
+footer span:not(:last-child):after {
+  content: ' - ';
+}
 
 @media screen and (max-width: 700px) {
   h1 {
diff --git a/sigal/themes/photoswipe/templates/album.html b/sigal/themes/photoswipe/templates/album.html
index f35f9b7..22e0324 100644
--- a/sigal/themes/photoswipe/templates/album.html
+++ b/sigal/themes/photoswipe/templates/album.html
@@ -1,5 +1,13 @@
 {% extends "base.html" %}
 
+{% block extra_head %}
+  <script src="{{ theme.url }}/photoswipe.min.js"></script>
+  <script src="{{ theme.url }}/photoswipe-ui-default.min.js"></script>
+  <script src="{{ theme.url }}/echo/echo.min.js"></script>
+  <link rel="stylesheet" href="{{ theme.url }}/photoswipe.css">
+  <link rel="stylesheet" href="{{ theme.url }}/default-skin/default-skin.css">
+{% endblock extra_head %}
+
 {% block content %}
   {% if album.zip %}
   <div class="additionnal-infos">
diff --git a/sigal/themes/photoswipe/templates/base.html b/sigal/themes/photoswipe/templates/base.html
index cfab9d4..0763ad3 100644
--- a/sigal/themes/photoswipe/templates/base.html
+++ b/sigal/themes/photoswipe/templates/base.html
@@ -8,13 +8,8 @@
     <meta name="description" content="">
     <meta name="author" content="{{ album.author }}">
     <meta name="viewport" content="width=device-width">
-    <link rel="stylesheet" href="{{ theme.url }}/photoswipe.css">
-    <link rel="stylesheet" href="{{ theme.url }}/default-skin/default-skin.css">
-    <link rel="stylesheet" href="{{ theme.url }}/styles.css">
-    <script src="{{ theme.url }}/photoswipe.min.js"></script>
-    <script src="{{ theme.url }}/photoswipe-ui-default.min.js"></script>
-    <script src="{{ theme.url }}/echo/echo.min.js"></script>
     {% block extra_head %}{% endblock extra_head %}
+    <link rel="stylesheet" href="{{ theme.url }}/styles.css">
     {% include 'analytics.html' %}
   </head>
   <body>
@@ -44,11 +39,7 @@
         {% endif %}
       </div>
 
-      <footer>
-        <p>{% if album.author %}&copy; {{ album.author }} - {% endif %}
-            Generated by <a href="{{ sigal_link }}">sigal</a>
-            </p>
-      </footer>
+      {% include 'footer.html' %}
       {% block extra_footer %}{% endblock %}
   </div>
   {% include 'piwik.html' %}