diff --git a/common/templates/mathjax_include.html b/common/templates/mathjax_include.html
index 799a132a3e49..31a5358ece76 100644
--- a/common/templates/mathjax_include.html
+++ b/common/templates/mathjax_include.html
@@ -1,10 +1,19 @@
-##
+## mako
 ## File:   templates/mathjax_include.html
 ##
 ## Advanced mathjax using 2.0-latest CDN for Dynamic Math
 ##
 ## This enables ASCIIMathJAX, and is used by js_textbox
 
+
+%if mathjax_mode is not Undefined and mathjax_mode == 'wiki':
+<script type="text/x-mathjax-config">
+  MathJax.Hub.Config({
+    tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
+              displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
+  });
+</script>
+%else:
 <script type="text/x-mathjax-config">
   MathJax.Hub.Config({
     tex2jax: {
@@ -19,6 +28,7 @@
     }
   });
 </script>
+%endif
 
 <!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
      It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of
diff --git a/lms/envs/common.py b/lms/envs/common.py
index ee09816b697d..94c39d2f8139 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -120,6 +120,9 @@
 # still left lying around.
 TEMPLATE_DIRS = (
     PROJECT_ROOT / "templates",
+    COMMON_ROOT / 'templates',
+    COMMON_ROOT / 'lib' / 'capa' / 'capa' / 'templates',
+    COMMON_ROOT / 'djangoapps' / 'pipeline_mako' / 'templates',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html
index 5554803d73e4..d300e666a9bc 100644
--- a/lms/templates/main_django.html
+++ b/lms/templates/main_django.html
@@ -17,7 +17,7 @@
 
 <body class="{% block bodyclass %}{% endblock %}">
   {% include "navigation.html" %}
-    
+  
   <section class="content-wrapper">
     {% block body %}{% endblock %}
         
diff --git a/lms/templates/wiki/base.html b/lms/templates/wiki/base.html
index 6c529ef748f3..2c1943e2a565 100644
--- a/lms/templates/wiki/base.html
+++ b/lms/templates/wiki/base.html
@@ -5,9 +5,6 @@
 
 {% block headextra %}
   {% compressed_css 'course' %}
-  <script src="{% static 'js/bootstrap-alert.js' %}"></script>
-  <script src="{% static 'js/bootstrap-collapse.js' %}"></script>
-  <script src="{% static 'js/bootstrap-modal.js' %}"></script>
   
   <script type="text/javascript">
     function ajaxError(){}
@@ -30,6 +27,21 @@
       });
     }
   </script>
+  
+  
+  {% addtoblock 'js' %}
+    {% comment %} These scripts load at the bottom of the body {% endcomment %}
+  
+    <script src="{% static 'js/bootstrap-alert.js' %}"></script>
+    <script src="{% static 'js/bootstrap-collapse.js' %}"></script>
+    <script src="{% static 'js/bootstrap-modal.js' %}"></script>
+    
+    {% with mathjax_mode='wiki' %}
+      {% include "mathjax_include.html" %}
+    {% endwith %}
+    
+  {% endaddtoblock %}
+  
 {% endblock %}
 
 
diff --git a/lms/templates/wiki/preview_inline.html b/lms/templates/wiki/preview_inline.html
index 69228a507e22..9248454137ac 100644
--- a/lms/templates/wiki/preview_inline.html
+++ b/lms/templates/wiki/preview_inline.html
@@ -31,6 +31,11 @@ <h1 class="page-header">{{ title }}</h1>
   
   {% compressed_js 'application' %}
   {% compressed_js 'module-js' %}
+  
+  {% with mathjax_mode='wiki' %}
+    {% include "mathjax_include.html" %}
+  {% endwith %}
+  
 </body>
 </html>
 
