Imported Upstream version 7.6.4

author: Agustin Henze <tin@sluc.org.ar> 2015-08-26 07:57:04 -0300
committer: Agustin Henze <tin@sluc.org.ar> 2015-08-26 07:57:04 -0300
commit: 8041475aab2b8efad7d2857027331bd626d26312 (patch)
tree: 3980e1763c067079a4cebb425d642ca9eac834bf /nikola/data
parent: b0b24795b24ee6809397fbbadf42f31f310a219f (diff)
162 files changed, 448 insertions, 1638 deletions
diff --git a/nikola/data/samplesite/README.txt b/nikola/data/samplesite/README.txt
index da0d685..011a882 100644
--- a/nikola/data/samplesite/README.txt
+++ b/nikola/data/samplesite/README.txt
@@ -2,7 +2,7 @@ This folder contains the source used to generate a static site using Nikola.
 
 Installation and documentation at https://getnikola.com/
 
-Configuration file for the site is `conf.py`.
+Configuration file for the site is ``conf.py``.
 
 To build the site::
 
@@ -10,10 +10,7 @@ To build the site::
 
 To see it::
 
-    nikola serve
-
-And point your browser to http://localhost:8000/
-
+    nikola serve -b
 
 To check all available commands::
 
diff --git a/nikola/data/samplesite/posts/1.rst b/nikola/data/samplesite/posts/1.rst
index 9a55859..88263a7 100644
--- a/nikola/data/samplesite/posts/1.rst
+++ b/nikola/data/samplesite/posts/1.rst
@@ -17,11 +17,11 @@ and build a site using it. Congratulations!
 
 Next steps:
 
-* `Read the manual </stories/handbook.html>`__
+* :doc:`Read the manual <handbook>`
 * `Visit the Nikola website to learn more <https://getnikola.com>`__
-* `See a demo photo gallery </galleries/demo/index.html>`__
-* `See a demo listing </stories/listings-demo.html>`__
-* `See a demo slideshow </stories/slides-demo.html>`__
-* `See a demo of the Bootstrap theme </stories/bootstrap-demo.html>`__
+* `See a demo photo gallery <link://gallery/demo>`__
+* :doc:`See a demo listing <listings-demo>`
+* :doc:`See a demo slideshow <slides-demo>`
+* :doc:`See a demo of the Bootstrap theme <bootstrap-demo>`
 
 Send feedback to info@getnikola.com!
diff --git a/nikola/data/symlinked.txt b/nikola/data/symlinked.txt
index aae8ea1..ce34ddf 100644
--- a/nikola/data/symlinked.txt
+++ b/nikola/data/symlinked.txt
@@ -14,105 +14,15 @@ nikola/data/samplesite/stories/theming.rst
 nikola/data/symlink-test-link.txt
 nikola/data/themes/base/assets/js/moment-with-locales.min.js
 nikola/data/themes/base/messages/messages_cz.py
-nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css
-nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png
-nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
-nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
-nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox-min.js
-nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js
-nikola/data/themes/bootstrap-jinja/assets/js/jquery.js
-nikola/data/themes/bootstrap-jinja/assets/js/jquery.min.js
-nikola/data/themes/bootstrap-jinja/assets/js/jquery.min.map
-nikola/data/themes/bootstrap-jinja/bundles
-nikola/data/themes/bootstrap/assets/css/colorbox.css
-nikola/data/themes/bootstrap/assets/css/images/controls.png
-nikola/data/themes/bootstrap/assets/css/images/loading.gif
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bn.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
-nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
-nikola/data/themes/bootstrap/assets/js/jquery.colorbox-min.js
-nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js
-nikola/data/themes/bootstrap/assets/js/jquery.js
-nikola/data/themes/bootstrap/assets/js/jquery.min.js
-nikola/data/themes/bootstrap/assets/js/jquery.min.map
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.css.map
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap-theme.min.css
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.css
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.css.map
 nikola/data/themes/bootstrap3-jinja/assets/css/bootstrap.min.css
+nikola/data/themes/bootstrap3-jinja/assets/css/colorbox.css
+nikola/data/themes/bootstrap3-jinja/assets/css/images/controls.png
+nikola/data/themes/bootstrap3-jinja/assets/css/images/loading.gif
 nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.eot
 nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.svg
 nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.ttf
@@ -120,6 +30,49 @@ nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.wo
 nikola/data/themes/bootstrap3-jinja/assets/fonts/glyphicons-halflings-regular.woff2
 nikola/data/themes/bootstrap3-jinja/assets/js/bootstrap.js
 nikola/data/themes/bootstrap3-jinja/assets/js/bootstrap.min.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
+nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
+nikola/data/themes/bootstrap3-jinja/assets/js/jquery.colorbox-min.js
+nikola/data/themes/bootstrap3-jinja/assets/js/jquery.colorbox.js
+nikola/data/themes/bootstrap3-jinja/assets/js/jquery.js
+nikola/data/themes/bootstrap3-jinja/assets/js/jquery.min.js
+nikola/data/themes/bootstrap3-jinja/assets/js/jquery.min.map
 nikola/data/themes/bootstrap3-jinja/bundles
 nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.css
 nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.css.map
@@ -127,6 +80,9 @@ nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css
 nikola/data/themes/bootstrap3/assets/css/bootstrap.css
 nikola/data/themes/bootstrap3/assets/css/bootstrap.css.map
 nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css
+nikola/data/themes/bootstrap3/assets/css/colorbox.css
+nikola/data/themes/bootstrap3/assets/css/images/controls.png
+nikola/data/themes/bootstrap3/assets/css/images/loading.gif
 nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.eot
 nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.svg
 nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.ttf
@@ -134,4 +90,47 @@ nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff
 nikola/data/themes/bootstrap3/assets/fonts/glyphicons-halflings-regular.woff2
 nikola/data/themes/bootstrap3/assets/js/bootstrap.js
 nikola/data/themes/bootstrap3/assets/js/bootstrap.min.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ar.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bg.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bn.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ca.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-cs.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-da.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-de.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-es.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-et.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fa.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fi.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fr.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gl.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gr.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-he.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hr.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hu.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-id.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-it.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ja.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-kr.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lt.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lv.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-my.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-nl.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-no.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pl.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ro.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ru.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-si.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sk.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sr.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sv.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-tr.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-uk.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
+nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
+nikola/data/themes/bootstrap3/assets/js/jquery.colorbox-min.js
+nikola/data/themes/bootstrap3/assets/js/jquery.colorbox.js
+nikola/data/themes/bootstrap3/assets/js/jquery.js
+nikola/data/themes/bootstrap3/assets/js/jquery.min.js
+nikola/data/themes/bootstrap3/assets/js/jquery.min.map
 nikola/plugins/command/auto/livereload.js
diff --git a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl
index 565732c..8b9286e 100644
--- a/nikola/data/themes/base-jinja/templates/archiveindex.tmpl
+++ b/nikola/data/themes/base-jinja/templates/archiveindex.tmpl
@@ -4,7 +4,7 @@
 {% block extra_head %}
     {{ super() }}
     {% if translations|length > 1 and generate_atom %}
-        {% for language in translations %}
+        {% for language in translations|sort %}
             <link rel="alternate" type="application/atom+xml" title="Atom for the {{ archive_name }} section ({{ language }})" href="{{ _link("archive_atom", archive_name, language) }}">
         {% endfor %}
     {% elif generate_atom %}
diff --git a/nikola/data/themes/base-jinja/templates/base.tmpl b/nikola/data/themes/base-jinja/templates/base.tmpl
index 00ba9d7..5412326 100644
--- a/nikola/data/themes/base-jinja/templates/base.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base.tmpl
@@ -14,13 +14,14 @@
 <a href="#content" class="sr-only sr-only-focusable">{{ messages("Skip to main content") }}</a>
     <div id="container">
          {{ header.html_header() }}
-         <main id="content" role="main">
+         <main id="content">
             {% block content %}{% endblock %}
          </main>
          {{ footer.html_footer() }}
     </div>
+    {{ base.late_load_js() }}
+    {% block extra_js %}{% endblock %}
     {{ body_end }}
     {{ template_hooks['body_end']() }}
-    {{ base.late_load_js() }}
 </body>
 </html>
diff --git a/nikola/data/themes/base-jinja/templates/base_footer.tmpl b/nikola/data/themes/base-jinja/templates/base_footer.tmpl
index 7fcf616..2e541a6 100644
--- a/nikola/data/themes/base-jinja/templates/base_footer.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base_footer.tmpl
@@ -3,7 +3,7 @@
 
 {% macro html_footer() %}
     {% if content_footer %}
-        <footer id="footer" role="contentinfo">
+        <footer id="footer">
             <p>{{ content_footer }}</p>
             {{ template_hooks['page_footer']() }}
         </footer>
diff --git a/nikola/data/themes/base-jinja/templates/base_header.tmpl b/nikola/data/themes/base-jinja/templates/base_header.tmpl
index 9f79e72..092abd8 100644
--- a/nikola/data/themes/base-jinja/templates/base_header.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base_header.tmpl
@@ -2,7 +2,7 @@
 {% import 'base_helper.tmpl' as base with context %}
 
 {% macro html_header() %}
-    <header id="header" role="banner">
+    <header id="header">
         {{ html_site_title() }}
         {{ html_translation_header() }}
         {{ html_navigation_links() }}
@@ -28,7 +28,7 @@
 {% endmacro %}
 
 {% macro html_navigation_links() %}
-    <nav id="menu" role="navigation">
+    <nav id="menu">
     <ul>
     {% for url, text in navigation_links[lang] %}
         {% if isinstance(url, tuple) %}
diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
index baa6810..8b4ed97 100644
--- a/nikola/data/themes/base-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -21,17 +21,20 @@ dir="rtl"
 lang="{{ lang }}">
 <head>
     <meta charset="utf-8">
+    <base href="{{ abs_link(permalink) }}">
     {% if description %}
     <meta name="description" content="{{ description }}">
     {% endif %}
     <meta name="viewport" content="width=device-width">
-    <title>{{ title|e }} | {{ blog_title|e }}</title>
+    {% if title == blog_title %}
+        <title>{{ blog_title|e }}</title>
+    {% else %}
+        <title>{{ title|e }} | {{ blog_title|e }}</title>
+    {% endif %}
 
     {{ html_stylesheets() }}
     {{ html_feedlinks() }}
-    {% if permalink %}
-      <link rel="canonical" href="{{ abs_link(permalink) }}">
-    {% endif %}
+    <link rel="canonical" href="{{ abs_link(permalink) }}">
 
     {% if favicons %}
         {% for name, file, size in favicons %}
@@ -90,7 +93,7 @@ lang="{{ lang }}">
         {{ rss_link }}
     {% elif generate_rss %}
         {% if translations|length > 1 %}
-            {% for language in translations %}
+            {% for language in translations|sort %}
                 <link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}">
             {% endfor %}
         {% else %}
@@ -99,7 +102,7 @@ lang="{{ lang }}">
     {% endif %}
     {% if generate_atom %}
         {% if translations|length > 1 %}
-            {% for language in translations %}
+            {% for language in translations|sort %}
                 <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
             {% endfor %}
         {% else %}
@@ -110,7 +113,7 @@ lang="{{ lang }}">
 
 {% macro html_translations() %}
     <ul class="translations">
-    {% for langname in translations.keys() %}
+    {% for langname in translations|sort %}
         {% if langname != lang %}
             <li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
         {% endif %}
diff --git a/nikola/data/themes/base-jinja/templates/index.tmpl b/nikola/data/themes/base-jinja/templates/index.tmpl
index fd9fcf4..222da43 100644
--- a/nikola/data/themes/base-jinja/templates/index.tmpl
+++ b/nikola/data/themes/base-jinja/templates/index.tmpl
@@ -19,7 +19,7 @@
         <h1 class="p-name entry-title"><a href="{{ post.permalink() }}" class="u-url">{{ post.title()|e }}</a></h1>
         <div class="metadata">
             <p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p>
-            <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p>
+            <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.formatted_date('webiso') }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p>
             {% if not post.meta('nocomments') and site_has_comments %}
                 <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }}
             {% endif %}
diff --git a/nikola/data/themes/base-jinja/templates/list_post.tmpl b/nikola/data/themes/base-jinja/templates/list_post.tmpl
index 166d8c4..919d6f0 100644
--- a/nikola/data/themes/base-jinja/templates/list_post.tmpl
+++ b/nikola/data/themes/base-jinja/templates/list_post.tmpl
@@ -9,7 +9,7 @@
     {% if posts %}
     <ul class="postlist">
     {% for post in posts %}
-        <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title()|e }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></li>
+        <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title()|e }}</a> <time class="listdate" datetime="{{ post.formatted_date('webiso') }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></li>
     {% endfor %}
     </ul>
     {% else %}
diff --git a/nikola/data/themes/base-jinja/templates/post_header.tmpl b/nikola/data/themes/base-jinja/templates/post_header.tmpl
index 00b6210..dc844e3 100644
--- a/nikola/data/themes/base-jinja/templates/post_header.tmpl
+++ b/nikola/data/themes/base-jinja/templates/post_header.tmpl
@@ -12,7 +12,7 @@
     {% if post.translated_to|length > 1 %}
         <div class="metadata posttranslations translations">
             <h3 class="posttranslations-intro">{{ messages("Also available in:") }}</h3>
-            {% for langname in translations.keys() %}
+            {% for langname in translations|sort %}
                 {% if langname != lang and post.is_translation_available(langname) %}
                 <p><a href="{{ post.permalink(langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></p>
                 {% endif %}
@@ -32,7 +32,7 @@
         {{ html_title() }}
         <div class="metadata">
             <p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p>
-            <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" itemprop="datePublished" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p>
+            <p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.formatted_date('webiso') }}" itemprop="datePublished" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p>
             {% if not post.meta('nocomments') and site_has_comments %}
                 <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }}
             {% endif %}
diff --git a/nikola/data/themes/base-jinja/templates/post_helper.tmpl b/nikola/data/themes/base-jinja/templates/post_helper.tmpl
index ae0206b..b4826eb 100644
--- a/nikola/data/themes/base-jinja/templates/post_helper.tmpl
+++ b/nikola/data/themes/base-jinja/templates/post_helper.tmpl
@@ -2,7 +2,7 @@
 
 {% macro meta_translations(post) %}
     {% if translations|length > 1 %}
-        {% for langname in translations.keys() %}
+        {% for langname in translations|sort %}
             {% if langname != lang and post.is_translation_available(langname) %}
                 <link rel="alternate" hreflang="{{ langname }}" href="{{ post.permalink(langname) }}">
             {% endif %}
