diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/langs/en.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/langs/en.js
new file mode 100755
index 0000000000..d5e0bbde43
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/langs/en.js
@@ -0,0 +1,8 @@
+tinymce.addI18n('en',{
+	'HTML source code': 'HTML source code',
+	'Start search': 'Start search',
+	'Find next': 'Find next',
+	'Find previous': 'Find previous',
+	'Replace': 'Replace',
+	'Replace all': 'Replace all'
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/plugin.min.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/plugin.min.js
new file mode 100755
index 0000000000..425083626d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/plugin.min.js
@@ -0,0 +1,3 @@
+tinymce.PluginManager.requireLangPack("codemirror");
+tinymce.PluginManager.add("codemirror",function(a,c){function b(){a.focus();a.selection.collapse(!0);a.selection.setContent('<span class="CmCaReT" style="display:none">&#0;</span>');var b=a.windowManager.open({title:"Source code",url:c+"/source.html",width: a.getParam("code_dialog_width", 600),height: a.getParam("code_dialog_height", Math.min(tinymce.DOM.getViewPort().h - 200, 500)),resizable:!0,maximizable:!0,buttons:[{text:"Ok",subtype:"primary",onclick:function(){document.querySelectorAll(".mce-container-body>iframe")[0].contentWindow.submit();b.close()}},{text:"Cancel",onclick:"close"}]})}a.addButton("code",
+{title:"Source code",icon:"code",onclick:b});a.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:b})});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/source.html b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/source.html
new file mode 100755
index 0000000000..6a4cd7ba57
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/codemirror/source.html
@@ -0,0 +1,243 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+/**
+ * source.html
+ *
+ * Copyright 2013-2014 Web Power, www.webpower.nl
+ * @author Arjan Haverkamp
+ */
+
+// Global vars:
+var tinymce,     // Reference to TinyMCE
+	editor,      // Reference to TinyMCE editor
+	codemirror,  // CodeMirror instance
+	chr = 0,     // Unused utf-8 character, placeholder for cursor
+	isMac = /macintosh|mac os/i.test(navigator.userAgent),
+	CMsettings;  // CodeMirror settings
+
+function inArray(key, arr)
+{
+	"use strict";
+	arr = '|' + arr.join('|') + '|';
+	return arr.indexOf('|'+key+'|') != -1;
+}
+
+(function()
+{// Initialise (before load)
+	"use strict";
+
+	tinymce = parent.tinymce;
+	editor = tinymce.activeEditor;
+	var i, userSettings = editor.settings.codemirror ? JSON.parse(editor.settings.codemirror) : {};
+	CMsettings = {
+		path: userSettings.path || 'CodeMirror',
+		indentOnInit: userSettings.indentOnInit || false,
+		config: {// Default config
+			mode: 'htmlmixed',
+			lineNumbers: true,
+			lineWrapping: true,
+			indentUnit: 2,
+			tabSize: 2,
+			matchBrackets: true,
+			styleActiveLine: true,
+			
+			// CodeMirror v2
+			onChange: function(inst) {
+				inst.isDirty = true;
+			},
+			
+		}, // CodeMirror v4 commented out below.
+		jsFiles: [// Default JS files
+			'lib/codemirror.js',
+			'lib/util/match-highlighter.js', //'addon/edit/matchbrackets.js',
+			'mode/xml/xml.js',
+			'mode/javascript/javascript.js',
+			'mode/css/css.js',
+			'mode/htmlmixed/htmlmixed.js',
+			'lib/util/dialog.js', //'addon/dialog/dialog.js',
+			'lib/util/searchcursor.js', //'addon/search/searchcursor.js',
+			'lib/util/search.js' //'addon/search/search.js',
+			//'addon/selection/active-line.js'
+		],
+		cssFiles: [// Default CSS files
+			'lib/codemirror.css',
+			'lib/util/dialog.css'//'addon/dialog/dialog.css'
+		]
+	};
+
+	// Merge config
+	for (i in userSettings.config) {
+		CMsettings.config[i] = userSettings.config[i];
+	}
+	
+	// Merge jsFiles
+	for (i in userSettings.jsFiles) {
+		if (!inArray(userSettings.jsFiles[i], CMsettings.jsFiles)) {
+			CMsettings.jsFiles.push(userSettings.jsFiles[i]);
+		}
+	}
+
+	// Merge cssFiles
+	for (i in userSettings.cssFiles) {
+		if (!inArray(userSettings.cssFiles[i], CMsettings.cssFiles)) {
+			CMsettings.cssFiles.push(userSettings.cssFiles[i]);
+		}
+	}
+
+	// Add trailing slash to path
+	if (!/\/$/.test(CMsettings.path)) {
+		CMsettings.path += '/';
+	}
+
+	// Write stylesheets
+	for (i = 0; i < CMsettings.cssFiles.length; i++) {
+		document.write('<li'+'nk rel="stylesheet" type="text/css" href="' + CMsettings.path + CMsettings.cssFiles[i] + '" />');
+	}
+
+	// Write JS source files
+	for (i = 0; i < CMsettings.jsFiles.length; i++) {
+		document.write('<scr'+'ipt type="text/javascript" src="' + CMsettings.path + CMsettings.jsFiles[i] + '"></scr'+'ipt>');
+	}
+
+	window.onload = start;
+}());
+
+function start()
+{// Initialise (on load)
+	"use strict";
+
+	if (typeof(window.CodeMirror) !== 'function') {
+		alert('CodeMirror not found in "' + CMsettings.path + '", aborting...');
+		return;
+	}
+
+	// Create legend for keyboard shortcuts for find & replace:
+	var head = parent.document.querySelectorAll('.mce-foot')[0],
+		div = parent.document.createElement('div'),
+		td1 = '<td style="font-size:11px;font-family:courier;font-weight:bold;text-align:right;padding-right: 1em;">',
+		td2 = '<td style="font-size:11px;padding-right: 1em;">';
+	div.innerHTML = '<table cellspacing="0" cellpadding="0" style="border-spacing:4px"><tr>' + td1 + (isMac ? '&#8984;-F' : 'Ctrl-F</td>') + td2 + tinymce.translate('Start search') + '</td>' + td1 + (isMac ? '&#8984;-G' : 'Ctrl-G') + '</td>' + td2 + tinymce.translate('Find next') + '</td>' + td1 + (isMac ? '&#8984;-Alt-F' : 'Shift-Ctrl-F') + '</td>' + td2 + tinymce.translate('Find previous') + '</td></tr>' + '<tr>' + td1 + (isMac ? '&#8984;-Alt-F' : 'Shift-Ctrl-F') + '</td>' + td2 + tinymce.translate('Replace') + '</td>' + td1 + (isMac ? 'Shift-&#8984;-Alt-F' : 'Shift-Ctrl-R') +'</td>' + td2 + tinymce.translate('Replace all') + '</td></tr></table>';
+	div.style.position = 'absolute';
+	div.style.left = '1em';
+	div.style.bottom = '.5em';
+	head.appendChild(div);
+	
+	// Set CodeMirror cursor to same position as cursor was in TinyMCE:
+	var html = editor.getContent({source_view: true});
+	html = html.replace(/<span\s+class="CmCaReT"([^>]*)>([^<]*)<\/span>/gm, String.fromCharCode(chr));
+	editor.dom.remove(editor.dom.select('.CmCaReT'));
+	html = html.replace(/(<div class=".*?umb-macro-holder.*?mceNonEditable.*?"><!-- <\?UMBRACO_MACRO macroAlias="(.*?)".*?\/> --> *<ins>)[\s\S]*?(<\/ins> *<\/div>)/ig, "$1Macro alias: <strong>$2</strong>$3");
+
+	//CodeMirror v4
+	CodeMirror.defineInitHook(function(inst) 
+	{
+		// Move cursor to correct position:
+		inst.focus();
+		var cursor = inst.getSearchCursor(String.fromCharCode(chr), false);
+		if (cursor.findNext()) {
+			inst.setCursor(cursor.to());
+			cursor.replace('');
+		}
+		
+		// Indent all code, if so requested:
+		if (editor.settings.codemirror.indentOnInit) {
+			var last = inst.lineCount();
+			inst.operation(function() {
+				for (var i = 0; i < last; ++i) {
+					inst.indentLine(i);
+				}
+			});
+		}
+	});
+
+	CMsettings.config.value = html;
+
+	// Instantiante CodeMirror:
+	codemirror = CodeMirror(document.body, CMsettings.config);
+	codemirror.isDirty = false;
+	/*codemirror.on('change', function(inst) {  // CodeMirror v4
+		inst.isDirty = true;
+	});*/
+}
+
+function findDepth(haystack, needle)
+{
+	"use strict";
+
+	var idx = haystack.indexOf(needle), depth = 0, x;
+	for (x = idx; x >= 0; x--) {
+		switch(haystack.charAt(x)) {
+			case '<': depth--; break;
+			case '>': depth++; break;
+		}
+	}
+	return depth;
+}
+
+// This function is called by plugin.js, when user clicks 'Ok' button
+function submit()
+{
+	"use strict";
+		
+	var cc = '&#x0;', isDirty = codemirror.isDirty, doc = codemirror;  // CodeMirror v4 doc = codemirror.doc
+
+	if (doc.getSelection() != "") { // CodeMirror v4 if(doc.somethingSelected()) {
+		// Clear selection:
+		doc.setCursor(doc.getCursor());
+	}
+
+	// Insert cursor placeholder (&#x0;)
+	doc.replaceSelection(cc);
+
+	var pos = codemirror.getCursor(),
+		curLineHTML = doc.getLine(pos.line);
+
+	if (findDepth(curLineHTML, cc) !== 0) {
+		// Cursor is inside a <tag>, don't set cursor:
+		curLineHTML = curLineHTML.replace(cc, '');
+		doc.setLine(pos.line, curLineHTML);
+	}
+
+	// Submit HTML to TinyMCE:
+	editor.setContent(codemirror.getValue().replace(cc, '<span class="CmCaReT">&nbsp;</span>'));
+	editor.isNotDirty = !isDirty;
+	if (isDirty) {
+		editor.nodeChanged();
+	}
+
+	// Set cursor:
+	var el = editor.dom.select('span.CmCaReT')[0];
+	if (el) {
+		editor.selection.scrollIntoView(el);
+		editor.selection.setCursorLocation(el,0);
+		editor.dom.remove(el);
+	}
+}
+
+</script>
+<style type="text/css">
+
+html,body,.CodeMirror-scroll {
+	height: 100%;
+}
+body {
+	margin: 0;
+}
+
+.CodeMirror {
+	height: 100%;
+	font-size: 12px;
+	line-height: 18px;
+}
+
+.CodeMirror-activeline-background {
+	background: #e8f2ff !important;
+}
+
+</style>
+</head>
+<body></body>
+</html>
diff --git a/src/Umbraco.Web.UI/config/tinyMceConfig.config b/src/Umbraco.Web.UI/config/tinyMceConfig.config
index 8a51b3f421..a3a9b9da01 100644
--- a/src/Umbraco.Web.UI/config/tinyMceConfig.config
+++ b/src/Umbraco.Web.UI/config/tinyMceConfig.config
@@ -6,7 +6,7 @@
         <command>
             <umbracoAlias>code</umbracoAlias>
             <icon>images/editor/code.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="code">code</tinyMceCommand>
