diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 98e9cb8a8..bff6120e4 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50B779EA-EC00-4699-84C0-03B395C365D2}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -161,6 +161,7 @@
     <Content Include="Themes\TheAdmin\Views\Layout.ascx" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Themes\TheAdminClassic\Styles\images\icons.psd" />
     <None Include="Themes\TheAdmin\Styles\images\icons.psd" />
     <Content Include="Themes\Classic\Content\Images\bodyBackground.gif" />
     <Content Include="Themes\Classic\Content\Images\bodyBackgroundgrey.gif" />
@@ -221,6 +222,18 @@
     <Content Include="Themes\Orchard\Views\Footer.ascx" />
     <Content Include="Themes\Orchard\Views\Layout.ascx" />
     <Content Include="Themes\Orchard\Views\Menu.ascx" />
+    <Content Include="Themes\TheAdminClassic\Styles\images\background_header.jpg" />
+    <Content Include="Themes\TheAdminClassic\Styles\images\icons.png" />
+    <Content Include="Themes\TheAdminClassic\Styles\images\orchardLogo.jpg" />
+    <Content Include="Themes\TheAdminClassic\Styles\images\tableHeaderBackground.gif" />
+    <Content Include="Themes\TheAdminClassic\Styles\images\tableHeaderBackgroundRed.gif" />
+    <Content Include="Themes\TheAdminClassic\Styles\site.css" />
+    <Content Include="Themes\TheAdminClassic\Theme.gif" />
+    <Content Include="Themes\TheAdminClassic\Theme.txt" />
+    <Content Include="Themes\TheAdminClassic\Views\Header.ascx" />
+    <Content Include="Themes\TheAdminClassic\Views\Layout.ascx" />
+    <Content Include="Themes\TheAdminClassic\Views\Menu.ascx" />
+    <Content Include="Themes\TheAdminClassic\Views\User.ascx" />
     <Content Include="Themes\TheAdmin\Views\Menu.ascx" />
     <Content Include="Themes\TheAdmin\Views\User.ascx" />
     <Content Include="Themes\TheAdmin\Views\Header.ascx" />
@@ -265,9 +278,6 @@
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/backgroundHeader.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/backgroundHeader.gif
new file mode 100644
index 000000000..69fff93e1
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/backgroundHeader.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.gif
index b6592dd75..7496b50f6 100644
Binary files a/src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.gif and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index b1a1d186a..d06d78bce 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -44,17 +44,17 @@ table {
 /* Base setup
 ----------------------------------------------------------*/
 html {
-    background:#8a8f7a;
-    color:#525e50;
+    background:#2d2f25;
+    color:#333;
 }
 body {
-	color:#484926;
-    font-family:Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+	color:#333;
+    font-family:Segoe UI,Trebuchet,Arial,Sans-Serif;
     font-size:62.5%; /* 10px */
 	line-height:1.6em;
     margin:0 auto 1em;
     min-width:94.6em; /* 946px */
-    padding:0 .4em;
+    padding:0;
 }
 body#preview {
     min-width:0;
@@ -139,7 +139,6 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14
 ----------------------------------------------------------*/
 h1, h2, h3, h4, h5, legend {
     padding:.4em 0;
-    font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif;
     font-style: normal;
     font-weight:normal;
 }
@@ -152,7 +151,7 @@ h5 { font-size:1.4em; } /* 14px */
 
 h6, p, legend, label, input, select, .button,
 .message, .validation-summary-errors,
-table.items th, table.items td, table.items caption { font-size:1.5em; line-height:1.5em; } /* 15px */
+table.items th, table.items td, table.items caption { font-size:1.4em; line-height:1.4em; } /* 15px */
 p .button { font-size:inherit; }
 .meta, .hint { font-size:1.2em; } /* 12px */
 
@@ -173,8 +172,8 @@ a:hover, a:active, a:focus {
 /* Header - Branding and Login  
 ----------------------------------------------------------*/
 #header {
-	background:#8a8f7a url(images/background_header.jpg) no-repeat bottom right;
-	height:60px;
+	background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right;
+	height:50px;
 }
 #header #app {
     float:left;
@@ -197,24 +196,22 @@ a:hover, a:active, a:focus {
 	text-indent:-9999px;
 	width:35px;
 }
-
 #site {
-    font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif;
     font-size:2em;
 }
 #site a, #site a:visited, #site a:active {
 	color:#fff;
 	float:left;
 	line-height:2.2em;
-	padding:6px 0 0 4px;
+	padding:0 0 0 6px;
 	position:relative;
 }
 #login {
     font-size:1.5em;
-	color:#1a1505;
+	color:#fff;
 	display:block;
 	float:right;
-	margin:20px 20px 0 0;
+	margin:16px 20px 0 0;
 	white-space:nowrap;
 }
 #login a, #login a:link, #login a:visited {