@@ -58,7 +58,7 @@
 {#     <meta property="article:author" content="{{ post.author() }}"> #}
 {#     %endif #}
     {% if post.date.isoformat() %}
-    <meta property="article:published_time" content="{{ post.date.isoformat() }}">
+    <meta property="article:published_time" content="{{ post.formatted_date('webiso') }}">
     {% endif %}
     {% if post.tags %}
         {% for tag in post.tags %}
diff --git a/nikola/data/themes/base-jinja/templates/tag.tmpl b/nikola/data/themes/base-jinja/templates/tag.tmpl
index 765c122..0928a5f 100644
--- a/nikola/data/themes/base-jinja/templates/tag.tmpl
+++ b/nikola/data/themes/base-jinja/templates/tag.tmpl
@@ -4,7 +4,7 @@
 {% block extra_head %}
     {{ super() }}
     {% if translations|length > 1 and generate_rss %}
-        {% for language in translations %}
+        {% for language in translations|sort %}
             <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for {{ kind }} {{ tag }} ({{ language }})" href="{{ _link(kind + "_rss", tag, language) }}">
         {% endfor %}
     {% elif generate_rss %}
@@ -30,7 +30,7 @@
         {% endif %}
         <div class="metadata">
             {% if translations|length > 1 and generate_rss %}
-                {% for language in translations %}
+                {% for language in translations|sort %}
                 <p class="feedlink">
                     <a href="{{ _link(kind + "_rss", tag, language) }}" hreflang="{{ language }}" type="application/rss+xml">{{ messages('RSS feed', language) }} ({{ language }})</a>&nbsp;
                 </p>
@@ -43,7 +43,7 @@
     {% if posts %}
     <ul class="postlist">
     {% for post in posts %}
-        <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title()|e }}</a> <time class="listdate" datetime="{{ post.date.isoformat() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></li>
+        <li><a href="{{ post.permalink() }}" class="listtitle">{{ post.title()|e }}</a> <time class="listdate" datetime="{{ post.formatted_date('webiso') }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></li>
     {% endfor %}
     </ul>
     {% endif %}
diff --git a/nikola/data/themes/base-jinja/templates/tagindex.tmpl b/nikola/data/themes/base-jinja/templates/tagindex.tmpl
index ee7d8b0..f2d2d7a 100644
--- a/nikola/data/themes/base-jinja/templates/tagindex.tmpl
+++ b/nikola/data/themes/base-jinja/templates/tagindex.tmpl
@@ -15,7 +15,7 @@
 {% block extra_head %}
     {{ super() }}
     {% if translations|length > 1 and generate_atom %}
-        {% for language in translations %}
+        {% for language in translations|sort %}
             <link rel="alternate" type="application/atom+xml" title="Atom for the {{ tag }} section ({{ language }})" href="{{ _link(kind + "_atom", tag, language) }}">
         {% endfor %}
     {% elif generate_atom %}
diff --git a/nikola/data/themes/base/assets/css/rst.css b/nikola/data/themes/base/assets/css/rst.css
index 6e6de97..0fbab76 100644
--- a/nikola/data/themes/base/assets/css/rst.css
+++ b/nikola/data/themes/base/assets/css/rst.css
@@ -1,6 +1,6 @@
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7514 2012-09-14 14:27:12Z milde $
+:Id: $Id: html4css1.css 7614 2013-02-21 15:55:51Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
@@ -35,18 +35,10 @@ a.toc-backref {
 blockquote.epigraph {
   margin: 2em 5em ; }
 
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
 object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
   overflow: hidden;
 }
 
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
-  font-weight: bold }
-*/
-
 div.abstract {
   margin: 2em 5em }
 
@@ -55,23 +47,51 @@ div.abstract p.topic-title {
   text-align: center }
 
 div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
+div.hint, div.important, div.note, div.tip, div.warning, div.sidebar {
+/* stolen from Boostrap 3 (.panel .panel-default) */
+  margin-bottom: 20px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+          box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+  padding: 0 15px 15px 15px;
+}
+
+div.attention, div.caution, div.danger, div.error, div.warning {
+  /* stolen from Boostrap 3 (.panel .panel-danger) */
+  border-color: #EBCCD1;
+}
 
 div.admonition p.admonition-title, div.hint p.admonition-title,
 div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
+div.tip p.admonition-title, div.sidebar p.sidebar-title,
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title {
+/* stolen from Boostrap 3 (.panel .panel-default .panel-heading) */
+  font-size: 16px;
+  color: #333;
+  background-color: #F5F5F5;
+  padding: 10px 15px;
+  margin-left: -15px;
+  margin-right: -15px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0);
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  color: #333;
+  background-color: #F5F5F5;
+  border-color: #DDD;
+}
 
 div.attention p.admonition-title, div.caution p.admonition-title,
 div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
+div.warning p.admonition-title {
+  /* stolen from Boostrap 3 (.panel .panel-danger) */
+  color: #A94442;
+  background-color: #F2DEDE;
+  border-color: #EBCCD1;
+}
 
 /* Uncomment (and remove this text!) to get reduced vertical space in
    compound paragraphs.
@@ -118,48 +138,32 @@ html[dir="rtl"] div.line-block div.line-block {
 }
 
 div.sidebar {
-  margin: 0 0 0.5em 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
+  margin-left: 2em;
+  min-height: 20px;
   width: 40% ;
   float: right ;
   clear: right }
 
 div.sidebar p.rubric {
-  font-family: sans-serif ;
   font-size: medium }
 
 div.system-messages {
   margin: 5em }
 
 div.system-messages h1 {
-  color: red }
+  color: #a94442 }
 
 div.system-message {
-  border: medium outset ;
+  border: 1px solid #ebccd1;
   padding: 1em }
 
 div.system-message p.system-message-title {
-  color: red ;
+  color: #a94442 ;
   font-weight: bold }
 
 div.topic {
   margin: 2em }
 
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr.docutils {
-  width: 75% }
-
 img.align-left, .figure.align-left, object.align-left {
   clear: left ;
   float: left ;
@@ -231,13 +235,7 @@ p.rubric {
   color: maroon ;
   text-align: center }
 
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
 p.sidebar-subtitle {
-  font-family: sans-serif ;
   font-weight: bold }
 
 p.topic-title {
@@ -248,30 +246,23 @@ pre.address {
   margin-top: 0 ;
   font: inherit }
 
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
-  margin-left: 2em ;
-  margin-right: 2em }
-
 pre.code .ln { color: grey; } /* line numbers */
-pre.code, code { background-color: #eeeeee; }
+/*
+pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
 pre.code .literal.string, code .literal.string { color: #0C5404 }
 pre.code .name.builtin, code .name.builtin { color: #352B84 }
 pre.code .deleted, code .deleted { background-color: #DEB0A1}
 pre.code .inserted, code .inserted { background-color: #A3D289}
+*/
 
 span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
+  font-style: italic }
 
 span.classifier-delimiter {
-  font-family: sans-serif ;
   font-weight: bold }
 
-span.interpreted {
-  font-family: sans-serif }
-
 span.option {
   white-space: nowrap }
 
@@ -312,6 +303,21 @@ table.docutils th.field-name, table.docinfo th.docinfo-name {
   white-space: nowrap ;
   padding-left: 0 }
 
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
 h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
 h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
   font-size: 100% }
