diff --git a/core/styles/tiddlywiki.css b/core/styles/tiddlywiki.css
index acf8b90cb..ce7a9670f 100644
--- a/core/styles/tiddlywiki.css
+++ b/core/styles/tiddlywiki.css
@@ -5983,16 +5983,8 @@ Tiddler styles
 */
 
 @media (min-width: 767px) {
-  .tw-tiddler-frame {
-    padding: 30px 30px 30px 30px;
-    margin: 30px 5px 30px 5px;
-    background-color: #fff;
-    -webkit-box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.4);
-       -moz-box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.4);
-            box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.4);
-  }
   body {
-    background: #eeeeee;
+    background: #fff;
   }
 }
 
@@ -6178,68 +6170,3 @@ Split label
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
 }
-
-/*
-Includes
-*/
-
-.javascript-source {
-  padding: 18px 18px 18px 18px;
-  border: 1px solid #888;
-  -webkit-box-shadow: inset 1px 1px 1px 1px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: inset 1px 1px 1px 1px rgba(0, 0, 0, 0.2);
-          box-shadow: inset 1px 1px 1px 1px rgba(0, 0, 0, 0.2);
-}
-
-.javascript-source .javascript-boolean {
-  color: #066;
-}
-
-.javascript-source .javascript-identifier {
-  color: #606;
-}
-
-.javascript-source .javascript-keyword {
-  font-weight: bold;
-  color: #008;
-}
-
-.javascript-source .javascript-null {
-  color: #080;
-}
-
-.javascript-source .javascript-numeric {
-  color: #066;
-}
-
-.javascript-source .javascript-punctuator {
-  color: #660;
-}
-
-.javascript-source .javascript-string {
-  color: #080;
-}
-
-.javascript-source .javascript-comment {
-  padding: 4px 4px 4px 4px;
-  color: #800;
-  background: linear-gradient(72deg, rgba(255, 255, 255, 0.5) 8%, rgba(255, 255, 255, 0.1) 80%), linear-gradient(top, #dede80 0, #feed77 7%, #feed77 92%, #dede80 100%);
-  background: #feed77;
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dede80), color-stop(7%, #feed77), color-stop(92%, #feed77), color-stop(100%, #dede80));
-  background: -webkit-linear-gradient(72deg, rgba(255, 255, 255, 0.5) 8%, rgba(255, 255, 255, 0.1) 80%), -webkit-linear-gradient(top, #dede80 0, #feed77 7%, #feed77 92%, #dede80 100%);
-  background: -moz-linear-gradient(72deg, rgba(255, 255, 255, 0.5) 8%, rgba(255, 255, 255, 0.1) 80%), -moz-linear-gradient(top, #dede80 0, #feed77 7%, #feed77 92%, #dede80 100%);
-  background: -o-linear-gradient(72deg, rgba(255, 255, 255, 0.5) 8%, rgba(255, 255, 255, 0.1) 80%), -o-linear-gradient(top, #dede80 0, #feed77 7%, #feed77 92%, #dede80 100%);
-  background: -ms-linear-gradient(72deg, rgba(255, 255, 255, 0.5) 8%, rgba(255, 255, 255, 0.1) 80%), -ms-linear-gradient(top, #dede80 0, #feed77 7%, #feed77 92%, #dede80 100%);
-  border: 1px solid #feed77;
-  -webkit-box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.4);
-     -moz-box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.4);
-          box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.4);
-}
-
-.javascript-source .javascript-block-comment {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-.javascript-source .javascript-line-comment {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
diff --git a/core/styles_new/base.tid b/core/styles_new/base.tid
new file mode 100644
index 000000000..61f9bc324
--- /dev/null
+++ b/core/styles_new/base.tid
@@ -0,0 +1,32 @@
+title: $:/core/styles/base
+tags: $:/core/styles
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
+\define border-radius(radius)
+```
+  -webkit-border-radius: $radius$;
+     -moz-border-radius: $radius$;
+          border-radius: $radius$;
+```
+\end
+\define box-shadow(shadow)
+```
+  -webkit-box-shadow: $shadow$;
+     -moz-box-shadow: $shadow$;
+          box-shadow: $shadow$;
+```
+\end
+
+html body {
+	position: relative; /* So that height: 100% will fit to the body */
+}
+
+.tw-tiddler-frame {
+	padding: 30px 30px 30px 30px;
+	margin: 0px;
+	background-color: #fff;
+	border-left: 1px solid #ddd;
+	border-right: 1px solid #ddd;
+	border-bottom: 1px solid #ddd;
+	<<border-radius 4px>>
+}
diff --git a/cssbuild/javascript.less b/cssbuild/javascript.less
deleted file mode 100644
index 9d1b309ad..000000000
--- a/cssbuild/javascript.less
+++ /dev/null
@@ -1,60 +0,0 @@
-// JavaScript syntax highlighting
-
-.javascript-source {
-	border: 1px solid #888;
-	padding: 18px 18px 18px 18px;
-	.box-shadow(inset 1px 1px 1px 1px rgba(0, 0, 0, 0.2));
-// TODO: Less doesn't seem to like my tab-size mixin
-//	.tab-size(4);
-}
-
-.javascript-source .javascript-boolean {
-	color: #066;
-}
-
-.javascript-source .javascript-identifier {
-	color: #606;
-}
-
-.javascript-source .javascript-keyword {
-	color: #008;
-	font-weight: bold;
-}
-
-.javascript-source .javascript-null {
-	color: #080;
-}
-
-.javascript-source .javascript-numeric {
-	color: #066;
-}
-
-.javascript-source .javascript-punctuator {
-	color: #660;
-}
-
-.javascript-source .javascript-string {
-	color: #080;
-}
-
-.javascript-source .javascript-comment {
-	color: #800;
-	padding: 4px 4px 4px 4px;
-	border: 1px solid #feed77;
-	background: #feed77;
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#dede80),color-stop(7%,#feed77),color-stop(92%,#feed77),color-stop(100%,#dede80));
-	background: -webkit-linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%),-webkit-linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
-	background:    -moz-linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%),   -moz-linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
-	background:      -o-linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%),     -o-linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
-	background:     -ms-linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%),    -ms-linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
-	background:         linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%),        linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
-	.box-shadow(1px 1px 6px rgba(0,0,0,0.4));
-}
-
-.javascript-source .javascript-block-comment {
-	font-family: @sansFontFamily;
-}
-
-.javascript-source .javascript-line-comment {
-	font-family: @sansFontFamily;
-}
diff --git a/cssbuild/tiddlywiki.less b/cssbuild/tiddlywiki.less
index e2e9da4a5..a8a0d3941 100644
--- a/cssbuild/tiddlywiki.less
+++ b/cssbuild/tiddlywiki.less
@@ -87,15 +87,8 @@ Tiddler styles
 
 @media (min-width: 767px) {
 
-.tw-tiddler-frame {
-	padding: 30px 30px 30px 30px;
-	margin: 30px 5px 30px 5px;
-	.box-shadow(1px 1px 6px rgba(0,0,0,0.4));
-	background-color: #fff;
-}
-
 body {
-	background: @grayLighter; 	// So that the tiddlers pop out more
+	background: #fff;
 }
 
 }
@@ -280,9 +273,3 @@ Split label
 	border-bottom-right-radius: 3px;
 	background-color: #eee;
 }
-
-/*
-Includes
-*/
-
-@import "javascript.less";