-                // 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);
+                // Editor is loaded
+                // Buttons are connected
+                // register callbacks for actions
+                $(document).bind("ui:action:INSERT_TAG", function(event, data) {
+                    var tag = data;
+                    var text = texteditor.selection();
+                    editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
+                    if (text.length == 0) {
+                        var pos = texteditor.cursorPosition();
+                        texteditor.selectLines(pos.line, pos.character + tag.length + 2);