diff --git a/nikola/data/themes/base/assets/css/theme.css b/nikola/data/themes/base/assets/css/theme.css
index 3cb8628..5c7c86d 100644
--- a/nikola/data/themes/base/assets/css/theme.css
+++ b/nikola/data/themes/base/assets/css/theme.css
@@ -320,6 +320,7 @@ pre.code, code {
 	 */
 
 	a[href^="#"]:after,
+	a[href^="data:"]:after,
 	a[href^="javascript:"]:after {
 		content: "";
 	}
diff --git a/nikola/data/themes/base/messages/messages_bs.py b/nikola/data/themes/base/messages/messages_bs.py
new file mode 100644
index 0000000..23a1f64
--- /dev/null
+++ b/nikola/data/themes/base/messages/messages_bs.py
@@ -0,0 +1,39 @@
+# -*- encoding:utf-8 -*-
+from __future__ import unicode_literals
+
+MESSAGES = {
+    "%d min remaining to read": "%d minuta preostalo za čitanje",
+    "(active)": "(aktivno)",
+    "Also available in:": "Takođe dostupan u:",
+    "Archive": "Arhiva",
+    "Categories": "Kategorije",
+    "Comments": "Komentari",
+    "LANGUAGE": "Bosanski",
+    "Languages:": "Jezici:",
+    "More posts about %s": "Više objava o %s",
+    "Newer posts": "Novije objave",
+    "Next post": "Naredna objava",
+    "No posts found.": "Nema objava.",
+    "Nothing found.": "Ništa nije pronađeno.",
+    "Older posts": "Starije objave",
+    "Original site": "Izvorni sajt",
+    "Posted:": "Objavljeno:",
+    "Posts about %s": "Objave o %s",
+    "Posts for year %s": "Objave u godini %s",
+    "Posts for {month} {day}, {year}": "Objave za {month} {day}, {year}",
+    "Posts for {month} {year}": "Objave za {month} {year}",
+    "Previous post": "Prethodne objave",
+    "Publication date": "Datum objavljivanja",
+    "RSS feed": "RSS feed",
+    "Read in English": "Pročitaj na bosanskom",
+    "Read more": "Pročitaj više",
+    "Skip to main content": "Preskoči na glavni sadržaj",
+    "Source": "Izvor",
+    "Subcategories:": "Podkategorije:",
+    "Tags and Categories": "Oznake i kategorije",
+    "Tags": "Oznake",
+    "Write your page here.": "Vašu stranicu napišite ovdje.",
+    "Write your post here.": "Vašu objavu napišite ovdje.",
+    "old posts, page %d": "stare objave, strana %d",
+    "page %d": "strana %d",
+}
diff --git a/nikola/data/themes/base/messages/messages_fi.py b/nikola/data/themes/base/messages/messages_fi.py
index bcc2680..1bcd6ad 100644
--- a/nikola/data/themes/base/messages/messages_fi.py
+++ b/nikola/data/themes/base/messages/messages_fi.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 MESSAGES = {
     "%d min remaining to read": "%d minuuttia lukuaikaa",
-    "(active)": "",
+    "(active)": "(aktiivinen)",
     "Also available in:": "Saatavilla myös:",
     "Archive": "Arkisto",
     "Categories": "Kategoriat",
@@ -22,14 +22,14 @@ MESSAGES = {
     "Posts for year %s": "Postauksia vuodelta %s",
     "Posts for {month} {day}, {year}": "",
     "Posts for {month} {year}": "Postauksia ajalle {month} {year}",
-    "Previous post": "Vanhempia postauksia",
+    "Previous post": "Edellinen postaus",
     "Publication date": "Julkaisupäivämäärä",
-    "RSS feed": "RSS syöte",
+    "RSS feed": "RSS-syöte",
     "Read in English": "Lue suomeksi",
     "Read more": "Lue lisää",
     "Skip to main content": "Hyppää sisältöön",
     "Source": "Lähde",
-    "Subcategories:": "",
+    "Subcategories:": "Alakategoriat:",
     "Tags and Categories": "Tagit ja kategoriat",
     "Tags": "Tagit",
     "Write your page here.": "",
diff --git a/nikola/data/themes/base/messages/messages_hr.py b/nikola/data/themes/base/messages/messages_hr.py
index d26fc85..11e07d8 100644
--- a/nikola/data/themes/base/messages/messages_hr.py
+++ b/nikola/data/themes/base/messages/messages_hr.py
@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 MESSAGES = {
-    "%d min remaining to read": "",
-    "(active)": "",
+    "%d min remaining to read": "%d minuta preostalo za čitanje",
+    "(active)": "(aktivno)",
     "Also available in:": "Također dostupno i u:",
     "Archive": "Arhiva",
     "Categories": "Kategorije",
@@ -27,9 +27,9 @@ MESSAGES = {
     "RSS feed": "RSS kanal",
     "Read in English": "Čitaj na hrvatskom",
     "Read more": "Čitaj dalje",
-    "Skip to main content": "",
+    "Skip to main content": "Preskoči na glavni sadržaj",
     "Source": "Izvor",
-    "Subcategories:": "",
+    "Subcategories:": "Podkategorije:",
     "Tags and Categories": "Tagovi i kategorije",
     "Tags": "Tagovi",
     "Write your page here.": "",
diff --git a/nikola/data/themes/base/messages/messages_it.py b/nikola/data/themes/base/messages/messages_it.py
index 91f8374..9f6d8be 100644
--- a/nikola/data/themes/base/messages/messages_it.py
+++ b/nikola/data/themes/base/messages/messages_it.py
@@ -8,7 +8,7 @@ MESSAGES = {
     "Archive": "Archivio",
     "Categories": "Categorie",
     "Comments": "Commenti",
-    "LANGUAGE": "Inglese",
+    "LANGUAGE": "Italiano",
     "Languages:": "Lingue:",
     "More posts about %s": "Altri articoli collegati %s",
     "Newer posts": "Articoli più recenti",
@@ -30,7 +30,7 @@ MESSAGES = {
     "Skip to main content": "Vai al testo principale",
     "Source": "Sorgente",
     "Subcategories:": "Sottocategorie:",
-    "Tags and Categories": "Tag e Categorie",
+    "Tags and Categories": "Tag e categorie",
     "Tags": "Tag",
     "Write your page here.": "Scrivi qui la tua pagina.",
     "Write your post here.": "Scrivi qui il tuo post.",
diff --git a/nikola/data/themes/base/messages/messages_nb.py b/nikola/data/themes/base/messages/messages_nb.py
index 2533247..30b798e 100644
--- a/nikola/data/themes/base/messages/messages_nb.py
+++ b/nikola/data/themes/base/messages/messages_nb.py
@@ -2,38 +2,38 @@
 from __future__ import unicode_literals
 
 MESSAGES = {
-    "%d min remaining to read": "",
-    "(active)": "",
+    "%d min remaining to read": "%d min gjenstår å lese",
+    "(active)": "(aktiv)",
     "Also available in:": "Også tilgjengelig på:",
     "Archive": "Arkiv",
     "Categories": "Kategorier",
-    "Comments": "",
+    "Comments": "Kommentarer",
     "LANGUAGE": "norsk",
-    "Languages:": "",
+    "Languages:": "Språk:",
     "More posts about %s": "Flere innlegg om %s",
     "Newer posts": "Nyere innlegg",
     "Next post": "Neste innlegg",
-    "No posts found.": "",
-    "Nothing found.": "",
+    "No posts found.": "Fant ingen innlegg.",
+    "Nothing found.": "Fant ingenting.",
     "Older posts": "Eldre innlegg",
     "Original site": "Opprinnelig side",
     "Posted:": "Publisert:",
     "Posts about %s": "Innlegg om %s",
     "Posts for year %s": "Innlegg fra %s",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "Innlegg fra {day}. {month} {year}",
     "Posts for {month} {year}": "Innlegg fra {month} {year}",
     "Previous post": "Forrige innlegg",
-    "Publication date": "",
-    "RSS feed": "",
+    "Publication date": "Publiseringsdato",
+    "RSS feed": "RSS-nyhetskanal",
     "Read in English": "Les på norsk",
     "Read more": "Les mer",
-    "Skip to main content": "",
+    "Skip to main content": "Hopp til hovedinnholdet",
     "Source": "Kilde",
-    "Subcategories:": "",
+    "Subcategories:": "Underkategorier:",
     "Tags and Categories": "Merker og kategorier",
     "Tags": "Merker",
-    "Write your page here.": "",
-    "Write your post here.": "",
+    "Write your page here.": "Skriv siden din her.",
+    "Write your post here.": "Skriv innlegget din her.",
     "old posts, page %d": "eldre innlegg, side %d",
     "page %d": "side %d",
 }
diff --git a/nikola/data/themes/base/messages/messages_pa.py b/nikola/data/themes/base/messages/messages_pa.py
new file mode 100644
index 0000000..392a38b
--- /dev/null
+++ b/nikola/data/themes/base/messages/messages_pa.py
@@ -0,0 +1,39 @@
+# -*- encoding:utf-8 -*-
+from __future__ import unicode_literals
+
+MESSAGES = {
+    "%d min remaining to read": "ਪੜਣ ਲਈ  %d ਮਿੰਟ ਬਾਕੀ",
+    "(active)": "(ਚਲੰਤ)",
+    "Also available in:": "ਹੋਰ  ਉਪਲਬਧ ਬੋਲੀਆਂ:",
+    "Archive": "ਆਰਕਾਈਵ",
+    "Categories": "ਸ਼੍ਰੇਣੀ",
+    "Comments": "ਟਿੱਪਣੀਆਂ",
+    "LANGUAGE": "ਅੰਗਰੇਜ਼ੀ",
+    "Languages:": "ਬੋਲੀਆਂ:",
+    "More posts about %s": "%s ਬਾਰੇ ਹੋਰ ਲਿਖਤਾਂ",
+    "Newer posts": "ਨਵੀਆਂ ਲਿਖਤਾਂ",
+    "Next post": "ਅਗਲੀ ਲਿਖਤ",
+    "No posts found.": "ਕੋਈ ਲਿਖਤ ਨਹੀਂ ਲੱਭੀ |",
+    "Nothing found.": "ਕੁਝ ਨਹੀਂ ਲੱਭਿਆ |",
+    "Older posts": "ਪੁਰਾਣੀਆਂ ਲਿਖਤਾਂ",
+    "Original site": "ਅਸਲ ਸਾਈਟ",
+    "Posted:": "ਲਿਖਤ ਛਪੀ:",
+    "Posts about %s": "%s ਬਾਰੇ ਲਿਖਤਾਂ",
+    "Posts for year %s": "ਸਾਲ %s ਦੀਆਂ ਲਿਖਤਾਂ",
+    "Posts for {month} {day}, {year}": "{day} {month} {year} ਦੀਆਂ ਲਿਖਤਾਂ",
+    "Posts for {month} {year}": "{month} {year} ਦੀਆਂ ਲਿਖਤਾਂ",
+    "Previous post": "ਪਿਛਲੀ ਲਿਖਤ",
+    "Publication date": "ਛਪਾਈ ਦੀ ਤਰੀਕ",
+    "RSS feed": "ਆਰ ਐੱਸ ਐੱਸ ਫੀਡ",
+    "Read in English": "ਅੰਗਰੇਜ਼ੀ ਵਿੱਚ ਪੜ੍ਹੋ",
+    "Read more": "ਹੋਰ ਪੜ੍ਹੋ",
+    "Skip to main content": "ਮੁੱਖ ਸਮੱਗਰੀ ਵੱਲ ਜਾਓ",
+    "Source": "ਮੂਲ",
+    "Subcategories:": "ਉਪਸ਼੍ਰੇਣੀਆਂ:",
+    "Tags and Categories": "ਟੈਗ ਅਤੇ ਸ਼੍ਰੇਣੀਆਂ",
+    "Tags": "ਟੈਗ",
+    "Write your page here.": "ਆਪਣਾ ਸਫ਼ਾ ਏਥੇ ਲਿਖੋ |",
+    "Write your post here.": "ਆਪਣੀ ਲਿਖਤ ਏਥੇ ਲਿਖੋ |",
+    "old posts, page %d": "ਪੁਰਾਣੀਆਂ ਲਿਖਤਾਂ , ਸਫ਼ਾ %d",
+    "page %d": "ਸਫ਼ਾ %d",
+}
diff --git a/nikola/data/themes/base/messages/messages_pt.py b/nikola/data/themes/base/messages/messages_pt.py
index fd26d77..91ea52e 100644
--- a/nikola/data/themes/base/messages/messages_pt.py
+++ b/nikola/data/themes/base/messages/messages_pt.py
@@ -2,38 +2,38 @@
 from __future__ import unicode_literals
 
 MESSAGES = {
-    "%d min remaining to read": "",
-    "(active)": "",
-    "Also available in:": "",
-    "Archive": "",
-    "Categories": "",
-    "Comments": "",
-    "LANGUAGE": "",
-    "Languages:": "",
-    "More posts about %s": "",
-    "Newer posts": "",
-    "Next post": "",
-    "No posts found.": "",
-    "Nothing found.": "",
-    "Older posts": "",
-    "Original site": "",
-    "Posted:": "",
-    "Posts about %s": "",
-    "Posts for year %s": "",
-    "Posts for {month} {day}, {year}": "",
-    "Posts for {month} {year}": "",
-    "Previous post": "",
-    "Publication date": "",
-    "RSS feed": "",
-    "Read in English": "",
-    "Read more": "",
-    "Skip to main content": "",
-    "Source": "",
-    "Subcategories:": "",
-    "Tags and Categories": "",
-    "Tags": "",
-    "Write your page here.": "",
-    "Write your post here.": "",
-    "old posts, page %d": "",
-    "page %d": "",
+    "%d min remaining to read": "%d minutos restante para leitura",
+    "(active)": "(ativo)",
+    "Also available in:": "Também disponível em:",
+    "Archive": "Arquivo",
+    "Categories": "Categorias",
+    "Comments": "Comentários",
+    "LANGUAGE": "Português",
+    "Languages:": "Idiomas:",
+    "More posts about %s": "Mais textos publicados sobre %s",
+    "Newer posts": "Textos publicados mais recentes",
+    "Next post": "Próximo texto publicado",
+    "No posts found.": "Nenhum texto publicado foi encontrado",
+    "Nothing found.": "Nada encontrado.",
+    "Older posts": "Textos publicados mais antigos",
+    "Original site": "Sítio original",
+    "Posted:": "Publicado:",
+    "Posts about %s": "Textos publicados sobre %s",
+    "Posts for year %s": "Textos publicados do ano %s",
+    "Posts for {month} {day}, {year}": "Textos publicados de {day} {month} {year}",
+    "Posts for {month} {year}": "Textos publicados de {month} {year}",
+    "Previous post": "Texto publicado anterior",
+    "Publication date": "Data de publicação",
+    "RSS feed": "Feed RSS",
+    "Read in English": "Ler em português",
+    "Read more": "Ler mais",
+    "Skip to main content": "Saltar para o conteúdo principal",
+    "Source": "Código",
+    "Subcategories:": "Sub-Categorias:",
+    "Tags and Categories": "Etiquetas e Categorias",
+    "Tags": "Etiqueta",
+    "Write your page here.": "Escreva a sua página aqui.",
+    "Write your post here.": "Escreva o seu texto para publicar aqui.",
+    "old posts, page %d": "Textos publicados antigos, página %d",
+    "page %d": "página %d",
 }
diff --git a/nikola/data/themes/base/messages/messages_sk.py b/nikola/data/themes/base/messages/messages_sk.py
index a793ba6..acd7364 100644
--- a/nikola/data/themes/base/messages/messages_sk.py
+++ b/nikola/data/themes/base/messages/messages_sk.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 MESSAGES = {
     "%d min remaining to read": "zostáva %d minút na čítanie",
-    "(active)": "",
+    "(active)": "(aktívne)",
     "Also available in:": "Tiež dostupné v:",
     "Archive": "Archív",
     "Categories": "Kategórie",
@@ -20,7 +20,7 @@ MESSAGES = {
     "Posted:": "Zverejnené:",
     "Posts about %s": "Príspevky o %s",
     "Posts for year %s": "Príspevky z roku %s",
-    "Posts for {month} {day}, {year}": "Príspevky z dňa {day}. {month} {year}",
+    "Posts for {month} {day}, {year}": "Príspevky zo dňa {day}. {month} {year}",
     "Posts for {month} {year}": "Príspevky za mesiac {month} z roku {year}",
     "Previous post": "Predchádzajúci príspevok",
     "Publication date": "Dátum zverejnenia",
@@ -29,11 +29,11 @@ MESSAGES = {
     "Read more": "Čítať ďalej",
     "Skip to main content": "Skočiť na hlavný obsah",
     "Source": "Zdroj",
-    "Subcategories:": "",
+    "Subcategories:": "Podkategórie:",
     "Tags and Categories": "Štítky a kategórie",
     "Tags": "Štítky",
-    "Write your page here.": "",
-    "Write your post here.": "",
+    "Write your page here.": "Tu napíšte svoju stránku.",
+    "Write your post here.": "Tu napíšte svoj príspevok.",
     "old posts, page %d": "staré príspevky, strana %d",
     "page %d": "stránka %d",
 }
diff --git a/nikola/data/themes/base/messages/messages_sr.py b/nikola/data/themes/base/messages/messages_sr.py
index 6087027..2b0aaf5 100644
--- a/nikola/data/themes/base/messages/messages_sr.py
+++ b/nikola/data/themes/base/messages/messages_sr.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 MESSAGES = {
     "%d min remaining to read": "%d минута је преостало за читање",
-    "(active)": "",
+    "(active)": "(активно)",
     "Also available in:": "Такође доступан у:",
     "Archive": "Архива",
     "Categories": "Категорије",
@@ -20,7 +20,7 @@ MESSAGES = {
     "Posted:": "Објављено:",
     "Posts about %s": "Постови о %s",
     "Posts for year %s": "Постови за годину %s",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "Објаве за {month} {day}, {year}",
     "Posts for {month} {year}": "Постови за {month} {year}",
     "Previous post": "Претходни пост",
     "Publication date": "Датум објаве",
@@ -29,11 +29,11 @@ MESSAGES = {
     "Read more": "Прочитај више",
     "Skip to main content": "Прескочи на главни садржај",
     "Source": "Извор",
-    "Subcategories:": "",
+    "Subcategories:": "Подкатегорије:",
     "Tags and Categories": "Тагови и категорије",
     "Tags": "Тагови",
-    "Write your page here.": "",
-    "Write your post here.": "",
+    "Write your page here.": "Вашу страницу напишите овдје.",
+    "Write your post here.": "Вашу објаву напишите овдје.",
     "old posts, page %d": "стари постови, страна %d",
     "page %d": "страна %d",
 }
diff --git a/nikola/data/themes/base/messages/messages_sr@latin.py b/nikola/data/themes/base/messages/messages_sr@latin.py
new file mode 100644
index 0000000..23a1f64
--- /dev/null
+++ b/nikola/data/themes/base/messages/messages_sr@latin.py
@@ -0,0 +1,39 @@
+# -*- encoding:utf-8 -*-
+from __future__ import unicode_literals
+
+MESSAGES = {
+    "%d min remaining to read": "%d minuta preostalo za čitanje",
+    "(active)": "(aktivno)",
+    "Also available in:": "Takođe dostupan u:",
+    "Archive": "Arhiva",
+    "Categories": "Kategorije",
+    "Comments": "Komentari",
+    "LANGUAGE": "Bosanski",
+    "Languages:": "Jezici:",
+    "More posts about %s": "Više objava o %s",
+    "Newer posts": "Novije objave",
+    "Next post": "Naredna objava",
+    "No posts found.": "Nema objava.",
+    "Nothing found.": "Ništa nije pronađeno.",
+    "Older posts": "Starije objave",
+    "Original site": "Izvorni sajt",
+    "Posted:": "Objavljeno:",
+    "Posts about %s": "Objave o %s",
+    "Posts for year %s": "Objave u godini %s",
+    "Posts for {month} {day}, {year}": "Objave za {month} {day}, {year}",
+    "Posts for {month} {year}": "Objave za {month} {year}",
+    "Previous post": "Prethodne objave",
+    "Publication date": "Datum objavljivanja",
+    "RSS feed": "RSS feed",
+    "Read in English": "Pročitaj na bosanskom",
+    "Read more": "Pročitaj više",
+    "Skip to main content": "Preskoči na glavni sadržaj",
+    "Source": "Izvor",
+    "Subcategories:": "Podkategorije:",
+    "Tags and Categories": "Oznake i kategorije",
+    "Tags": "Oznake",
+    "Write your page here.": "Vašu stranicu napišite ovdje.",
+    "Write your post here.": "Vašu objavu napišite ovdje.",
+    "old posts, page %d": "stare objave, strana %d",
+    "page %d": "strana %d",
+}
diff --git a/nikola/data/themes/base/messages/messages_sv.py b/nikola/data/themes/base/messages/messages_sv.py
index deda21a..52df00d 100644
--- a/nikola/data/themes/base/messages/messages_sv.py
+++ b/nikola/data/themes/base/messages/messages_sv.py
@@ -3,37 +3,37 @@ from __future__ import unicode_literals
 
 MESSAGES = {
     "%d min remaining to read": "%d minuter kvar att läsa",
-    "(active)": "",
+    "(active)": "(aktiv)",
     "Also available in:": "Även tillgänglig på:",
     "Archive": "Arkiv",
     "Categories": "Kategorier",
     "Comments": "Kommentarer",
     "LANGUAGE": "Svenska",
     "Languages:": "Språk:",
-    "More posts about %s": "Mer inlägg om %s",
+    "More posts about %s": "Fler inlägg om %s",
     "Newer posts": "Nya inlägg",
     "Next post": "Nästa inlägg",
-    "No posts found.": "Inga inlägg hittade",
-    "Nothing found.": "Inget hittat",
+    "No posts found.": "Inga inlägg hittade.",
+    "Nothing found.": "Inget hittat.",
     "Older posts": "Äldre inlägg",
-    "Original site": "Orgnialsida",
-    "Posted:": "Publicerad",
+    "Original site": "Originalsida",
+    "Posted:": "Publicerad:",
     "Posts about %s": "Inlägg om %s",
     "Posts for year %s": "Inlägg för år %s",
     "Posts for {month} {day}, {year}": "Inlägg för {month} {day}, {year}",
     "Posts for {month} {year}": "Inlägg för {month} {year}",
     "Previous post": "Föregående inlägg",
     "Publication date": "Publiceringsdatum",
-    "RSS feed": "RSS flöde",
-    "Read in English": "Läs på Svenska",
+    "RSS feed": "RSS-flöde",
+    "Read in English": "Läs på svenska",
     "Read more": "Läs mer",
-    "Skip to main content": "hoppa till huvudinehåll",
+    "Skip to main content": "Hoppa till huvudinnehåll",
     "Source": "Källa",
     "Subcategories:": "Underkategorier:",
     "Tags and Categories": "Taggar och Kategorier",
     "Tags": "Taggar",
-    "Write your page here.": "",
-    "Write your post here.": "",
+    "Write your page here.": "Skriv din sida här.",
+    "Write your post here.": "Skriv ditt inlägg här.",
     "old posts, page %d": "gamla inlägg, sida %d",
     "page %d": "sida %d",
 }
diff --git a/nikola/data/themes/base/messages/messages_ur.py b/nikola/data/themes/base/messages/messages_ur.py
index 075606c..074cb06 100644
--- a/nikola/data/themes/base/messages/messages_ur.py
+++ b/nikola/data/themes/base/messages/messages_ur.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 MESSAGES = {
     "%d min remaining to read": "%d منٹ کا مطالعہ باقی",
-    "(active)": "",
+    "(active)": "(فعال)",
     "Also available in:": "ان زبانوں میں بھی دستیاب:",
     "Archive": "آرکائیو",
     "Categories": "زمرے",
@@ -32,8 +32,8 @@ MESSAGES = {
     "Subcategories:": "ذیلی زمرے",
     "Tags and Categories": "ٹیگز اور زمرے",
     "Tags": "ٹیگز",
-    "Write your page here.": "",
-    "Write your post here.": "",
+    "Write your page here.": "اپنے صفحے کا متن یہاں لکھیں۔",
+    "Write your post here.": "اپنی تحریر یہاں لکھیں۔",
     "old posts, page %d": "پرانی تحاریر صفحہ %d",
     "page %d": "صفحہ %d",
 }
diff --git a/nikola/data/themes/base/templates/archiveindex.tmpl b/nikola/data/themes/base/templates/archiveindex.tmpl
index 129b7c4..8c58f13 100644
--- a/nikola/data/themes/base/templates/archiveindex.tmpl
+++ b/nikola/data/themes/base/templates/archiveindex.tmpl
@@ -4,7 +4,7 @@
 <%block name="extra_head">
     ${parent.extra_head()}
     %if len(translations) > 1 and generate_atom:
-        %for language in translations:
+        %for language in sorted(translations):
             <link rel="alternate" type="application/atom+xml" title="Atom for the ${archive_name} section (${language})" href="${_link("archive_atom", archive_name, language)}">
         %endfor
     %elif generate_atom:
diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl
index 6da6416..2b0cbfd 100644
--- a/nikola/data/themes/base/templates/base.tmpl
+++ b/nikola/data/themes/base/templates/base.tmpl
@@ -14,13 +14,14 @@ ${template_hooks['extra_head']()}
 <a href="#content" class="sr-only sr-only-focusable">${messages("Skip to main content")}</a>
     <div id="container">
          ${header.html_header()}
-         <main id="content" role="main">
+         <main id="content">
             <%block name="content"></%block>
          </main>
          ${footer.html_footer()}
     </div>
+    ${base.late_load_js()}
+    <%block name="extra_js"></%block>
     ${body_end}
     ${template_hooks['body_end']()}
-    ${base.late_load_js()}
 </body>
 </html>
diff --git a/nikola/data/themes/base/templates/base_footer.tmpl b/nikola/data/themes/base/templates/base_footer.tmpl
index 9a1c00f..cd41d37 100644
--- a/nikola/data/themes/base/templates/base_footer.tmpl
+++ b/nikola/data/themes/base/templates/base_footer.tmpl
@@ -3,7 +3,7 @@
 
 <%def name="html_footer()">
     %if content_footer:
-        <footer id="footer" role="contentinfo">
+        <footer id="footer">
             <p>${content_footer}</p>
             ${template_hooks['page_footer']()}
         </footer>
diff --git a/nikola/data/themes/base/templates/base_header.tmpl b/nikola/data/themes/base/templates/base_header.tmpl
index 0c19af6..e29e2b3 100644
--- a/nikola/data/themes/base/templates/base_header.tmpl
+++ b/nikola/data/themes/base/templates/base_header.tmpl
@@ -2,7 +2,7 @@
 <%namespace name="base" file="base_helper.tmpl" import="*"/>
 
 <%def name="html_header()">
-    <header id="header" role="banner">
+    <header id="header">
         ${html_site_title()}
         ${html_translation_header()}
         ${html_navigation_links()}
@@ -28,7 +28,7 @@
 </%def>
 
 <%def name="html_navigation_links()">
-    <nav id="menu" role="navigation">
+    <nav id="menu">
     <ul>
     %for url, text in navigation_links[lang]:
         % if isinstance(url, tuple):
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
index 28b3f8a..948cfba 100644
--- a/nikola/data/themes/base/templates/base_helper.tmpl
+++ b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -21,17 +21,20 @@ dir="rtl" \
 lang="${lang}">
 <head>
     <meta charset="utf-8">
+    <base href="${abs_link(permalink)}">
     %if description:
     <meta name="description" content="${description}">
     %endif
     <meta name="viewport" content="width=device-width">
-    <title>${title|striphtml} | ${blog_title|striphtml}</title>
+    %if title == blog_title:
+        <title>${blog_title|h}</title>
+    %else:
+        <title>${title|h} | ${blog_title|h}</title>
+    %endif
 
     ${html_stylesheets()}
     ${html_feedlinks()}
-    %if permalink:
-      <link rel="canonical" href="${abs_link(permalink)}">
-    %endif
+    <link rel="canonical" href="${abs_link(permalink)}">
 
     %if favicons:
         %for name, file, size in favicons:
@@ -90,7 +93,7 @@ lang="${lang}">
         ${rss_link}
     %elif generate_rss:
         %if len(translations) > 1:
-            %for language in translations:
+            %for language in sorted(translations):
                 <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
             %endfor
         %else:
@@ -99,7 +102,7 @@ lang="${lang}">
     %endif
     %if generate_atom:
         %if len(translations) > 1:
-            %for language in translations:
+            %for language in sorted(translations):
                 <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
             %endfor
         %else:
@@ -110,7 +113,7 @@ lang="${lang}">
 
 <%def name="html_translations()">
     <ul class="translations">
-    %for langname in translations.keys():
+    %for langname in sorted(translations):
         %if langname != lang:
             <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
         %endif
diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl
index 69630e5..88bb25c 100644
--- a/nikola/data/themes/base/templates/index.tmpl
+++ b/nikola/data/themes/base/templates/index.tmpl
@@ -19,7 +19,7 @@
         <h1 class="p-name entry-title"><a href="${post.permalink()}" class="u-url">${post.title()|h}</a></h1>
         <div class="metadata">
             <p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p>
-            <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></a></p>
+            <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></a></p>
             % if not post.meta('nocomments') and site_has_comments:
                 <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)}
             % endif
diff --git a/nikola/data/themes/base/templates/list_post.tmpl b/nikola/data/themes/base/templates/list_post.tmpl
index 4fb497c..3335fa6 100644
--- a/nikola/data/themes/base/templates/list_post.tmpl
+++ b/nikola/data/themes/base/templates/list_post.tmpl
@@ -9,7 +9,7 @@
     %if posts:
     <ul class="postlist">
     % for post in posts:
-        <li><a href="${post.permalink()}" class="listtitle">${post.title()|h}</a> <time class="listdate" datetime="${post.date.isoformat()}" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></li>
+        <li><a href="${post.permalink()}" class="listtitle">${post.title()|h}</a> <time class="listdate" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></li>
     % endfor
     </ul>
     %else:
diff --git a/nikola/data/themes/base/templates/post_header.tmpl b/nikola/data/themes/base/templates/post_header.tmpl
index 0efb2f8..75383cb 100644
--- a/nikola/data/themes/base/templates/post_header.tmpl
+++ b/nikola/data/themes/base/templates/post_header.tmpl
@@ -12,7 +12,7 @@
     % if len(post.translated_to) > 1:
         <div class="metadata posttranslations translations">
             <h3 class="posttranslations-intro">${messages("Also available in:")}</h3>
-            % for langname in translations.keys():
+            % for langname in sorted(translations):
                 % if langname != lang and post.is_translation_available(langname):
                 <p><a href="${post.permalink(langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></p>
                 % endif
@@ -32,7 +32,7 @@
         ${html_title()}
         <div class="metadata">
             <p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p>
-            <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" itemprop="datePublished" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></a></p>
+            <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.formatted_date('webiso')}" itemprop="datePublished" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></a></p>
             % if not post.meta('nocomments') and site_has_comments:
                 <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)}
             % endif
diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl
index e091447..424d134 100644
--- a/nikola/data/themes/base/templates/post_helper.tmpl
+++ b/nikola/data/themes/base/templates/post_helper.tmpl
@@ -2,7 +2,7 @@
 
 <%def name="meta_translations(post)">
     %if len(translations) > 1:
-        %for langname in translations.keys():
+        %for langname in sorted(translations):
             %if langname != lang and post.is_translation_available(langname):
                 <link rel="alternate" hreflang="${langname}" href="${post.permalink(langname)}">
             %endif
@@ -58,7 +58,7 @@
 ###    <meta property="article:author" content="${post.author()}">
 ###    %endif
     %if post.date.isoformat():
-    <meta property="article:published_time" content="${post.date.isoformat()}">
+    <meta property="article:published_time" content="${post.formatted_date('webiso')}">
     %endif
     %if post.tags:
         %for tag in post.tags:
diff --git a/nikola/data/themes/base/templates/tag.tmpl b/nikola/data/themes/base/templates/tag.tmpl
index ec5caca..7509f3e 100644
--- a/nikola/data/themes/base/templates/tag.tmpl
+++ b/nikola/data/themes/base/templates/tag.tmpl
@@ -4,7 +4,7 @@
 <%block name="extra_head">
     ${parent.extra_head()}
     %if len(translations) > 1 and generate_rss:
-        %for language in translations:
+        %for language in sorted(translations):
             <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${tag} (${language})" href="${_link(kind + "_rss", tag, language)}">
         %endfor
     %elif generate_rss:
@@ -30,7 +30,7 @@
         %endif
         <div class="metadata">
             %if len(translations) > 1 and generate_rss:
-                %for language in translations:
+                %for language in sorted(translations):
                 <p class="feedlink">
                     <a href="${_link(kind + "_rss", tag, language)}" hreflang="${language}" type="application/rss+xml">${messages('RSS feed', language)} (${language})</a>&nbsp;
                 </p>
@@ -43,7 +43,7 @@
     %if posts:
     <ul class="postlist">
     % for post in posts:
-        <li><a href="${post.permalink()}" class="listtitle">${post.title()|h}</a> <time class="listdate" datetime="${post.date.isoformat()}" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></li>
+        <li><a href="${post.permalink()}" class="listtitle">${post.title()|h}</a> <time class="listdate" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></li>
     % endfor
     </ul>
     %endif
diff --git a/nikola/data/themes/base/templates/tagindex.tmpl b/nikola/data/themes/base/templates/tagindex.tmpl
index 7160fe9..0834411 100644
--- a/nikola/data/themes/base/templates/tagindex.tmpl
+++ b/nikola/data/themes/base/templates/tagindex.tmpl
@@ -15,7 +15,7 @@
 <%block name="extra_head">
     ${parent.extra_head()}
     %if len(translations) > 1 and generate_atom:
-        %for language in translations:
+        %for language in sorted(translations):
             <link rel="alternate" type="application/atom+xml" title="Atom for the ${tag} section (${language})" href="${_link(kind + "_atom", tag, language)}">
         %endfor
     %elif generate_atom:
diff --git a/nikola/data/themes/bootstrap-jinja/AUTHORS.txt b/nikola/data/themes/bootstrap-jinja/AUTHORS.txt
deleted file mode 100644
index 043d497..0000000
--- a/nikola/data/themes/bootstrap-jinja/AUTHORS.txt
+++ /dev/null
@@ -1 +0,0 @@
-Roberto Alsina <https://github.com/ralsina>
diff --git a/nikola/data/themes/bootstrap-jinja/README.md b/nikola/data/themes/bootstrap-jinja/README.md
deleted file mode 100644
index 637caf5..0000000
--- a/nikola/data/themes/bootstrap-jinja/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-A "website-done-with-bootstrap" theme, so to speak. 
-
-Has a fixed navigation bar at top that displays the NAVIGATION_LINKS
-setting and supports nested menus.
-
-This theme is used in Nikola's website: https://getnikola.com
-
-Important: To fit in the bootstrap navigation bar, the search form needs the
-navbar-form and pull-left CSS classes applied. Here is an example with Nikola's
-default duckduckgo search form:
-
-    SEARCH_FORM = """
-        <!-- Custom search -->
-        <form method="get" id="search" action="http://duckduckgo.com/" class="navbar-form pull-left">
-            <input type="hidden" name="sites" value="%s"/>
-            <input type="hidden" name="k8" value="#444444"/>
-            <input type="hidden" name="k9" value="#D51920"/>
-            <input type="hidden" name="kt" value="h"/>
-            <input type="text" name="q" maxlength="255" placeholder="Search&hellip;" class="span2" style="margin-top: 4px;"/>
-            <input type="submit" value="DuckDuckGo Search" style="visibility: hidden;" />
-        </form>
-        <!-- End of custom search -->
-    """ % SITE_URL
diff --git a/nikola/data/themes/bootstrap-jinja/assets/css/theme.css b/nikola/data/themes/bootstrap-jinja/assets/css/theme.css
deleted file mode 100644
index 4fc31a8..0000000
--- a/nikola/data/themes/bootstrap-jinja/assets/css/theme.css
+++ /dev/null
@@ -1,205 +0,0 @@
-#container {
-    width: 960px;
-    margin: 50 auto;
-}
-
-#contentcolumn {
-    max-width: 760px;
-}
-#q {
-    width: 150px;
-}
-
-img {
-    max-width: 90%;
-}
-
-.postbox {
-    border-bottom: 2px solid darkgrey;
-    margin-bottom: 12px;
-}
-
-.footerbox {padding: 15px; text-align: center; margin-bottom: 15px;}
-
-td.label {
-    /* Issue #290 */
-    background-color: inherit;
-}
-
-.footnote-reference {
-    /* Issue 290 */
-    vertical-align: super;
-    font-size: xx-small;
-}
-
-.caption {
-    /* Issue 292 */
-    text-align: center;
-    padding-top: 1em;
-}
-
-div.figure > img,
-div.figure > a > img {
-    /* Issue 292 */
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-div.sidebar, div.admonition, div.attention, div.caution, div.danger, div.error, div.hint, div.important, div.note, div.tip, div.warning {
-    /* Issue 277 */
-    border: 1px solid #aaa;
-    border-radius: 5px;
-}
-
-blockquote p, blockquote {
-  font-size: 17.5px;
-  font-weight: 300;
-  line-height: 1.25;
-}
-
-ul.bricks > li {
-    display: inline;
-    background-color: lightblue;
-    padding: 8px;
-    border-radius: 5px;
-    line-height: 3;
-    white-space:nowrap;
-    margin: 3px;
-}
-
-ul.breadcrumb > li:before {
-    content: " / ";
-}
-
-pre, pre code {
-    white-space: pre;
-    word-wrap: normal;
-    overflow: auto;
-}
-
-article.post-micro {
-    font-family: Georgia, 'Times New Roman', Times, serif;
-    font-size: 1.5em;
-}
-
-.image-block {
-    display: inline-block;
-}
-
-.flowr_row {
-    width: 100%;
-}
-
-.tags {
-    padding-left: 0;
-    margin-left: -5px;
-    list-style: none;
-    text-align: center;
-
-}
-
-.tags > li {
-    display: inline-block;
-    min-width: 10px;
-    padding: 3px 7px;
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 1;
-    color: #fff;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: baseline;
-    background-color: #999;
-    border-radius: 10px;
-}
-
-.tags > li a {
-    color: #fff;
-}
-
-.metadata p:before,
-.postlist .listdate:before {
-    content: " — ";
-}
-
-.metadata p:first-of-type:before {
-    content: "";
-}
-
-.metadata p {
-    display: inline;
-}
-
-.posttranslations h3 {
-    display: inline;
-    font-size: 1em;
-    font-weight: bold;
-}
-
-.posttranslations h3:last-child {
-    display: none;
-}
-
-.entry-content {
-    margin-top: 1em;
-}
-
-.navbar .brand {
-    padding: 0 20px;
-}
-
-.navbar .brand #blog-title {
-    padding: 10px 0;
-    display: inline-block;
-}
-
-.sr-only {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    padding: 0;
-    margin: -1px;
-    overflow: hidden;
-    clip: rect(0, 0, 0, 0);
-    border: 0;
-}
-
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-    position: static;
-    width: auto;
-    height: auto;
-    margin: 0;
-    overflow: visible;
-    clip: auto;
-}
-
-/* hat tip bootstrap/html5 boilerplate */
-@media print {
-    *, *:before, *:after {
-        font-family: Garamond, Junicode, serif;
-    }
-
-    body {
-        font-size: 12pt;
-    }
-
-    article .entry-title a[href]:after,
-    article .metadata a[href]:after,
-    article .tags a[href]:after {
-        content: "";
-    }
-
-    article .metadata .sourceline {
-        display: none;
-    }
-
-    article .metadata .linkline a[href]:after {
-        content: " (" attr(href) ")";
-    }
-
-    .navbar {
-        display: none;
-    }
-}
diff --git a/nikola/data/themes/bootstrap-jinja/bundles b/nikola/data/themes/bootstrap-jinja/bundles
deleted file mode 120000
index 3e517bb..0000000
--- a/nikola/data/themes/bootstrap-jinja/bundles
+++ /dev/null
@@ -1 +0,0 @@
-../bootstrap/bundles
-\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap-jinja/engine b/nikola/data/themes/bootstrap-jinja/engine
deleted file mode 100644
index 6f04b30..0000000
--- a/nikola/data/themes/bootstrap-jinja/engine
+++ /dev/null
@@ -1 +0,0 @@
-jinja
diff --git a/nikola/data/themes/bootstrap-jinja/parent b/nikola/data/themes/bootstrap-jinja/parent
deleted file mode 100644
index e9ed660..0000000
--- a/nikola/data/themes/bootstrap-jinja/parent
+++ /dev/null
@@ -1 +0,0 @@
-base-jinja
diff --git a/nikola/data/themes/bootstrap-jinja/templates/base.tmpl b/nikola/data/themes/bootstrap-jinja/templates/base.tmpl
deleted file mode 100644
index 3177276..0000000
--- a/nikola/data/themes/bootstrap-jinja/templates/base.tmpl
+++ /dev/null
@@ -1,93 +0,0 @@
-{#  -*- coding: utf-8 -*- #}
-{% import 'base_helper.tmpl' as base with context %}
-{% import 'annotation_helper.tmpl' as notes with context %}
-{{ set_locale(lang) }}
-{{ base.html_headstart() }}
-{% block extra_head %}
-{#  Leave this block alone. #}
-{% endblock %}
-{{ template_hooks['extra_head']() }}
-</head>
-<body>
-<a href="#content" class="sr-only sr-only-focusable">{{ messages("Skip to main content") }}</a>
-
-<!-- Menubar -->
-
-<div class="navbar navbar-static-top" id="navbar">
-    <div class="navbar-inner">
-        <div class="container">
-
-        <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-        <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-        </a>
-
-            <a class="brand" href="{{ abs_link(_link("root", None, lang)) }}">
-            {% if logo_url %}
-                <img src="{{ logo_url }}" alt="{{ blog_title }}" id="logo">
-            {% endif %}
-
-            {% if show_blog_title %}
-                <span id="blog-title">{{ blog_title }}</span>
-            {% endif %}
-            </a>
-            <!-- Everything you want hidden at 940px or less, place within here -->
-            <div class="nav-collapse collapse">
-                <ul class="nav">
-                    {{ base.html_navigation_links() }}
-                    {{ template_hooks['menu']() }}
-                </ul>
-                {% if search_form %}
-                    {{ search_form }}
-                {% endif %}
-                <ul class="nav pull-right">
-                {% block belowtitle %}
-                {% if translations|length > 1 %}
-                    <li>{{ base.html_translations() }}</li>
-                {% endif %}
-                {% endblock %}
-                {% if show_sourcelink %}
-                    <li>{% block sourcelink %}{% endblock %}</li>
-                {% endif %}
-                {{ template_hooks['menu_alt']() }}
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End of Menubar -->
-<div class="container-fluid" id="content" role="main">
-    <!--Body content-->
-    <div class="row-fluid">
-    <div class="span2"></div>
-    <div class="span8">
-    {{ template_hooks['page_header']() }}
-    {% block content %}{% endblock %}
-    </div>
-    </div>
-    <!--End of body content-->
-</div>
-<div class="footerbox">
-    {{ content_footer }}
-    {{ template_hooks['page_footer']() }}
-</div>
-{{ base.late_load_js() }}
-    <script>$('a.image-reference:not(.islink) img:not(.islink)').parent().colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
-    <!-- fancy dates -->
-    <script>
-    moment.locale("{{ momentjs_locales[lang] }}");
-    fancydates({{ date_fanciness }}, {{ js_date_format }});
-    </script>
-    <!-- end fancy dates -->
-    {% block extra_js %}{% endblock %}
-    {% if annotations and post and not post.meta('noannotations') %}
-        {{ notes.code() }}
-    {% elif not annotations and post and post.meta('annotations') %}
-        {{ notes.code() }}
-    {% endif %}
-{{ body_end }}
-{{ template_hooks['body_end']() }}
-</body>
-</html>
diff --git a/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
deleted file mode 100644
index 4a29e69..0000000
--- a/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
+++ /dev/null
@@ -1,184 +0,0 @@
-{#  -*- coding: utf-8 -*- #}
-
-{% import 'annotation_helper.tmpl' as notes with context %}
-{% macro html_headstart() %}
-<!DOCTYPE html>
-<html
-
-{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook') %}
-prefix='
-{% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) %}
-og: http://ogp.me/ns#
-{% endif %}
-{% if use_open_graph %}
-article: http://ogp.me/ns/article#
-{% endif %}
-{% if comment_system == 'facebook' %}
-fb: http://ogp.me/ns/fb#
-{% endif %}
-'
-{% endif %}
-
-{% if is_rtl %}
-dir="rtl"
-{% endif %}
-
-lang="{{ lang }}">
-    <head>
-    <meta charset="utf-8">
-    {% if description %}
-    <meta name="description" content="{{ description }}">
-    {% endif %}
-    <meta name="viewport" content="width=device-width">
-    <title>{{ title|e }} | {{ blog_title|e }}</title>
-
-    {{ html_stylesheets() }}
-    {{ html_feedlinks() }}
-    {% if permalink %}
-      <link rel="canonical" href="{{ abs_link(permalink) }}">
-    {% endif %}
-
-    {% if favicons %}
-        {% for name, file, size in favicons %}
-            <link rel="{{ name }}" href="{{ file }}" sizes="{{ size }}"/>
-        {% endfor %}
-    {% endif %}
-
-    {% if comment_system == 'facebook' %}
-        <meta property="fb:app_id" content="{{ comment_system_id }}">
-    {% endif %}
-
-    {% if prevlink %}
-        <link rel="prev" href="{{ prevlink }}" type="text/html">
-    {% endif %}
-    {% if nextlink %}
-        <link rel="next" href="{{ nextlink }}" type="text/html">
-    {% endif %}
-
-    {{ mathjax_config }}
-    {% if use_cdn %}
-        <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-    {% else %}
-        <!--[if lt IE 9]><script src="{{ url_replacer(permalink, '/assets/js/html5.js', lang) }}"></script><![endif]-->
-    {% endif %}
-
-    {{ extra_head_data }}
-{% endmacro %}
-
-
-{% macro late_load_js() %}
-    {% if use_bundles %}
-        {% if use_cdn %}
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-            <script src="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-            <script src="/assets/js/all.js"></script>
-        {% else %}
-            <script src="/assets/js/all-nocdn.js"></script>
-        {% endif %}
-    {% else %}
-        {% if use_cdn %}
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-            <script src="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-        {% else %}
-            <script src="/assets/js/jquery.min.js"></script>
-            <script src="/assets/js/bootstrap.min.js"></script>
-            <script src="/assets/js/moment-with-locales.min.js"></script>
-            <script src="/assets/js/fancydates.js"></script>
-        {% endif %}
-        <script src="/assets/js/jquery.colorbox-min.js"></script>
-    {% endif %}
-    {% if colorbox_locales[lang] %}
-        <script src="/assets/js/colorbox-i18n/jquery.colorbox-{{ colorbox_locales[lang] }}.js"></script>
-    {% endif %}
-    {{ social_buttons_code }}
-{% endmacro %}
-
-
-{% macro html_stylesheets() %}
-    {% if use_bundles %}
-        {% if use_cdn %}
-            <link href="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
-            <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
-        {% else %}
-            <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
-        {% endif %}
-    {% else %}
-        {% if use_cdn %}
-            <link href="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
-        {% else %}
-            <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-            <link href="/assets/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css">
-        {% endif %}
-        <link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/code.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
-        {% if has_custom_css %}
-            <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
-        {% endif %}
-    {% endif %}
-    {% if needs_ipython_css %}
-        <link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/nikola_ipython.css" rel="stylesheet" type="text/css">
-    {% endif %}
-    {% if annotations and post and not post.meta('noannotations') %}
-        {{ notes.css() }}
-    {% elif not annotations and post and post.meta('annotations') %}
-        {{ notes.css() }}
-    {% endif %}
-{% endmacro %}
-
-
-{% macro html_navigation_links() %}
-    {% for url, text in navigation_links[lang] %}
-        {% if isinstance(url, tuple) %}
-            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ text }}<b class="caret"></b></a>
-            <ul class="dropdown-menu">
-            {% for suburl, text in url %}
-                {% if rel_link(permalink, suburl) == "#" %}
-                    <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a>
-                {% else %}
-                    <li><a href="{{ suburl }}">{{ text }}</a>
-                {% endif %}
-            {% endfor %}
-            </ul>
-        {% else %}
-            {% if rel_link(permalink, url) == "#" %}
-                <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a>
-            {% else %}
-                <li><a href="{{ url }}">{{ text }}</a>
-            {% endif %}
-        {% endif %}
-    {% endfor %}
-{% endmacro %}
-
-{% macro html_feedlinks() %}
-    {% if rss_link %}
-        {{ rss_link }}
-    {% elif generate_rss %}
-        {% if translations|length > 1 %}
-            {% for language in translations %}
-                <link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}">
-            {% endfor %}
-        {% else %}
-            <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ _link('rss', None) }}">
-        {% endif %}
-    {% endif %}
-    {% if generate_atom %}
-        {% if translations|length > 1 %}
-            {% for language in translations %}
-                <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
-            {% endfor %}
-        {% else %}
-            <link rel="alternate" type="application/atom+xml" title="Atom" href="{{ _link('index_atom', None) }}">
-        {% endif %}
-    {% endif %}
-{% endmacro %}
-
-{% macro html_translations() %}
-    {% for langname in translations.keys() %}
-        {% if langname != lang %}
-            <li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
-        {% endif %}
-    {% endfor %}
-{% endmacro %}
diff --git a/nikola/data/themes/bootstrap-jinja/templates/gallery.tmpl b/nikola/data/themes/bootstrap-jinja/templates/gallery.tmpl
deleted file mode 100644
index 07112da..0000000
--- a/nikola/data/themes/bootstrap-jinja/templates/gallery.tmpl
+++ /dev/null
@@ -1,94 +0,0 @@
-{#  -*- coding: utf-8 -*- #}
-{% extends 'base.tmpl' %}
-{% import 'comments_helper.tmpl' as comments with context %}
-{% import 'crumbs.tmpl' as ui with context %}
-{% block sourcelink %}{% endblock %}
-
-{% block content %}
-    {{ ui.bar(crumbs) }}
-    {% if title %}
-    <h1>{{ title|e }}</h1>
-    {% endif %}
-    {% if post %}
-    <p>
-        {{ post.text() }}
-    </p>
-    {% endif %}
-    {% if folders %}
-    <ul>
-    {% for folder, ftitle in folders %}
-        <li><a href="{{ folder }}"><i class="icon-folder-open"></i>&nbsp;{{ ftitle }}</a></li>
-    {% endfor %}
-    </ul>
-    {% endif %}
-
-<div id="gallery_container"></div>
-{% if photo_array %}
-<noscript>
-<ul class="thumbnails">
-    {% for image in photo_array %}
-        <li><a href="{{ image['url'] }}" class="thumbnail image-reference" title="{{ image['title'] }}">
-            <img src="{{ image['url_thumb'] }}" alt="{{ image['title'] }}" /></a>
-    {% endfor %}
-</ul>
-</noscript>
-{% endif %}
-{% if site_has_comments and enable_comments %}
-{{ comments.comment_form(None, permalink, title) }}
-{% endif %}
-{% endblock %}
-
-{% block extra_head %}
-{{ super() }}
-<link rel="alternate" type="application/rss+xml" title="RSS" href="rss.xml">
-<style type="text/css">
-    .image-block {
-        display: inline-block;
-    }
-    .flowr_row {
-        width: 100%;
-    }
-    </style>
-{% endblock %}
-
-
-{% block extra_js %}
-<script src="/assets/js/flowr.plugin.js"></script>
-<script>
-jsonContent = {{ photo_array_json }};
-$("#gallery_container").flowr({
-        data : jsonContent,
-        height : {{ thumbnail_size }}*.6,
-        padding: 5,
-        rows: -1,
-        render : function(params) {
-            // Just return a div, string or a dom object, anything works fine
-            img = $("<img />").attr({
-                'src': params.itemData.url_thumb,
-                'width' : params.width,
-                'height' : params.height
-            }).css('max-width', '100%');
-            link = $( "<a></a>").attr({
-                'href': params.itemData.url,
-                'class': 'image-reference'
-            });
-            div = $("<div />").addClass('image-block').attr({
-                'title': params.itemData.title,
-                'data-toggle': "tooltip",
-            });
-            link.append(img);
-            div.append(link);
-            div.hover(div.tooltip());
-            return div;
-        },
-        itemWidth : function(data) { return data.size.w; },
-        itemHeight : function(data) { return data.size.h; },
-        complete : function(params) {
-            if( jsonContent.length > params.renderedItems ) {
-                nextRenderList = jsonContent.slice( params.renderedItems );
-            }
-        }
-    });
-$("a.image-reference").colorbox({rel:"gal", maxWidth:"100%",maxHeight:"100%",scalePhotos:true});
-</script>
-{% endblock %}
diff --git a/nikola/data/themes/bootstrap-jinja/templates/listing.tmpl b/nikola/data/themes/bootstrap-jinja/templates/listing.tmpl
deleted file mode 100644
index 4b99f86..0000000
--- a/nikola/data/themes/bootstrap-jinja/templates/listing.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{#  -*- coding: utf-8 -*- #}
-{% extends 'base.tmpl' %}
-{% import 'crumbs.tmpl' as ui with context %}
-
-{% block content %}
-{{ ui.bar(crumbs) }}
-{% if folders or files %}
-<ul class="list-unstyled">
-{% for name in folders %}
-    <li><a href="{{ name }}"><i class="icon-folder-open"></i> {{ name }}</a>
-{% endfor %}
-{% for name in files %}
-    <li><a href="{{ name }}.html"><i class="icon-file"></i> {{ name }}</a>
-{% endfor %}
-</ul>
-{% endif %}
-{% if code %}
-    {{ code }}
-{% endif %}
-{% endblock %}
-
-{% block sourcelink %}
-{% if source_link %}
-    <li>
-    <a href="{{ source_link }}" id="sourcelink">{{ messages("Source") }}</a>
-    </li>
-{% endif %}
-{% endblock %}
diff --git a/nikola/data/themes/bootstrap-jinja/templates/slides.tmpl b/nikola/data/themes/bootstrap-jinja/templates/slides.tmpl
deleted file mode 100644
index 0ae8fe8..0000000
--- a/nikola/data/themes/bootstrap-jinja/templates/slides.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{% block content %}
-<div id="{{ carousel_id }}" class="carousel slide">
-    <ol class="carousel-indicators">
-    {% for i in range(slides_content|length) %}
-        {% if i == 0 %}
-            <li data-target="#{{ carousel_id }}" data-slide-to="{{ i }}" class="active"></li>
-        {% else %}
-            <li data-target="#{{ carousel_id }}" data-slide-to="{{ i }}"></li>
-        {% endif %}
-    {% endfor %}
-    </ol>
-    <div class="carousel-inner">
-        {% for i, image in enumerate(slides_content) %}
-            {% if i == 0 %}
-                <div class="item active"><img src="{{ image }}" alt="" style="margin: 0 auto 0 auto;"></div>
-            {% else %}
-                <div class="item"><img src="{{ image }}" alt="" style="margin: 0 auto 0 auto;"></div>
-            {% endif %}
-        {% endfor %}
-    </div>
-    <a class="left carousel-control" href="#{{ carousel_id }}" data-slide="prev">&lsaquo;</a>
-    <a class="right carousel-control" href="#{{ carousel_id }}" data-slide="next">&rsaquo;</a>
-</div>
-{% endblock %}
diff --git a/nikola/data/themes/bootstrap/README.md b/nikola/data/themes/bootstrap/README.md
deleted file mode 100644
index 637caf5..0000000
--- a/nikola/data/themes/bootstrap/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-A "website-done-with-bootstrap" theme, so to speak. 
-
-Has a fixed navigation bar at top that displays the NAVIGATION_LINKS
-setting and supports nested menus.
-
-This theme is used in Nikola's website: https://getnikola.com
-
-Important: To fit in the bootstrap navigation bar, the search form needs the
-navbar-form and pull-left CSS classes applied. Here is an example with Nikola's
-default duckduckgo search form:
-
-    SEARCH_FORM = """
-        <!-- Custom search -->
-        <form method="get" id="search" action="http://duckduckgo.com/" class="navbar-form pull-left">
-            <input type="hidden" name="sites" value="%s"/>
-            <input type="hidden" name="k8" value="#444444"/>
-            <input type="hidden" name="k9" value="#D51920"/>
-            <input type="hidden" name="kt" value="h"/>
-            <input type="text" name="q" maxlength="255" placeholder="Search&hellip;" class="span2" style="margin-top: 4px;"/>
-            <input type="submit" value="DuckDuckGo Search" style="visibility: hidden;" />
-        </form>
-        <!-- End of custom search -->
-    """ % SITE_URL
diff --git a/nikola/data/themes/bootstrap/assets/css/theme.css b/nikola/data/themes/bootstrap/assets/css/theme.css
deleted file mode 100644
index 4fc31a8..0000000
--- a/nikola/data/themes/bootstrap/assets/css/theme.css
+++ /dev/null
@@ -1,205 +0,0 @@
-#container {
-    width: 960px;
-    margin: 50 auto;
-}
-
-#contentcolumn {
-    max-width: 760px;
-}
-#q {
-    width: 150px;
-}
-
-img {
-    max-width: 90%;
-}
-
-.postbox {
-    border-bottom: 2px solid darkgrey;
-    margin-bottom: 12px;
-}
-
-.footerbox {padding: 15px; text-align: center; margin-bottom: 15px;}
-
-td.label {
-    /* Issue #290 */
-    background-color: inherit;
-}
-
-.footnote-reference {
-    /* Issue 290 */
-    vertical-align: super;
-    font-size: xx-small;
-}
-
-.caption {
-    /* Issue 292 */
-    text-align: center;
-    padding-top: 1em;
-}
-
-div.figure > img,
-div.figure > a > img {
-    /* Issue 292 */
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-div.sidebar, div.admonition, div.attention, div.caution, div.danger, div.error, div.hint, div.important, div.note, div.tip, div.warning {
-    /* Issue 277 */
-    border: 1px solid #aaa;
-    border-radius: 5px;
-}
-
-blockquote p, blockquote {
-  font-size: 17.5px;
-  font-weight: 300;
-  line-height: 1.25;
-}
-
-ul.bricks > li {
-    display: inline;
-    background-color: lightblue;
-    padding: 8px;
-    border-radius: 5px;
-    line-height: 3;
-    white-space:nowrap;
-    margin: 3px;
-}
-
-ul.breadcrumb > li:before {
-    content: " / ";
-}
-
-pre, pre code {
-    white-space: pre;
-    word-wrap: normal;
-    overflow: auto;
-}
-
-article.post-micro {
-    font-family: Georgia, 'Times New Roman', Times, serif;
-    font-size: 1.5em;
-}
-
-.image-block {
-    display: inline-block;
-}
-
-.flowr_row {
-    width: 100%;
-}
-
-.tags {
-    padding-left: 0;
-    margin-left: -5px;
-    list-style: none;
-    text-align: center;
-
-}
-
-.tags > li {
-    display: inline-block;
-    min-width: 10px;
-    padding: 3px 7px;
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 1;
-    color: #fff;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: baseline;
-    background-color: #999;
-    border-radius: 10px;
-}
-
-.tags > li a {
-    color: #fff;
-}
-
-.metadata p:before,
-.postlist .listdate:before {
-    content: " — ";
-}
-
-.metadata p:first-of-type:before {
-    content: "";
-}
-
-.metadata p {
-    display: inline;
-}
-
-.posttranslations h3 {
-    display: inline;
-    font-size: 1em;
-    font-weight: bold;
-}
-
-.posttranslations h3:last-child {
-    display: none;
-}
-
-.entry-content {
-    margin-top: 1em;
-}
-
-.navbar .brand {
-    padding: 0 20px;
-}
-
-.navbar .brand #blog-title {
-    padding: 10px 0;
-    display: inline-block;
-}
-
-.sr-only {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    padding: 0;
-    margin: -1px;
-    overflow: hidden;
-    clip: rect(0, 0, 0, 0);
-    border: 0;
-}
-
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-    position: static;
-    width: auto;
-    height: auto;
-    margin: 0;
-    overflow: visible;
-    clip: auto;
-}
-
-/* hat tip bootstrap/html5 boilerplate */
-@media print {
-    *, *:before, *:after {
-        font-family: Garamond, Junicode, serif;
-    }
-
-    body {
-        font-size: 12pt;
-    }
-
-    article .entry-title a[href]:after,
-    article .metadata a[href]:after,
-    article .tags a[href]:after {
-        content: "";
-    }
-
-    article .metadata .sourceline {
-        display: none;
-    }
-
-    article .metadata .linkline a[href]:after {
-        content: " (" attr(href) ")";
-    }
-
-    .navbar {
-        display: none;
-    }
-}
diff --git a/nikola/data/themes/bootstrap/bundles b/nikola/data/themes/bootstrap/bundles
deleted file mode 100644
index 38257d2..0000000
--- a/nikola/data/themes/bootstrap/bundles
+++ /dev/null
@@ -1,4 +0,0 @@
-assets/css/all-nocdn.css=bootstrap.css,bootstrap-responsive.css,rst.css,code.css,colorbox.css,theme.css,custom.css
-assets/css/all.css=rst.css,code.css,colorbox.css,theme.css,custom.css
-assets/js/all-nocdn.js=jquery.min.js,bootstrap.min.js,jquery.colorbox-min.js,moment-with-locales.min.js,fancydates.js
-assets/js/all.js=jquery.colorbox-min.js,moment-with-locales.min.js,fancydates.js
diff --git a/nikola/data/themes/bootstrap/engine b/nikola/data/themes/bootstrap/engine
deleted file mode 100644
index 2951cdd..0000000
--- a/nikola/data/themes/bootstrap/engine
+++ /dev/null
@@ -1 +0,0 @@
-mako
diff --git a/nikola/data/themes/bootstrap/parent b/nikola/data/themes/bootstrap/parent
deleted file mode 100644
index df967b9..0000000
--- a/nikola/data/themes/bootstrap/parent
+++ /dev/null
@@ -1 +0,0 @@
-base
diff --git a/nikola/data/themes/bootstrap/templates/base.tmpl b/nikola/data/themes/bootstrap/templates/base.tmpl
deleted file mode 100644
index e848673..0000000
--- a/nikola/data/themes/bootstrap/templates/base.tmpl
+++ /dev/null
@@ -1,93 +0,0 @@
-## -*- coding: utf-8 -*-
-<%namespace name="base" file="base_helper.tmpl" import="*" />
-<%namespace name="notes" file="annotation_helper.tmpl" import="*" />
-${set_locale(lang)}
-${base.html_headstart()}
-<%block name="extra_head">
-### Leave this block alone.
-</%block>
-${template_hooks['extra_head']()}
-</head>
-<body>
-<a href="#content" class="sr-only sr-only-focusable">${messages("Skip to main content")}</a>
-
-<!-- Menubar -->
-
-<div class="navbar navbar-static-top" id="navbar">
-    <div class="navbar-inner">
-        <div class="container">
-
-        <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-        <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-        </a>
-
-            <a class="brand" href="${abs_link(_link("root", None, lang))}">
-            %if logo_url:
-                <img src="${logo_url}" alt="${blog_title}" id="logo">
-            %endif
-
-            % if show_blog_title:
-                <span id="blog-title">${blog_title}</span>
-            % endif
-            </a>
-            <!-- Everything you want hidden at 940px or less, place within here -->
-            <div class="nav-collapse collapse">
-                <ul class="nav">
-                    ${base.html_navigation_links()}
-                    ${template_hooks['menu']()}
-                </ul>
-                %if search_form:
-                    ${search_form}
-                %endif
-                <ul class="nav pull-right">
-                <%block name="belowtitle">
-                %if len(translations) > 1:
-                    <li>${base.html_translations()}</li>
-                %endif
-                </%block>
-                % if show_sourcelink:
-                    <li><%block name="sourcelink"></%block></li>
-                %endif
-                ${template_hooks['menu_alt']()}
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End of Menubar -->
-<div class="container-fluid" id="content" role="main">
-    <!--Body content-->
-    <div class="row-fluid">
-    <div class="span2"></div>
-    <div class="span8">
-    ${template_hooks['page_header']()}
-    <%block name="content"></%block>
-    </div>
-    </div>
-    <!--End of body content-->
-</div>
-<div class="footerbox">
-    ${content_footer}
-    ${template_hooks['page_footer']()}
-</div>
-${base.late_load_js()}
-    <script>$('a.image-reference:not(.islink) img:not(.islink)').parent().colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
-    <!-- fancy dates -->
-    <script>
-    moment.locale("${momentjs_locales[lang]}");
-    fancydates(${date_fanciness}, ${js_date_format});
-    </script>
-    <!-- end fancy dates -->
-    <%block name="extra_js"></%block>
-    % if annotations and post and not post.meta('noannotations'):
-        ${notes.code()}
-    % elif not annotations and post and post.meta('annotations'):
-        ${notes.code()}
-    % endif
-${body_end}
-${template_hooks['body_end']()}
-</body>
-</html>
diff --git a/nikola/data/themes/bootstrap/templates/base_helper.tmpl b/nikola/data/themes/bootstrap/templates/base_helper.tmpl
deleted file mode 100644
index 4c62f8d..0000000
--- a/nikola/data/themes/bootstrap/templates/base_helper.tmpl
+++ /dev/null
@@ -1,184 +0,0 @@
-## -*- coding: utf-8 -*-
-
-<%namespace name="notes" file="annotation_helper.tmpl" import="*" />
-<%def name="html_headstart()">
-<!DOCTYPE html>
-<html
-\
-% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook'):
-prefix='\
-%if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']):
-og: http://ogp.me/ns# \
-%endif
-%if use_open_graph:
-article: http://ogp.me/ns/article# \
-%endif
-%if comment_system == 'facebook':
-fb: http://ogp.me/ns/fb# \
-%endif
-'\
-%endif
-\
-% if is_rtl:
-dir="rtl" \
-% endif
-\
-lang="${lang}">
-    <head>
-    <meta charset="utf-8">
-    %if description:
-    <meta name="description" content="${description}">
-    %endif
-    <meta name="viewport" content="width=device-width">
-    <title>${title|striphtml} | ${blog_title|striphtml}</title>
-
-    ${html_stylesheets()}
-    ${html_feedlinks()}
-    %if permalink:
-      <link rel="canonical" href="${abs_link(permalink)}">
-    %endif
-
-    %if favicons:
-        %for name, file, size in favicons:
-            <link rel="${name}" href="${file}" sizes="${size}"/>
-        %endfor
-    %endif
-
-    % if comment_system == 'facebook':
-        <meta property="fb:app_id" content="${comment_system_id}">
-    % endif
-
-    %if prevlink:
-        <link rel="prev" href="${prevlink}" type="text/html">
-    %endif
-    %if nextlink:
-        <link rel="next" href="${nextlink}" type="text/html">
-    %endif
-
-    ${mathjax_config}
-    %if use_cdn:
-        <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-    %else:
-        <!--[if lt IE 9]><script src="${url_replacer(permalink, '/assets/js/html5.js', lang)}"></script><![endif]-->
-    %endif
-
-    ${extra_head_data}
-</%def>
-
-
-<%def name="late_load_js()">
-    %if use_bundles:
-        %if use_cdn:
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-            <script src="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-            <script src="/assets/js/all.js"></script>
-        %else:
-            <script src="/assets/js/all-nocdn.js"></script>
-        %endif
-    %else:
-        %if use_cdn:
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-            <script src="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-        %else:
-            <script src="/assets/js/jquery.min.js"></script>
-            <script src="/assets/js/bootstrap.min.js"></script>
-            <script src="/assets/js/moment-with-locales.min.js"></script>
-            <script src="/assets/js/fancydates.js"></script>
-        %endif
-        <script src="/assets/js/jquery.colorbox-min.js"></script>
-    %endif
-    %if colorbox_locales[lang]:
-        <script src="/assets/js/colorbox-i18n/jquery.colorbox-${colorbox_locales[lang]}.js"></script>
-    %endif
-    ${social_buttons_code}
-</%def>
-
-
-<%def name="html_stylesheets()">
-    %if use_bundles:
-        %if use_cdn:
-            <link href="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
-            <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
-        %else:
-            <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
-        %endif
-    %else:
-        %if use_cdn:
-            <link href="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
-        %else:
-            <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-            <link href="/assets/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css">
-        %endif
-        <link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/code.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
-        %if has_custom_css:
-            <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
-        %endif
-    %endif
-    % if needs_ipython_css:
-        <link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/nikola_ipython.css" rel="stylesheet" type="text/css">
-    % endif
-    % if annotations and post and not post.meta('noannotations'):
-        ${notes.css()}
-    % elif not annotations and post and post.meta('annotations'):
-        ${notes.css()}
-    % endif
-</%def>
-
-
-<%def name="html_navigation_links()">
-    %for url, text in navigation_links[lang]:
-        % if isinstance(url, tuple):
-            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">${text}<b class="caret"></b></a>
-            <ul class="dropdown-menu">
-            %for suburl, text in url:
-                % if rel_link(permalink, suburl) == "#":
-                    <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", lang)}</span></a>
-                %else:
-                    <li><a href="${suburl}">${text}</a>
-                %endif
-            %endfor
-            </ul>
-        % else:
-            % if rel_link(permalink, url) == "#":
-                <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", lang)}</span></a>
-            %else:
-                <li><a href="${url}">${text}</a>
-            %endif
-        % endif
-    %endfor
-</%def>
-
-<%def name="html_feedlinks()">
-    %if rss_link:
-        ${rss_link}
-    %elif generate_rss:
-        %if len(translations) > 1:
-            %for language in translations:
-                <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
-            %endfor
-        %else:
-            <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}">
-        %endif
-    %endif
-    %if generate_atom:
-        %if len(translations) > 1:
-            %for language in translations:
-                <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
-            %endfor
-        %else:
-            <link rel="alternate" type="application/atom+xml" title="Atom" href="${_link('index_atom', None)}">
-        %endif
-    %endif
-</%def>
-
-<%def name="html_translations()">
-    %for langname in translations.keys():
-        %if langname != lang:
-            <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
-        %endif
-    %endfor
-</%def>
diff --git a/nikola/data/themes/bootstrap/templates/gallery.tmpl b/nikola/data/themes/bootstrap/templates/gallery.tmpl
deleted file mode 100644
index ab15587..0000000
--- a/nikola/data/themes/bootstrap/templates/gallery.tmpl
+++ /dev/null
@@ -1,94 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="base.tmpl"/>
-<%namespace name="comments" file="comments_helper.tmpl"/>
-<%namespace name="ui" file="crumbs.tmpl" import="bar"/>
-<%block name="sourcelink"></%block>
-
-<%block name="content">
-    ${ui.bar(crumbs)}
-    %if title:
-    <h1>${title|h}</h1>
-    %endif
-    %if post:
-    <p>
-        ${post.text()}
-    </p>
-    %endif
-    %if folders:
-    <ul>
-    % for folder, ftitle in folders:
-        <li><a href="${folder}"><i class="icon-folder-open"></i>&nbsp;${ftitle}</a></li>
-    % endfor
-    </ul>
-    %endif
-
-<div id="gallery_container"></div>
-%if photo_array:
-<noscript>
-<ul class="thumbnails">
-    %for image in photo_array:
-        <li><a href="${image['url']}" class="thumbnail image-reference" title="${image['title']}">
-            <img src="${image['url_thumb']}" alt="${image['title']}" /></a>
-    %endfor
-</ul>
-</noscript>
-%endif
-%if site_has_comments and enable_comments:
-${comments.comment_form(None, permalink, title)}
-%endif
-</%block>
-
-<%block name="extra_head">
-${parent.extra_head()}
-<link rel="alternate" type="application/rss+xml" title="RSS" href="rss.xml">
-<style type="text/css">
-    .image-block {
-        display: inline-block;
-    }
-    .flowr_row {
-        width: 100%;
-    }
-    </style>
-</%block>
-
-
-<%block name="extra_js">
-<script src="/assets/js/flowr.plugin.js"></script>
-<script>
-jsonContent = ${photo_array_json};
-$("#gallery_container").flowr({
-        data : jsonContent,
-        height : ${thumbnail_size}*.6,
-        padding: 5,
-        rows: -1,
-        render : function(params) {
-            // Just return a div, string or a dom object, anything works fine
-            img = $("<img />").attr({
-                'src': params.itemData.url_thumb,
-                'width' : params.width,
-                'height' : params.height
-            }).css('max-width', '100%');
-            link = $( "<a></a>").attr({
-                'href': params.itemData.url,
-                'class': 'image-reference'
-            });
-            div = $("<div />").addClass('image-block').attr({
-                'title': params.itemData.title,
-                'data-toggle': "tooltip",
-            });
-            link.append(img);
-            div.append(link);
-            div.hover(div.tooltip());
-            return div;
-        },
-        itemWidth : function(data) { return data.size.w; },
-        itemHeight : function(data) { return data.size.h; },
-        complete : function(params) {
-            if( jsonContent.length > params.renderedItems ) {
-                nextRenderList = jsonContent.slice( params.renderedItems );
-            }
-        }
-    });
-$("a.image-reference").colorbox({rel:"gal", maxWidth:"100%",maxHeight:"100%",scalePhotos:true});
-</script>
-</%block>
diff --git a/nikola/data/themes/bootstrap/templates/listing.tmpl b/nikola/data/themes/bootstrap/templates/listing.tmpl
deleted file mode 100644
index f03ea23..0000000
--- a/nikola/data/themes/bootstrap/templates/listing.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="base.tmpl"/>
-<%namespace name="ui" file="crumbs.tmpl" import="bar"/>
-
-<%block name="content">
-${ui.bar(crumbs)}
-%if folders or files:
-<ul class="list-unstyled">
-% for name in folders:
-    <li><a href="${name}"><i class="icon-folder-open"></i> ${name}</a>
-% endfor
-% for name in files:
-    <li><a href="${name}.html"><i class="icon-file"></i> ${name}</a>
-% endfor
-</ul>
-%endif
-% if code:
-    ${code}
-% endif
-</%block>
-
-<%block name="sourcelink">
-% if source_link:
-    <li>
-    <a href="${source_link}" id="sourcelink">${messages("Source")}</a>
-    </li>
-% endif
-</%block>
diff --git a/nikola/data/themes/bootstrap/templates/slides.tmpl b/nikola/data/themes/bootstrap/templates/slides.tmpl
deleted file mode 100644
index 048fb7e..0000000
--- a/nikola/data/themes/bootstrap/templates/slides.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<%block name="content">
-<div id="${carousel_id}" class="carousel slide">
-    <ol class="carousel-indicators">
-    % for i in range(len(slides_content)):
-        % if i == 0:
-            <li data-target="#${carousel_id}" data-slide-to="${i}" class="active"></li>
-        % else:
-            <li data-target="#${carousel_id}" data-slide-to="${i}"></li>
-        % endif
-    % endfor
-    </ol>
-    <div class="carousel-inner">
-        % for i, image in enumerate(slides_content):
-            % if i == 0:
-                <div class="item active"><img src="${image}" alt="" style="margin: 0 auto 0 auto;"></div>
-            % else:
-                <div class="item"><img src="${image}" alt="" style="margin: 0 auto 0 auto;"></div>
-            % endif
-        % endfor
-    </div>
-    <a class="left carousel-control" href="#${carousel_id}" data-slide="prev">&lsaquo;</a>
-    <a class="right carousel-control" href="#${carousel_id}" data-slide="next">&rsaquo;</a>
-</div>
-</%block>
diff --git a/nikola/data/themes/bootstrap3-jinja/README.md b/nikola/data/themes/bootstrap3-jinja/README.md
index f008daf..10e673a 100644
--- a/nikola/data/themes/bootstrap3-jinja/README.md
+++ b/nikola/data/themes/bootstrap3-jinja/README.md
@@ -1,4 +1,4 @@
-A bootstrap3 version of the bootstrap theme.
+A theme based on Bootstrap 3.
 
 There is a variant called bootstrap3-gradients which uses an extra CSS
 file for a *visually enhanced experience* (according to Bootstrap
diff --git a/nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css b/nikola/data/themes/bootstrap3-jinja/assets/css/colorbox.css
index 5f8b3b0..5f8b3b0 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/css/colorbox.css
+++ b/nikola/data/themes/bootstrap3-jinja/assets/css/colorbox.css
diff --git a/nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png b/nikola/data/themes/bootstrap3-jinja/assets/css/images/controls.png
index 841a726..841a726 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/css/images/controls.png
+++ b/nikola/data/themes/bootstrap3-jinja/assets/css/images/controls.png
diff --git a/nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif b/nikola/data/themes/bootstrap3-jinja/assets/css/images/loading.gif
index b192a75..b192a75 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/css/images/loading.gif
+++ b/nikola/data/themes/bootstrap3-jinja/assets/css/images/loading.gif
diff --git a/nikola/data/themes/bootstrap3-jinja/assets/css/theme.css b/nikola/data/themes/bootstrap3-jinja/assets/css/theme.css
index 9ce6472..6964ec6 100644
--- a/nikola/data/themes/bootstrap3-jinja/assets/css/theme.css
+++ b/nikola/data/themes/bootstrap3-jinja/assets/css/theme.css
@@ -51,12 +51,6 @@ div.figure > a > img {
     margin-right: auto;
 }
 
-div.sidebar, div.admonition, div.attention, div.caution, div.danger, div.error, div.hint, div.important, div.note, div.tip, div.warning {
-    /* Issue 277 */
-    border: 1px solid #aaa;
-    border-radius: 5px;
-}
-
 blockquote p, blockquote {
   font-size: 17.5px;
   font-weight: 300;
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js
index f83073f..f83073f 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ar.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js
index bafc4e0..bafc4e0 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-bg.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js
index 9b995d8..9b995d8 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-bn.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js
index a749232..a749232 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ca.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js
index e4a595c..e4a595c 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-cs.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js
index 1e9a1d6..1e9a1d6 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-da.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js
index 748f53b..748f53b 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-de.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js
index 1154fb5..1154fb5 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-es.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js
index 483e192..483e192 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-et.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js
index a30b13c..a30b13c 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fa.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js
index 2a7e8ad..2a7e8ad 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fi.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js
index e359290..e359290 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-fr.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js
index 04fa276..04fa276 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-gl.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js
index d8105ab..d8105ab 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-gr.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js
index 72dddf5..72dddf5 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-he.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js
index 34aa3c0..34aa3c0 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-hr.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js
index a87f03c..a87f03c 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-hu.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js
index 31053b8..31053b8 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-id.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js
index aad9d22..aad9d22 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-it.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js
index 3ea27c2..3ea27c2 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ja.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js
index 3e23b4a..3e23b4a 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-kr.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js
index 374b9bb..374b9bb 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-lt.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js
index 101b476..101b476 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-lv.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js
index 8e14f15..8e14f15 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-my.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js
index 2d03d48..2d03d48 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-nl.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js
index 9af0ba7..9af0ba7 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-no.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js
index 34f8ab1..34f8ab1 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-pl.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
index e20bd38..e20bd38 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js
index 555f2e6..555f2e6 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ro.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js
index bac4855..bac4855 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-ru.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js
index 65b0492..65b0492 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-si.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js
index 99859fd..99859fd 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sk.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js
index c4fd9d5..c4fd9d5 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sr.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js
index d7f26e0..d7f26e0 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-sv.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js
index 86fd98f..86fd98f 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-tr.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js
index 7cd1336..7cd1336 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-uk.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
index e6c5965..e6c5965 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
index bd2254c..bd2254c 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/flowr.plugin.js b/nikola/data/themes/bootstrap3-jinja/assets/js/flowr.plugin.js
index c0d986b..c0d986b 100644
--- a/nikola/data/themes/bootstrap-jinja/assets/js/flowr.plugin.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/flowr.plugin.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js b/nikola/data/themes/bootstrap3-jinja/assets/js/jquery.colorbox.js
index 5ee7a90..5ee7a90 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/jquery.colorbox.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/jquery.colorbox.js
diff --git a/nikola/data/themes/bootstrap-jinja/assets/js/jquery.js b/nikola/data/themes/bootstrap3-jinja/assets/js/jquery.js
index 966173b..966173b 120000
--- a/nikola/data/themes/bootstrap-jinja/assets/js/jquery.js
+++ b/nikola/data/themes/bootstrap3-jinja/assets/js/jquery.js
diff --git a/nikola/data/themes/bootstrap3-jinja/parent b/nikola/data/themes/bootstrap3-jinja/parent
index e89c4ee..e9ed660 100644
--- a/nikola/data/themes/bootstrap3-jinja/parent
+++ b/nikola/data/themes/bootstrap3-jinja/parent
@@ -1 +1 @@
-bootstrap-jinja
+base-jinja
diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
index 058640a..46d145a 100644
--- a/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
+++ b/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
@@ -13,10 +13,10 @@
 
 <!-- Menubar -->
 
-<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
+<nav class="navbar navbar-inverse navbar-static-top">
     <div class="container"><!-- This keeps the margins nice -->
         <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false">
             <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -32,7 +32,7 @@
             {% endif %}
             </a>
         </div><!-- /.navbar-header -->
-        <div class="collapse navbar-collapse navbar-ex1-collapse">
+        <div class="collapse navbar-collapse" id="bs-navbar" aria-expanded="false">
             <ul class="nav navbar-nav">
                 {{ base.html_navigation_links() }}
                 {{ template_hooks['menu']() }}
diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
index a481632..5ab4dcb 100644
--- a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -26,17 +26,20 @@ dir="rtl"
 lang="{{ lang }}">
     <head>
     <meta charset="utf-8">
+    <base href="{{ abs_link(permalink) }}">
     {% if description %}
     <meta name="description" content="{{ description }}">
     {% endif %}
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ title|e }} | {{ blog_title|e }}</title>
+    {% if title == blog_title %}
+        <title>{{ blog_title|e }}</title>
+    {% else %}
+        <title>{{ title|e }} | {{ blog_title|e }}</title>
+    {% endif %}
 
     {{ html_stylesheets() }}
     {{ html_feedlinks() }}
