diff --git a/docs/sphinx/_templates/layout.html b/docs/sphinx/_templates/layout.html
index ecdf38d1e493cdd68e31a6bee5a120e609e72594..ddbb4f94d378043c33bf2552f8034d8e514cd5f0 100644
--- a/docs/sphinx/_templates/layout.html
+++ b/docs/sphinx/_templates/layout.html
@@ -2,7 +2,7 @@
 
 {% block sidebarlogo %}
     <a href="../_build/index.html">
-      <img src="../_templates/maestro-logo.png" alt="Maestro logo">
+      <img src="../_static/maestro-logo.png" alt="Maestro logo">
     </a>
 {% endblock %}
 
diff --git a/docs/sphinx/_templates/maestro-logo.png b/docs/sphinx/_templates/maestro-logo.png
deleted file mode 100644
index c5a4e696178be76582d57af2ef7cb9cc56e35251..0000000000000000000000000000000000000000
Binary files a/docs/sphinx/_templates/maestro-logo.png and /dev/null differ
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
index da21ce912874ef2da0423934d13485e9c7c7dbd2..038f6b738e12a98a4ecd66164e14328ad6e19467 100644
--- a/docs/sphinx/conf.py
+++ b/docs/sphinx/conf.py
@@ -70,7 +70,8 @@ html_theme = 'alabaster'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
+html_static_path = []
 
 html_sidebars = {
    '**': ['globaltoc.html', 'searchbox.html'],
diff --git a/docs/sphinx/dev.rst b/docs/sphinx/dev.rst
index e915e45a29068d59ea330d41cd5dcc6ff55794d4..216733e798191d062c2c212987dfec4ffe7bbd26 100644
--- a/docs/sphinx/dev.rst
+++ b/docs/sphinx/dev.rst
@@ -8,18 +8,18 @@ Contributing
 
 TODO
 
-Full documentation
-------------------
+.. Full documentation
+.. ------------------
 
-.. doxygengroup:: MSTRO_CONFIG
+.. .. doxygengroup:: MSTRO_CONFIG
 
 .. .. doxygengroup:: MSTRO_ENV
 
-.. doxygengroup:: MSTRO_CDO
+.. .. doxygengroup:: MSTRO_CDO
 
-.. doxygengroup:: MSTRO_Attr
+.. .. doxygengroup:: MSTRO_Attr
 
-.. doxygengroup:: MSTRO_Pool
+.. .. doxygengroup:: MSTRO_Pool
 
-.. doxygengroup:: MSTRO_GROUPS
+.. .. doxygengroup:: MSTRO_GROUPS
 
diff --git a/docs/sphinx/img/maestro-logo.png b/docs/sphinx/img/maestro-logo.png
deleted file mode 100644
index c5a4e696178be76582d57af2ef7cb9cc56e35251..0000000000000000000000000000000000000000
Binary files a/docs/sphinx/img/maestro-logo.png and /dev/null differ
diff --git a/docs/sphinx/tuning.rst b/docs/sphinx/tuning.rst
index 3503cbd9bbaa8bc3bd923f5110e23be8b6a9fa41..1468a311e7d19d84ebab06c097ca43ef7b6d47de 100644
--- a/docs/sphinx/tuning.rst
+++ b/docs/sphinx/tuning.rst
@@ -3,18 +3,19 @@ Tuning
 
 Make Maestro Core perform.
 
+Architecture
+------------
+
+
+
 Knobs
 -----
 
-Maestro features a range of environment variables, the full list and doc follows.
+Maestro features a range of environment variables that can be played with.
+
 Maestro is relying on OFI for network operations, therefore the usual OFI knobs
 can also be played with.
 
-.. attention::
-   The following variables are the C-sides ones as extracted from doxygen. To get the environment variable name, just remove ``ENV_`` from the name.
-  
-
-.. doxygengroup:: MSTRO_ENV
 
 Telemetry
 ---------