+            <tinyMceCommand value="" userInterface="false" frontendCommand="codemirror">code</tinyMceCommand>
             <priority>1</priority>
         </command>
         <command>
@@ -199,7 +199,7 @@
        
     </commands>
     <plugins>
-        <plugin loadOnFrontend="true">code</plugin>  
+        <plugin loadOnFrontend="true">codemirror</plugin>
         <plugin loadOnFrontend="true">paste</plugin>
         <plugin loadOnFrontend="true">umbracolink</plugin>
         <plugin loadOnFrontend="true">anchor</plugin>
@@ -228,5 +228,17 @@ param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|cla
         <!--    <config key="myKey">mySetting</config>-->
         <config key="entity_encoding">raw</config>
         <config key="spellchecker_rpc_url">GoogleSpellChecker.ashx</config>
+      <config key="codemirror">
+        {
+        "indentOnInit": false,
+        "path": "/umbraco_client/CodeMirror/Js",
+        "config": {
+        },
+        "jsFiles": [
+        ],
+        "cssFiles": [
+        ]
+        }
+      </config>
     </customConfig>
 </tinymceConfig>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/CodeMirror/js/lib/codemirror.js b/src/Umbraco.Web.UI/umbraco_client/CodeMirror/js/lib/codemirror.js
old mode 100644
new mode 100755
index 09a577aa18..f61f04a5dd
--- a/src/Umbraco.Web.UI/umbraco_client/CodeMirror/js/lib/codemirror.js
+++ b/src/Umbraco.Web.UI/umbraco_client/CodeMirror/js/lib/codemirror.js
@@ -1980,6 +1980,7 @@ window.CodeMirror = (function() {
       if (extensions.propertyIsEnumerable(ext) &&
           !instance.propertyIsEnumerable(ext))
         instance[ext] = extensions[ext];
+	for (var i = 0; i < initHooks.length; ++i) initHooks[i](instance);
     return instance;
   } // (end of function CodeMirror)
 
@@ -2076,6 +2077,9 @@ window.CodeMirror = (function() {
   CodeMirror.defineExtension = function(name, func) {
     extensions[name] = func;
   };
+  
+  var initHooks = [];
+  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
 
   var modeExtensions = CodeMirror.modeExtensions = {};
   CodeMirror.extendMode = function(mode, properties) {
