3 files changed, 9 insertions, 11 deletions
diff --git a/docs/sphinx/conf.py.in b/docs/sphinx/conf.py.in
index 792c87ca..d32b53f4 100644
--- a/docs/sphinx/conf.py.in
+++ b/docs/sphinx/conf.py.in
@@ -14,24 +14,23 @@ import os
 import re
 import glob
 
-sys.path.insert(0, r'@conf_path@')
+sys.path.insert(0, r'@CMAKE_CURRENT_SOURCE_DIR@/sphinx/ext')
 
 source_suffix = '.rst'
 master_doc = 'index'
 
 project = 'Extra CMake Modules'
 copyright = 'KDE Developers'
-version = '@conf_version@' # feature version
-release = '@conf_release@' # full version string
+version = '@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@' # feature version
+release = '@PROJECT_VERSION@' # full version string
 
 primary_domain = 'ecm'
 
 exclude_patterns = []
 
 extensions = ['ecm']
-templates_path = ['@conf_path@/templates']
 
-ecm_manuals = sorted(glob.glob(r'@conf_docs@/manual/*.rst'))
+ecm_manuals = sorted(glob.glob(r'@CMAKE_CURRENT_SOURCE_DIR@/manual/*.rst'))
 ecm_manual_description = re.compile('^\.\. ecm-manual-description:(.*)$')
 man_pages = []
 for fpath in ecm_manuals:
@@ -55,9 +54,8 @@ for fpath in ecm_manuals:
 man_show_urls = False
 
 html_show_sourcelink = True
-html_static_path = ['@conf_path@/static']
+html_static_path = ['@CMAKE_CURRENT_BINARY_DIR@/static']
 html_style = 'ecm.css'
-html_theme = 'default'
-html_title = 'Extra CMake Modules %s Documentation' % release
-html_short_title = '%s Documentation' % release
-html_favicon = '@conf_path@/kde-favicon.ico'
+html_theme = '@sphinx_theme@'
+html_short_title = 'ECM %s documentation' % version
+html_favicon = '@CMAKE_CURRENT_SOURCE_DIR@/sphinx/kde-favicon.ico'
diff --git a/docs/sphinx/static/ecm.css b/docs/sphinx/ecm.css.in
index 2a326d47..a05e4527 100644
--- a/docs/sphinx/static/ecm.css
+++ b/docs/sphinx/ecm.css.in
@@ -1,5 +1,5 @@
 /* Import the Sphinx theme style.  */
-@import url("default.css");
+@import url("${sphinx_theme}.css");
 
 /* Wrap sidebar content even within words so that long
    document names do not escape sidebar borders.  */
diff --git a/docs/sphinx/ecm.py b/docs/sphinx/ext/ecm.py
index ed966bfb..ed966bfb 100644
--- a/docs/sphinx/ecm.py
+++ b/docs/sphinx/ext/ecm.py