diff --git a/VERSION b/VERSION
index 0c612866..e732835f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.8 (2012-09-09 14:15:10) stable
+Version 2.0.8 (2012-09-09 14:24:22) stable
diff --git a/applications/admin/static/codemirror/theme/web2py.css b/applications/admin/static/codemirror/theme/web2py.css
new file mode 100644
index 00000000..88acc257
--- /dev/null
+++ b/applications/admin/static/codemirror/theme/web2py.css
@@ -0,0 +1,32 @@
+.cm-s-web2py span.cm-meta {color: #FF1717;}
+.cm-s-web2py span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
+.cm-s-web2py span.cm-atom {color: #219;}
+.cm-s-web2py span.cm-number {color: #164;}
+.cm-s-web2py span.cm-def {color: #00f;}
+.cm-s-web2py span.cm-variable {color: black;}
+.cm-s-web2py span.cm-variable-2 {color: #0000C0;}
+.cm-s-web2py span.cm-variable-3 {color: #0000C0;}
+.cm-s-web2py span.cm-property {color: black;}
+.cm-s-web2py span.cm-operator {color: black;}
+.cm-s-web2py span.cm-comment {color: #3F7F5F;}
+.cm-s-web2py span.cm-string {color: #2A00FF;}
+.cm-s-web2py span.cm-string-2 {color: #f50;}
+.cm-s-web2py span.cm-error {color: #f00;}
+.cm-s-web2py span.cm-qualifier {color: #555;}
+.cm-s-web2py span.cm-builtin {color: #30a;}
+.cm-s-web2py span.cm-bracket {color: #cc7;}
+.cm-s-web2py span.cm-tag {color: #170;}
+.cm-s-web2py span.cm-attribute {color: #00c;}
+.cm-s-web2py span.cm-link {color: #219;}
+
+.cm-s-web2py .CodeMirror-matchingbracket {
+	border:1px solid grey;
+	color:black !important;;
+}
+
+/* Editor styling */
+
+.cm-s-web2py {
+  line-height: 1.40em;
+  font-family: Monaco, Menlo,"Andale Mono","lucida console","Courier New",monospace !important;
+}
\ No newline at end of file
diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html
index ee9426b5..43b566bb 100644
--- a/applications/admin/views/default/edit.html
+++ b/applications/admin/views/default/edit.html
@@ -9,6 +9,7 @@
 {{elif TEXT_EDITOR == 'codemirror':}}
 {{cm=URL('static','codemirror')}}
 <link rel="stylesheet" href="{{=cm}}/lib/codemirror.css">
+<link rel="stylesheet" href="{{=cm}}/theme/web2py.css">
 <script src="{{=cm}}/lib/codemirror.js"></script>
 <script src="{{=cm}}/mode/clike/clike.js"></script>
 <script src="{{=cm}}/keymap/emacs.js"></script>
@@ -134,6 +135,7 @@ jQuery(document).ready(function(){
       { mode: {name: '{{=cm_mode}}'{{if cm_mode=='python':}},version: 2,singleLineStringErrors: false{{pass}} },
         lineNumbers: true,
         indentUnit: 4,
+        theme: "web2py",
         tabMode: "shift",
         extraKeys: { "Ctrl-S": function(instance) {doClickSave();} },
         {{if TEXT_EDITOR_KEYBINDING == 'emacs':}}keyMap: "emacs",{{pass}}