diff --git a/IPython/frontend/html/notebook/static/Makefile b/IPython/frontend/html/notebook/static/Makefile
new file mode 100644
index 0000000..ace9598
--- /dev/null
+++ b/IPython/frontend/html/notebook/static/Makefile
@@ -0,0 +1,7 @@
+
+.PHONY: css
+
+default: css
+
+css: less/style.less
+	lessc -x less/style.less css/style.min.css
diff --git a/IPython/frontend/html/notebook/static/css/fbm.css b/IPython/frontend/html/notebook/static/css/fbm.css
deleted file mode 100644
index 0e21d19..0000000
--- a/IPython/frontend/html/notebook/static/css/fbm.css
+++ /dev/null
@@ -1,97 +0,0 @@
-
-/* Flexible box model classes */
-/* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
- 
-.hbox {
-	display: -webkit-box;
-	-webkit-box-orient: horizontal;
-	-webkit-box-align: stretch;
- 
-	display: -moz-box;
-	-moz-box-orient: horizontal;
-	-moz-box-align: stretch;
- 
-	display: box;
-	box-orient: horizontal;
-	box-align: stretch;
-}
- 
-.hbox > * {
-	-webkit-box-flex: 0;
-	-moz-box-flex: 0;
-	box-flex: 0;
-}
- 
-.vbox {
-	display: -webkit-box;
-	-webkit-box-orient: vertical;
-	-webkit-box-align: stretch;
- 
-	display: -moz-box;
-	-moz-box-orient: vertical;
-	-moz-box-align: stretch;
- 
-	display: box;
-	box-orient: vertical;
-	box-align: stretch;
-}
- 
-.vbox > * {
-	-webkit-box-flex: 0;
-	-moz-box-flex: 0;
-	box-flex: 0;
-}
-  
-.reverse {
-	-webkit-box-direction: reverse;
-	-moz-box-direction: reverse;
-	box-direction: reverse;
-}
- 
-.box-flex0 {
-	-webkit-box-flex: 0;
-	-moz-box-flex: 0;
-	box-flex: 0;
-}
- 
-.box-flex1, .box-flex {
-	-webkit-box-flex: 1;
-	-moz-box-flex: 1;
-	box-flex: 1;
-}
- 
-.box-flex2 {
-	-webkit-box-flex: 2;
-	-moz-box-flex: 2;
-	box-flex: 2;
-}
- 
-.box-group1 {
-	-webkit-box-flex-group: 1;
-	-moz-box-flex-group: 1;
-	box-flex-group: 1;
-}
- 
-.box-group2 {
-	-webkit-box-flex-group: 2;
-	-moz-box-flex-group: 2;
-	box-flex-group: 2;
-}
- 
-.start {
-	-webkit-box-pack: start;
-	-moz-box-pack: start;
-	box-pack: start;
-}
- 
-.end {
-	-webkit-box-pack: end;
-	-moz-box-pack: end;
-	box-pack: end;
-}
- 
-.center {
-	-webkit-box-pack: center;
-	-moz-box-pack: center;
-	box-pack: center;
-}
diff --git a/IPython/frontend/html/notebook/static/css/style.min.css b/IPython/frontend/html/notebook/static/css/style.min.css
index 310da57..d79eb87 100644
--- a/IPython/frontend/html/notebook/static/css/style.min.css
+++ b/IPython/frontend/html/notebook/static/css/style.min.css
@@ -1,3 +1,16 @@
+.hbox{display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
+.hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;}
+.vbox{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;}
+.vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;}
+.reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;}
+.box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;}
+.box-flex1,.box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
+.box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;}
+.box-group1{-webkit-box-flex-group:1;-moz-box-flex-group:1;box-flex-group:1;}
+.box-group2{-webkit-box-flex-group:2;-moz-box-flex-group:2;box-flex-group:2;}
+.start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;}
+.end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;}
+.center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;}
 .corner-all{border-radius:3px;}
 body{overflow:hidden;background-color:#ffffff;}
 span#save_widget{padding:5px;margin:0px 0px 0px 300px;display:inline-block;}
diff --git a/IPython/frontend/html/notebook/static/less/style.less b/IPython/frontend/html/notebook/static/less/style.less
index 5ffa10a..cc15f4f 100644
--- a/IPython/frontend/html/notebook/static/less/style.less
+++ b/IPython/frontend/html/notebook/static/less/style.less
@@ -1,3 +1,4 @@
+@import "flexible-box-model.less";
 @import "notebook.less";
 @import "printnotebook.less";
 @import "renderedhtml.less";
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 40d40ca..e4d7ea3 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -19,13 +19,9 @@ window.mathjax_url = "{{mathjax_url}}";
 <link rel="stylesheet" href="{{ static_url("css/celltoolbar.css") }}" type="text/css" />
 
 {% if use_less %}
-	<link rel="stylesheet/less" href="{{ static_url("less/notebook.less") }}" type="text/css" />
-	<link rel="stylesheet/less" href="{{ static_url("less/tooltip.less") }}" type="text/css" />
-	<link rel="stylesheet/less" href="{{ static_url("less/renderedhtml.less") }}" type="text/css" />
-
-	<link rel="stylesheet/less" href="{{ static_url("less/printnotebook.less") }}" type="text/css"/>
+    <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"/>
+    <link rel="stylesheet" href="{{ static_url("css/style.min.css") }}" type="text/css"/>
 {% endif %}
 
 {% endblock %}
diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/page.html
index 13ceb09..d978b96 100644
--- a/IPython/frontend/html/notebook/templates/page.html
+++ b/IPython/frontend/html/notebook/templates/page.html
@@ -13,7 +13,6 @@
     <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/fbm.css") }}" type="text/css" />
     <link rel="stylesheet" href="{{static_url("css/page.css") }}" type="text/css"/>
     {% block stylesheet %}
     {% endblock %}
diff --git a/IPython/frontend/html/notebook/templates/projectdashboard.html b/IPython/frontend/html/notebook/templates/projectdashboard.html
index 79d2122..436cfec 100644
--- a/IPython/frontend/html/notebook/templates/projectdashboard.html
+++ b/IPython/frontend/html/notebook/templates/projectdashboard.html
@@ -4,7 +4,8 @@
 
 {% block stylesheet %}
     <link rel="stylesheet" href="{{static_url("css/projectdashboard.css") }}" type="text/css" />
-	<link rel="stylesheet" href="{{static_url("css/alternateuploadform.css") }}" type="text/css" />
+    <link rel="stylesheet" href="{{static_url("css/alternateuploadform.css") }}" type="text/css" />
+    <link rel="stylesheet" href="{{static_url("css/style.min.css") }}" type="text/css" />
 {% endblock %}