diff --git a/IPython/frontend/html/notebook/templates/notebooks.html b/IPython/frontend/html/notebook/templates/notebooks.html
index 897074d34..2a4f0f86d 100644
--- a/IPython/frontend/html/notebook/templates/notebooks.html
+++ b/IPython/frontend/html/notebook/templates/notebooks.html
@@ -13,12 +13,18 @@ window.mathjax_url = "{{mathjax_url}}";
 
 <link rel="stylesheet" href="{{ static_url("components/codemirror/lib/codemirror.css") }}">
 
-<link rel="stylesheet" href="{{ static_url("css/celltoolbar.css") }}" type="text/css" />
-
 {{super()}}
 
 {% endblock %}
 
+{% block lesscss %}
+    {% if use_less %}
+        <link rel="stylesheet/less" href="{{ static_url("ipython/notebooks/less/style.less") }}" type="text/css" />
+    {% else %}
+        <link rel="stylesheet" href="{{ static_url("ipython/notebooks/css/style.min.css") }}" type="text/css"/>
+    {% endif %}
+{% endblock lesscss%}
+
 {% block params %}
 
 data-project={{project}}
@@ -196,7 +202,7 @@ class="notebook_app"
 <script src="{{ static_url("components/codemirror/addon/mode/loadmode.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/addon/mode/multiplex.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/addon/mode/overlay.js") }}" charset="utf-8"></script>
-<script src="{{ static_url("js/codemirror-ipython.js") }}" charset="utf-8"></script>
+<script src="{{ static_url("ipython/notebooks/js/codemirror-ipython.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/mode/htmlmixed/htmlmixed.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/mode/xml/xml.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/mode/javascript/javascript.js") }}" charset="utf-8"></script>
@@ -210,8 +216,8 @@ class="notebook_app"
 
 <script src="{{ static_url("dateformat/date.format.js") }}" charset="utf-8"></script>
 
-<script src="{{ static_url("js/events.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/utils.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("ipython/base/js/events.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("ipython/base/js/utils.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("js/layoutmanager.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("js/mathjaxutils.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("js/outputarea.js") }}" type="text/javascript" charset="utf-8"></script>
diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/page.html
index 816038eac..58804827c 100644
--- a/IPython/frontend/html/notebook/templates/page.html
+++ b/IPython/frontend/html/notebook/templates/page.html
@@ -12,18 +12,12 @@
     <title>{% block title %}IPython Notebook{% endblock %}</title>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <link rel="stylesheet" href="{{static_url("jquery/css/themes/base/jquery-ui.min.css") }}" type="text/css" />
-    <link rel="stylesheet" href="{{static_url("css/boilerplate.css") }}" type="text/css" />
-    <link rel="stylesheet" href="{{static_url("css/page.css") }}" type="text/css"/>
+    <link rel="stylesheet" href="{{static_url("ipython/base/css/boilerplate.css") }}" type="text/css" />
     {% block stylesheet %}
     {% block lesscss %}
-        {% if use_less %}
-            <link rel="stylesheet/less" href="{{ static_url("less/style.less") }}" type="text/css" />
-        {% else %}
-            <link rel="stylesheet" href="{{ static_url("css/style.min.css") }}" type="text/css"/>
-        {% endif %}
     {% endblock lesscss%}
     {% endblock %}
-    <link rel="stylesheet" href="{{ static_url("css/custom.css") }}" type="text/css" />
+    <!-- <link rel="stylesheet" href="{{ static_url("css/custom.css") }}" type="text/css" /> -->
 
 
     {% block meta %}
@@ -59,9 +53,9 @@
 
 <script src="{{static_url("jquery/js/jquery-1.7.1.min.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{static_url("jquery/js/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{static_url("js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{static_url("js/page.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{static_url("js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("ipython/base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("ipython/base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("ipython/auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
 
 {% block script %}
     {% if use_less %}
@@ -69,7 +63,7 @@
     {% endif %}
 {% endblock %}
 
-<script src="{{static_url("js/custom.js") }}" type="text/javascript" charset="utf-8"></script>
+<!-- <script src="{{static_url("js/custom.js") }}" type="text/javascript" charset="utf-8"></script> -->
 
 </body>