diff --git a/README.rst b/README.rst
index 0a73abf..e806a25 100644
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,20 @@ Links :
 * Source, issues and pull requests on `Github`_
 * Releases on `PyPI`_
 
-.. _galleria: http://galleria.io/
+Themes & Demo
+-------------
+
+Sigal comes with two themes, based on the `colorbox`_ and `galleria`_
+Javascript libraries:
+
+- `colorbox demo`_
+- `galleria demo`_
+
 .. _website: http://sigal.saimon.org/
 .. _Github: https://github.com/saimn/sigal/
 .. _PyPI: http://pypi.python.org/pypi/sigal
+.. _galleria: http://galleria.io/
+.. _colorbox: http://www.jacklmoore.com/colorbox
+.. _galleria demo: http://saimon.org/sigal-demo/galleria/
+.. _colorbox demo: http://saimon.org/sigal-demo/colorbox/
+
diff --git a/docs/album_information.rst b/docs/album_information.rst
index 70aca21..b54e0a9 100644
--- a/docs/album_information.rst
+++ b/docs/album_information.rst
@@ -1,5 +1,3 @@
-.. _album-information-label:
-
 ===================
  Album information
 ===================
diff --git a/docs/index.rst b/docs/index.rst
index 7c00958..08abd78 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,19 +1,5 @@
 .. include:: ../README.rst
 
-Themes & Demo
--------------
-
-Sigal comes with two themes, based on the `colorbox`_ and `galleria`_
-Javascript libraries:
-
-- `colorbox demo`_
-- `galleria demo`_
-
-.. _galleria: http://galleria.io/
-.. _colorbox: http://www.jacklmoore.com/colorbox
-.. _galleria demo: http://saimon.org/sigal-demo/galleria/
-.. _colorbox demo: http://saimon.org/sigal-demo/colorbox/
-
 Documentation
 -------------
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 298a414..2bc5450 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -35,6 +35,9 @@ developpement packages of libjpeg, freetype2 and zlib.
 
     apt-get build-dep python-dev python-imaging
 
+  Debian/Sid users can use the experimental ``python-imaging`` package that is
+  built from Pillow source.
+
 - For Archlinux, there is a package_ for sigal in the AUR which already uses
   Pillow.
 
diff --git a/docs/themes.rst b/docs/themes.rst
index f82b8af..b68c7f0 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -7,6 +7,19 @@ be located in ``THEME_DIR/templates``.
 
 .. _Jinja2: http://jinja.pocoo.org/docs/
 
+Bundled themes
+~~~~~~~~~~~~~~
+
+Sigal comes with two themes, based on the `colorbox`_ and `galleria`_
+Javascript libraries, and located in the ``sigal/themes`` folder.
+
+The stylesheets for these themes are written with sass_ (``gem install sass``).
+A Makefile is available to compile the scss files to css
+(``sigal/themes/Makefile``).
+
+.. _galleria: http://galleria.io/
+.. _colorbox: http://www.jacklmoore.com/colorbox
+.. _sass: http://sass-lang.com/
 
 Variables
 ~~~~~~~~~
@@ -44,7 +57,7 @@ You can use the following variables in your template:
 
 ``meta`` and ``description``
     Meta data and album description. For details how to annotate your albums
-    with meta data, see :ref:`album-information-label`.
+    with meta data, see :doc:`album_information`.
 
 ``theme.name``
     Name of the currently used theme.