diff --git a/doc/doc-requirements.txt b/doc/doc-requirements.txt
index 4eb28efc1..be9dff62a 100644
--- a/doc/doc-requirements.txt
+++ b/doc/doc-requirements.txt
@@ -1,6 +1,5 @@
 Cython>=0.24
 # Frozen Sphinx requirements for easier pip installation
-sphinx==1.7.9
 sphinxcontrib-actdiag
 sphinxcontrib-blockdiag
 sphinxcontrib-nwdiag
diff --git a/doc/sources/.templates/layout.html b/doc/sources/.templates/layout.html
index 4d07d1a2c..a87dc0bac 100644
--- a/doc/sources/.templates/layout.html
+++ b/doc/sources/.templates/layout.html
@@ -106,12 +106,14 @@
 
       };
     </script>
+{%- block scripts %}
     {%- for scriptfile in script_files %}
     <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
     {%- endfor %}
     <script type="text/javascript" src="{{ pathto('_static/jquery-effects-core-and-slide.js', 1) }}"></script>
     <script type="text/javascript" src="{{ pathto('_static/jquery.cookie.js', 1) }}"></script>
     <script type="text/javascript" src="{{ pathto('_static/kivy.js', 1) }}"></script>
+{%- endblock %}
     {%- if use_opensearch %}
     <link rel="search" type="application/opensearchdescription+xml"
           title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
diff --git a/doc/sources/sphinxext/preprocess.py b/doc/sources/sphinxext/preprocess.py
index a49665a8c..fe0c43d89 100644
--- a/doc/sources/sphinxext/preprocess.py
+++ b/doc/sources/sphinxext/preprocess.py
@@ -109,7 +109,7 @@ def setup(app):
     sys.path += [join(dirname(kivy.__file__), 'extras')]
     from highlight import KivyLexer
 
-    app.add_lexer('kv', KivyLexer())
+    app.add_lexer('kv', KivyLexer)
     app.add_autodocumenter(CythonMethodDocumenter)
     app.connect('autodoc-process-docstring', callback_docstring)
     app.connect('autodoc-process-signature', callback_signature)