-    {% if permalink %}
-      <link rel="canonical" href="{{ abs_link(permalink) }}">
-    {% endif %}
+    <link rel="canonical" href="{{ abs_link(permalink) }}">
 
     {% if favicons %}
         {% for name, file, size in favicons %}
@@ -129,7 +132,7 @@ lang="{{ lang }}">
 {% macro html_navigation_links() %}
     {% for url, text in navigation_links[lang] %}
         {% if isinstance(url, tuple) %}
-            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ text }} <b class="caret"></b></a>
+            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ text }} <b class="caret"></b></a>
             <ul class="dropdown-menu">
             {% for suburl, text in url %}
                 {% if rel_link(permalink, suburl) == "#" %}
@@ -154,7 +157,7 @@ lang="{{ lang }}">
         {{ rss_link }}
     {% elif generate_rss %}
         {% if translations|length > 1 %}
-            {% for language in translations %}
+            {% for language in translations|sort %}
                 <link rel="alternate" type="application/rss+xml" title="RSS ({{ language }})" href="{{ _link('rss', None, language) }}">
             {% endfor %}
         {% else %}
@@ -163,7 +166,7 @@ lang="{{ lang }}">
     {% endif %}
     {% if generate_atom %}
         {% if translations|length > 1 %}
-            {% for language in translations %}
+            {% for language in translations|sort %}
                 <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
             {% endfor %}
         {% else %}
