diff --git a/source/clear-linux/virtual-environments/hyper-v.rst b/source/clear-linux/virtual-environments/hyper-v.rst
index 066b75ed..a16fa104 100644
--- a/source/clear-linux/virtual-environments/hyper-v.rst
+++ b/source/clear-linux/virtual-environments/hyper-v.rst
@@ -33,7 +33,7 @@ Create a virtual machine
    c. When finished, open VM settings, select Firmware Section and in Secure
       Boot config, **uncheck** Enable Secure Boot.
 
-   .. note:: Currently, Clear Linux does not boot with :option:`secure boot`
+   .. note:: Currently, Clear Linux does not boot with `secure boot`
       enabled.
 
 #. Connect to your new VM and start it. You should see a prompt:
diff --git a/source/conf.py b/source/conf.py
index f18397c8..bf0ec690 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -110,7 +110,7 @@ pygments_style = 'sphinx'
 todo_include_todos = False
 
 rst_epilog = """
-.. include:: /substitutions.rst
+.. include:: /substitutions.txt
 """
 
 # -- Options for HTML output ----------------------------------------------
diff --git a/source/disclaimers.rst b/source/disclaimers.rst
index 4786a970..6f2dfb6e 100644
--- a/source/disclaimers.rst
+++ b/source/disclaimers.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. _disclaimers:
 
 
diff --git a/source/documentation_license.rst b/source/documentation_license.rst
index dc993849..758a7a24 100644
--- a/source/documentation_license.rst
+++ b/source/documentation_license.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. raw:: html
 
    <a rel="license"
diff --git a/source/index.rst b/source/index.rst
index d96ca398..4841c961 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -1,45 +1,17 @@
-.. ClearLinux Documentation documentation master file, created by
-   sphinx-quickstart on Fri Nov 13 12:23:35 2015.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
+.. Clear Technologies documentation master file.
 
 Clear technologies - Documentation
 ##################################
 
-
-Clear Linux\* Project for Intel® Architecture
-=============================================
-
 .. toctree::
    :maxdepth: 2
 
    clear-linux/clear-linux
-
-
-Intel® Clear Containers
-=======================
-
-.. toctree::
-   :maxdepth: 2
-
    clear-containers/clear-containers
-
-Ciao
-====
-
-.. toctree::
-   :maxdepth: 2
-
    ciao/ciao
 
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`search`
-
 License and disclaimers
 =======================
 
 .. include:: documentation_license.rst
+   :start-line: 2
diff --git a/source/substitutions.rst b/source/substitutions.txt
similarity index 100%
rename from source/substitutions.rst
rename to source/substitutions.txt