@@ -236,8 +233,7 @@ a:hover, a:active, a:focus {
 
 #navigation li {
 	background:#fff;
-	border:1px solid #d2d6c6;
-	margin:10px 0 15px 0;
+	margin:7px 0 20px 0;
 }
 #navigation ul li {
     border:0;
@@ -247,7 +243,7 @@ a:hover, a:active, a:focus {
     padding:0;
 }
 #navigation li h3 a, #navigation li h3 span {
-	background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
+	border-bottom:1px solid #bdbcbc;
     display:block;
 	padding:6px 4px 8px 8px;
 }
@@ -255,22 +251,20 @@ a:hover, a:active, a:focus {
     color:inherit;
 }
 #navigation li h3 a:hover, #navigation li h3 a:active, #navigation li h3 a:focus {
-    background:#8a8f7a;
-    color:#f6faea;
     text-decoration:none;
 }
 #navigation ul a, #navigation ul a:link, #navigation ul a:visited {
-	color:#5a5b32;
+	color:#2d2f25;
 	display:block;
-	font-size:1.5em;
+	font-size:1.4em;
 	height:28px;
 	line-height:28px;
 	padding:0 0 0 12px;
 	text-decoration:none;
 }
 #navigation ul a:hover, #navigation ul a:active, #navigation ul a:focus {
-	background:#f0ecd2;
-	color: #3e4301;
+	background:#f5f5f5;
+	color: #000;
 	text-decoration:underline;
 }
 
@@ -299,7 +293,7 @@ a:hover, a:active, a:focus {
     margin:0;
 }
 #main h1, #main h2 {
-    border-bottom:1px solid #e4e7dc;
+    border-bottom:1px solid #bdbcbc;
 }
 
 
