diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html
index de89f0ba..87337a96 100644
--- a/sphinx_rtd_theme/layout.html
+++ b/sphinx_rtd_theme/layout.html
@@ -25,16 +25,6 @@
   {# CSS #}
   <link href='http://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700' rel='stylesheet' type='text/css'>
   
-
-  {# RTD hosts this file themselves, only load for non RTD builds #}
-  {% if not READTHEDOCS %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-  {% endif %}
-
-  {% for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {% endfor %}    
-
   {# JS #}    
   {% if not embedded %}
   
@@ -47,7 +37,7 @@
         HAS_SOURCE:  {{ has_source|lower }}
       };
     </script>
-    {%- for scriptfile in script_files + ["_static/theme.js"] %}
+    {%- for scriptfile in script_files %}
       <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
     {%- endfor %}
     
@@ -56,7 +46,17 @@
     {% endif %}
 
   {% endif %}
-  
+
+  {# RTD hosts these file themselves, so just load on non RTD builds #}
+  {% if not READTHEDOCS %}
+    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+    <script type="text/javascript" src="_static/theme.js"></script>
+  {% endif %}
+
+  {% for cssfile in css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+  {% endfor %}
+
   {%- block linktags %}
     {%- if hasdoc('about') %}
         <link rel="author" title="{{ _('About these documents') }}"
diff --git a/sphinx_rtd_theme/static/theme.js b/sphinx_rtd_theme/static/theme.js
index 8a711f86..9143c8b1 100644
--- a/sphinx_rtd_theme/static/theme.js
+++ b/sphinx_rtd_theme/static/theme.js
@@ -1,17 +1,15 @@
-/* Comment this because we include this information in our main JS file.
-$(document).ready(function() {
+$( document ).ready(function() {
   // Shift nav in mobile when clicking the menu.
-  $(document).on('click', "[data-toggle='wy-nav-top']", function() {
+  $("[data-toggle='wy-nav-top']").click(function() {
     $("[data-toggle='wy-nav-shift']").toggleClass("shift");
     $("[data-toggle='rst-versions']").toggleClass("shift");
   });
   // Close menu when you click a link.
-  $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
+  $(".wy-menu-vertical .current ul li a").click(function() {
     $("[data-toggle='wy-nav-shift']").removeClass("shift");
     $("[data-toggle='rst-versions']").toggleClass("shift");
   });
-  $(document).on('click', "[data-toggle='rst-current-version']", function() {
+  $("[data-toggle='rst-current-version']").click(function() {
     $("[data-toggle='rst-versions']").toggleClass("shift-up");
   });  
 });
-*/