diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7c8341d3..26c3a4b3 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -24,5 +24,6 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DEST
  PATTERN "*.pdf"
  PATTERN "*.py"
  PATTERN "*.txt"
+ PATTERN "*.inv"
  PATTERN "*.bib"
  )
diff --git a/doc/_static/logo_cea.png b/doc/_static/logo_cea.png
new file mode 100644
index 00000000..89b29641
Binary files /dev/null and b/doc/_static/logo_cea.png differ
diff --git a/doc/_static/logo_cnrs.png b/doc/_static/logo_cnrs.png
new file mode 100644
index 00000000..53c7af0e
Binary files /dev/null and b/doc/_static/logo_cnrs.png differ
diff --git a/doc/_static/logo_x.png b/doc/_static/logo_x.png
new file mode 100644
index 00000000..03d2c29f
Binary files /dev/null and b/doc/_static/logo_x.png differ
diff --git a/doc/_templates/sideb.html b/doc/_templates/sideb.html
new file mode 100644
index 00000000..4f6a02c7
--- /dev/null
+++ b/doc/_templates/sideb.html
@@ -0,0 +1,6 @@
+<p>
+<a href="http://ipht.cea.fr"> <img style="width: 80px; margin: 10px 5px 0 0" src='_static/logo_cea.png' alt="CEA"/> </a>
+<a href="http://www.cpht.polytechnique.fr"> <img style="width: 80px; margin: 10px 5px 0 5px" src='_static/logo_x.png' alt="Ecole Polytechnique"/> </a>
+<br>
+<a href="http://www.cnrs.fr"> <img style="width: 80px; margin: 10px 0 0 5px" src='_static/logo_cnrs.png' alt="CNRS"/> </a>
+</p>
diff --git a/doc/about.rst b/doc/about.rst
index cc77527d..090e4947 100644
--- a/doc/about.rst
+++ b/doc/about.rst
@@ -24,7 +24,7 @@ calculations.
 .. [#wien2k2] `M. Aichhorn, L. Pourovskii, and A. Georges, Phys. Rev. B 84, 054529 (2011) <http://link.aps.org/doi/10.1103/PhysRevB.84.054529>`_ (:download:`bibtex file <wien2k2.bib>`)
 
 This application is a part of our scientific work and we would appreciate if
-projects using it will include a citation to the following relevant papers.  In
+projects using it will include a citation to the above relevant papers.  In
 order to help you, we provide a BibTeX entry for each paper.
 
 If you find the application useful, giving proper reference and citation is
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 56310d9b..da5fef22 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -9,12 +9,13 @@ extensions = ['sphinx.ext.autodoc',
 
 source_suffix = '.rst'
 
-project = u'TRIQS interface to Wien2k'
+project = u'TRIQS Interface to Wien2k'
 copyright = u'2011-2013, M. Aichhorn, L. Pourovskii, V. Vildosola, C. Martins'
-version = '1.0'
-release = '1.0.0'
+version = '@DFT_TOOLS_VERSION@'
+release = '@DFT_TOOLS_RELEASE@'
 
 mathjax_path = "@TRIQS_MATHJAX_PATH@/MathJax.js?config=default"
+templates_path = ['@CMAKE_SOURCE_DIR@/doc/_templates']
 
 html_theme = 'triqs'
 html_theme_path = ['@TRIQS_THEMES_PATH@']
@@ -25,13 +26,10 @@ html_context = {'header_title': 'Wien2TRIQS',
                                  ['Documentation', 'documentation'],
                                  ['Issues', 'issues'],
                                  ['About Wien2TRIQS', 'about']]}
-
-templates_path = ['@TRIQS_THEMES_PATH@/../export/_templates']
-html_sidebars = {'index': ['sideb_appli.html', 'searchbox.html']}
-html_static_path = ['@TRIQS_THEMES_PATH@/../export/_static']
+html_static_path = ['@CMAKE_SOURCE_DIR@/doc/_static']
+html_sidebars = {'index': ['sideb.html', 'searchbox.html']}
 
 htmlhelp_basename = 'TRIQSDftToolsdoc'
 
-intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None), 
-#'triqscthybmatrix': ('@TRIQS_THEMES_PATH@/../../doc/triqs',None),
-'triqslibs': ('@TRIQS_THEMES_PATH@/../../doc/triqs',None)}
+intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None), 'triqslibs': ('http://ipht.cea.fr/triqs', None),
+                       'triqscthyb': ('http://ipht.cea.fr/triqs/cthyb_matrix', None)}
diff --git a/doc/wien2k1.bib b/doc/wien2k1.bib
new file mode 100644
index 00000000..1c241a01
--- /dev/null
+++ b/doc/wien2k1.bib
@@ -0,0 +1,15 @@
+@Article{triqs_wien2k_interface,
+  volume = {80},
+  month = {Aug},
+  numpages = {15},
+  author = {Aichhorn, Markus and Pourovskii, Leonid and Vildosola, Veronica and Ferrero, Michel and Parcollet, Olivier and Miyake, Takashi and Georges, Ant
+oine and Biermann, Silke},
+  year = {2009},
+  url = {http://link.aps.org/doi/10.1103/PhysRevB.80.085101},
+  doi = {10.1103/PhysRevB.80.085101},
+  issue = {8},
+  title = {Dynamical mean-field theory within an augmented plane-wave framework: Assessing electronic correlations in the iron pnictide LaFeAsO},
+  publisher = {American Physical Society},
+  pages = {085101},
+  journal = {Phys. Rev. B}
+}
diff --git a/doc/wien2k2.bib b/doc/wien2k2.bib
new file mode 100644
index 00000000..cfe49e24
--- /dev/null
+++ b/doc/wien2k2.bib
@@ -0,0 +1,14 @@
+@Article{triqs_wien2k_full_charge_SC,
+  doi = {10.1103/PhysRevB.84.054529},
+  month = {Aug},
+  issue = {5},
+  author = {Aichhorn, Markus and Pourovskii, Leonid and Georges, Antoine},
+  year = {2011},
+  url = {http://link.aps.org/doi/10.1103/PhysRevB.84.054529},
+  publisher = {American Physical Society},
+  title = {Importance of electronic correlations for structural and magnetic properties of the iron pnictide superconductor LaFeAsO},
+  pages = {054529},
+  journal = {Phys. Rev. B},
+  volume = {84},
+  numpages = {7}
+}