@@ -366,7 +360,7 @@ fieldset.bulk.actions {
 
 label {
 	display: block;
-	font-weight:700;
+	font-weight:600;
 }
 label.forcheckbox {
     display:inline;
@@ -389,8 +383,8 @@ label input {
 /* todo: (heskew) try to get .text on stuff like .text-box */
 select, textarea, input.text, input.text-box {
 	padding:2px;
-	border:1px solid #d2d6c6;
-	color:#5a5b32;
+	border:1px solid #ddd;
+	color:#000;
 }
 input.text, input.text-box {
     line-height:1.2em;
@@ -441,13 +435,12 @@ textarea {
 }
 
 button, .button, .button:link, .button:visited {
-	background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
-	border:1px solid #d2d6c6;
-	color:#5a5b32;
+	background:#f5f5f5;
+	border:1px solid #999;
+	color:#2d2f25;
 	cursor:pointer;
-	height:26px;
-	padding:0 8px 3px;
 	text-align:center;
+	padding:0 .8em .1em .8em;
 }
 button.remove, .remove.button, .remove.button:link, .remove.button:visited {
     background-color:#DECCCA;
@@ -462,9 +455,9 @@ a.button, a.button:link, a.button:visited {
 button:hover, .button:hover,
 button:active, .button:active,
 button:focus, .button:focus {
-    background:#8a8f7a;
-    border-color:#666d51;
-    color:#f6faea;
+    background:#ffac40;
+    border-color:#bb8b2d;
+    color:#fff;
     text-decoration:none;
 }
 button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
@@ -513,7 +506,6 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
     height:inherit;
     margin-left:.3em;
     padding-bottom:.3em;
-    padding-top:.3em;
 }
 
 
@@ -620,7 +612,7 @@ button.ibutton {
 ----------------------------------------------------------*/
 table.items {
 	background:#fff;
-	border:1px solid #B0B083;
+	border:1px solid #999;
 	border-collapse:separate;
 	border-spacing:0;
 	width:100%;
@@ -643,7 +635,7 @@ table.items tbody {
 	vertical-align:middle;
 }
 table.items thead, table.items th {
-	background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
+	background:#f5f5f5;
 	font-weight:700;
 	overflow:hidden;
 	text-align:left;
@@ -655,7 +647,7 @@ table.items tr.hover {
 table.items tr.critical {background:#e68585; border:inherit;}
 table.items tr.warning {background:#fdf5bc; border:inherit;}
 table.items th, table.items td {
-	border-bottom:1px solid #EAE9D9;
+	border-bottom:1px solid #ccc;
 	border-spacing:0px;
 	display:table-cell;
 	padding:8px 12px;
@@ -692,7 +684,7 @@ todo: (heskew) pull out into relevant modules where appropriate
 }
 
 /* Rounded borders and other "works in some browsers" additions
-----------------------------------------------------------*/
+----------------------------------------------------------
 #content, #navigation li, button, .button,
 table.items, textarea, input.text, input.text-box,
 .contentItems, .message, .validation-summary-errors {
@@ -704,4 +696,4 @@ table.items, textarea, input.text, input.text-box,
 	-moz-border-radius:3px 3px 0 0;
 	-webkit-border-radius:3px 3px 0 0;
 	border-radius:3px 3px 0 0;
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/background_header.jpg b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/background_header.jpg
similarity index 100%
rename from src/Orchard.Web/Themes/TheAdmin/Styles/images/background_header.jpg
rename to src/Orchard.Web/Themes/TheAdminClassic/Styles/images/background_header.jpg
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/icons.png b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/icons.png
new file mode 100644
index 000000000..b115f24f4
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/icons.png differ
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/icons.psd b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/icons.psd
new file mode 100644
index 000000000..047460f1e
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/icons.psd differ
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/orchardLogo.gif b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/orchardLogo.gif
new file mode 100644
index 000000000..b6592dd75
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/orchardLogo.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.jpg b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/orchardLogo.jpg
similarity index 100%
rename from src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.jpg
rename to src/Orchard.Web/Themes/TheAdminClassic/Styles/images/orchardLogo.jpg
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/tableHeaderBackground.gif b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/tableHeaderBackground.gif
similarity index 100%
rename from src/Orchard.Web/Themes/TheAdmin/Styles/images/tableHeaderBackground.gif
rename to src/Orchard.Web/Themes/TheAdminClassic/Styles/images/tableHeaderBackground.gif
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/tableHeaderBackgroundRed.gif b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/tableHeaderBackgroundRed.gif
new file mode 100644
index 000000000..b5330cbfd
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdminClassic/Styles/images/tableHeaderBackgroundRed.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Styles/site.css b/src/Orchard.Web/Themes/TheAdminClassic/Styles/site.css
new file mode 100644
index 000000000..b1a1d186a
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdminClassic/Styles/site.css
@@ -0,0 +1,707 @@
+/* begin: reset
+   todo: (heskew) pare down and combine with existing selectors where appropriate */
+/* http://meyerweb.com/eric/tools/css/reset/ */
+/* v1.0 | 20080212 */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	border:0;
+	font-size:100%;
+	margin:0;
+	padding:0;
+	vertical-align:baseline;
+}
+ol, ul {
+	list-style:none;
+}
+blockquote, q {
+	quotes:none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content:'';
+	content:none;
+}
+ins {
+	text-decoration:none;
+}
+del {
+	text-decoration:line-through;
+}
+table {
+	border-collapse:collapse;
+	border-spacing:0;
+}
+/* end: reset */
+
+
+/* Base setup
+----------------------------------------------------------*/
+html {
+    background:#8a8f7a;
+    color:#525e50;
+}
+body {
+	color:#484926;
+    font-family:Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size:62.5%; /* 10px */
+	line-height:1.6em;
+    margin:0 auto 1em;
+    min-width:94.6em; /* 946px */
+    padding:0 .4em;
+}
+body#preview {
+    min-width:0;
+}
+#content {
+    background:#fff;
+}
+
+
+/* Layout
+
+number of columns: 24; actual width: 946; column width: 26; gutter width:14
+
+   |     24|     23|     22|     21|     20|     19|     18|     17|     16|     15|     14|     13|     12|     11|     10|      9|      8|      7|      6|      5|      4|      3|      2
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+.5g|  0.759|  0.793|  0.829|  0.870|  0.914|  0.963|  1.017|  1.079|  1.148|  1.226|  1.316|  1.420|  1.542|  1.687|  1.862|  2.077|  2.349|  2.703|  3.182|  3.867|  4.930|  6.796| 10.938
+ 24|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 23| 95.770|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 22| 91.540| 95.583|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 21| 87.310| 91.166| 95.379|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 20| 83.080| 86.750| 90.758| 95.155|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 19| 78.850| 82.333| 86.137| 90.311| 94.909|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 18| 74.620| 77.916| 81.517| 85.466| 89.817| 94.635|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 17| 70.390| 73.499| 76.896| 80.621| 84.726| 89.271| 94.331|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 16| 66.161| 69.083| 72.275| 75.776| 79.634| 83.906| 88.663| 93.991|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 15| 61.931| 64.666| 67.654| 70.932| 74.543| 78.542| 82.994| 87.982| 93.607|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 14| 57.701| 60.249| 63.033| 66.087| 69.452| 73.177| 77.326| 81.972| 87.213| 93.170|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 13| 53.471| 55.832| 58.412| 61.242| 64.360| 67.813| 71.657| 75.963| 80.820| 86.340| 92.669|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 12| 49.241| 51.416| 53.791| 56.398| 59.269| 62.448| 65.988| 69.954| 74.426| 79.510| 85.338| 92.089|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 11| 45.011| 46.999| 49.171| 51.553| 54.178| 57.084| 60.320| 63.945| 68.033| 72.680| 78.008| 84.178| 91.410|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+ 10| 40.781| 42.582| 44.550| 46.708| 49.086| 51.719| 54.651| 57.935| 61.639| 65.849| 70.677| 76.268| 82.819| 90.602|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+  9| 36.551| 38.165| 39.929| 41.863| 43.995| 46.355| 48.983| 51.926| 55.246| 59.019| 63.346| 68.357| 74.229| 81.205| 89.628|100.000|    ---|    ---|    ---|    ---|    ---|    ---|    ---
+  8| 32.321| 33.749| 35.308| 37.019| 38.903| 40.990| 43.314| 45.917| 48.852| 52.189| 56.015| 60.446| 65.639| 71.807| 79.255| 88.427|100.000|    ---|    ---|    ---|    ---|    ---|    ---
+  7| 28.091| 29.332| 30.687| 32.174| 33.812| 35.626| 37.645| 39.908| 42.459| 45.359| 48.684| 52.535| 57.048| 62.410| 68.883| 76.855| 86.913|100.000|    ---|    ---|    ---|    ---|    ---
+  6| 23.861| 24.915| 26.066| 27.329| 28.721| 30.261| 31.977| 33.898| 36.066| 38.529| 41.353| 44.625| 48.458| 53.012| 58.511| 65.282| 73.826| 84.942|100.000|    ---|    ---|    ---|    ---
+  5| 19.631| 20.498| 21.445| 22.484| 23.629| 24.897| 26.308| 27.889| 29.672| 31.699| 34.023| 36.714| 39.868| 43.614| 48.138| 53.709| 60.738| 69.884| 82.273|100.000|    ---|    ---|    ---
+  4| 15.401| 16.082| 16.825| 17.640| 18.538| 19.532| 20.640| 21.880| 23.279| 24.869| 26.692| 28.803| 31.278| 34.217| 37.766| 42.136| 47.651| 54.826| 64.545| 78.453|100.000|    ---|    ---
+  3| 11.171| 11.665| 12.204| 12.795| 13.446| 14.168| 14.971| 15.871| 16.885| 18.039| 19.361| 20.892| 22.687| 24.819| 27.394| 30.564| 34.564| 39.768| 46.818| 56.906| 72.535|100.000|    ---
+  2|  6.941|  7.248|  7.583|  7.950|  8.355|  8.803|  9.302|  9.861| 10.492| 11.208| 12.030| 12.982| 14.097| 15.422| 17.021| 18.991| 21.477| 24.710| 29.091| 35.359| 45.070| 62.136|100.000
+  1|  2.711|  2.831|  2.962|  3.106|  3.264|  3.439|  3.634|  3.852|  4.098|  4.378|  4.699|  5.071|  5.507|  6.024|  6.649|  7.418|  8.389|  9.653| 11.364| 13.812| 17.606| 24.272| 39.063
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+   |     24|     23|     22|     21|     20|     19|     18|     17|     16|     15|     14|     13|     12|     11|     10|      9|      8|      7|      6|      5|      4|      3|      2
+
+----------------------------------------------------------*/
+#header, #footer {
+    width:100%;
+}
+#header {
+    overflow:hidden;
+}
+#content {
+    overflow:auto;
+    padding:1.4em;
+}
+#main {
+    display:inline;
+    float:right;
+    width:83.08%;
+}
+#navigation {
+    display:inline;
+    float:left;
+    width:15.401%;
+}
+.wrapper, .sections {
+    overflow:hidden;
+}
+.sections .primary {
+    display:inline;
+    float:left;
+    width:74.543%;
+}
+.sections .secondary {
+    display:inline;
+    float:left;
+    margin-left:1.71%;
+    width:23.629%;
+}
+
+
+/* Headings and defaults
+----------------------------------------------------------*/
+h1, h2, h3, h4, h5, legend {
+    padding:.4em 0;
+    font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif;
+    font-style: normal;
+    font-weight:normal;
+}
+h1 { font-size:2.6em; } /* 26px */
+h2 { font-size:2.1em; } /* 21px */
+h2 span { font-size:.57em; } /* 12px */
+h3 { font-size:1.8em; } /* 18px */
+h4 { font-size:1.6em; } /* 16px */
+h5 { font-size:1.4em; } /* 14px */
+
+h6, p, legend, label, input, select, .button,
+.message, .validation-summary-errors,
+table.items th, table.items td, table.items caption { font-size:1.5em; line-height:1.5em; } /* 15px */
+p .button { font-size:inherit; }
+.meta, .hint { font-size:1.2em; } /* 12px */
+
+
+
+/* Links
+----------------------------------------------------------*/
+a, a:link, a:visited {
+    color:#1e5d7d;
+    text-decoration:none;
+}
+a:hover, a:active, a:focus {
+    color:#1e5d7d;
+    text-decoration:underline;
+}
+
+
+/* Header - Branding and Login  
+----------------------------------------------------------*/
+#header {
+	background:#8a8f7a url(images/background_header.jpg) no-repeat bottom right;
+	height:60px;
+}
+#header #app {
+    float:left;
+    font-size:2.4em;
+    padding:.4em 0;
+}
+#header #app a {
+	background:url(images/orchardLogo.gif) no-repeat;
+	display:block;
+	height:60px;
+	margin:-11px 0 0 14px;
+	text-indent:-9999px;
+	width:105px;
+}
+#header #app a {
+	background:url(images/orchardLogo.gif) no-repeat;
+	display:block;
+	height:60px;
+	margin:-11px 0 0 14px;
+	text-indent:-9999px;
+	width:35px;
+}
+
+#site {
+    font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif;
+    font-size:2em;
+}
+#site a, #site a:visited, #site a:active {
+	color:#fff;
+	float:left;
+	line-height:2.2em;
+	padding:6px 0 0 4px;
+	position:relative;
+}
+#login {
+    font-size:1.5em;
+	color:#1a1505;
+	display:block;
+	float:right;
+	margin:20px 20px 0 0;
+	white-space:nowrap;
+}
+#login a, #login a:link, #login a:visited {
+    color:#fff;
+    padding:0;
+}
+#login a:hover, #login a:active, #login a:focus {
+    color:#ffea9b;
+}
+
+
+/* Navigation
+----------------------------------------------------------*/
+#navshortcut {
+    height:0;
+    overflow:hidden;
+    width:0;
+}
+
+#navigation li {
+	background:#fff;
+	border:1px solid #d2d6c6;
+	margin:10px 0 15px 0;
+}
+#navigation ul li {
+    border:0;
+    margin:0;
+}
+#navigation li h3 {
+    padding:0;
+}
+#navigation li h3 a, #navigation li h3 span {
+	background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
+    display:block;
+	padding:6px 4px 8px 8px;
+}
+#navigation li h3 a, #navigation li h3 a:link, #navigation li h3 a:visited {
+    color:inherit;
+}
+#navigation li h3 a:hover, #navigation li h3 a:active, #navigation li h3 a:focus {
+    background:#8a8f7a;
+    color:#f6faea;
+    text-decoration:none;
+}
+#navigation ul a, #navigation ul a:link, #navigation ul a:visited {
+	color:#5a5b32;
+	display:block;
+	font-size:1.5em;
+	height:28px;
+	line-height:28px;
+	padding:0 0 0 12px;
+	text-decoration:none;
+}
+#navigation ul a:hover, #navigation ul a:active, #navigation ul a:focus {
+	background:#f0ecd2;
+	color: #3e4301;
+	text-decoration:underline;
+}
+
+
+/* Content
+----------------------------------------------------------*/
+#main h1 {
+    margin:0 0 1em;
+}
+#main h2, #main h3 {
+    margin:.5em 0;
+}
+#main p {
+    margin:0 0 1.5em;
+}
+#main .main.actions {
+    margin:0 0 1.4em;
+}
+#main .meta {
+    margin:-.4em 0 .4em;
+}
+#main form {
+    margin:.345em 0 1.38em;
+}
+#main form.inline {
+    margin:0;
+}
+#main h1, #main h2 {
+    border-bottom:1px solid #e4e7dc;
+}
+
+
+/* Confirmations, Messages and the like
+----------------------------------------------------------*/
+.message, .validation-summary-errors {
+	margin:10px 0 4px 0;
+    padding:4px;
+}
+span.message {
+    display:block;
+	margin:4px 0 4px 4px;
+}
+.message a {
+    font-weight:bold;
+}
+
+.confirmation.message {
+	background:#e6f1c9; /* green */
+	border:1px solid #cfe493;
+}
+.warning.message {
+	background:#fdf5bc; /* yellow */
+	border:1px solid #ffea9b;
+}
+/* todo: (heskew) what else (other inputs) needs this? */
+.critical.message, .validation-summary-errors,
+.input-validation-error.text-box, .input-validation-error.text {
+	border:1px solid #990808;
+}
+.critical.message, .validation-summary-errors {
+	background:#e68585; /* red */
+	color:#fff;
+}
+.info.message {
+    background:#fff; /* orange :P */
+	border:1px dashed #D2D6C6;
+}
+.debug.message {
+    background:#eee;
+	border:1px dashed #D2D6C6;
+	color:#7a7a7a;
+	margin:20px 0 14px 0;
+}
+.debug.message:before {
+    content:"DEBUG » ";
+}
+
+
+/* Forms   
+----------------------------------------------------------*/
+form.inline, form.inline fieldset { /* todo: (heskew) need something other than .inline ... */
+    display:inline;
+}
+form.inline fieldset {
+    margin:0;
+}
+fieldset.bulk.actions {
+    display:inline;
+    height:auto;
+    margin:0 1.4em 0 0;
+    padding-top:0;
+}
+
+label {
+	display: block;
+	font-weight:700;
+}
+label.forcheckbox {
+    display:inline;
+}
+fieldset.bulk.actions label, label.sub {
+    display:inline;
+}
+label span {
+	font-weight:normal;
+}
+label input {
+    vertical-align:text-top;
+}
+.hint {
+    display:block;
+}
+.hint.forcheckbox {
+    text-indent:3ex; /* todo: (heskew) this might look out of place */
+}
+/* todo: (heskew) try to get .text on stuff like .text-box */
+select, textarea, input.text, input.text-box {
+	padding:2px;
+	border:1px solid #d2d6c6;
+	color:#5a5b32;
+}
+input.text, input.text-box {
+    line-height:1.2em;
+}
+select:focus, textarea:focus, input.text:focus, input.text-box:focus {
+	border-color:#666d51;
+}
+input.check-box {
+    margin-left:0;
+    vertical-align:-.1em;
+}
+.permalink input {
+    background:transparent;
+    border-color:#EAE9D9;
+    border-style:dashed;
+    margin-left:0;
+	width:350px;
+}
+.permalink input:focus {
+    background:#FFF;
+    border-color:#666d51;
+    border-style:solid;
+}
+input.large.text, textarea, fieldset {
+    clear:both;
+}
+fieldset {
+    margin:.7em 0 .4em;
+}
+textarea {
+    min-height:8em;
+}
+.primary input.large.text, .primary textarea {
+    margin:0;
+    padding:4px;
+    width:98%;
+}
+
+/* todo: (heskew) move editor specific style elsewhere */
+.primary .mceEditor {
+    display:block;
+    margin:0;
+}
+.secondary fieldset {
+    margin:.446% 0 .446% .446%;
+    padding:4px;
+    width:98.662%;
+}
+
+button, .button, .button:link, .button:visited {
+	background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
+	border:1px solid #d2d6c6;
+	color:#5a5b32;
+	cursor:pointer;
+	height:26px;
+	padding:0 8px 3px;
+	text-align:center;
+}
+button.remove, .remove.button, .remove.button:link, .remove.button:visited {
+    background-color:#DECCCA;
+    background-image:url(images/tableHeaderBackgroundRed.gif);
+    border-color:#d6c9c7;
+    color:#5c3732;
+}
+a.button, a.button:link, a.button:visited {
+    line-height:1em;
+    padding:.2em .6em;
+}
+button:hover, .button:hover,
+button:active, .button:active,
+button:focus, .button:focus {
+    background:#8a8f7a;
+    border-color:#666d51;
+    color:#f6faea;
+    text-decoration:none;
+}
+button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
+    border-color:#8a8f7a;
+}
+button.remove:hover, .remove.button:hover,
+button.remove:active, .remove.button:active,
+button.remove:focus, .remove.button:focus {
+    background:#8f7c79;
+    border-color:#6e5551;
+    color:#faedeb;
+}
+button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
+    border-color:#8f7c79;
+}
+.delete.button {
+    float:right;
+}
+.cancel {
+    margin:0 0 0 .93em;
+}
+.manage {
+    float:right;
+    margin:0 0 10px 8px;
+    overflow:hidden;
+}
+.actions {
+    height:2em;
+    overflow:hidden;
+    padding:.6em 0 .1em;
+    text-align:right;
+}
+.contentItems .actions li {
+    background:inherit;
+    border:0;
+    padding:0;
+}
+.actions .construct {
+    float:left;
+}
+.actions .destruct {
+    float:right;
+}
+.manage a.button {
+    float:right;
+    height:inherit;
+    margin-left:.3em;
+    padding-bottom:.3em;
+    padding-top:.3em;
+}
+
+
+/* Icon buttons
+----------------------------------------------------------*/
+.ibutton, .ibutton:link, .ibutton:visited,
+button.ibutton, button.ibutton:hover, button.ibutton:focus, button.ibutton:active {
+    background:url(images/icons.png) 0 -20px;
+    border:0;
+    display:inline;
+    float:left;
+    height:17px;
+    overflow:hidden;
+    padding:0 0 0 17px;
+    width:0;
+}
+button.ibutton {
+    text-indent:-9999em;
+}
+.ibutton:hover, .ibutton:active, .ibutton:focus { background-position:0 0; }
+.ibutton.remove,
+.ibutton.remove:link,
+.ibutton.remove:visited { background-position:-20px -20px; }
+.ibutton.remove:hover, .ibutton.remove:active, .ibutton.remove:focus { background-position:-20px 0; }
+.ibutton.view,
+.ibutton.view:link,
+.ibutton.view:visited { background-position:-40px -20px; }
+.ibutton.view:hover, .ibutton.view:active, .ibutton.view:focus { background-position:-40px 0; }
+.ibutton.add.page,
+.ibutton.add.page:link,
+.ibutton.add.page:visited { background-position:-60px -20px; }
+.ibutton.add.page:hover, .ibutton.add.page:active, .ibutton.add.page:focus { background-position:-60px 0; }
+.ibutton.edit,
+.ibutton.edit:link,
+.ibutton.edit:visited { background-position:-80px -20px; }
+.ibutton.edit:hover, .ibutton.edit:active, .ibutton.edit:focus { background-position:-80px 0; }
+.ibutton.publish,
+.ibutton.publish:link,
+.ibutton.publish:visited { background-position:-100px -20px; }
+.ibutton.publish:hover, .ibutton.publish:active, .ibutton.publish:focus { background-position:-100px 0; }
+.ibutton.blog,
+.ibutton.blog:link,
+.ibutton.blog:visited { background-position:-120px -20px; }
+.ibutton.blog:hover, .ibutton.blog:active, .ibutton.blog:focus { background-position:-120px 0; }
+
+
+/* todo: (heskew) needs attention */
+.withActions {
+    overflow:hidden;
+}
+.withActions a {
+    display:inline;
+    float:left;
+    margin-right:7px;
+}
+
+
+/* Content item lists
+----------------------------------------------------------*/
+.contentItems {
+    background:#FFF;
+    border:1px solid #B0B083;
+    margin:1.4em 0;
+    padding:2px;
+}
+.contentItems li {
+    background:#FFF;
+    border-bottom:1px solid #EAE9D9;
+    margin:0;
+    overflow:hidden;
+    padding:.7em 1.4em;
+}
+.contentItems li.last {
+    border-bottom:0;
+}
+#main .contentItems li h3 {
+    border-bottom:0;
+    margin-top:0;
+}
+#main .contentItems li .actions {
+    color:#EAE9D9;
+    height:auto;
+    margin:-1.3em 0 0;
+    padding:0 0 .1em;
+}
+#main .contentItems li .actions .ibutton {
+    margin-right:6px;
+}
+#main .contentItems li .actions .destruct .ibutton {
+    margin-left:8px;
+    margin-right:0;
+}
+#main .contentItems li:hover { background:#fafbed; }
+#main .contentItems li:hover .ibutton { background-position:0 0; }
+#main .contentItems li:hover .ibutton.remove { background-position:-20px 0; }
+#main .contentItems li:hover .ibutton.view { background-position:-40px 0; }
+#main .contentItems li:hover .ibutton.add.page { background-position:-60px 0; }
+#main .contentItems li:hover .ibutton.edit { background-position:-80px 0; }
+#main .contentItems li:hover .ibutton.publish { background-position:-100px 0; }
+#main .contentItems li:hover .ibutton.blog { background-position:-120px 0; }
+
+
+/* (Items) Tables
+----------------------------------------------------------*/
+table.items {
+	background:#fff;
+	border:1px solid #B0B083;
+	border-collapse:separate;
+	border-spacing:0;
+	width:100%;
+}
+table.items caption {
+	padding:8px 0;
+	text-indent:0;
+}
+table.items col {
+	border-spacing:0;
+	display:table-column;
+}
+table.items colgroup 
+{
+	border-spacing:0;
+	display:table-column-group;
+}
+table.items tbody {
+	border-spacing:0;
+	vertical-align:middle;
+}
+table.items thead, table.items th {
+	background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
+	font-weight:700;
+	overflow:hidden;
+	text-align:left;
+}
+/* todo: (heskew) hook back up */
+table.items tr.hover {
+    background-color:#f0f3d6;
+}
+table.items tr.critical {background:#e68585; border:inherit;}
+table.items tr.warning {background:#fdf5bc; border:inherit;}
+table.items th, table.items td {
+	border-bottom:1px solid #EAE9D9;
+	border-spacing:0px;
+	display:table-cell;
+	padding:8px 12px;
+	vertical-align:middle;
+}
+
+
+/* MISC.
+todo: (heskew) pull out into relevant modules where appropriate
+----------------------------------------------------------*/
+
+/* Pages
+----------------------------------------------------------*/
+.templates li {
+    border-bottom:1px dashed #e4e7dc;
+    margin-bottom:2em;
+    padding-bottom:2em;
+}
+.templates fieldset {
+    margin:0 0 .933%;
+}
+.templates p {
+    overflow:hidden;
+}
+.templates p img {
+    float:left;
+    height:200px;
+    margin:.27em .93em .93em .54em;
+}
+.previewImage {
+	border:1px solid #525e50;
+	height:70%;
+	width:70%;
+}
+
+/* Rounded borders and other "works in some browsers" additions
+----------------------------------------------------------*/
+#content, #navigation li, button, .button,
+table.items, textarea, input.text, input.text-box,
+.contentItems, .message, .validation-summary-errors {
+	-moz-border-radius:4px;
+	-webkit-border-radius:4px;
+	border-radius:4px;
+}
+#navigation li h4 a {
+	-moz-border-radius:3px 3px 0 0;
+	-webkit-border-radius:3px 3px 0 0;
+	border-radius:3px 3px 0 0;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Theme.gif b/src/Orchard.Web/Themes/TheAdminClassic/Theme.gif
new file mode 100644
index 000000000..330b8e799
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdminClassic/Theme.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Theme.txt b/src/Orchard.Web/Themes/TheAdminClassic/Theme.txt
new file mode 100644
index 000000000..33c63a180
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdminClassic/Theme.txt
@@ -0,0 +1,5 @@
+name: The Admin
+version: 1.0
+author: Jon Wall
+description: An admin theme not to be used for the site so don't click "Activate" (or "Uninstall"). In the near future admin themes won't be mixed in with site themes.
+homepage: http://www.orchardproject.net
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Views/Header.ascx b/src/Orchard.Web/Themes/TheAdminClassic/Views/Header.ascx
new file mode 100644
index 000000000..8d8ecdd7d
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdminClassic/Views/Header.ascx
@@ -0,0 +1,4 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<AdminViewModel>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<div id="app"><%=Html.ActionLink(T("Project Orchard").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
+<div id="site"><%=Html.ActionLink(T("Your Site").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Views/Layout.ascx b/src/Orchard.Web/Themes/TheAdminClassic/Views/Layout.ascx
new file mode 100644
index 000000000..f68c50ab1
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdminClassic/Views/Layout.ascx
@@ -0,0 +1,15 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<AdminViewModel>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<%@ Import Namespace="Orchard.Mvc.Html"%><%
+Html.RegisterStyle("site.css");
+Model.Zones.AddRenderPartial("header", "Header", Model);
+Model.Zones.AddRenderPartial("header:after", "User", Model); // todo: (heskew) should be a user display or widget
+Model.Zones.AddRenderPartial("menu", "Menu", Model);
+%>
+<div id="header" role="banner"><% Html.Zone("header"); %></div>
+<div id="content">
+    <div id="navshortcut"><a href="#menu"><%=_Encoded("Skip to navigation") %></a></div>
+    <div id="main" role="main"><% Html.ZoneBody("content"); %></div>
+    <div id="menu"><% Html.Zone("menu"); %></div>
+</div>
+<div id="footer" role="contentinfo"><% Html.Zone("footer"); %></div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Views/Menu.ascx b/src/Orchard.Web/Themes/TheAdminClassic/Views/Menu.ascx
new file mode 100644
index 000000000..0891b8cc1
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdminClassic/Views/Menu.ascx
@@ -0,0 +1,19 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<AdminViewModel>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<ul id="navigation" role="navigation">
+    <li class="first"><h3><span><%=_Encoded("Dashboard")%></span></h3></li>
+    <%if (Model.AdminMenu != null) {
+          foreach (var menuSection in Model.AdminMenu) {
+              // todo: (heskew) need some help(er)
+              var firstSectionItem = menuSection.Items.FirstOrDefault();
+              var sectionHeaderMarkup = firstSectionItem != null
+                  ? Html.ActionLink(menuSection.Text, (string)firstSectionItem.RouteValues["action"], firstSectionItem.RouteValues).ToHtmlString()
+                  : string.Format("<span>{0}</span>", Html.Encode(menuSection.Text));
+              %>
+          <li><h3><%=sectionHeaderMarkup %></h3><ul><%foreach (var menuItem in menuSection.Items) { %>
+          <li><%=Html.ActionLink(menuItem.Text, (string)menuItem.RouteValues["action"], menuItem.RouteValues)%></li>
+          <%} %></ul></li>
+    <%
+        }
+      }%>
+</ul>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdminClassic/Views/User.ascx b/src/Orchard.Web/Themes/TheAdminClassic/Views/User.ascx
new file mode 100644
index 000000000..c9e2ad3fc
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdminClassic/Views/User.ascx
@@ -0,0 +1,5 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<AdminViewModel>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<% if (Model.CurrentUser != null) {
+    %><div id="login"><%=_Encoded("User:")%> <%=Html.Encode(Model.CurrentUser.UserName)%> | <%=Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" }) %></div><%
+   } %>
\ No newline at end of file