-       function xmleditor_onload(event, me) {
-               console.log('loading: ', me);
-               var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
-               $('textarea', panel).attr('id', textareaId);
-               var editor = CodeMirror.fromTextArea(textareaId, {
-                       parserfile: 'parsexml.js',
-                       path: "/static/js/codemirror/",
-                       stylesheet: "/static/css/xmlcolors.css",
-                       parserConfig: {useHTMLKludges: false},
-               })
-               console.log('Frame is: ', editor.frame);
-               var frame = $(editor.frame)
-               frame.css({width: '100%', height: '100%', background: 'yellow'});
-       };
+    function xmleditor_onload(event, panel) {
+        var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
+        $('textarea', panel).attr('id', textareaId);
+        var editor = CodeMirror.fromTextArea(textareaId, {
+            parserfile: 'parsexml.js',
+            path: "/static/js/codemirror/",
+            stylesheet: "/static/css/xmlcolors.css",
+            parserConfig: {useHTMLKludges: false},
+            onChange: function() {
+                $(document).trigger('panel:contentChanged', panel);
+            },
+            initCallback: function(editor) {
+                // Toolbar
+                $('.toolbar-tabs li', panel).click(function() {
+                    var id = $(this).attr('p:button-list');
+                    $('.toolbar-tabs li', panel).removeClass('active');
+                    $(this).addClass('active');
+                    if (!$('.' + id, panel).is(':visible')) {
+                        $('.toolbar-buttons ol', panel).not('#' + id).hide();
+                        $('.' + id, panel).show();
+                    }
+                })
+                
+                var keys = {};
+                $('.toolbar-buttons li', panel).each(function() {
+                    var tag = $(this).attr('p:tag');
+                    var handler = function() {
+                        var text = editor.selection();
+                        editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
+                        if (text.length == 0) {
+                            var pos = editor.cursorPosition();
+                            editor.selectLines(pos.line, pos.character + tag.length + 2);
+                        }
+                        $(document).trigger('panel:contentChanged', panel);
+                    }
+                    if ($(this).attr('p:key')) {
+                        keys[$(this).attr('p:key')] = handler;
+                    }
+                    $(this).click(handler)
+                });