@@ -173,7 +176,7 @@ lang="{{ lang }}">
 {% endmacro %}
 
 {% macro html_translations() %}
-    {% for langname in translations.keys() %}
+    {% for langname in translations|sort %}
         {% if langname != lang %}
             <li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
         {% endif %}
diff --git a/nikola/data/themes/bootstrap-jinja/templates/post.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/post.tmpl
index df4109c..df4109c 100644
--- a/nikola/data/themes/bootstrap-jinja/templates/post.tmpl
+++ b/nikola/data/themes/bootstrap3-jinja/templates/post.tmpl
diff --git a/nikola/data/themes/bootstrap-jinja/templates/tags.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/tags.tmpl
index c308f19..c308f19 100644
--- a/nikola/data/themes/bootstrap-jinja/templates/tags.tmpl
+++ b/nikola/data/themes/bootstrap3-jinja/templates/tags.tmpl
diff --git a/nikola/data/themes/bootstrap3/README.md b/nikola/data/themes/bootstrap3/README.md
index f008daf..10e673a 100644
--- a/nikola/data/themes/bootstrap3/README.md
+++ b/nikola/data/themes/bootstrap3/README.md
@@ -1,4 +1,4 @@
-A bootstrap3 version of the bootstrap theme.
+A theme based on Bootstrap 3.
 
 There is a variant called bootstrap3-gradients which uses an extra CSS
 file for a *visually enhanced experience* (according to Bootstrap
diff --git a/nikola/data/themes/bootstrap/assets/css/colorbox.css b/nikola/data/themes/bootstrap3/assets/css/colorbox.css
index 5f8b3b0..5f8b3b0 120000
--- a/nikola/data/themes/bootstrap/assets/css/colorbox.css
+++ b/nikola/data/themes/bootstrap3/assets/css/colorbox.css
diff --git a/nikola/data/themes/bootstrap/assets/css/images/controls.png b/nikola/data/themes/bootstrap3/assets/css/images/controls.png
index 841a726..841a726 120000
--- a/nikola/data/themes/bootstrap/assets/css/images/controls.png
+++ b/nikola/data/themes/bootstrap3/assets/css/images/controls.png
diff --git a/nikola/data/themes/bootstrap/assets/css/images/loading.gif b/nikola/data/themes/bootstrap3/assets/css/images/loading.gif
index b192a75..b192a75 120000
--- a/nikola/data/themes/bootstrap/assets/css/images/loading.gif
+++ b/nikola/data/themes/bootstrap3/assets/css/images/loading.gif
diff --git a/nikola/data/themes/bootstrap3/assets/css/theme.css b/nikola/data/themes/bootstrap3/assets/css/theme.css
index 9ce6472..6964ec6 100644
--- a/nikola/data/themes/bootstrap3/assets/css/theme.css
+++ b/nikola/data/themes/bootstrap3/assets/css/theme.css
@@ -51,12 +51,6 @@ div.figure > a > img {
     margin-right: auto;
 }
 
-div.sidebar, div.admonition, div.attention, div.caution, div.danger, div.error, div.hint, div.important, div.note, div.tip, div.warning {
-    /* Issue 277 */
-    border: 1px solid #aaa;
-    border-radius: 5px;
-}
-
 blockquote p, blockquote {
   font-size: 17.5px;
   font-weight: 300;
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ar.js
index f83073f..f83073f 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ar.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bg.js
index bafc4e0..bafc4e0 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bg.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bn.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bn.js
index 9b995d8..9b995d8 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bn.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-bn.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ca.js
index a749232..a749232 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ca.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-cs.js
index e4a595c..e4a595c 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-cs.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-da.js
index 1e9a1d6..1e9a1d6 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-da.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-de.js
index 748f53b..748f53b 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-de.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-es.js
index 1154fb5..1154fb5 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-es.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-et.js
index 483e192..483e192 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-et.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fa.js
index a30b13c..a30b13c 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fa.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fi.js
index 2a7e8ad..2a7e8ad 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fi.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fr.js
index e359290..e359290 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-fr.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gl.js
index 04fa276..04fa276 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gl.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gr.js
index d8105ab..d8105ab 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-gr.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-he.js
index 72dddf5..72dddf5 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-he.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hr.js
index 34aa3c0..34aa3c0 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hr.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hu.js
index a87f03c..a87f03c 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-hu.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-id.js
index 31053b8..31053b8 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-id.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-it.js
index aad9d22..aad9d22 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-it.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ja.js
index 3ea27c2..3ea27c2 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ja.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-kr.js
index 3e23b4a..3e23b4a 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-kr.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lt.js
index 374b9bb..374b9bb 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lt.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lv.js
index 101b476..101b476 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-lv.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-my.js
index 8e14f15..8e14f15 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-my.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-nl.js
index 2d03d48..2d03d48 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-nl.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-no.js
index 9af0ba7..9af0ba7 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-no.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pl.js
index 34f8ab1..34f8ab1 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pl.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
index e20bd38..e20bd38 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-pt-BR.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ro.js
index 555f2e6..555f2e6 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ro.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ru.js
index bac4855..bac4855 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-ru.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-si.js
index 65b0492..65b0492 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-si.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sk.js
index 99859fd..99859fd 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sk.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sr.js
index c4fd9d5..c4fd9d5 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sr.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sv.js
index d7f26e0..d7f26e0 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-sv.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-tr.js
index 86fd98f..86fd98f 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-tr.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-uk.js
index 7cd1336..7cd1336 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-uk.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
index e6c5965..e6c5965 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
index bd2254c..bd2254c 120000
--- a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
+++ b/nikola/data/themes/bootstrap3/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
diff --git a/nikola/data/themes/bootstrap/assets/js/flowr.plugin.js b/nikola/data/themes/bootstrap3/assets/js/flowr.plugin.js
index c0d986b..c0d986b 100644
--- a/nikola/data/themes/bootstrap/assets/js/flowr.plugin.js
+++ b/nikola/data/themes/bootstrap3/assets/js/flowr.plugin.js
diff --git a/nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js b/nikola/data/themes/bootstrap3/assets/js/jquery.colorbox.js
index 5ee7a90..5ee7a90 120000
--- a/nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js
+++ b/nikola/data/themes/bootstrap3/assets/js/jquery.colorbox.js
diff --git a/nikola/data/themes/bootstrap/assets/js/jquery.js b/nikola/data/themes/bootstrap3/assets/js/jquery.js
index 966173b..966173b 120000
--- a/nikola/data/themes/bootstrap/assets/js/jquery.js
+++ b/nikola/data/themes/bootstrap3/assets/js/jquery.js
diff --git a/nikola/data/themes/bootstrap3/parent b/nikola/data/themes/bootstrap3/parent
index b7c200a..df967b9 100644
--- a/nikola/data/themes/bootstrap3/parent
+++ b/nikola/data/themes/bootstrap3/parent
@@ -1 +1 @@
-bootstrap
+base
diff --git a/nikola/data/themes/bootstrap3/templates/base.tmpl b/nikola/data/themes/bootstrap3/templates/base.tmpl
index 16aebce..5f90733 100644
--- a/nikola/data/themes/bootstrap3/templates/base.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/base.tmpl
@@ -13,10 +13,10 @@ ${template_hooks['extra_head']()}
 
 <!-- Menubar -->
 
-<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
+<nav class="navbar navbar-inverse navbar-static-top">
     <div class="container"><!-- This keeps the margins nice -->
         <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false">
             <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -32,7 +32,7 @@ ${template_hooks['extra_head']()}
             % endif
             </a>
         </div><!-- /.navbar-header -->
-        <div class="collapse navbar-collapse navbar-ex1-collapse">
+        <div class="collapse navbar-collapse" id="bs-navbar" aria-expanded="false">
             <ul class="nav navbar-nav">
                 ${base.html_navigation_links()}
                 ${template_hooks['menu']()}
diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
index 8ea843a..a1e7508 100644
--- a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -26,17 +26,20 @@ dir="rtl" \
 lang="${lang}">
     <head>
     <meta charset="utf-8">
+    <base href="${abs_link(permalink)}">
     %if description:
     <meta name="description" content="${description}">
     %endif
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>${title|striphtml} | ${blog_title|striphtml}</title>
+    %if title == blog_title:
+        <title>${blog_title|h}</title>
+    %else:
+        <title>${title|h} | ${blog_title|h}</title>
+    %endif
 
     ${html_stylesheets()}
     ${html_feedlinks()}
-    %if permalink:
-      <link rel="canonical" href="${abs_link(permalink)}">
-    %endif
+    <link rel="canonical" href="${abs_link(permalink)}">
 
     %if favicons:
         %for name, file, size in favicons:
@@ -129,7 +132,7 @@ lang="${lang}">
 <%def name="html_navigation_links()">
     %for url, text in navigation_links[lang]:
         % if isinstance(url, tuple):
-            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">${text} <b class="caret"></b></a>
+            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">${text} <b class="caret"></b></a>
             <ul class="dropdown-menu">
             %for suburl, text in url:
                 % if rel_link(permalink, suburl) == "#":
@@ -154,7 +157,7 @@ lang="${lang}">
         ${rss_link}
     %elif generate_rss:
         %if len(translations) > 1:
-            %for language in translations:
+            %for language in sorted(translations):
                 <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
             %endfor
         %else:
@@ -163,7 +166,7 @@ lang="${lang}">
     %endif
     %if generate_atom:
         %if len(translations) > 1:
-            %for language in translations:
+            %for language in sorted(translations):
                 <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
             %endfor
         %else:
@@ -173,7 +176,7 @@ lang="${lang}">
 </%def>
 
 <%def name="html_translations()">
-    %for langname in translations.keys():
+    %for langname in sorted(translations):
         %if langname != lang:
             <li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
         %endif
diff --git a/nikola/data/themes/bootstrap/templates/post.tmpl b/nikola/data/themes/bootstrap3/templates/post.tmpl
index 8d9f88a..8d9f88a 100644
--- a/nikola/data/themes/bootstrap/templates/post.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/post.tmpl
diff --git a/nikola/data/themes/bootstrap/templates/tags.tmpl b/nikola/data/themes/bootstrap3/templates/tags.tmpl
index ead3b0a..ead3b0a 100644
--- a/nikola/data/themes/bootstrap/templates/tags.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/tags.tmpl
author	Agustin Henze <tin@sluc.org.ar>	2015-08-26 07:57:04 -0300
committer	Agustin Henze <tin@sluc.org.ar>	2015-08-26 07:57:04 -0300
commit	8041475aab2b8efad7d2857027331bd626d26312 (patch)
tree	3980e1763c067079a4cebb425d642ca9eac834bf /nikola/data
parent	b0b24795b24ee6809397fbbadf42f31f310a219f (diff)