diff --git a/applications/admin/static/codemirror/lib/codemirror.css b/applications/admin/static/codemirror/lib/codemirror.css
index f7fe9716..7b005a95 100644
--- a/applications/admin/static/codemirror/lib/codemirror.css
+++ b/applications/admin/static/codemirror/lib/codemirror.css
@@ -3,7 +3,7 @@
 .CodeMirror {
   /* Set height, width, borders, and global font properties here */
   font-family: monospace;
-  height: 300px;
+  height: auto;
 }
 
 .CodeMirror-scroll {
@@ -12,17 +12,13 @@
 }
 
 /* Fullscreen */
-
 .CodeMirror-fullscreen {
-        display: block;
-        position: absolute;
-        top: 0; left: 0;
-        width: 100% ! important;;
-        z-index: 9999;
-      }
-
-
-
+	display: block;
+	position: absolute ! important;
+	top: 0; left: 0;
+	width: 100% ! important;
+	z-index: 9999;
+}
 
 /* BREAKPOINTS */
 
diff --git a/applications/admin/static/codemirror/theme/web2py.css b/applications/admin/static/codemirror/theme/web2py.css
index 35be9a49..62c3003d 100644
--- a/applications/admin/static/codemirror/theme/web2py.css
+++ b/applications/admin/static/codemirror/theme/web2py.css
@@ -27,8 +27,9 @@
 /* Editor styling */
 
 .cm-s-web2py {
-  line-height: 1.40em;
-  font-family: Monaco, Menlo,"Andale Mono","lucida console","Courier New",monospace !important;
+	line-height: 1.40em;
+	font-family: Monaco, Menlo,"Andale Mono","lucida console","Courier New",monospace !important;
+	background: white;
 }
 
 
diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html
index da5ae8cd..914c5b06 100644
--- a/applications/admin/views/default/edit.html
+++ b/applications/admin/views/default/edit.html
@@ -38,13 +38,9 @@
 <script src="{{=cm}}/addon/selection/active-line.js"></script>
 <script src="{{=cm}}/emmet.min.js"></script>
 
-<style type="text/css">
-	
-</style>
-
 <script language="Javascript" type="text/javascript" src="{{=URL('static','js/ajax_editor.js')}}"></script>
 <script language="Javascript" type="text/javascript">
-
+var current_theme = "web2py";  //Default theme
 jQuery(document).on('shown click', 'a[data-toggle="tab"]', function (e) {
 	var tab_id = jQuery(this).attr('href');
 	var editor = jQuery(tab_id + " textarea").data('editor');
@@ -102,6 +98,7 @@ jQuery(document).on('click', '#themes a', function (e) {
 		editor.setOption("theme", name);
 	});
 	jQuery('#themeName').html(name);
+	current_theme = name;
 //#TODO save on session
 });
 
@@ -115,10 +112,13 @@ jQuery(document).on('click', '#themes a', function (e) {
 		var wrap = instance.getWrapperElement(), scroll = instance.getScrollerElement();
 		if (full) {
 			wrap.className += " CodeMirror-fullscreen";
+			jQuery(wrap).css('width', "100%");
+			jQuery(wrap).css('position', "absolute");
 			scroll.style.height = winHeight() + "px";
 			document.documentElement.style.overflow = "hidden";
 		} else {
 			wrap.className = wrap.className.replace(" CodeMirror-fullscreen", "");
+			jQuery(wrap).css('position', "relative");
 			scroll.style.height = "";
 			document.documentElement.style.overflow = "";
 		}
@@ -140,8 +140,8 @@ jQuery(document).on('click', '#themes a', function (e) {
 
 
 <div class='row-fluid'>
-<div class="right controls pull-right">
-<div class="dropdown pull-left">
+<div class="right controls btn-toolbar pull-right">
+<div class="dropdown btn-group pull-left">
 	<a class="dropdown-toggle button btn" data-target="themes" data-toggle="dropdown" href="#" >Theme: <span id="themeName" style="color: #E8953C">Web2py</span> <span class="caret"></span></a>
 	<ul class="dropdown-menu" role="menu" id="themes">	
 		{{for f in listfiles('admin', "static/codemirror/theme", regexp='.*\.css$' ):}}
@@ -149,12 +149,13 @@ jQuery(document).on('click', '#themes a', function (e) {
 		{{pass}}
 	</ul>
 </div>
+<div class="btn-group">
   {{=button(URL('design',args=request.vars.app if request.vars.app else request.args[0], anchor=request.vars.id), T('back'))}}
   {{#if request.args[1]=='models':}}
   <a class="button btn" href="http://www.web2py.com/sqldesigner" target="_blank"><span>{{=T('online designer')}}</span></a>
   {{#pass}}
   <a class="button btn" href="http://www.web2py.com/examples/static/epydoc/index.html" target="_blank"><span>{{=T('docs')}}</span></a>
-
+</div>
 </div>
 </div>
 <div id="editor_area" class="row-fluid">
diff --git a/applications/admin/views/default/edit_js.html b/applications/admin/views/default/edit_js.html
index 97739284..492b8657 100644
--- a/applications/admin/views/default/edit_js.html
+++ b/applications/admin/views/default/edit_js.html
@@ -52,7 +52,7 @@
         indentUnit: 4,
 		  styleActiveLine: true,
 		  autoCloseTags: true,
-        theme: "web2py",
+        theme: current_theme,
         tabMode: "shift",
         lineWrapping: true,
 		  gutters: ["CodeMirror-linenumbers", "breakpoints"],