diff --git a/mps/manual/source/conf.py b/mps/manual/source/conf.py
index d9daac312ea..733438fc253 100644
--- a/mps/manual/source/conf.py
+++ b/mps/manual/source/conf.py
@@ -25,9 +25,16 @@ sys.path.insert(0, os.path.abspath('.'))
 # -- Project configuration -----------------------------------------------------
 
 # The same set of sources builds the Memory Pool System documentation
-# and the Memory Management Reference.
+# and the Memory Management Reference, depending on whether the MMREF
+# environment variable is set.
 
-if True:
+if os.environ.get('MMREF'):
+    project = u'Memory Management Reference'
+    master_doc = 'index'
+    html_theme = 'mmref'
+    version = '4'
+    release = '4.0'
+else:
     project = u'Memory Pool System'
     master_doc = 'index'
     html_theme = 'mps'
@@ -41,12 +48,6 @@ if True:
             if m:
                 release, version = m.groups()
                 break
-else:
-    project = u'Memory Management Reference'
-    master_doc = 'index'
-    html_theme = 'mmref'
-    version = '4'
-    release = '4.0'
 
 
 # -- General configuration -----------------------------------------------------
diff --git a/mps/manual/source/themes/mmref/layout.html b/mps/manual/source/themes/mmref/layout.html
new file mode 100644
index 00000000000..0597e1ca7ef
--- /dev/null
+++ b/mps/manual/source/themes/mmref/layout.html
@@ -0,0 +1,42 @@
+{#
+    scrolls/layout.html
+    ~~~~~~~~~~~~~~~~~~~
+
+    Sphinx layout template for the scrolls theme, originally written
+    by Armin Ronacher.
+
+    :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- extends "basic/layout.html" %}
+{% set script_files = script_files + ['_static/theme_extras.js'] %}
+{% set css_files = css_files + ['_static/print.css'] %}
+{# do not display relbars #}
+{% block relbar1 %}{% endblock %}
+{% block relbar2 %}{% endblock %}
+{% block content %}
+    <div id="content">
+      <div class="header">
+        <h1 class="heading"><a href="{{ pathto('index') }}"
+          title="Memory Management Reference"><span>Memory Management Reference</span></a></h1>
+      </div>
+      <div class="relnav">
+        {%- if prev and '../' not in prev.link %}
+        <a href="{{ prev.link|e }}">&laquo; {{ prev.title }}</a> |
+        {%- endif %}
+        <a href="{{ pathto(current_page_name) if current_page_name else '#' }}">{{ title }}</a>
+        {%- if next and '../' not in next.link %}
+        | <a href="{{ next.link|e }}">{{ next.title }} &raquo;</a>
+        {%- endif %}
+      </div>
+      <div id="contentwrapper">
+        {%- if display_toc %}
+        <div id="toc">
+          <h3>{{ _('Table Of Contents') }}</h3>
+          {{ toc }}
+        </div>
+        {%- endif %}
+        {% block body %}{% endblock %}
+      </div>
+    </div>
+{% endblock %}
diff --git a/mps/manual/source/themes/mmref/static/mmref.css_t b/mps/manual/source/themes/mmref/static/mmref.css_t
index 69a3be290b0..cd77bc91aed 100644
--- a/mps/manual/source/themes/mmref/static/mmref.css_t
+++ b/mps/manual/source/themes/mmref/static/mmref.css_t
@@ -2,28 +2,38 @@
 
 @import url('scrolls.css');
 
-h1, h2, h3, h4, h5, h6, dl.glossary dt {
+h2, h3, h4, h5, h6, dl.glossary dt {
     font-family: {{ theme_headfont }};
 }
 
-dl.glossary dt {
-    font-size: 120%;
-}
-
 div.header {
     background-image: none;
     background-color: {{ theme_headerbg }};
     border-top: none;
 }
 
+h1.heading {
+    height: auto;
+    text-align: center;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+h1.heading:hover {
+    background: #73626E;
+}
+
 h1.heading a {
-    background-image: url(logo.png);
-    background-size: auto 100%;
-    background-position: center;
-    background-repeat: no-repeat;
+    background-image: none;
     display: block;
     width: 100%;
-    height: 80px;
+    height: auto;
+    font-size: 150%;
+}
+
+h1.heading span {
+    display: block;
+    color: {{ theme_textcolor }};
 }
 
 a, a:visited, a.reference.internal {
@@ -75,4 +85,14 @@ img.align-center {
     display: block;
     margin-left: auto;
     margin-right: auto;
-}
\ No newline at end of file
+}
+
+dl.glossary dt {
+    font-size: 120%;
+    margin-top: 1em;
+}
+
+p.glossary-alphabet {
+    font-weight: bold;
+    text-align: center;
+}