diff --git a/mindplot/pom.xml b/mindplot/pom.xml
index 6e2ad6c9..c66e1b16 100644
--- a/mindplot/pom.xml
+++ b/mindplot/pom.xml
@@ -192,10 +192,6 @@
                                     <filelist dir="${basedir}/src/main/javascript/widget/" files="LinkEditor.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/widget/" files="FloatingTip.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/widget/" files="LinkIconTooltip.js"/>
-
-
-                                    <filelist dir="${basedir}/src/main/javascript/"
-                                              files="widget/ColorPickerPanel.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/"
                                               files="widget/ColorPalettePanel.js"/>
                                     <filelist dir="${basedir}/src/main/javascript/"
diff --git a/mindplot/src/main/javascript/CentralTopic.js b/mindplot/src/main/javascript/CentralTopic.js
index 3aac4767..5f6d6cdc 100644
--- a/mindplot/src/main/javascript/CentralTopic.js
+++ b/mindplot/src/main/javascript/CentralTopic.js
@@ -100,11 +100,11 @@ mindplot.CentralTopic = new Class({
     },
 
     _defaultBackgroundColor : function() {
-        return "#f7f7f7";
+        return "rgb(80,157,192)";
     },
 
     _defaultBorderColor : function() {
-        return "#023BB9";
+        return "rgb(57,113,177)";
     },
 
     _defaultFontStyle : function() {
@@ -113,7 +113,7 @@ mindplot.CentralTopic = new Class({
             size: 10,
             style:"normal",
             weight:"bold",
-            color:"#023BB9"
+            color:"#ffffff"
         };
     }
 });
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/ConnectionLine.js b/mindplot/src/main/javascript/ConnectionLine.js
index 9c6f532b..8da3c562 100644
--- a/mindplot/src/main/javascript/ConnectionLine.js
+++ b/mindplot/src/main/javascript/ConnectionLine.js
@@ -43,7 +43,7 @@ mindplot.ConnectionLine = new Class({
             }
             line.setStroke(1, 'solid', strokeColor);
         }
-
+        line.setFill(mindplot.ConnectionLine.getStrokeColor());
         this._line2d = line;
     },
 
diff --git a/mindplot/src/main/javascript/LinkIcon.js b/mindplot/src/main/javascript/LinkIcon.js
index 7a2227cc..2197d990 100644
--- a/mindplot/src/main/javascript/LinkIcon.js
+++ b/mindplot/src/main/javascript/LinkIcon.js
@@ -25,7 +25,7 @@ mindplot.LinkIcon = new Class({
 
 
         this.parent(mindplot.LinkIcon.IMAGE_URL);
-        this._noteModel = linkModel;
+        this._linksModel = linkModel;
         this._topic = topic;
 
         this._registerEvents();
@@ -44,7 +44,7 @@ mindplot.LinkIcon = new Class({
     },
 
     getModel : function() {
-        return this._noteModel;
+        return this._linksModel;
     },
 
     remove : function() {
@@ -52,6 +52,6 @@ mindplot.LinkIcon = new Class({
         actionDispatcher.removeLinkFromTopic(this._topic.getId());
     }
 });
-mindplot.LinkIcon.IMAGE_URL = "../images/world_link.png";
+mindplot.LinkIcon.IMAGE_URL = "../nicons/links.png";
 
  
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/NodeGraph.js b/mindplot/src/main/javascript/NodeGraph.js
index 4e8fd1ed..e7666365 100644
--- a/mindplot/src/main/javascript/NodeGraph.js
+++ b/mindplot/src/main/javascript/NodeGraph.js
@@ -103,11 +103,10 @@ mindplot.NodeGraph = new Class({
             this._onFocus = focus;
             var outerShape = this.getOuterShape();
             if (focus) {
-                outerShape.setFill('#c7d8ff');
+                outerShape.setFill(mindplot.Topic.OUTER_SHAPE_ATTRIBUTES_FOCUS.fillColor);
                 outerShape.setOpacity(1);
 
             } else {
-                // @todo: node must not know about the topic.
                 outerShape.setFill(mindplot.Topic.OUTER_SHAPE_ATTRIBUTES.fillColor);
                 outerShape.setOpacity(0);
             }
diff --git a/mindplot/src/main/javascript/NoteIcon.js b/mindplot/src/main/javascript/NoteIcon.js
index 2783ee48..6b563715 100644
--- a/mindplot/src/main/javascript/NoteIcon.js
+++ b/mindplot/src/main/javascript/NoteIcon.js
@@ -22,7 +22,7 @@ mindplot.NoteIcon = new Class({
         $assert(topic, 'topic can not be null');
 
         this.parent(mindplot.NoteIcon.IMAGE_URL);
-        this._noteModel = noteModel;
+        this._linksModel = noteModel;
         this._topic = topic;
 
         this._registerEvents();
@@ -52,7 +52,7 @@ mindplot.NoteIcon = new Class({
                 });
                 title.inject(result);
 
-                var text = new Element('div', {text:this._noteModel.getText()});
+                var text = new Element('div', {text:this._linksModel.getText()});
                 text.setStyles({
                         'white-space': 'pre-wrap',
                         'word-wrap': 'break-word'
@@ -74,7 +74,7 @@ mindplot.NoteIcon = new Class({
     },
 
     getModel : function() {
-        return this._noteModel;
+        return this._linksModel;
     },
 
     remove : function() {
@@ -83,5 +83,5 @@ mindplot.NoteIcon = new Class({
     }
 });
 
-mindplot.NoteIcon.IMAGE_URL = "../images/note.png";
+mindplot.NoteIcon.IMAGE_URL = "../nicons/notes.png";
 
diff --git a/mindplot/src/main/javascript/ShrinkConnector.js b/mindplot/src/main/javascript/ShrinkConnector.js
index 20e49b4c..9c008f02 100644
--- a/mindplot/src/main/javascript/ShrinkConnector.js
+++ b/mindplot/src/main/javascript/ShrinkConnector.js
@@ -21,7 +21,7 @@ mindplot.ShirinkConnector = new Class({
 
         var elipse = new web2d.Elipse(mindplot.Topic.prototype.INNER_RECT_ATTRIBUTES);
         this._elipse = elipse;
-        elipse.setFill('#f7f7f7');
+        elipse.setFill('rgb(62,118,179)');
 
         elipse.setSize(mindplot.Topic.CONNECTOR_WIDTH, mindplot.Topic.CONNECTOR_WIDTH);
         elipse.addEvent('click', function(event) {
diff --git a/mindplot/src/main/javascript/Topic.js b/mindplot/src/main/javascript/Topic.js
index 0a84a52c..f15646c0 100644
--- a/mindplot/src/main/javascript/Topic.js
+++ b/mindplot/src/main/javascript/Topic.js
@@ -207,7 +207,6 @@ mindplot.Topic = new Class({
         else {
             $assert(false, "Unsupported figure type:" + type);
         }
-
         result.setPosition(0, 0);
         return result;
     },
@@ -1198,5 +1197,6 @@ mindplot.Topic = new Class({
 
 
 mindplot.Topic.CONNECTOR_WIDTH = 6;
-mindplot.Topic.OUTER_SHAPE_ATTRIBUTES = {fillColor:'#dbe2e6',stroke:'1 solid #77555a',x:0,y:0};
-mindplot.Topic.INNER_RECT_ATTRIBUTES = {stroke:'0.5 solid'};
+mindplot.Topic.OUTER_SHAPE_ATTRIBUTES = {fillColor:'rgb(252,235,192)',stroke:'1 dot rgb(241,163,39)',x:0,y:0};
+mindplot.Topic.OUTER_SHAPE_ATTRIBUTES_FOCUS = {fillColor:'rgb(244,184,45)',x:0,y:0};
+mindplot.Topic.INNER_RECT_ATTRIBUTES = {stroke:'2 solid'};
diff --git a/mindplot/src/main/javascript/widget/ColorPalettePanel.js b/mindplot/src/main/javascript/widget/ColorPalettePanel.js
index 481de9bb..f68aa2d0 100644
--- a/mindplot/src/main/javascript/widget/ColorPalettePanel.js
+++ b/mindplot/src/main/javascript/widget/ColorPalettePanel.js
@@ -67,36 +67,33 @@ mindplot.widget.ColorPalettePanel = new Class({
             elem.addEvent('click', function() {
                 var color = elem.getStyle("background-color");
                 model.setValue(color);
-            });
-        });
+                this.hide();
+            }.bind(this));
+        }.bind(this));
 
         return content;
     },
 
-    show : function() {
-        if (!this.isVisible()) {
+    _updateSelectedItem : function() {
+        var panelElem = this.getPanelElem();
 
-            var panelElem = this.getPanelElem();
+        // Clear selected cell based on the color  ...
+        var tdCells = panelElem.getElements("td[class='palette-cell palette-cell-selected']");
+        tdCells.forEach(function(elem) {
+            elem.className = 'palette-cell';
+        });
 
-            // Clear selected cell based on the color  ...
-            var tdCells = panelElem.getElements("td[class='palette-cell palette-cell-selected']");
-            tdCells.forEach(function(elem) {
-                elem.className = 'palette-cell';
-            });
-
-            // Mark the cell as selected ...
-            var colorCells = panelElem.getElements('div[class=palette-colorswatch]');
-            var model = this.getModel();
-            var modelValue = model.getValue();
-            colorCells.forEach(function(elem) {
-                var color = elem.getStyle("background-color");
-                if (modelValue == color) {
-                    elem.parentNode.className = 'palette-cell palette-cell-selected';
-                }
-            });
-        }
-        this.parent();
+        // Mark the cell as selected ...
+        var colorCells = panelElem.getElements('div[class=palette-colorswatch]');
+        var model = this.getModel();
+        var modelValue = model.getValue();
+        colorCells.forEach(function(elem) {
+            var color = elem.getStyle("background-color");
+            if (modelValue == color) {
+                elem.parentNode.className = 'palette-cell palette-cell-selected';
+            }
+        });
+        return panelElem;
     }
 
-
 });
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/widget/ColorPickerPanel.js b/mindplot/src/main/javascript/widget/ColorPickerPanel.js
deleted file mode 100644
index 8a2a05ab..00000000
--- a/mindplot/src/main/javascript/widget/ColorPickerPanel.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *    Copyright [2011] [wisemapping]
- *
- *   Licensed under WiseMapping Public License, Version 1.0 (the "License").
- *   It is basically the Apache License, Version 2.0 (the "License") plus the
- *   "powered by wisemapping" text requirement on every single page;
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the license at
- *
- *       http://www.wisemapping.org/license
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
-mindplot.widget.ColorPickerPanel = new Class({
-    Extends: mindplot.widget.ToolbarPaneItem,
-    initialize : function(buttonId, model) {
-        this.parent(buttonId, model);
-        this._mooRainbow = new MooRainbow(buttonId, {
-            id: buttonId,
-            imgPath: '../images/',
-            startColor: [255, 255, 255],
-            onInit: function() {
-                this.fireEvent("show");
-            }.bind(this),
-            onChange: function(color) {
-                this.getModel().setValue(color.hex);
-            }.bind(this),
-            onComplete: function() {
-                this.hide();
-            }.bind(this)
-        });
-    },
-
-    show : function() {
-        this.parent();
-        this._mooRainbow.show();
-    },
-
-    hide : function() {
-        this.parent();
-        this._mooRainbow.hide();
-
-    }
-});
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/widget/FloatingTip.js b/mindplot/src/main/javascript/widget/FloatingTip.js
index 1e92ea87..5263cd92 100644
--- a/mindplot/src/main/javascript/widget/FloatingTip.js
+++ b/mindplot/src/main/javascript/widget/FloatingTip.js
@@ -43,12 +43,12 @@ mindplot.widget.FloatingTip = new Class({
 
     initialize: function(element, options) {
         this.setOptions(options);
-        this.boundShow = function(event) {
-            this.show(event, element);
+        this.boundShow = function() {
+            this.show(element);
         }.bind(this);
 
-        this.boundHide = function(event) {
-            this.hide(event, element);
+        this.boundHide = function() {
+            this.hide(element);
         }.bind(this);
 
         if (!['top', 'right', 'bottom', 'left', 'inside'].contains(this.options.position))
@@ -65,7 +65,7 @@ mindplot.widget.FloatingTip = new Class({
         element.store('hasEvents', true);
     },
 
-    show: function(event, element) {
+    show: function(element) {
         var old = element.retrieve('floatingtip');
         if (old) if (old.getStyle('opacity') == 1) {
             clearTimeout(old.retrieve('timeout'));
@@ -74,17 +74,20 @@ mindplot.widget.FloatingTip = new Class({
         var tip = this._create(element);
         if (tip == null)
             return this;
+
         element.store('floatingtip', tip);
         this._animate(tip, 'in');
+
         if (this.options.preventHideOnOver) {
             tip.addEvent(this.options.showOn, this.boundShow);
             tip.addEvent(this.options.hideOn, this.boundHide);
         }
+
         this.fireEvent('show', [tip, element]);
         return this;
     },
 
-    hide: function(event, element) {
+    hide: function(element) {
         var tip = element.retrieve('floatingtip');
         if (!tip) {
             if (this.options.position == 'inside') {
diff --git a/mindplot/src/main/javascript/widget/IconPanel.js b/mindplot/src/main/javascript/widget/IconPanel.js
index f1f3d378..128f72c7 100644
--- a/mindplot/src/main/javascript/widget/IconPanel.js
+++ b/mindplot/src/main/javascript/widget/IconPanel.js
@@ -22,6 +22,11 @@ mindplot.widget.IconPanel = new Class({
         this.parent(buttonId, model);
     },
 
+    _updateSelectedItem : function() {
+        return this.getPanelElem();
+
+    },
+
     buildPanel: function() {
         var content = new Element('div', {'class':'toolbarPanel','id':'IconsPanel'});
         content.setStyles({width:253,height:200,padding:5});
diff --git a/mindplot/src/main/javascript/widget/LinkIconTooltip.js b/mindplot/src/main/javascript/widget/LinkIconTooltip.js
index 5c6d338c..b3d5f492 100644
--- a/mindplot/src/main/javascript/widget/LinkIconTooltip.js
+++ b/mindplot/src/main/javascript/widget/LinkIconTooltip.js
@@ -29,7 +29,8 @@ mindplot.widget.LinkIconTooltip = new Class({
             arrowOffset : 10,
             center: true,
             arrowSize: 15,
-            offset : {x:10,y:20}
+            offset : {x:10,y:20},
+            className: 'linkTip'
         });
     },
 
diff --git a/mindplot/src/main/javascript/widget/ListToolbarPanel.js b/mindplot/src/main/javascript/widget/ListToolbarPanel.js
index 615bdd96..850bff20 100644
--- a/mindplot/src/main/javascript/widget/ListToolbarPanel.js
+++ b/mindplot/src/main/javascript/widget/ListToolbarPanel.js
@@ -28,27 +28,27 @@ mindplot.widget.ListToolbarPanel = new Class({
         var menuElems = this.getPanelElem().getElements('div');
         menuElems.forEach(function(elem) {
             elem.addEvent('click', function(event) {
-                var value = $defined(elem.getAttribute('model')) ? elem.getAttribute('model') : elem.id;
-                this.getModel().setValue(value);
                 event.stopPropagation();
                 this.hide();
+
+                var value = $defined(elem.getAttribute('model')) ? elem.getAttribute('model') : elem.id;
+                this.getModel().setValue(value);
             }.bind(this));
         }.bind(this));
     },
 
-    show : function() {
-        if (!this.isVisible()) {
-            var menuElems = this.getPanelElem().getElements('div');
-            var value = this.getModel().getValue();
-            menuElems.forEach(function(elem) {
-                var elemValue = $defined(elem.getAttribute('model')) ? elem.getAttribute('model') : elem.id;
-                if (elemValue == value)
-                    elem.className = "toolbarPanelLinkSelectedLink";
-                else
-                    elem.className = "toolbarPanelLink";
-            });
-
-            this.parent();
-      }
+    _updateSelectedItem : function() {
+        var panelElem = this.getPanelElem();
+        var menuElems = panelElem.getElements('div');
+        var value = this.getModel().getValue();
+        menuElems.forEach(function(elem) {
+            var elemValue = $defined(elem.getAttribute('model')) ? elem.getAttribute('model') : elem.id;
+            $assert(elemValue,"elemValue can not be null");
+            if (elemValue == value)
+                elem.className = "toolbarPanelLinkSelectedLink";
+            else
+                elem.className = "toolbarPanelLink";
+        });
+        return panelElem;
     }
 });
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js
index af54d021..be3d05c5 100644
--- a/mindplot/src/main/javascript/widget/Menu.js
+++ b/mindplot/src/main/javascript/widget/Menu.js
@@ -359,20 +359,20 @@ mindplot.widget.Menu = new Class({
             })
         }.bind(this));
 
-        designer.addEvent("modelUpdate", function(event) {
-            if (event.undoSteps > 0) {
-                $("undoEdition").setStyle("background-image", "url(../images/file_undo.png)");
-            } else {
-                $("undoEdition").setStyle("background-image", "url(../images/file_undo_dis.png)");
-            }
-
-            if (event.redoSteps > 0) {
-                $("redoEdition").setStyle("background-image", "url(../images/file_redo.png)");
-            } else {
-                $("redoEdition").setStyle("background-image", "url(../images/file_redo_dis.png)");
-            }
-
-        });
+//        designer.addEvent("modelUpdate", function(event) {
+//            if (event.undoSteps > 0) {
+//                $("undoEdition").setStyle("background-image", "url(../nicons/undo.png)");
+//            } else {
+//                $("undoEdition").setStyle("background-image", "url(../nicons/undo.png)");
+//            }
+//
+//            if (event.redoSteps > 0) {
+//                $("redoEdition").setStyle("background-image", "url(../nicons/redo.png)");
+//            } else {
+//                $("redoEdition").setStyle("background-image", "url(../nicons/redo.png)");
+//            }
+//
+//        });
     },
 
     addButton:function (buttonId, topic, rel, fn) {
diff --git a/mindplot/src/main/javascript/widget/ToolbarItem.js b/mindplot/src/main/javascript/widget/ToolbarItem.js
index add6e30f..04725ae1 100644
--- a/mindplot/src/main/javascript/widget/ToolbarItem.js
+++ b/mindplot/src/main/javascript/widget/ToolbarItem.js
@@ -24,8 +24,9 @@ mindplot.widget.ToolbarItem = new Class({
         this._buttonId = buttonId;
         this._fn = fn;
         this._options = options;
+        this._enable = false;
         this.enable();
-//        this._tip = this._registerTip();
+//        this._registerTip();
 
     },
 
diff --git a/mindplot/src/main/javascript/widget/ToolbarPaneItem.js b/mindplot/src/main/javascript/widget/ToolbarPaneItem.js
index 427a55dd..b7a2ed78 100644
--- a/mindplot/src/main/javascript/widget/ToolbarPaneItem.js
+++ b/mindplot/src/main/javascript/widget/ToolbarPaneItem.js
@@ -21,6 +21,7 @@ mindplot.widget.ToolbarPaneItem = new Class({
     initialize : function(buttonId, model) {
         $assert(buttonId, "buttonId can not be null");
         $assert(model, "model can not be null");
+        this._model = model;
         var fn = function() {
             // Is the panel being displayed ?
             if (this.isVisible()) {
@@ -31,19 +32,46 @@ mindplot.widget.ToolbarPaneItem = new Class({
 
         }.bind(this);
         this.parent(buttonId, fn, {topicAction:true,relAction:false});
-        this._model = model;
-        this._panelId = this._init().id;
+        this._panelElem = this._init();
+        this._visible = false;
     },
 
     _init:function () {
         // Load the context of the panel ...
         var panelElem = this.buildPanel();
-        panelElem.setStyle('cursor','default');
+        panelElem.setStyle('cursor', 'default');
         var buttonElem = this.getButtonElem();
 
-        // Add panel content ..
-        panelElem.setStyle('display', 'none');
-        panelElem.inject(buttonElem);
+        var item = this;
+        this._tip = new mindplot.widget.FloatingTip(buttonElem, {
+            html: true,
+            position: 'bottom',
+            arrowOffset : 5,
+            center: true,
+            arrowSize: 7,
+            showDelay: 0,
+            hideDelay: 0,
+            content: function() {
+                return item._updateSelectedItem();
+            }.bind(this),
+            className: 'toolbarPaneTip',
+            motionOnShow:false,
+            motionOnHide:false,
+            motion: 0,
+            distance: 0,
+            showOn: 'xxxx',
+            hideOn: 'xxxx',
+            preventHideOnOver:true,
+            offset: {x:-4,y:0}
+        });
+
+        this._tip.addEvent('hide', function() {
+            this._visible = false
+        }.bind(this));
+
+        this._tip.addEvent('show', function() {
+            this._visible = true
+        }.bind(this));
 
         return panelElem;
     },
@@ -53,34 +81,55 @@ mindplot.widget.ToolbarPaneItem = new Class({
     },
 
     getPanelElem : function() {
-        return $(this._panelId);
+        return this._panelElem;
     }.protect(),
 
     show : function() {
         if (!this.isVisible()) {
             this.parent();
-            this.getButtonElem().className = 'buttonActive';
-            this.getPanelElem().setStyle('display', 'block');
+            this._tip.show(this.getButtonElem());
+            this.getButtonElem().className = 'buttonExtActive';
         }
     },
 
     hide : function() {
         if (this.isVisible()) {
-            this.getButtonElem().className = 'buttonOn';
-            this.getPanelElem().setStyle('display', 'none');
             this.parent();
+            this._tip.hide(this.getButtonElem());
+            this.getButtonElem().className = 'buttonExtOn';
         }
     },
 
     isVisible : function() {
-        return this.getPanelElem().getStyle('display') == 'block';
+        return this._visible;
     },
 
-    disable: function() {
+    disable : function() {
         this.hide();
-        this.parent();
+        var elem = this.getButtonElem();
+        if (this._enable) {
+            elem.removeEvent('click', this._fn);
+            elem.removeClass('buttonExtOn');
+
+            // Todo: Hack...
+            elem.removeClass('buttonOn');
+
+            elem.addClass('buttonExtOff');
+            this._enable = false;
+        }
     },
 
+    enable : function() {
+        var elem = this.getButtonElem();
+        if (!this._enable) {
+            elem.addEvent('click', this._fn);
+            elem.removeClass('buttonExtOff');
+            elem.addClass('buttonExtOn');
+            this._enable = true;
+        }
+    },
+
+
     buildPanel : function() {
         throw "Method must be implemented";
     }.protect()
diff --git a/wise-doc/src/main/webapp/css/editor2.css b/wise-doc/src/main/webapp/css/editor2.css
index ca9101da..e1197e3c 100644
--- a/wise-doc/src/main/webapp/css/editor2.css
+++ b/wise-doc/src/main/webapp/css/editor2.css
@@ -1,8 +1,8 @@
 @import "/mindplot/src/main/javascript/widget/lightbox.css";
 @import "/mindplot/src/main/javascript/libraries/moodialog/css/MooDialog.css";
 
-@header-height : 70px;
-@header-toolbar-height : 30px;
+@header-height : 75px;
+@header-toolbar-height : 35px;
 @header-info-height : @header-height - @header-toolbar-height;
 
 /* Common Default Style */
@@ -247,9 +247,22 @@ h4 {
 /********************************************************************************/
 
 div#header {
-    background-color: #000000;
     width: 100%;
     height: @header-height;
+    background: #393939; /* Old browsers */
+    background: -moz-linear-gradient(top, #393939 0%, #000000 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #393939), color-stop(100%, #000000)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top, #393939 0%, #000000 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top, #393939 0%, #000000 100%); /* Opera11.10+ */
+    background: -ms-linear-gradient(top, #393939 0%, #000000 100%); /* IE10+ */
+    background: linear-gradient(top, #393939 0%, #000000 100%); /* W3C */
+}
+
+div#headerLogo {
+    background: url(../nicons/logo-small.png) no-repeat center top;
+    height: 40px;
+    width: 80px;
+    float: left;
 }
 
 div#headerInfo {
@@ -258,66 +271,90 @@ div#headerInfo {
     color: white;
 }
 
+div#headerActions {
+    text-align: right;
+    margin-top: 13px;
+    padding-right: 10px;
+    color: white;
+    float: right;
+}
+
+div#headerActions span {
+    border-bottom: 3px solid rgb(247, 201, 49);
+}
+
+div#headerMapTitle {
+    width: 200px;
+    height:(@header-info-height ) - 13;
+    text-align: left;
+    padding-top: 13px;
+    padding-left: 50px;
+    color: white;
+    float: left;
+    font-style: italic;
+}
+
+div#headerMapTitle span {
+    padding: 4px 50px ;
+    border: 1px solid rgb(90, 90, 90);
+    background-color: rgb(45, 45, 45);
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
+}
+
 div#toolbar {
     width: 100%;
     height: @header-toolbar-height;
-    background: whiteSmoke;
-    border-top: 1px solid #E5E5E5;
+    background-image: linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+    background-image: -o-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+    background-image: -moz-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+    background-image: -webkit-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+    background-image: -ms-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.47, rgb(229, 227, 209)), color-stop(0.87, rgb(252, 250, 237)));
+    border-bottom: 3px double rgb(190, 190, 190);
+    border-top: 1px solid rgb(190, 190, 190);
 }
 
 div#toolbar .buttonContainer {
     height: @header-toolbar-height;
     float: left;
-    color: black;
-    border: 1px solid #BBB4D6;
+    /*color: black;*/
+    /*border: 1px solid #BBB4D6;*/
     margin-left: 5px;
 }
 
+/******************************************************************************************/
+/* Buttons*/
+/******************************************************************************************/
+
 div#toolbar .buttonOn, div#toolbar .buttonOff, div#toolbar .buttonActive, div#toolbar .buttonOn:hover {
-    width: 30px;
-    height: @header-toolbar-height;
+    width: 28px;
+    height: 28px;
     float: left;
     text-align: center;
+    z-index: 4;
+    margin-top: 3px;
+    padding-top: 2px;
+    padding-left: 2px;
 }
 
-div#toolbar .buttonOn:hover, div#toolbar .buttonActive {
-    margin: 0;
-    cursor: pointer;
-    border: 1px solid #d3d3d3;
+div#toolbar .buttonOn:hover {
     cursor: pointer;
     opacity: 1;
+    background: url(../nicons/btn-bg-hover.png) no-repeat center top;
 }
 
 div#toolbar .buttonOn {
-    margin: 1px;
     opacity: 0.8;
+    background: url(../nicons/btn-bg-normal.png) no-repeat center top;
 }
 
 div#toolbar .buttonOff {
-    margin: 1px;
     opacity: 0.4;
-}
-
-div#toolbar .button img {
-    height: @header-toolbar-height;
-    border: 0;
-}
-
-div#saveButton {
-    background: url(../images/save.png) no-repeat center top;
-}
-
-div#undoEdition {
-    background: url(../images/file_undo_dis.png) no-repeat center top;
-}
-
-div#redoEdition {
-    background: url(../images/file_redo_dis.png) no-repeat center top;
-}
-
-div#export {
-    background: url(../images/file_export.png) no-repeat center top;
-    position: relative;
+    background: url(../nicons/btn-bg-normal.png) no-repeat center top;
 }
 
 div#exportAnchor {
@@ -328,101 +365,149 @@ div#exportAnchor {
     left: 0;
 }
 
-div#zoomIn {
-    background: url(../images/zoom_in.png) no-repeat center top;
-}
-
-div#zoomOut {
-    background: url(../images/zoom_out.png) no-repeat center top;
-}
-
-div#addTopic {
-    background: url(../images/topic_add.png) no-repeat center top;
-}
-
-div#deleteTopic {
-    background: url(../images/topic_delete.png) no-repeat center top;
-}
-
-div#topicColor {
-    background: url(../images/topic_bgcolor.png) no-repeat center top;
-    z-index: 4;
-}
-
-div#topicIcon {
-    background: url(../images/topic_icon.png) no-repeat center top;
-    z-index: 4;
-}
-
-div#topicNote {
-    background: url(../images/note.png) no-repeat center top;
-    z-index: 4;
-}
-
-div#topicNote {
-    background: url(../images/topic_icon.png) no-repeat center top;
-    z-index: 4;
-}
-
-div#topicLink {
-    background: url(../images/topic_link.png) no-repeat center top;
-    z-index: 4;
-}
-
-div#topicNote {
-    background-image: url(../images/note.png);
-    z-index: 4;
-}
-
-div#topicBorder {
-    background: url(../images/topic_border.png) no-repeat center top;
-}
-
-div#fontFamily {
-    background: url(../images/font_type.png) no-repeat center top;
-}
-
-div#topicShape {
-    background: url(../images/topic_shape.png) no-repeat center top;
-}
-
-div#fontBold {
-    background: url(../images/font_bold.png) no-repeat center top;
-}
-
-div#fontItalic {
-    background: url(../images/font_italic.png) no-repeat center top;
-}
-
-div#fontColor {
-    background: url(../images/font_color.png) no-repeat center top;
-    z-index: 4;
-}
-
-div#fontSize {
+div#toolbar .buttonExtOn, div#toolbar .buttonExtOff, div#toolbar .buttonExtActive, div#toolbar .buttonExtOn:hover {
+    width: 40px;
+    height: 28px;
     float: left;
-    background: url(../images/font_size.png) no-repeat center top;
+    text-align: left;
+    z-index: 4;
+    margin-top: 3px;
+    padding-top: 2px;
+    padding-left: 5px;
 }
 
-div#font-size {
-    font-size: 10px;
+div#toolbar .buttonExtOn:hover {
+    opacity: 1;
+    background: url(../nicons/btne-bg-hover.png) no-repeat center top;
+
 }
 
-div#shareIt {
-    background: url(../images/collab_share.png) no-repeat center top;
+div#toolbar .buttonExtActive {
+    opacity: 1;
+    background: url(../nicons/btne-bg-selected.png) no-repeat center top;
+
 }
 
-div#publishIt {
-    background: url(../images/collab_publish.png) no-repeat center top;
+div#toolbar .buttonExtOn {
+    opacity: 0.8;
+    background: url(../nicons/btne-bg-normal.png) no-repeat center top;
 }
 
-div#tagIt {
-    background: url(../images/collab_tag.png) no-repeat center top;
+div#toolbar .buttonExtOff {
+    opacity: 0.4;
+    background: url(../nicons/btne-bg-normal.png) no-repeat center top;
 }
 
+div#exportAnchor {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+}
+
+/*div#saveButton {*/
+/*background: url(../nicons/save.png) no-repeat center top;*/
+/*}*/
+
+/*div#undoEdition {*/
+/*background: url(../nicons/undo.png) no-repeat center top;*/
+/*}*/
+
+/*div#redoEdition {*/
+/*background: url(../nicons/redo.png) no-repeat center top;*/
+/*}*/
+
+/*div#export {*/
+/*background: url(../nicons/export.png) no-repeat center top;*/
+/*}*/
+
+/*div#zoomIn {*/
+/*background: url(../nicons/zoom-in.png) no-repeat center top;*/
+/*}*/
+
+/*div#zoomOut {*/
+/*background: url(../nicons/zoom-out.png) no-repeat center top;*/
+/*}*/
+
+/*div#addTopic {*/
+/*background: url(../nicons/topic-add.png) no-repeat center top;*/
+/*}*/
+
+/*div#deleteTopic {*/
+/*background: url(../nicons/topic-delete.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicColor {*/
+/*background: url(../nicons/topic-color.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicIcon {*/
+/*background: url(../nicons/topic-icon.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicNote {*/
+/*background: url(../nicons/note.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicNote {*/
+/*background: url(../nicons/topic-icon.png) no-repeat center top;*/
+/*z-index: 4;*/
+/*}*/
+
+/*div#topicLink {*/
+/*background: url(../nicons/topic-link.png) no-repeat center top;*/
+/*z-index: 4;*/
+/*}*/
+
+/*div#topicNote {*/
+/*background-image: url(../nicons/note.png);*/
+/*z-index: 4;*/
+/*}*/
+
+/*div#topicBorder {*/
+/*background: url(../nicons/topic-border.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontFamily {*/
+/*background: url(../nicons/font-type.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicShape {*/
+/*background: url(../nicons/topic-shape.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontBold {*/
+/*background: url(../nicons/font-bold.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontItalic {*/
+/*background: url(../nicons/font-italic.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontColor {*/
+/*background: url(../nicons/font-color.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontSize {*/
+/*background: url(../nicons/font-size.png) no-repeat center top;*/
+/*}*/
+
+/*div#shareIt {*/
+/*background: url(../nicons/share.png) no-repeat center top;*/
+/*}*/
+
+/*div#publishIt {*/
+/*background: url(../nicons/publish.png) no-repeat center top;*/
+/*}*/
+
+/*div#tagIt {*/
+/*background: url(../nicons/tag.png) no-repeat center top;*/
+/*}*/
+
 div#topicRelation {
     width: 56px;
-    background: url(../images/topic_relationship.png) no-repeat center top;
+    background: url(../nicons/topic-relation.png) no-repeat center top;
     z-index: 4;
 }
 
@@ -435,20 +520,20 @@ div#colorPalette {
     top: 89px;
 }
 
-.toolbarPanel {
-    z-index: 4;
-    top: @header-height+3;
-    -moz-transition: opacity 0.218s ease 0s;
-    background: none repeat scroll 0 0 #FFFFFF;
-    border: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-    cursor: default;
-    font-size: 13px;
-    margin: 0;
-    outline: medium none;
-    padding: 0 0 6px;
-    position: absolute;
-}
+/*.toolbarPanel {*/
+/*z-index: 4;*/
+/*top: @header-height;*/
+/*-moz-transition: opacity 0.218s ease 0s;*/
+/*background: none repeat scroll 0 0 #FFFFFF;*/
+/*border: 1px solid rgba(0, 0, 0, 0.2);*/
+/*box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);*/
+/*cursor: default;*/
+/*font-size: 13px;*/
+/*margin: 0;*/
+/*outline: medium none;*/
+/*padding: 0 0 6px;*/
+/*position: absolute;*/
+/*}*/
 
 div.toolbarPanelLink, div.toolbarPanelLinkSelectedLink {
     cursor: pointer;
@@ -473,7 +558,7 @@ div#mindplot {
 }
 
 div#workspaceContainer {
-    background: url(../images/grid.gif) bottom left repeat !important;
+    /*background: url(../images/grid.gif) bottom left repeat !important;*/
 }
 
 div#small_error_icon {
@@ -495,17 +580,117 @@ div#small_error_icon {
     box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
 }
 
-.toolbarTip {
-    background-color: black;
-    padding: 5px 5px;
-    color: #f5f5f5;
+.linkTip {
+    background-color: #dfcf3c;
+    padding: 5px 15px;
+    color: #666666;
     /*font-weight: bold;*/
     /*width: 100px;*/
-    font-size: 11px;
+    font-size: 13px;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     border-radius: 3px;
     box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
 }
 
+.toolbarPaneTip {
+    background-color: rgb(228, 226, 210);
+    padding: 5px 5px;
+    color: #f5f5f5;
+    /*font-weight: bold;*/
+    /*width: 100px;*/
+    font-size: 11px;
+    -moz-border-radius: 60px;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+    box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.2);
+    border: 3px double rgb(190, 190, 190);
+}
 
+.toolbarTip {
+    background-color: #000000;
+    padding: 5px 5px;
+    color: #f5f5f5;
+    /*font-weight: bold;*/
+    /*width: 100px;*/
+    font-size: 11px;
+}
+
+/* */
+.btn-primary {
+    cursor: pointer;
+    display: inline-block;
+    padding: 5px 14px 6px;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+    color: #333;
+    font-size: 13px;
+    line-height: normal;
+    border: 1px solid #ccc;
+    border-bottom-color: #bbb;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -webkit-transition: 0.1s linear all;
+    -moz-transition: 0.1s linear all;
+    -ms-transition: 0.1s linear all;
+    -o-transition: 0.1s linear all;
+    transition: 0.1s linear all;
+    color: #ffffff;
+    background-color: #0064cd;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+    background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+    background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+    background-image: linear-gradient(top, #049cdb, #0064cd);
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    border-color: #0064cd #0064cd #003f81;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.btn-primary:hover {
+    background-position: 0 -15px;
+    text-decoration: none;
+}
+
+.btn-secondary {
+    cursor: pointer;
+    display: inline-block;
+    background-color: #e6e6e6;
+    background-repeat: no-repeat;
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+    background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    padding: 5px 14px 6px;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+    color: #333;
+    font-size: 13px;
+    line-height: normal;
+    border: 1px solid #ccc;
+    border-bottom-color: #bbb;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -webkit-transition: 0.1s linear all;
+    -moz-transition: 0.1s linear all;
+    -ms-transition: 0.1s linear all;
+    -o-transition: 0.1s linear all;
+    transition: 0.1s linear all;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-secondary:hover {
+    background-position: 0 -15px;
+    text-decoration: none;
+}
\ No newline at end of file
diff --git a/wise-doc/src/main/webapp/html/editor.html b/wise-doc/src/main/webapp/html/editor.html
index 919cf6b0..bcef42ce 100644
--- a/wise-doc/src/main/webapp/html/editor.html
+++ b/wise-doc/src/main/webapp/html/editor.html
@@ -8,18 +8,16 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <![endif]-->
     <!--<script type="text/javascript" src="http://docs.google.com/brix/static/api/js/jsapi.nocache.js"></script>-->
-
+    <script type='text/javascript' src='../js/less-1.1.3.min.js'></script>
     <link rel="stylesheet/less" type="text/css" href="../css/editor2.css"/>
-    <link rel="stylesheet" type="text/css" href='/mindplot/src/main/javascript/libraries/moodialog/css/MooDialog.css'/>
 
+    <link rel="stylesheet" type="text/css" href='/mindplot/src/main/javascript/libraries/moodialog/css/MooDialog.css'/>
     <script type='text/javascript'
             src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
-    <script type='text/javascript' src='../js/less-1.1.3.min.js'></script>
 
     <script type='text/javascript'
             src='/mindplot/src/main/javascript/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>
     <script type='text/javascript' src='/core-js/target/classes/core.js'></script>
-
     <script type="text/javascript">
 
         //Google-Brix framework load callback function
@@ -119,35 +117,76 @@
 
 <div id="header">
     <div id="headerInfo">
-          Algo a aca ....
+        <div id="headerActions">
+            <span>MyWiseMappigs</span> | <span>Settings</span> | <span>Logout</span>
+        </div>
+        <div id="headerLogo"></div>
+        <div id="headerMapTitle">Title: <span>Hola</span></div>
     </div>
     <div id="toolbar">
         <div id="editTab" class="tabContent">
             <div id="file" class="buttonContainer">
-                <div id="undoEdition" class="buttonOn" title="Undo Edition"></div>
-                <div id="redoEdition" class="buttonOn" title="Redo Edition"></div>
+                <div id="undoEdition" class="buttonOn" title="Undo Edition">
+                    <img src="../nicons/undo.png"/>
+                </div>
+                <div id="redoEdition" class="buttonOn" title="Redo Edition">
+                    <img src="../nicons/redo.png"/>
+                </div>
             </div>
             <div id="zoom" class="buttonContainer">
-                <div id="zoomIn" class="buttonOn" title="Zoom In"></div>
-                <div id="zoomOut" class="buttonOn" title="Zoom Out"></div>
+                <div id="zoomIn" class="buttonOn" title="Zoom In">
+                    <img src="../nicons/zoom-in.png"/>
+                </div>
+                <div id="zoomOut" class="buttonOn" title="Zoom Out">
+                    <img src="../nicons/zoom-out.png"/>
+                </div>
             </div>
             <div id="node" class="buttonContainer">
-                <div id="topicShape" class="buttonOn" title="SYMB_TOPIC_SHAPE"></div>
-                <div id="addTopic" class="buttonOn" title="SYMB_ TOPIC_ADD"></div>
-                <div id="deleteTopic" class="buttonOn" title="Delete"></div>
-                <div id="topicBorder" class="buttonOn" title="Boder Color"></div>
-                <div id="topicColor" class="buttonOn" title="Background Color"></div>
-                <div id="topicIcon" class="buttonOn" title="Add Icon"></div>
-                <div id="topicNote" class="buttonOn" title="Add Note"></div>
-                <div id="topicLink" class="buttonOn" title="Add Link"></div>
-                <div id="topicRelation" class="buttonOn" title="Add Relationship"></div>
+                <div id="topicShape" class="buttonExtOn" title="Topic Shape">
+                    <img src="../nicons/topic-shape.png"/>
+                </div>
+                <div id="addTopic" class="buttonOn" title="Add Topic">
+                    <img src="../nicons/topic-add.png"/>
+                </div>
+                <div id="deleteTopic" class="buttonOn" title="Delete">
+                    <img src="../nicons/topic-delete.png"/>
+                </div>
+                <div id="topicBorder" class="buttonOn" title="Border Color">
+                    <img src="../nicons/topic-border.png"/>
+                </div>
+                <div id="topicColor" class="buttonExtOn" title="Background Color">
+                    <img src="../nicons/topic-color.png"/>
+                </div>
+                <div id="topicIcon" class="buttonExtOn" title="Add Icon">
+                    <img src="../nicons/topic-icon.png"/>
+                </div>
+                <div id="topicNote" class="buttonOn" title="Add Note">
+                    <img src="../nicons/topic-note.png"/>
+                </div>
+                <div id="topicLink" class="buttonOn" title="Add Link">
+                    <img src="../nicons/topic-link.png"/>
+                </div>
+                <div id="topicRelation" class="buttonOn" title="Add Relationship">
+                    <img src="../nicons/topic-relation.png"/>
+                </div>
             </div>
             <div id="font" class="buttonContainer">
-                <div id="fontFamily" class="buttonOn" title="Font Style"></div>
-                <div id="fontSize" class="buttonOn" title="Font Size"></div>
-                <div id="fontBold" class="buttonOn" title="Bold Style"></div>
-                <div id="fontItalic" class="buttonOn" title="Italic Style"></div>
-                <div id="fontColor" class="buttonOn" title="Fond Color"></div>
+                <div id="fontFamily" class="buttonOn" title="Font Style">
+                    <img src="../nicons/font-type.png"/>
+                </div>
+                <div id="fontSize" class="buttonExtOn" title="Font Size">
+                    <img src="../nicons/font-size.png"/>
+                </div>
+                <div id="fontBold" class="buttonOn" title="Bold Style">
+                    <img src="../nicons/topic-border.png"/>
+                </div>
+                <div id="fontItalic" class="buttonOn" title="Italic Style">
+                    <img src="../nicons/font-italic.png"/>
+                </div>
+                <div id="fontColor" class="buttonExtOn" title="Fond Color">
+                    <img src="../nicons/font-color.png"/>
+
+                </div>
             </div>
         </div>
     </div>
diff --git a/wise-doc/src/main/webapp/icons/links.png b/wise-doc/src/main/webapp/icons/links.png
new file mode 100644
index 00000000..dd3b830f
Binary files /dev/null and b/wise-doc/src/main/webapp/icons/links.png differ
diff --git a/wise-doc/src/main/webapp/nicons/btn-bg-hover.png b/wise-doc/src/main/webapp/nicons/btn-bg-hover.png
new file mode 100644
index 00000000..ee07c4c2
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/btn-bg-hover.png differ
diff --git a/wise-doc/src/main/webapp/nicons/btn-bg-normal.png b/wise-doc/src/main/webapp/nicons/btn-bg-normal.png
new file mode 100644
index 00000000..50b333be
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/btn-bg-normal.png differ
diff --git a/wise-doc/src/main/webapp/nicons/btne-bg-hover.png b/wise-doc/src/main/webapp/nicons/btne-bg-hover.png
new file mode 100644
index 00000000..5ea2e15b
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/btne-bg-hover.png differ
diff --git a/wise-doc/src/main/webapp/nicons/btne-bg-normal.png b/wise-doc/src/main/webapp/nicons/btne-bg-normal.png
new file mode 100644
index 00000000..378476a9
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/btne-bg-normal.png differ
diff --git a/wise-doc/src/main/webapp/nicons/btne-bg-selected.png b/wise-doc/src/main/webapp/nicons/btne-bg-selected.png
new file mode 100644
index 00000000..32194e81
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/btne-bg-selected.png differ
diff --git a/wise-doc/src/main/webapp/nicons/discart.png b/wise-doc/src/main/webapp/nicons/discart.png
new file mode 100644
index 00000000..63cec6ed
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/discart.png differ
diff --git a/wise-doc/src/main/webapp/nicons/export.png b/wise-doc/src/main/webapp/nicons/export.png
new file mode 100644
index 00000000..e8463255
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/export.png differ
diff --git a/wise-doc/src/main/webapp/nicons/font-bold.png b/wise-doc/src/main/webapp/nicons/font-bold.png
new file mode 100644
index 00000000..15cfbc16
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/font-bold.png differ
diff --git a/wise-doc/src/main/webapp/nicons/font-color.png b/wise-doc/src/main/webapp/nicons/font-color.png
new file mode 100644
index 00000000..1c2761df
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/font-color.png differ
diff --git a/wise-doc/src/main/webapp/nicons/font-italic.png b/wise-doc/src/main/webapp/nicons/font-italic.png
new file mode 100644
index 00000000..59e79cf0
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/font-italic.png differ
diff --git a/wise-doc/src/main/webapp/nicons/font-size.png b/wise-doc/src/main/webapp/nicons/font-size.png
new file mode 100644
index 00000000..8fa9500f
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/font-size.png differ
diff --git a/wise-doc/src/main/webapp/nicons/font-type.png b/wise-doc/src/main/webapp/nicons/font-type.png
new file mode 100644
index 00000000..7b9ba609
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/font-type.png differ
diff --git a/wise-doc/src/main/webapp/nicons/history.png b/wise-doc/src/main/webapp/nicons/history.png
new file mode 100644
index 00000000..fa33bab4
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/history.png differ
diff --git a/wise-doc/src/main/webapp/nicons/iconitos-separados.psd b/wise-doc/src/main/webapp/nicons/iconitos-separados.psd
new file mode 100644
index 00000000..222e2263
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/iconitos-separados.psd differ
diff --git a/wise-doc/src/main/webapp/nicons/links.png b/wise-doc/src/main/webapp/nicons/links.png
new file mode 100644
index 00000000..dd3b830f
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/links.png differ
diff --git a/wise-doc/src/main/webapp/nicons/logo-small.png b/wise-doc/src/main/webapp/nicons/logo-small.png
new file mode 100644
index 00000000..107b817b
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/logo-small.png differ
diff --git a/wise-doc/src/main/webapp/nicons/notes.png b/wise-doc/src/main/webapp/nicons/notes.png
new file mode 100644
index 00000000..bf438b1d
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/notes.png differ
diff --git a/wise-doc/src/main/webapp/nicons/print.png b/wise-doc/src/main/webapp/nicons/print.png
new file mode 100644
index 00000000..6c3788ba
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/print.png differ
diff --git a/wise-doc/src/main/webapp/nicons/public.png b/wise-doc/src/main/webapp/nicons/public.png
new file mode 100644
index 00000000..eba5b64f
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/public.png differ
diff --git a/wise-doc/src/main/webapp/nicons/redo.png b/wise-doc/src/main/webapp/nicons/redo.png
new file mode 100644
index 00000000..d904c0c4
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/redo.png differ
diff --git a/wise-doc/src/main/webapp/nicons/save.png b/wise-doc/src/main/webapp/nicons/save.png
new file mode 100644
index 00000000..174c6d6e
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/save.png differ
diff --git a/wise-doc/src/main/webapp/nicons/share.png b/wise-doc/src/main/webapp/nicons/share.png
new file mode 100644
index 00000000..c2aa4494
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/share.png differ
diff --git a/wise-doc/src/main/webapp/nicons/tag.png b/wise-doc/src/main/webapp/nicons/tag.png
new file mode 100644
index 00000000..d595a8ba
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/tag.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-add.png b/wise-doc/src/main/webapp/nicons/topic-add.png
new file mode 100644
index 00000000..3d572e72
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-add.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-border.png b/wise-doc/src/main/webapp/nicons/topic-border.png
new file mode 100644
index 00000000..e0617e7c
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-border.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-color.png b/wise-doc/src/main/webapp/nicons/topic-color.png
new file mode 100644
index 00000000..b923d89a
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-color.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-delete.png b/wise-doc/src/main/webapp/nicons/topic-delete.png
new file mode 100644
index 00000000..1499e58e
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-delete.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-icon.png b/wise-doc/src/main/webapp/nicons/topic-icon.png
new file mode 100644
index 00000000..1bb8c98d
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-icon.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-link.png b/wise-doc/src/main/webapp/nicons/topic-link.png
new file mode 100644
index 00000000..e5a05326
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-link.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-note.png b/wise-doc/src/main/webapp/nicons/topic-note.png
new file mode 100644
index 00000000..5c9aeaae
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-note.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-relation.png b/wise-doc/src/main/webapp/nicons/topic-relation.png
new file mode 100644
index 00000000..3f8ebcfa
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-relation.png differ
diff --git a/wise-doc/src/main/webapp/nicons/topic-shape.png b/wise-doc/src/main/webapp/nicons/topic-shape.png
new file mode 100644
index 00000000..8937ca9b
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/topic-shape.png differ
diff --git a/wise-doc/src/main/webapp/nicons/undo.png b/wise-doc/src/main/webapp/nicons/undo.png
new file mode 100644
index 00000000..5133b949
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/undo.png differ
diff --git a/wise-doc/src/main/webapp/nicons/zoom-in.png b/wise-doc/src/main/webapp/nicons/zoom-in.png
new file mode 100644
index 00000000..008cfc49
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/zoom-in.png differ
diff --git a/wise-doc/src/main/webapp/nicons/zoom-out.png b/wise-doc/src/main/webapp/nicons/zoom-out.png
new file mode 100644
index 00000000..158563a2
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/zoom-out.png differ
diff --git a/wise-webapp/src/main/webapp/css/editor2.css b/wise-webapp/src/main/webapp/css/editor2.css
new file mode 100644
index 00000000..740abee3
--- /dev/null
+++ b/wise-webapp/src/main/webapp/css/editor2.css
@@ -0,0 +1,699 @@
+@import "widget/lightbox.css";
+@import "libraries/moodialog/css/MooDialog.css";
+
+
+
+/* Common Default Style */
+html {
+    overflow: hidden;
+}
+
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td {
+    margin: 0;
+    padding: 0;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+fieldset, img {
+    border: 0;
+}
+
+address, caption, cite, code, dfn, em, strong, th, var {
+    font-style: normal;
+    font-weight: normal;
+}
+
+ol, ul {
+    list-style: none;
+}
+
+caption, th {
+    text-align: left;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-size: 100%;
+    font-weight: normal;
+}
+
+q:before, q:after {
+    content: '';
+}
+
+abbr, acronym {
+    border: 0;
+}
+
+/**
+ * Percents could work for IE, but for backCompat purposes, we are using keywords.
+ * x-small is for IE6/7 quirks mode.
+ *
+ */
+body {
+    font: 13px arial, helvetica, clean, sans-serif;
+    font-size: small;
+    font: x-small;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -o-user-select: none;
+    user-select: none;
+}
+
+table {
+    font-size: inherit;
+    font-size: 100%;
+}
+
+/**
+ * 99% for safari; 100% is too large
+ */
+select, input, textarea {
+    font: 99% arial, helvetica, clean, sans-serif;
+}
+
+/**
+ * Bump up !IE to get to 13px equivalent
+ */
+pre, code {
+    font: 115% monospace;
+    font-size: 100%;
+}
+
+/**
+ * Default line-height based on font-size rather than "computed-value"
+ * see: http://www.w3.org/TR/CSS21/visudet.html#line-height
+ */
+
+body * {
+    line-height: 1.22em;
+}
+
+* {
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    font: normal 80% "trebuchet ms", verdana, arial, helvetica, sans-serif;
+    background-color: #fff;
+}
+
+img {
+    border: 0;
+}
+
+form {
+    padding: 0;
+    margin: 0;
+}
+
+p {
+    margin: 5px 0 5px 0;
+}
+
+ul {
+    list-style-position: inside;
+}
+
+a:link, a:visited {
+    font: bold 100%;
+    text-decoration: underline;
+    color: black;
+}
+
+a:hover, a:active {
+    font: bold 100%;
+    text-decoration: underline;
+    color: black;
+}
+
+h2 {
+    font-size: 160%;
+    color: #8e9181;
+}
+
+h1 {
+    font-style: normal;
+    font-size: 180%;
+    color: white;
+    padding-bottom: 2px;
+}
+
+h3 {
+    /* use as subhead on main body */
+    clear: left;
+    font-style: normal;
+    font-size: 130%;
+    color: #6b6f5b;
+}
+
+h4 {
+    /* use as headers in footer */
+    font-weight: bold;
+    font-size: 120%;
+    border-bottom: 1px solid #8e9181;
+    color: #e2e3dd;
+    padding-bottom: 10px;
+    width: 400px;
+}
+
+/**********************************************************/
+/* End: Common Default Style */
+/**********************************************************/
+
+/**********************************************************/
+/* Error Dialog ... */
+/**********************************************************/
+
+#waitDialog {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    height: 200px;
+}
+
+#waitingContainer, #errorContainer {
+    position: relative;
+    top: 80px;
+    height: 120px; /*background: whitesmoke;*/
+    background: #FEFEFE;
+    opacity: .99;
+    padding: 15px;
+    width: 100%;
+    border: 1px solid;
+    border-color: #a9a9a9;
+
+}
+
+#errorContainer {
+    width: 400px;
+    border: 1px solid red;
+}
+
+#waitingContainer .loadingText {
+    position: relative;
+    top: 50%;
+    margin-top: -35px;
+    font-size: 30px;
+    font-weight: bold;
+    vertical-align: text-bottom;
+    height: 30px;
+    float: left;
+}
+
+#errorContainer .loadingText {
+    position: relative;
+    top: 50%;
+    margin-top: -80px;
+    font-size: 15px;
+    font-weight: bold;
+    vertical-align: text-bottom;
+    height: 30px;
+    float: right;
+    padding-left: 120px;
+}
+
+#waitingContainer .loadingIcon {
+    position: relative;
+    background: url(../images/loadingIcon.gif) no-repeat;
+    top: 50%;
+    margin-top: -65px;
+    height: 100px;
+    width: 121px;
+    float: left;
+    clear: both;
+}
+
+#errorContainer .loadingIcon {
+    position: relative;
+    background: url(../images/errorIcon.png) no-repeat;
+    top: 50%;
+    margin-top: -65px;
+    height: 100px;
+    width: 121px;
+    float: left;
+    clear: both;
+}
+
+/********************************************************************************/
+/* Toolbar Styles */
+/********************************************************************************/
+
+div#header {
+    width: 100%;
+    height: 75px;
+    background: #393939; /* Old browsers */
+    background: -moz-linear-gradient(top, #393939 0%, #000000 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #393939), color-stop(100%, #000000)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top, #393939 0%, #000000 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top, #393939 0%, #000000 100%); /* Opera11.10+ */
+    background: -ms-linear-gradient(top, #393939 0%, #000000 100%); /* IE10+ */
+    background: linear-gradient(top, #393939 0%, #000000 100%); /* W3C */
+}
+
+div#headerLogo {
+    background: url(../nicons/logo-small.png) no-repeat center top;
+    height: 40px;
+    width: 80px;
+    float: left;
+}
+
+div#headerInfo {
+    width: 100%;
+    height: 45px;
+    color: white;
+}
+
+div#headerActions {
+    text-align: right;
+    margin-top: 13px;
+    padding-right: 10px;
+    color: white;
+    float: right;
+}
+
+div#headerActions span {
+    border-bottom: 3px solid rgb(247, 201, 49);
+}
+
+div#headerActions a {
+    color: white;
+    text-decoration: none;
+}
+
+div#headerMapTitle {
+    width: 200px;
+    height:(45 ) - 13;
+    text-align: left;
+    padding-top: 13px;
+    padding-left: 50px;
+    color: white;
+    float: left;
+    font-style: italic;
+}
+
+div#headerMapTitle span {
+    padding: 4px 50px;
+    border: 1px solid rgb(90, 90, 90);
+    background-color: rgb(45, 45, 45);
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
+}
+
+div#toolbar {
+    width: 100%;
+    height: 35px;
+    background-image: linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+    background-image: -o-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+    background-image: -moz-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+    background-image: -webkit-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+    background-image: -ms-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);
+
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.47, rgb(229, 227, 209)), color-stop(0.87, rgb(252, 250, 237)));
+    border-bottom: 3px double rgb(190, 190, 190);
+    border-top: 1px solid rgb(190, 190, 190);
+}
+
+div#toolbar .buttonContainer {
+    height: 35px;
+    float: left;
+    /*color: black;*/
+    /*border: 1px solid #BBB4D6;*/
+    margin-left: 5px;
+}
+
+/******************************************************************************************/
+/* Buttons*/
+/******************************************************************************************/
+
+div#toolbar .buttonOn, div#toolbar .buttonOff, div#toolbar .buttonActive, div#toolbar .buttonOn:hover {
+    width: 28px;
+    height: 28px;
+    float: left;
+    text-align: center;
+    z-index: 4;
+    margin-top: 3px;
+    padding-top: 2px;
+    padding-left: 2px;
+}
+
+div#toolbar .buttonOn:hover {
+    cursor: pointer;
+    opacity: 1;
+    background: url(../nicons/btn-bg-hover.png) no-repeat center top;
+}
+
+div#toolbar .buttonOn {
+    opacity: 0.8;
+    background: url(../nicons/btn-bg-normal.png) no-repeat center top;
+}
+
+div#toolbar .buttonOff {
+    opacity: 0.4;
+    background: url(../nicons/btn-bg-normal.png) no-repeat center top;
+}
+
+div#exportAnchor {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+}
+
+div#toolbar .buttonExtOn, div#toolbar .buttonExtOff, div#toolbar .buttonExtActive, div#toolbar .buttonExtOn:hover {
+    width: 40px;
+    height: 28px;
+    float: left;
+    text-align: left;
+    z-index: 4;
+    margin-top: 3px;
+    padding-top: 2px;
+    padding-left: 5px;
+}
+
+div#toolbar .buttonExtOn:hover {
+    opacity: 1;
+    background: url(../nicons/btne-bg-hover.png) no-repeat center top;
+
+}
+
+div#toolbar .buttonExtActive {
+    opacity: 1;
+    background: url(../nicons/btne-bg-selected.png) no-repeat center top;
+
+}
+
+div#toolbar .buttonExtOn {
+    opacity: 0.8;
+    background: url(../nicons/btne-bg-normal.png) no-repeat center top;
+}
+
+div#toolbar .buttonExtOff {
+    opacity: 0.4;
+    background: url(../nicons/btne-bg-normal.png) no-repeat center top;
+}
+
+div#exportAnchor {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+}
+
+/*div#saveButton {*/
+/*background: url(../nicons/save.png) no-repeat center top;*/
+/*}*/
+
+/*div#undoEdition {*/
+/*background: url(../nicons/undo.png) no-repeat center top;*/
+/*}*/
+
+/*div#redoEdition {*/
+/*background: url(../nicons/redo.png) no-repeat center top;*/
+/*}*/
+
+/*div#export {*/
+/*background: url(../nicons/export.png) no-repeat center top;*/
+/*}*/
+
+/*div#zoomIn {*/
+/*background: url(../nicons/zoom-in.png) no-repeat center top;*/
+/*}*/
+
+/*div#zoomOut {*/
+/*background: url(../nicons/zoom-out.png) no-repeat center top;*/
+/*}*/
+
+/*div#addTopic {*/
+/*background: url(../nicons/topic-add.png) no-repeat center top;*/
+/*}*/
+
+/*div#deleteTopic {*/
+/*background: url(../nicons/topic-delete.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicColor {*/
+/*background: url(../nicons/topic-color.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicIcon {*/
+/*background: url(../nicons/topic-icon.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicNote {*/
+/*background: url(../nicons/note.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicNote {*/
+/*background: url(../nicons/topic-icon.png) no-repeat center top;*/
+/*z-index: 4;*/
+/*}*/
+
+/*div#topicLink {*/
+/*background: url(../nicons/topic-link.png) no-repeat center top;*/
+/*z-index: 4;*/
+/*}*/
+
+/*div#topicNote {*/
+/*background-image: url(../nicons/note.png);*/
+/*z-index: 4;*/
+/*}*/
+
+/*div#topicBorder {*/
+/*background: url(../nicons/topic-border.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontFamily {*/
+/*background: url(../nicons/font-type.png) no-repeat center top;*/
+/*}*/
+
+/*div#topicShape {*/
+/*background: url(../nicons/topic-shape.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontBold {*/
+/*background: url(../nicons/font-bold.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontItalic {*/
+/*background: url(../nicons/font-italic.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontColor {*/
+/*background: url(../nicons/font-color.png) no-repeat center top;*/
+/*}*/
+
+/*div#fontSize {*/
+/*background: url(../nicons/font-size.png) no-repeat center top;*/
+/*}*/
+
+/*div#shareIt {*/
+/*background: url(../nicons/share.png) no-repeat center top;*/
+/*}*/
+
+/*div#publishIt {*/
+/*background: url(../nicons/publish.png) no-repeat center top;*/
+/*}*/
+
+/*div#tagIt {*/
+/*background: url(../nicons/tag.png) no-repeat center top;*/
+/*}*/
+
+div#topicRelation {
+    width: 56px;
+    background: url(../nicons/topic-relation.png) no-repeat center top;
+    z-index: 4;
+}
+
+div#colorPalette {
+    border: 1px solid #bbb4d6;
+    display: none;
+    position: absolute;
+    z-index: 4;
+    width: 160px;
+    top: 89px;
+}
+
+/*.toolbarPanel {*/
+/*z-index: 4;*/
+/*top: 75px;*/
+/*-moz-transition: opacity 0.218s ease 0s;*/
+/*background: none repeat scroll 0 0 #FFFFFF;*/
+/*border: 1px solid rgba(0, 0, 0, 0.2);*/
+/*box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);*/
+/*cursor: default;*/
+/*font-size: 13px;*/
+/*margin: 0;*/
+/*outline: medium none;*/
+/*padding: 0 0 6px;*/
+/*position: absolute;*/
+/*}*/
+
+div.toolbarPanelLink, div.toolbarPanelLinkSelectedLink {
+    cursor: pointer;
+    color: black;
+    margin: 1px;
+    cursor: pointer;
+    font-size: 12px;
+    padding: 5px 15px;
+}
+
+div.toolbarPanelLink:hover, div.toolbarPanelLinkSelectedLink {
+    cursor: pointer;
+    background-color: #efefef;
+}
+
+div#mindplot {
+    position: relative;
+    top: 0;
+    left: 0;
+    width: 100%;
+    border: 0;
+}
+
+div#workspaceContainer {
+    /*background: url(../images/grid.gif) bottom left repeat !important;*/
+}
+
+div#small_error_icon {
+    padding-left: 18px;
+    min-height: 16px;
+    background: url(../images/error_icon.png) bottom left no-repeat !important;
+}
+
+.notesTip {
+    background-color: #dfcf3c;
+    padding: 5px 15px;
+    color: #666666;
+    /*font-weight: bold;*/
+    /*width: 100px;*/
+    font-size: 13px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
+}
+
+.linkTip {
+    background-color: #dfcf3c;
+    padding: 5px 15px;
+    color: #666666;
+    /*font-weight: bold;*/
+    /*width: 100px;*/
+    font-size: 13px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
+}
+
+.toolbarPaneTip {
+    background-color: rgb(228, 226, 210);
+    padding: 5px 5px;
+    color: #f5f5f5;
+    /*font-weight: bold;*/
+    /*width: 100px;*/
+    font-size: 11px;
+    -moz-border-radius: 60px;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+    box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.2);
+    border: 3px double rgb(190, 190, 190);
+}
+
+.toolbarTip {
+    background-color: #000000;
+    padding: 5px 5px;
+    color: #f5f5f5;
+    /*font-weight: bold;*/
+    /*width: 100px;*/
+    font-size: 11px;
+}
+
+/* */
+.btn-primary {
+    cursor: pointer;
+    display: inline-block;
+    padding: 5px 14px 6px;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+    color: #333;
+    font-size: 13px;
+    line-height: normal;
+    border: 1px solid #ccc;
+    border-bottom-color: #bbb;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -webkit-transition: 0.1s linear all;
+    -moz-transition: 0.1s linear all;
+    -ms-transition: 0.1s linear all;
+    -o-transition: 0.1s linear all;
+    transition: 0.1s linear all;
+    color: #ffffff;
+    background-color: #0064cd;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+    background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+    background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+    background-image: linear-gradient(top, #049cdb, #0064cd);
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    border-color: #0064cd #0064cd #003f81;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.btn-primary:hover {
+    background-position: 0 -15px;
+    text-decoration: none;
+}
+
+.btn-secondary {
+    cursor: pointer;
+    display: inline-block;
+    background-color: #e6e6e6;
+    background-repeat: no-repeat;
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+    background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+    padding: 5px 14px 6px;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+    color: #333;
+    font-size: 13px;
+    line-height: normal;
+    border: 1px solid #ccc;
+    border-bottom-color: #bbb;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    -webkit-transition: 0.1s linear all;
+    -moz-transition: 0.1s linear all;
+    -ms-transition: 0.1s linear all;
+    -o-transition: 0.1s linear all;
+    transition: 0.1s linear all;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-secondary:hover {
+    background-position: 0 -15px;
+    text-decoration: none;
+}
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/js/editor.js b/wise-webapp/src/main/webapp/js/editor.js
index 0e15f8fd..058f35d1 100644
--- a/wise-webapp/src/main/webapp/js/editor.js
+++ b/wise-webapp/src/main/webapp/js/editor.js
@@ -25,164 +25,10 @@ Asset.javascript('../js/mindplot-min.js', {
 var designer = null;
 /* JavaScript tabs changer */
 
-// CSS helper functions
-CSS = {
-    // Adds a class to an element.
-    AddClass: function (e, c) {
-        if (!e.className.match(new RegExp("\\b" + c + "\\b", "i")))
-            e.className += (e.className ? " " : "") + c;
-    },
-
-    // Removes a class from an element.
-    RemoveClass: function (e, c) {
-        e.className = e.className.replace(new RegExp(" \\b" + c + "\\b|\\b" + c + "\\b ?", "gi"), "");
-    }
-};
-
-// Functions for handling tabs.
-Tabs = {
-    // Changes to the tab with the specified ID.
-    GoTo: function (contentId, skipReplace) {
-        // This variable will be true if a tab for the specified
-        // content ID was found.
-        var foundTab = false;
-
-        // Get the TOC element.
-        var toc = $("toc");
-        if (toc) {
-            var lis = toc.getElementsByTagName("li");
-            for (var j = 0; j < lis.length; j++) {
-                var li = lis[j];
-
-                // Give the current tab link the class "current" and
-                // remove the class from any other TOC links.
-                var anchors = li.getElementsByTagName("a");
-                var anchors = li.getElementsByTagName("a");
-                for (var k = 0; k < anchors.length; k++) {
-                    if (anchors[k].hash == "#" + contentId) {
-                        CSS.AddClass(li, "current");
-                        foundTab = true;
-                        break;
-                    } else {
-                        CSS.RemoveClass(li, "current");
-                    }
-                }
-            }
-        }
-
-        // Show the content with the specified ID.
-        var divsToHide = [];
-        var divs = document.getElementsByTagName("div");
-        for (var i = 0; i < divs.length; i++) {
-            var div = divs[i];
-
-            if (div.className.match(/\btabContent\b/i)) {
-                if (div.id == "_" + contentId)
-                    div.style.display = "block";
-                else {
-                    divsToHide.push(div);
-                }
-            }
-        }
-
-        // Hide the other content boxes.
-        for (var i = 0; i < divsToHide.length; i++)
-            divsToHide[i].style.display = "none";
-
-        // Change the address bar.
-        if (!skipReplace) window.location.replace("#" + contentId);
-    },
-
-    OnClickHandler: function (e) {
-        // Stop the event (to stop it from scrolling or
-        // making an entry in the history).
-        if (!e) e = window.event;
-        if (e.preventDefault) e.preventDefault(); else e.returnValue = false;
-
-        // Get the name of the anchor of the link that was clicked.
-        Tabs.GoTo(this.hash.substring(1));
-    },
-
-    Init: function () {
-        if (!document.getElementsByTagName) {
-            return;
-        }
-
-        // Attach an onclick event to all the anchor links on the page.
-        var anchors = document.getElementsByTagName("a");
-        for (var i = 0; i < anchors.length; i++) {
-            var a = anchors[i];
-            if (a.hash) {
-                a.onclick = Tabs.OnClickHandler;
-            }
-        }
-
-        var contentId;
-        if (window.location.hash)
-            contentId = window.location.hash.substring(1);
-
-        var divs = document.getElementsByTagName("div");
-        for (var i = 0; i < divs.length; i++) {
-            var div = divs[i];
-
-            if (div.className.match(/\btabContent\b/i)) {
-                if (!contentId) contentId = div.id;
-                div.id = "_" + div.id;
-            }
-        }
-
-        if (contentId)
-            Tabs.GoTo(contentId, true);
-    }
-};
-
-if (document.createStyleSheet) {
-    var style = document.createStyleSheet();
-    style.addRule("div.tabContent", "display: none;");
-    style.addRule("div" + contentId, "display: block;");
-} else {
-    var head = document.getElementsByTagName("head")[0];
-    if (head) {
-        var style = document.createElement("style");
-        style.setAttribute("type", "text/css");
-        style.appendChild(document.createTextNode("div.tabContent { display: none; }"));
-        style.appendChild(document.createTextNode("div" + contentId + " { display: block; }"));
-        head.appendChild(style);
-    }
-}
-
-// Hook up the OnLoad event to the tab initialization function.
-Tabs.Init();
-
-// Hide the content while waiting for the onload event to trigger.
-var contentId = window.location.hash || "#Introduction";
-
 function setUpToolbar(designer, isTryMode) {
 
     var menu = new mindplot.widget.Menu(designer, 'toolbar');
 
-    if ($('helpButton') != null) {
-        var helpPanel = new Panel({panelButton:$('helpButton'), backgroundColor:'black'});
-        helpPanel.setContent(Help.buildHelp(helpPanel));
-    }
-
-    if ($('helpButtonFirstSteps') != null) {
-        var firstStepsPanel = $('helpButtonFirstSteps')
-        firstStepsPanel.addEvent('click', function(event) {
-            var firstStepWindow = window.open("firststeps.htm", "WiseMapping", "width=100px, height=100px");
-            firstStepWindow.focus();
-            firstStepWindow.moveTo(0, 0);
-            firstStepWindow.resizeTo(screen.availWidth, screen.availHeight);
-        });
-    }
-
-    if ($('helpButtonKeyboard') != null) {
-        var keyboardPanel = $('helpButtonKeyboard')
-        keyboardPanel.addEvent('click', function(event) {
-            MOOdalBox.open('keyboard.htm', 'KeyBoard Shortcuts', '500px 400px', false)
-        });
-    }
-
     // Autosave ...
     if (!isTryMode) {
         (function() {
@@ -210,7 +56,6 @@ function setUpToolbar(designer, isTryMode) {
 
 }
 
-
 function buildDesigner(editorProperties, isTryMode) {
     $assert(editorProperties, "editorProperties can not be null");
 
diff --git a/wise-webapp/src/main/webapp/js/less-1.1.3.min.js b/wise-webapp/src/main/webapp/js/less-1.1.3.min.js
new file mode 100644
index 00000000..6e4d5cff
--- /dev/null
+++ b/wise-webapp/src/main/webapp/js/less-1.1.3.min.js
@@ -0,0 +1,16 @@
+//
+// LESS - Leaner CSS v1.1.3
+// http://lesscss.org
+// 
+// Copyright (c) 2009-2011, Alexis Sellier
+// Licensed under the Apache 2.0 License.
+//
+//
+// LESS - Leaner CSS v1.1.3
+// http://lesscss.org
+// 
+// Copyright (c) 2009-2011, Alexis Sellier
+// Licensed under the Apache 2.0 License.
+//
+(function(a,b){function v(a,b){var c="less-error-message:"+p(b),e=["<ul>",'<li><label>[-1]</label><pre class="ctx">{0}</pre></li>',"<li><label>[0]</label><pre>{current}</pre></li>",'<li><label>[1]</label><pre class="ctx">{2}</pre></li>',"</ul>"].join("\n"),f=document.createElement("div"),g,h;f.id=c,f.className="less-error-message",h="<h3>"+(a.message||"There is an error in your .less file")+"</h3>"+'<p><a href="'+b+'">'+b+"</a> ",a.extract&&(h+="on line "+a.line+", column "+(a.column+1)+":</p>"+e.replace(/\[(-?\d)\]/g,function(b,c){return parseInt(a.line)+parseInt(c)||""}).replace(/\{(\d)\}/g,function(b,c){return a.extract[parseInt(c)]||""}).replace(/\{current\}/,a.extract[1].slice(0,a.column)+'<span class="error">'+a.extract[1].slice(a.column)+"</span>")),f.innerHTML=h,q([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #ee4444;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.ctx {","color: #dd4444;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: #10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"),{title:"error-message"}),f.style.cssText=["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),d.env=="development"&&(g=setInterval(function(){document.body&&(document.getElementById(c)?document.body.replaceChild(f,document.getElementById(c)):document.body.insertBefore(f,document.body.firstChild),clearInterval(g))},10))}function u(a){d.env=="development"&&typeof console!="undefined"&&console.log("less: "+a)}function t(a){return a&&a.parentNode.removeChild(a)}function s(){if(a.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(b){u("browser doesn't support AJAX.");return null}}function r(a,b,c,e){function i(b,c,d){b.status>=200&&b.status<300?c(b.responseText,b.getResponseHeader("Last-Modified")):typeof d=="function"&&d(b.status,a)}var f=s(),h=g?!1:d.async;typeof f.overrideMimeType=="function"&&f.overrideMimeType("text/css"),f.open("GET",a,h),f.setRequestHeader("Accept",b||"text/x-less, text/css; q=0.9, */*; q=0.5"),f.send(null),g?f.status===0?c(f.responseText):e(f.status,a):h?f.onreadystatechange=function(){f.readyState==4&&i(f,c,e)}:i(f,c,e)}function q(a,b,c){var d,e=b.href?b.href.replace(/\?.*$/,""):"",f="less:"+(b.title||p(e));(d=document.getElementById(f))===null&&(d=document.createElement("style"),d.type="text/css",d.media=b.media||"screen",d.id=f,document.getElementsByTagName("head")[0].appendChild(d));if(d.styleSheet)try{d.styleSheet.cssText=a}catch(g){throw new Error("Couldn't reassign styleSheet.cssText.")}else(function(a){d.childNodes.length>0?d.firstChild.nodeValue!==a.nodeValue&&d.replaceChild(a,d.firstChild):d.appendChild(a)})(document.createTextNode(a));c&&h&&(u("saving "+e+" to cache."),h.setItem(e,a),h.setItem(e+":timestamp",c))}function p(a){return a.replace(/^[a-z]+:\/\/?[^\/]+/,"").replace(/^\//,"").replace(/\?.*$/,"").replace(/\.[^\.\/]+$/,"").replace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function o(b,c,e,f){var g=a.location.href.replace(/[#?].*$/,""),i=b.href.replace(/\?.*$/,""),j=h&&h.getItem(i),k=h&&h.getItem(i+":timestamp"),l={css:j,timestamp:k};/^(https?|file):/.test(i)||(i.charAt(0)=="/"?i=a.location.protocol+"//"+a.location.host+i:i=g.slice(0,g.lastIndexOf("/")+1)+i),r(b.href,b.type,function(a,g){if(!e&&l&&g&&(new Date(g)).valueOf()===(new Date(l.timestamp)).valueOf())q(l.css,b),c(null,b,{local:!0,remaining:f});else try{(new d.Parser({optimization:d.optimization,paths:[i.replace(/[\w\.-]+$/,"")],mime:b.type})).parse(a,function(a,d){if(a)return v(a,i);try{c(d,b,{local:!1,lastModified:g,remaining:f}),t(document.getElementById("less-error-message:"+p(i)))}catch(a){v(a,i)}})}catch(h){v(h,i)}},function(a,b){throw new Error("Couldn't load "+b+" ("+a+")")})}function n(a,b){for(var c=0;c<d.sheets.length;c++)o(d.sheets[c],a,b,d.sheets.length-(c+1))}function m(){var a=document.getElementsByTagName("style");for(var b=0;b<a.length;b++)a[b].type.match(k)&&(new d.Parser).parse(a[b].innerHTML||"",function(c,d){a[b].type="text/css",a[b].innerHTML=d.toCSS()})}function c(b){return a.less[b.split("/")[1]]}Array.isArray||(Array.isArray=function(a){return Object.prototype.toString.call(a)==="[object Array]"||a instanceof Array}),Array.prototype.forEach||(Array.prototype.forEach=function(a,b){var c=this.length>>>0;for(var d=0;d<c;d++)d in this&&a.call(b,this[d],d,this)}),Array.prototype.map||(Array.prototype.map=function(a){var b=this.length>>>0,c=Array(b),d=arguments[1];for(var e=0;e<b;e++)e in this&&(c[e]=a.call(d,this[e],e,this));return c}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=[],c=arguments[1];for(var d=0;d<this.length;d++)a.call(c,this[d])&&b.push(this[d]);return b}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=this.length>>>0,c=0;if(b===0&&arguments.length===1)throw new TypeError;if(arguments.length>=2)var d=arguments[1];else for(;;){if(c in this){d=this[c++];break}if(++c>=b)throw new TypeError}for(;c<b;c++)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=this.length,c=arguments[1]||0;if(!b)return-1;if(c>=b)return-1;c<0&&(c+=b);for(;c<b;c++){if(!Object.prototype.hasOwnProperty.call(this,c))continue;if(a===this[c])return c}return-1}),Object.keys||(Object.keys=function(a){var b=[];for(var c in a)Object.prototype.hasOwnProperty.call(a,c)&&b.push(c);return b}),String.prototype.trim||(String.prototype.trim=function(){return String(this).replace(/^\s\s*/,"").replace(/\s\s*$/,"")});var d,e;typeof a=="undefined"?(d=exports,e=c("less/tree")):(typeof a.less=="undefined"&&(a.less={}),d=a.less,e=a.less.tree={}),d.Parser=function(a){function t(a){return typeof a=="string"?b.charAt(c)===a:a.test(j[f])?!0:!1}function s(a){var d,e,g,h,i,m,n,o;if(a instanceof Function)return a.call(l.parsers);if(typeof a=="string")d=b.charAt(c)===a?a:null,g=1,r();else{r();if(d=a.exec(j[f]))g=d[0].length;else return null}if(d){o=c+=g,m=c+j[f].length-g;while(c<m){h=b.charCodeAt(c);if(h!==32&&h!==10&&h!==9)break;c++}j[f]=j[f].slice(g+(c-o)),k=c,j[f].length===0&&f<j.length-1&&f++;return typeof d=="string"?d:d.length===1?d[0]:d}}function r(){c>k&&(j[f]=j[f].slice(c-k),k=c)}function q(){j[f]=g,c=h,k=c}function p(){g=j[f],h=c,k=c}var b,c,f,g,h,i,j,k,l,m=this,n=function(){},o=this.imports={paths:a&&a.paths||[],queue:[],files:{},mime:a&&a.mime,push:function(b,c){var e=this;this.queue.push(b),d.Parser.importer(b,this.paths,function(a){e.queue.splice(e.queue.indexOf(b),1),e.files[b]=a,c(a),e.queue.length===0&&n()},a)}};this.env=a=a||{},this.optimization="optimization"in this.env?this.env.optimization:1,this.env.filename=this.env.filename||null;return l={imports:o,parse:function(d,g){var h,l,m,o,p,q,r=[],t,u=null;c=f=k=i=0,j=[],b=d.replace(/\r\n/g,"\n"),j=function(c){var d=0,e=/[^"'`\{\}\/\(\)]+/g,f=/\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,g=0,h,i=c[0],j,k;for(var l=0,m,n;l<b.length;l++){e.lastIndex=l,(h=e.exec(b))&&h.index===l&&(l+=h[0].length,i.push(h[0])),m=b.charAt(l),f.lastIndex=l,!k&&!j&&m==="/"&&(n=b.charAt(l+1),(n==="/"||n==="*")&&(h=f.exec(b))&&h.index===l&&(l+=h[0].length,i.push(h[0]),m=b.charAt(l)));if(m==="{"&&!k&&!j)g++,i.push(m);else if(m==="}"&&!k&&!j)g--,i.push(m),c[++d]=i=[];else if(m==="("&&!k&&!j)i.push(m),j=!0;else if(m===")"&&!k&&j)i.push(m),j=!1;else{if(m==='"'||m==="'"||m==="`")k?k=k===m?!1:k:k=m;i.push(m)}}if(g>0)throw{type:"Syntax",message:"Missing closing `}`",filename:a.filename};return c.map(function(a){return a.join("")})}([[]]),h=new e.Ruleset([],s(this.parsers.primary)),h.root=!0,h.toCSS=function(c){var d,f,g;return function(g,h){function n(a){return a?(b.slice(0,a).match(/\n/g)||"").length:null}var i=[];g=g||{},typeof h=="object"&&!Array.isArray(h)&&(h=Object.keys(h).map(function(a){var b=h[a];b instanceof e.Value||(b instanceof e.Expression||(b=new e.Expression([b])),b=new e.Value([b]));return new e.Rule("@"+a,b,!1,0)}),i=[new e.Ruleset(null,h)]);try{var j=c.call(this,{frames:i}).toCSS([],{compress:g.compress||!1})}catch(k){f=b.split("\n"),d=n(k.index);for(var l=k.index,m=-1;l>=0&&b.charAt(l)!=="\n";l--)m++;throw{type:k.type,message:k.message,filename:a.filename,index:k.index,line:typeof d=="number"?d+1:null,callLine:k.call&&n(k.call)+1,callExtract:f[n(k.call)],stack:k.stack,column:m,extract:[f[d-1],f[d],f[d+1]]}}return g.compress?j.replace(/(\s)+/g,"$1"):j}}(h.eval);if(c<b.length-1){c=i,q=b.split("\n"),p=(b.slice(0,c).match(/\n/g)||"").length+1;for(var v=c,w=-1;v>=0&&b.charAt(v)!=="\n";v--)w++;u={name:"ParseError",message:"Syntax Error on line "+p,index:c,filename:a.filename,line:p,column:w,extract:[q[p-2],q[p-1],q[p]]}}this.imports.queue.length>0?n=function(){g(u,h)}:g(u,h)},parsers:{primary:function(){var a,b=[];while((a=s(this.mixin.definition)||s(this.rule)||s(this.ruleset)||s(this.mixin.call)||s(this.comment)||s(this.directive))||s(/^[\s\n]+/))a&&b.push(a);return b},comment:function(){var a;if(b.charAt(c)==="/"){if(b.charAt(c+1)==="/")return new e.Comment(s(/^\/\/.*/),!0);if(a=s(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new e.Comment(a)}},entities:{quoted:function(){var a,d=c,f;b.charAt(d)==="~"&&(d++,f=!0);if(b.charAt(d)==='"'||b.charAt(d)==="'"){f&&s("~");if(a=s(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new e.Quoted(a[0],a[1]||a[2],f)}},keyword:function(){var a;if(a=s(/^[A-Za-z-]+/))return new e.Keyword(a)},call:function(){var a,b,d=c;if(!!(a=/^([\w-]+|%)\(/.exec(j[f]))){a=a[1].toLowerCase();if(a==="url")return null;c+=a.length;if(a==="alpha")return s(this.alpha);s("("),b=s(this.entities.arguments);if(!s(")"))return;if(a)return new e.Call(a,b,d)}},arguments:function(){var a=[],b;while(b=s(this.expression)){a.push(b);if(!s(","))break}return a},literal:function(){return s(this.entities.dimension)||s(this.entities.color)||s(this.entities.quoted)},url:function(){var a;if(b.charAt(c)==="u"&&!!s(/^url\(/)){a=s(this.entities.quoted)||s(this.entities.variable)||s(this.entities.dataURI)||s(/^[-\w%@$\/.&=:;#+?~]+/)||"";if(!s(")"))throw new Error("missing closing ) for url()");return new e.URL(a.value||a.data||a instanceof e.Variable?a:new e.Anonymous(a),o.paths)}},dataURI:function(){var a;if(s(/^data:/)){a={},a.mime=s(/^[^\/]+\/[^,;)]+/)||"",a.charset=s(/^;\s*charset=[^,;)]+/)||"",a.base64=s(/^;\s*base64/)||"",a.data=s(/^,\s*[^)]+/);if(a.data)return a}},variable:function(){var a,d=c;if(b.charAt(c)==="@"&&(a=s(/^@@?[\w-]+/)))return new e.Variable(a,d)},color:function(){var a;if(b.charAt(c)==="#"&&(a=s(/^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})/)))return new e.Color(a[1])},dimension:function(){var a,d=b.charCodeAt(c);if(!(d>57||d<45||d===47))if(a=s(/^(-?\d*\.?\d+)(px|%|em|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn)?/))return new e.Dimension(a[1],a[2])},javascript:function(){var a,d=c,f;b.charAt(d)==="~"&&(d++,f=!0);if(b.charAt(d)==="`"){f&&s("~");if(a=s(/^`([^`]*)`/))return new e.JavaScript(a[1],c,f)}}},variable:function(){var a;if(b.charAt(c)==="@"&&(a=s(/^(@[\w-]+)\s*:/)))return a[1]},shorthand:function(){var a,b;if(!!t(/^[@\w.%-]+\/[@\w.-]+/)&&(a=s(this.entity))&&s("/")&&(b=s(this.entity)))return new e.Shorthand(a,b)},mixin:{call:function(){var a=[],d,f,g,h=c,i=b.charAt(c);if(i==="."||i==="#"){while(d=s(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/))a.push(new e.Element(f,d)),f=s(">");s("(")&&(g=s(this.entities.arguments))&&s(")");if(a.length>0&&(s(";")||t("}")))return new e.mixin.Call(a,g,h)}},definition:function(){var a,d=[],f,g,h,i;if(!(b.charAt(c)!=="."&&b.charAt(c)!=="#"||t(/^[^{]*(;|})/)))if(f=s(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)){a=f[1];while(h=s(this.entities.variable)||s(this.entities.literal)||s(this.entities.keyword)){if(h instanceof e.Variable)if(s(":"))if(i=s(this.expression))d.push({name:h.name,value:i});else throw new Error("Expected value");else d.push({name:h.name});else d.push({value:h});if(!s(","))break}if(!s(")"))throw new Error("Expected )");g=s(this.block);if(g)return new e.mixin.Definition(a,d,g)}}},entity:function(){return s(this.entities.literal)||s(this.entities.variable)||s(this.entities.url)||s(this.entities.call)||s(this.entities.keyword)||s(this.entities.javascript)||s(this.comment)},end:function(){return s(";")||t("}")},alpha:function(){var a;if(!!s(/^\(opacity=/i))if(a=s(/^\d+/)||s(this.entities.variable)){if(!s(")"))throw new Error("missing closing ) for alpha()");return new e.Alpha(a)}},element:function(){var a,b,c;c=s(this.combinator),a=s(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/)||s("*")||s(this.attribute)||s(/^\([^)@]+\)/);if(a)return new e.Element(c,a)},combinator:function(){var a,d=b.charAt(c);if(d===">"||d==="&"||d==="+"||d==="~"){c++;while(b.charAt(c)===" ")c++;return new e.Combinator(d)}if(d===":"&&b.charAt(c+1)===":"){c+=2;while(b.charAt(c)===" ")c++;return new e.Combinator("::")}return b.charAt(c-1)===" "?new e.Combinator(" "):new e.Combinator(null)},selector:function(){var a,d,f=[],g,h;while(d=s(this.element)){g=b.charAt(c),f.push(d);if(g==="{"||g==="}"||g===";"||g===",")break}if(f.length>0)return new e.Selector(f)},tag:function(){return s(/^[a-zA-Z][a-zA-Z-]*[0-9]?/)||s("*")},attribute:function(){var a="",b,c,d;if(!!s("[")){if(b=s(/^[a-zA-Z-]+/)||s(this.entities.quoted))(d=s(/^[|~*$^]?=/))&&(c=s(this.entities.quoted)||s(/^[\w-]+/))?a=[b,d,c.toCSS?c.toCSS():c].join(""):a=b;if(!s("]"))return;if(a)return"["+a+"]"}},block:function(){var a;if(s("{")&&(a=s(this.primary))&&s("}"))return a},ruleset:function(){var a=[],b,d,g;p();if(g=/^([.#: \w-]+)[\s\n]*\{/.exec(j[f]))c+=g[0].length-1,a=[new e.Selector([new e.Element(null,g[1])])];else while(b=s(this.selector)){a.push(b),s(this.comment);if(!s(","))break;s(this.comment)}if(a.length>0&&(d=s(this.block)))return new e.Ruleset(a,d);i=c,q()},rule:function(){var a,d,g=b.charAt(c),k,l;p();if(g!=="."&&g!=="#"&&g!=="&")if(a=s(this.variable)||s(this.property)){a.charAt(0)!="@"&&(l=/^([^@+\/'"*`(;{}-]*);/.exec(j[f]))?(c+=l[0].length-1,d=new e.Anonymous(l[1])):a==="font"?d=s(this.font):d=s(this.value),k=s(this.important);if(d&&s(this.end))return new e.Rule(a,d,k,h);i=c,q()}},"import":function(){var a;if(s(/^@import\s+/)&&(a=s(this.entities.quoted)||s(this.entities.url))&&s(";"))return new e.Import(a,o)},directive:function(){var a,d,f,g;if(b.charAt(c)==="@"){if(d=s(this["import"]))return d;if(a=s(/^@media|@page|@-[-a-z]+/)){g=(s(/^[^{]+/)||"").trim();if(f=s(this.block))return new e.Directive(a+" "+g,f)}else if(a=s(/^@[-a-z]+/))if(a==="@font-face"){if(f=s(this.block))return new e.Directive(a,f)}else if((d=s(this.entity))&&s(";"))return new e.Directive(a,d)}},font:function(){var a=[],b=[],c,d,f,g;while(g=s(this.shorthand)||s(this.entity))b.push(g);a.push(new e.Expression(b));if(s(","))while(g=s(this.expression)){a.push(g);if(!s(","))break}return new e.Value(a)},value:function(){var a,b=[],c;while(a=s(this.expression)){b.push(a);if(!s(","))break}if(b.length>0)return new e.Value(b)},important:function(){if(b.charAt(c)==="!")return s(/^! *important/)},sub:function(){var a;if(s("(")&&(a=s(this.expression))&&s(")"))return a},multiplication:function(){var a,b,c,d;if(a=s(this.operand)){while((c=s("/")||s("*"))&&(b=s(this.operand)))d=new e.Operation(c,[d||a,b]);return d||a}},addition:function(){var a,d,f,g;if(a=s(this.multiplication)){while((f=s(/^[-+]\s+/)||b.charAt(c-1)!=" "&&(s("+")||s("-")))&&(d=s(this.multiplication)))g=new e.Operation(f,[g||a,d]);return g||a}},operand:function(){var a,d=b.charAt(c+1);b.charAt(c)==="-"&&(d==="@"||d==="(")&&(a=s("-"));var f=s(this.sub)||s(this.entities.dimension)||s(this.entities.color)||s(this.entities.variable)||s(this.entities.call);return a?new e.Operation("*",[new e.Dimension(-1),f]):f},expression:function(){var a,b,c=[],d;while(a=s(this.addition)||s(this.entity))c.push(a);if(c.length>0)return new e.Expression(c)},property:function(){var a;if(a=s(/^(\*?-?[-a-z_0-9]+)\s*:/))return a[1]}}}},typeof a!="undefined"&&(d.Parser.importer=function(a,b,c,d){a.charAt(0)!=="/"&&b.length>0&&(a=b[0]+a),o({href:a,title:a,type:d.mime},c,!0)}),function(a){function d(a){return Math.min(1,Math.max(0,a))}function c(b){if(b instanceof a.Dimension)return parseFloat(b.unit=="%"?b.value/100:b.value);if(typeof b=="number")return b;throw{error:"RuntimeError",message:"color functions take numbers as parameters"}}function b(b){return a.functions.hsla(b.h,b.s,b.l,b.a)}a.functions={rgb:function(a,b,c){return this.rgba(a,b,c,1)},rgba:function(b,d,e,f){var g=[b,d,e].map(function(a){return c(a)}),f=c(f);return new a.Color(g,f)},hsl:function(a,b,c){return this.hsla(a,b,c,1)},hsla:function(a,b,d,e){function h(a){a=a<0?a+1:a>1?a-1:a;return a*6<1?g+(f-g)*a*6:a*2<1?f:a*3<2?g+(f-g)*(2/3-a)*6:g}a=c(a)%360/360,b=c(b),d=c(d),e=c(e);var f=d<=.5?d*(b+1):d+b-d*b,g=d*2-f;return this.rgba(h(a+1/3)*255,h(a)*255,h(a-1/3)*255,e)},hue:function(b){return new a.Dimension(Math.round(b.toHSL().h))},saturation:function(b){return new a.Dimension(Math.round(b.toHSL().s*100),"%")},lightness:function(b){return new a.Dimension(Math.round(b.toHSL().l*100),"%")},alpha:function(b){return new a.Dimension(b.toHSL().a)},saturate:function(a,c){var e=a.toHSL();e.s+=c.value/100,e.s=d(e.s);return b(e)},desaturate:function(a,c){var e=a.toHSL();e.s-=c.value/100,e.s=d(e.s);return b(e)},lighten:function(a,c){var e=a.toHSL();e.l+=c.value/100,e.l=d(e.l);return b(e)},darken:function(a,c){var e=a.toHSL();e.l-=c.value/100,e.l=d(e.l);return b(e)},fadein:function(a,c){var e=a.toHSL();e.a+=c.value/100,e.a=d(e.a);return b(e)},fadeout:function(a,c){var e=a.toHSL();e.a-=c.value/100,e.a=d(e.a);return b(e)},spin:function(a,c){var d=a.toHSL(),e=(d.h+c.value)%360;d.h=e<0?360+e:e;return b(d)},mix:function(b,c,d){var e=d.value/100,f=e*2-1,g=b.toHSL().a-c.toHSL().a,h=((f*g==-1?f:(f+g)/(1+f*g))+1)/2,i=1-h,j=[b.rgb[0]*h+c.rgb[0]*i,b.rgb[1]*h+c.rgb[1]*i,b.rgb[2]*h+c.rgb[2]*i],k=b.alpha*e+c.alpha*(1-e);return new a.Color(j,k)},greyscale:function(b){return this.desaturate(b,new a.Dimension(100))},e:function(b){return new a.Anonymous(b instanceof a.JavaScript?b.evaluated:b)},escape:function(b){return new a.Anonymous(encodeURI(b.value).replace(/=/g,"%3D").replace(/:/g,"%3A").replace(/#/g,"%23").replace(/;/g,"%3B").replace(/\(/g,"%28").replace(/\)/g,"%29"))},"%":function(b){var c=Array.prototype.slice.call(arguments,1),d=b.value;for(var e=0;e<c.length;e++)d=d.replace(/%[sda]/i,function(a){var b=a.match(/s/i)?c[e].value:c[e].toCSS();return a.match(/[A-Z]$/)?encodeURIComponent(b):b});d=d.replace(/%%/g,"%");return new a.Quoted('"'+d+'"',d)},round:function(b){if(b instanceof a.Dimension)return new a.Dimension(Math.round(c(b)),b.unit);if(typeof b=="number")return Math.round(b);throw{error:"RuntimeError",message:"math functions take numbers as parameters"}}}}(c("less/tree")),function(a){a.Alpha=function(a){this.value=a},a.Alpha.prototype={toCSS:function(){return"alpha(opacity="+(this.value.toCSS?this.value.toCSS():this.value)+")"},eval:function(a){this.value.eval&&(this.value=this.value.eval(a));return this}}}(c("less/tree")),function(a){a.Anonymous=function(a){this.value=a.value||a},a.Anonymous.prototype={toCSS:function(){return this.value},eval:function(){return this}}}(c("less/tree")),function(a){a.Call=function(a,b,c){this.name=a,this.args=b,this.index=c},a.Call.prototype={eval:function(b){var c=this.args.map(function(a){return a.eval(b)});if(!(this.name in a.functions))return new a.Anonymous(this.name+"("+c.map(function(a){return a.toCSS()}).join(", ")+")");try{return a.functions[this.name].apply(a.functions,c)}catch(d){throw{message:"error evaluating function `"+this.name+"`",index:this.index}}},toCSS:function(a){return this.eval(a).toCSS()}}}(c("less/tree")),function(a){a.Color=function(a,b){Array.isArray(a)?this.rgb=a:a.length==6?this.rgb=a.match(/.{2}/g).map(function(a){return parseInt(a,16)}):a.length==8?(this.alpha=parseInt(a.substring(0,2),16)/255,this.rgb=a.substr(2).match(/.{2}/g).map(function(a){return parseInt(a,16)})):this.rgb=a.split("").map(function(a){return parseInt(a+a,16)}),this.alpha=typeof b=="number"?b:1},a.Color.prototype={eval:function(){return this},toCSS:function(){return this.alpha<1?"rgba("+this.rgb.map(function(a){return Math.round(a)}).concat(this.alpha).join(", ")+")":"#"+this.rgb.map(function(a){a=Math.round(a),a=(a>255?255:a<0?0:a).toString(16);return a.length===1?"0"+a:a}).join("")},operate:function(b,c){var d=[];c instanceof a.Color||(c=c.toColor());for(var e=0;e<3;e++)d[e]=a.operate(b,this.rgb[e],c.rgb[e]);return new a.Color(d,this.alpha+c.alpha)},toHSL:function(){var a=this.rgb[0]/255,b=this.rgb[1]/255,c=this.rgb[2]/255,d=this.alpha,e=Math.max(a,b,c),f=Math.min(a,b,c),g,h,i=(e+f)/2,j=e-f;if(e===f)g=h=0;else{h=i>.5?j/(2-e-f):j/(e+f);switch(e){case a:g=(b-c)/j+(b<c?6:0);break;case b:g=(c-a)/j+2;break;case c:g=(a-b)/j+4}g/=6}return{h:g*360,s:h,l:i,a:d}}}}(c("less/tree")),function(a){a.Comment=function(a,b){this.value=a,this.silent=!!b},a.Comment.prototype={toCSS:function(a){return a.compress?"":this.value},eval:function(){return this}}}(c("less/tree")),function(a){a.Dimension=function(a,b){this.value=parseFloat(a),this.unit=b||null},a.Dimension.prototype={eval:function(){return this},toColor:function(){return new a.Color([this.value,this.value,this.value])},toCSS:function(){var a=this.value+this.unit;return a},operate:function(b,c){return new a.Dimension(a.operate(b,this.value,c.value),this.unit||c.unit)}}}(c("less/tree")),function(a){a.Directive=function(b,c){this.name=b,Array.isArray(c)?this.ruleset=new a.Ruleset([],c):this.value=c},a.Directive.prototype={toCSS:function(a,b){if(this.ruleset){this.ruleset.root=!0;return this.name+(b.compress?"{":" {\n  ")+this.ruleset.toCSS(a,b).trim().replace(/\n/g,"\n  ")+(b.compress?"}":"\n}\n")}return this.name+" "+this.value.toCSS()+";\n"},eval:function(a){a.frames.unshift(this),this.ruleset=this.ruleset&&this.ruleset.eval(a),a.frames.shift();return this},variable:function(b){return a.Ruleset.prototype.variable.call(this.ruleset,b)},find:function(){return a.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return a.Ruleset.prototype.rulesets.apply(this.ruleset)}}}(c("less/tree")),function(a){a.Element=function(b,c){this.combinator=b instanceof a.Combinator?b:new a.Combinator(b),this.value=c.trim()},a.Element.prototype.toCSS=function(a){return this.combinator.toCSS(a||{})+this.value},a.Combinator=function(a){a===" "?this.value=" ":this.value=a?a.trim():""},a.Combinator.prototype.toCSS=function(a){return{"":""," ":" ","&":"",":":" :","::":"::","+":a.compress?"+":" + ","~":a.compress?"~":" ~ ",">":a.compress?">":" > "}[this.value]}}(c("less/tree")),function(a){a.Expression=function(a){this.value=a},a.Expression.prototype={eval:function(b){return this.value.length>1?new a.Expression(this.value.map(function(a){return a.eval(b)})):this.value.length===1?this.value[0].eval(b):this},toCSS:function(a){return this.value.map(function(b){return b.toCSS(a)}).join(" ")}}}(c("less/tree")),function(a){a.Import=function(b,c){var d=this;this._path=b,b instanceof a.Quoted?this.path=/\.(le?|c)ss$/.test(b.value)?b.value:b.value+".less":this.path=b.value.value||b.value,this.css=/css$/.test(this.path),this.css||c.push(this.path,function(a){if(!a)throw new Error("Error parsing "+d.path);d.root=a})},a.Import.prototype={toCSS:function(){return this.css?"@import "+this._path.toCSS()+";\n":""},eval:function(b){var c;if(this.css)return this;c=new a.Ruleset(null,this.root.rules.slice(0));for(var d=0;d<c.rules.length;d++)c.rules[d]instanceof a.Import&&Array.prototype.splice.apply(c.rules,[d,1].concat(c.rules[d].eval(b)));return c.rules}}}(c("less/tree")),function(a){a.JavaScript=function(a,b,c){this.escaped=c,this.expression=a,this.index=b},a.JavaScript.prototype={eval:function(b){var c,d=this,e={},f=this.expression.replace(/@\{([\w-]+)\}/g,function(c,e){return a.jsify((new a.Variable("@"+e,d.index)).eval(b))});try{f=new Function("return ("+f+")")}catch(g){throw{message:"JavaScript evaluation error: `"+f+"`",index:this.index}}for(var h in b.frames[0].variables())e[h.slice(1)]={value:b.frames[0].variables()[h].value,toJS:function(){return this.value.eval(b).toCSS()}};try{c=f.call(e)}catch(g){throw{message:"JavaScript evaluation error: '"+g.name+": "+g.message+"'",index:this.index}}return typeof c=="string"?new a.Quoted('"'+c+'"',c,this.escaped,this.index):Array.isArray(c)?new a.Anonymous(c.join(", ")):new a.Anonymous(c)}}}(c("less/tree")),function(a){a.Keyword=function(a){this.value=a},a.Keyword.prototype={eval:function(){return this},toCSS:function(){return this.value}}}(c("less/tree")),function(a){a.mixin={},a.mixin.Call=function(b,c,d){this.selector=new a.Selector(b),this.arguments=c,this.index=d},a.mixin.Call.prototype={eval:function(a){var b,c,d=[],e=!1;for(var f=0;f<a.frames.length;f++)if((b=a.frames[f].find(this.selector)).length>0){c=this.arguments&&this.arguments.map(function(b){return b.eval(a)});for(var g=0;g<b.length;g++)if(b[g].match(c,a))try{Array.prototype.push.apply(d,b[g].eval(a,this.arguments).rules),e=!0}catch(h){throw{message:h.message,index:h.index,stack:h.stack,call:this.index}}if(e)return d;throw{message:"No matching definition was found for `"+this.selector.toCSS().trim()+"("+this.arguments.map(function(a){return a.toCSS()}).join(", ")+")`",index:this.index}}throw{message:this.selector.toCSS().trim()+" is undefined",index:this.index}}},a.mixin.Definition=function(b,c,d){this.name=b,this.selectors=[new a.Selector([new a.Element(null,b)])],this.params=c,this.arity=c.length,this.rules=d,this._lookups={},this.required=c.reduce(function(a,b){return!b.name||b.name&&!b.value?a+1:a},0),this.parent=a.Ruleset.prototype,this.frames=[]},a.mixin.Definition.prototype={toCSS:function(){return""},variable:function(a){return this.parent.variable.call(this,a)},variables:function(){return this.parent.variables.call(this)},find:function(){return this.parent.find.apply(this,arguments)},rulesets:function(){return this.parent.rulesets.apply(this)},eval:function(b,c){var d=new a.Ruleset(null,[]),e,f=[];for(var g=0,h;g<this.params.length;g++)if(this.params[g].name)if(h=c&&c[g]||this.params[g].value)d.rules.unshift(new a.Rule(this.params[g].name,h.eval(b)));else throw{message:"wrong number of arguments for "+this.name+" ("+c.length+" for "+this.arity+")"};for(var g=0;g<Math.max(this.params.length,c&&c.length);g++)f.push(c[g]||this.params[g].value);d.rules.unshift(new a.Rule("@arguments",(new a.Expression(f)).eval(b)));return(new a.Ruleset(null,this.rules.slice(0))).eval({frames:[this,d].concat(this.frames,b.frames)})},match:function(a,b){var c=a&&a.length||0,d;if(c<this.required)return!1;if(this.required>0&&c>this.params.length)return!1;d=Math.min(c,this.arity);for(var e=0;e<d;e++)if(!this.params[e].name&&a[e].eval(b).toCSS()!=this.params[e].value.eval(b).toCSS())return!1;return!0}}}(c("less/tree")),function(a){a.Operation=function(a,b){this.op=a.trim(),this.operands=b},a.Operation.prototype.eval=function(b){var c=this.operands[0].eval(b),d=this.operands[1].eval(b),e;if(c instanceof a.Dimension&&d instanceof a.Color)if(this.op==="*"||this.op==="+")e=d,d=c,c=e;else throw{name:"OperationError",message:"Can't substract or divide a color from a number"};return c.operate(this.op,d)},a.operate=function(a,b,c){switch(a){case"+":return b+c;case"-":return b-c;case"*":return b*c;case"/":return b/c}}}(c("less/tree")),function(a){a.Quoted=function(a,b,c,d){this.escaped=c,this.value=b||"",this.quote=a.charAt(0),this.index=d},a.Quoted.prototype={toCSS:function(){return this.escaped?this.value:this.quote+this.value+this.quote},eval:function(b){var c=this,d=this.value.replace(/`([^`]+)`/g,function(d,e){return(new a.JavaScript(e,c.index,!0)).eval(b).value}).replace(/@\{([\w-]+)\}/g,function(d,e){var f=(new a.Variable("@"+e,c.index)).eval(b);return f.value||f.toCSS()});return new a.Quoted(this.quote+d+this.quote,d,this.escaped,this.index)}}}(c("less/tree")),function(a){a.Rule=function(b,c,d,e){this.name=b,this.value=c instanceof a.Value?c:new a.Value([c]),this.important=d?" "+d.trim():"",this.index=e,b.charAt(0)==="@"?this.variable=!0:this.variable=!1},a.Rule.prototype.toCSS=function(a){return this.variable?"":this.name+(a.compress?":":": ")+this.value.toCSS(a)+this.important+";"},a.Rule.prototype.eval=function(b){return new a.Rule(this.name,this.value.eval(b),this.important,this.index)},a.Shorthand=function(a,b){this.a=a,this.b=b},a.Shorthand.prototype={toCSS:function(a){return this.a.toCSS(a)+"/"+this.b.toCSS(a)},eval:function(){return this}}}(c("less/tree")),function(a){a.Ruleset=function(a,b){this.selectors=a,this.rules=b,this._lookups={}},a.Ruleset.prototype={eval:function(b){var c=new a.Ruleset(this.selectors,this.rules.slice(0));c.root=this.root,b.frames.unshift(c);if(c.root)for(var d=0;d<c.rules.length;d++)c.rules[d]instanceof a.Import&&Array.prototype.splice.apply(c.rules,[d,1].concat(c.rules[d].eval(b)));for(var d=0;d<c.rules.length;d++)c.rules[d]instanceof a.mixin.Definition&&(c.rules[d].frames=b.frames.slice(0));for(var d=0;d<c.rules.length;d++)c.rules[d]instanceof a.mixin.Call&&Array.prototype.splice.apply(c.rules,[d,1].concat(c.rules[d].eval(b)));for(var d=0,e;d<c.rules.length;d++)e=c.rules[d],e instanceof a.mixin.Definition||(c.rules[d]=e.eval?e.eval(b):e);b.frames.shift();return c},match:function(a){return!a||a.length===0},variables:function(){return this._variables?this._variables:this._variables=this.rules.reduce(function(b,c){c instanceof a.Rule&&c.variable===!0&&(b[c.name]=c);return b},{})},variable:function(a){return this.variables()[a]},rulesets:function(){return this._rulesets?this._rulesets:this._rulesets=this.rules.filter(function(b){return b instanceof a.Ruleset||b instanceof a.mixin.Definition})},find:function(b,c){c=c||this;var d=[],e,f,g=b.toCSS();if(g in this._lookups)return this._lookups[g];this.rulesets().forEach(function(e){if(e!==c)for(var g=0;g<e.selectors.length;g++)if(f=b.match(e.selectors[g])){b.elements.length>1?Array.prototype.push.apply(d,e.find(new a.Selector(b.elements.slice(1)),c)):d.push(e);break}});return this._lookups[g]=d},toCSS:function(b,c){var d=[],e=[],f=[],g=[],h,i;if(!this.root)if(b.length===0)g=this.selectors.map(function(a){return[a]});else for(var j=0;j<this.selectors.length;j++)for(var k=0;k<b.length;k++)g.push(b[k].concat([this.selectors[j]]));for(var l=0;l<this.rules.length;l++)i=this.rules[l],i.rules||i instanceof a.Directive?f.push(i.toCSS(g,c)):i instanceof a.Comment?i.silent||(this.root?f.push(i.toCSS(c)):e.push(i.toCSS(c))):i.toCSS&&!i.variable?e.push(i.toCSS(c)):i.value&&!i.variable&&e.push(i.value.toString());f=f.join(""),this.root?d.push(e.join(c.compress?"":"\n")):e.length>0&&(h=g.map(function(a){return a.map(function(a){return a.toCSS(c)}).join("").trim()}).join(c.compress?",":g.length>3?",\n":", "),d.push(h,(c.compress?"{":" {\n  ")+e.join(c.compress?"":"\n  ")+(c.compress?"}":"\n}\n"))),d.push(f);return d.join("")+(c.compress?"\n":"")}}}(c("less/tree")),function(a){a.Selector=function(a){this.elements=a,this.elements[0].combinator.value===""&&(this.elements[0].combinator.value=" ")},a.Selector.prototype.match=function(a){return this.elements[0].value===a.elements[0].value?!0:!1},a.Selector.prototype.toCSS=function(a){if(this._css)return this._css;return this._css=this.elements.map(function(b){return typeof b=="string"?" "+b.trim():b.toCSS(a)}).join("")}}(c("less/tree")),function(b){b.URL=function(b,c){b.data?this.attrs=b:(!/^(?:https?:\/|file:\/|data:\/)?\//.test(b.value)&&c.length>0&&typeof a!="undefined"&&(b.value=c[0]+(b.value.charAt(0)==="/"?b.value.slice(1):b.value)),this.value=b,this.paths=c)},b.URL.prototype={toCSS:function(){return"url("+(this.attrs?"data:"+this.attrs.mime+this.attrs.charset+this.attrs.base64+this.attrs.data:this.value.toCSS())+")"},eval:function(a){return this.attrs?this:new b.URL(this.value.eval(a),this.paths)}}}(c("less/tree")),function(a){a.Value=function(a){this.value=a,this.is="value"},a.Value.prototype={eval:function(b){return this.value.length===1?this.value[0].eval(b):new a.Value(this.value.map(function(a){return a.eval(b)}))},toCSS:function(a){return this.value.map(function(b){return b.toCSS(a)}).join(a.compress?",":", ")}}}(c("less/tree")),function(a){a.Variable=function(a,b){this.name=a,this
+.index=b},a.Variable.prototype={eval:function(b){var c,d,e=this.name;e.indexOf("@@")==0&&(e="@"+(new a.Variable(e.slice(1))).eval(b).value);if(c=a.find(b.frames,function(a){if(d=a.variable(e))return d.value.eval(b)}))return c;throw{message:"variable "+e+" is undefined",index:this.index}}}}(c("less/tree")),c("less/tree").find=function(a,b){for(var c=0,d;c<a.length;c++)if(d=b.call(a,a[c]))return d;return null},c("less/tree").jsify=function(a){return Array.isArray(a.value)&&a.value.length>1?"["+a.value.map(function(a){return a.toCSS(!1)}).join(", ")+"]":a.toCSS(!1)};var g=location.protocol==="file:"||location.protocol==="chrome:"||location.protocol==="chrome-extension:"||location.protocol==="resource:";d.env=d.env||(location.hostname=="127.0.0.1"||location.hostname=="0.0.0.0"||location.hostname=="localhost"||location.port.length>0||g?"development":"production"),d.async=!1,d.poll=d.poll||(g?1e3:1500),d.watch=function(){return this.watchMode=!0},d.unwatch=function(){return this.watchMode=!1},d.env==="development"?(d.optimization=0,/!watch/.test(location.hash)&&d.watch(),d.watchTimer=setInterval(function(){d.watchMode&&n(function(a,b,c){a&&q(a.toCSS(),b,c.lastModified)})},d.poll)):d.optimization=3;var h;try{h=typeof a.localStorage=="undefined"?null:a.localStorage}catch(i){h=null}var j=document.getElementsByTagName("link"),k=/^text\/(x-)?less$/;d.sheets=[];for(var l=0;l<j.length;l++)(j[l].rel==="stylesheet/less"||j[l].rel.match(/stylesheet/)&&j[l].type.match(k))&&d.sheets.push(j[l]);d.refresh=function(a){var b,c;b=c=new Date,n(function(a,d,e){e.local?u("loading "+d.href+" from cache."):(u("parsed "+d.href+" successfully."),q(a.toCSS(),d,e.lastModified)),u("css for "+d.href+" generated in "+(new Date-c)+"ms"),e.remaining===0&&u("css generated in "+(new Date-b)+"ms"),c=new Date},a),m()},d.refreshStyles=m,d.refresh(d.env==="development")})(window)
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index ffec587d..2c5f5a99 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -13,14 +13,16 @@
     <!--[if lt IE 9]>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <![endif]-->
-
-    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
     <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
-    <link rel="stylesheet" type="text/css" href="../css/editor.css"/>
+    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
+
+    <script type='text/javascript' src='../js/less-1.1.3.min.js'></script>
+    <link rel="stylesheet" type="text/css" href="../css/editor2.css"/>
 
     <script type='text/javascript'
             src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
     <script type='text/javascript' src='../js/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>
+
     <script type="text/javascript" src="../dwr/engine.js"></script>
     <script type="text/javascript" src="../dwr/interface/LoggerService.js"></script>
     <script type='text/javascript' src='../js/core.js'></script>
@@ -60,9 +62,6 @@
 
 </head>
 <body>
-<jsp:include page="editorHeader.jsp">
-    <jsp:param name="onlyActionHeader" value="true"/>
-</jsp:include>
 
 <form method="post" id="printForm" name="printForm" action='<c:url value="export.htm"/>' style="height:100%;"
       target="${mindmap.title}">
@@ -75,7 +74,7 @@
     <div id="waitingContainer">
         <div class="loadingIcon"></div>
         <div class="loadingText">
-            <spring:message code="EDITOR.LOADING"/>
+            Loading ...
         </div>
     </div>
 </div>
@@ -84,7 +83,7 @@
     <div id="errorContainer">
         <div class="loadingIcon"></div>
         <div class="loadingText">
-            <spring:message code="EDITOR.ERROR_LOADING"/>
+            Unexpected error loading your map :(
         </div>
     </div>
 </div>
@@ -119,223 +118,110 @@
     <div id="paletteHeader"></div>
 </div>
 
-<div id="toolbar">
-    <div id="editTab" class="tabContent">
-        <div id="file" class="buttonContainer" title="<spring:message code="FILE"/>">
-            <fieldset>
-                <legend>
-                    <spring:message code="FILE"/>
-                </legend>
-                <div id="saveButton" class="buttonOn" title="<spring:message code="SAVE"/>">
-                    <div class="toolbarLabel"><p><spring:message code="SAVE"/></p></div>
-                </div>
-                <div id="discardButton" class="buttonOn" title="<spring:message code="CLOSE"/>">
-                    <div class="toolbarLabel"><p><spring:message code="CLOSE"/></p></div>
-                </div>
-                <div id="undoEdition" class="buttonOn" title="<spring:message code="UNDO_EDITION"/>">
-                    <div class="toolbarLabel"><p><spring:message code="UNDO"/></p></div>
-                </div>
-                <div id="redoEdition" class="buttonOn" title="<spring:message code="REDO_EDITION"/>">
-                    <div class="toolbarLabel"><p><spring:message code="REDO"/></p></div>
-                </div>
+<div id="header">
+    <div id="headerInfo">
+        <div id="headerActions">
 
-                <div id="print" class="buttonOn" title="<spring:message code="PRINT"/>" onclick="printMap();">
-                    <div class="toolbarLabel"><p><spring:message code="PRINT"/></p></div>
-                </div>
-
-                <div id="export" class="buttonOn" title="<spring:message code="EXPORT"/>">
-                    <div class="toolbarLabel"><p><spring:message code="EXPORT"/></p></div>
-                    <a id="exportAnchor" href="export.htm?mapId=${mindmap.id}" rel="moodalbox 600px 400px"
-                       title="<spring:message code="EXPORT_DETAILS"/>">
-                    </a>
-                </div>
-            </fieldset>
+            <spring:message code="WELCOME"/>, ${principal.firstname}|<span><a
+                href="${pageContext.request.contextPath}/c/mymaps.htm"><spring:message code="MY_WISEMAPS"/></a></span> |
+            <span><a href="${pageContext.request.contextPath}/c/settings.htm" rel="moodalbox 400px 250px wizard"
+                     title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
+            | <span><a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
+            <spring:message code="LOGOUT"/>
+        </a></span>
         </div>
-        <div id="zoom" class="buttonContainer" title="Zoom In">
-            <fieldset>
-                <legend>
-                    <spring:message code="ZOOM"/>
-                </legend>
-                <div id="zoomIn" class="buttonOn" title="<spring:message code="ZOOM_IN"/>">
-                    <div class="toolbarLabel"><p><spring:message code="IN"/></p></div>
-                </div>
-                <div id="zoomOut" class="buttonOn" title="<spring:message code="ZOOM_OUT"/>">
-                    <div class="toolbarLabel"><p><spring:message code="OUT"/></p></div>
-                </div>
-            </fieldset>
+        <div id="headerLogo"></div>
+        <div id="headerMapTitle">Title: <span>Hola</span></div>
+    </div>
+    <div id="toolbar">
+        <div id="persist" class="buttonContainer">
+            <div id="save" class="buttonOn" title="Save">
+                <img src="../nicons/save.png"/>
+            </div>
+            <div id="discart" class="buttonOn" title="Discart">
+                <img src="../nicons/discart.png"/>
+            </div>
         </div>
-        <div id="node" class="buttonContainer" title="Node Properties">
-            <fieldset>
-                <legend>
-                    <spring:message code="TOPIC"/>
-                </legend>
-                <div id="topicShape" class="buttonOn" title="<spring:message code="TOPIC_SHAPE"/>">
-                    <div class="toolbarLabel"><p><spring:message code="SHAPE"/></p></div>
-                </div>
-                <div id="addTopic" class="buttonOn" title="<spring:message code="TOPIC_ADD"/>">
-                    <div class="toolbarLabel"><p><spring:message code="ADD"/></p></div>
-                </div>
-                <div id="deleteTopic" class="buttonOn" title="<spring:message code="TOPIC_DELETE"/>">
-                    <div class="toolbarLabel"><p><spring:message code="DELETE"/></p></div>
-                </div>
-                <div id="topicBorder" class="buttonOn" title="<spring:message code="TOPIC_BORDER_COLOR"/>">
-                    <div class="toolbarLabel"><p><spring:message code="BORDER"/></p></div>
-                </div>
-                <div id="topicColor" class="buttonOn" title="<spring:message code="TOPIC_BACKGROUND_COLOR"/>">
-                    <div class="toolbarLabel"><p><spring:message code="COLOR"/></p></div>
-                </div>
-                <div id="topicIcon" class="buttonOn" title="<spring:message code="TOPIC_ICON"/>">
-                    <div class="toolbarLabel"><p><spring:message code="ICON"/></p></div>
-                </div>
-                <div id="topicNote" class="buttonOn" title="<spring:message code="TOPIC_NOTE"/>">
-                    <div class="toolbarLabel"><p><spring:message code="NOTE"/></p></div>
-                </div>
-                <div id="topicLink" class="buttonOn" title="<spring:message code="TOPIC_LINK"/>">
-                    <div class="toolbarLabel"><p><spring:message code="LINK"/></p></div>
-                </div>
-                <div id="topicRelation" class="topicRelation buttonOn"
-                     title="<spring:message code="TOPIC_RELATIONSHIP"/>">
-                    <div class="relationshiplabel toolbarLabel"><p><spring:message code="TOPIC_RELATIONSHIP"/></p></div>
-                </div>
-            </fieldset>
+        <div id="edit" class="buttonContainer">
+            <div id="undoEdition" class="buttonOn" title="Undo Edition">
+                <img src="../nicons/undo.png"/>
+            </div>
+            <div id="redoEdition" class="buttonOn" title="Redo Edition">
+                <img src="../nicons/redo.png"/>
+            </div>
         </div>
-        <div id="font" class="buttonContainer" title="Font Properties">
-            <fieldset>
-                <legend>
-                    <spring:message code="FONT"/>
-                </legend>
-                <div id="fontFamily" class="buttonOn" title="<spring:message code="FONT_TYPE"/>">
-                    <div class="toolbarLabel"><p><spring:message code="TYPE"/></p></div>
-                </div>
-                <div id="fontSize" class="buttonOn" title="<spring:message code="FONT_SIZE"/>">
-                    <div class="toolbarLabel"><p><spring:message code="SIZE"/></p></div>
-                </div>
-                <div id="fontBold" class="buttonOn" title="<spring:message code="FONT_BOLD"/>">
-                    <div class="toolbarLabel"><p><spring:message code="BOLD"/></p></div>
-                </div>
-                <div id="fontItalic" class="buttonOn" title="<spring:message code="FONT_ITALIC"/>">
-                    <div class="toolbarLabel"><p><spring:message code="ITALIC"/></p></div>
-                </div>
-                <div id="fontColor" class="buttonOn" title="<spring:message code="FONT_COLOR"/>">
-                    <div class="toolbarLabel"><p><spring:message code="COLOR"/></p></div>
-                </div>
-            </fieldset>
+        <div id="zoom" class="buttonContainer">
+            <div id="zoomIn" class="buttonOn" title="Zoom In">
+                <img src="../nicons/zoom-in.png"/>
+            </div>
+            <div id="zoomOut" class="buttonOn" title="Zoom Out">
+                <img src="../nicons/zoom-out.png"/>
+            </div>
         </div>
-        <div id="share" class="buttonContainer" title="Share Properties">
-            <c:choose>
-                <c:when test="${editorTryMode==false}">
-                    <fieldset>
-                        <legend>
-                            <spring:message code="COLLABORATION"/>
-                        </legend>
-                        <a id="tagAnchor" href="tags.htm?mapId=${mindmap.id}" rel="moodalbox 400px 200px wizard"
-                           title="<spring:message code="TAGS_DETAILS"/>">
-                            <div id="tagIt" class="buttonOn" title="<spring:message code="TAG"/>">
-                                <div class="toolbarLabel"><p><spring:message code="TAG"/></p></div>
-                            </div>
-                        </a>
-                        <c:choose>
-                            <c:when test="${mindmap.owner==user}">
-                                <a id="shareAnchor" href="<c:out value="${shareMap}"/>&amp;mapId=${mindmap.id}"
-                                   rel="moodalbox 780px 530px wizard" title="<spring:message code="SHARE_DETAILS"/>">
-                                    <div id="shareIt" class="buttonOn" title="<spring:message code="COLLABORATION"/>">
-                                        <div class="toolbarLabel"><p><spring:message code="SHARE"/></p></div>
-                                    </div>
-                                </a>
-                                <a id="publishAnchor" href="publish.htm?mapId=${mindmap.id}"
-                                   rel="moodalbox 600px 400px wizard"
-                                   title="<spring:message code="PUBLISH_MSG"/>">
-                                    <div id="publishIt" class="buttonOn" title="<spring:message code="PUBLISH"/>">
-                                        <div class="toolbarLabel"><p><spring:message code="PUBLISH"/></p></div>
-                                    </div>
-                                </a>
-                            </c:when>
-                        </c:choose>
-                        <a id="historyAnchor" href="history.htm?action=list&amp;mapId=${mindmap.id}"
-                           rel="moodalbox 600px 400px wizard" title="<spring:message code="HISTORY_MSG"/>">
-                            <div id="history" class="buttonOn" title="<spring:message code="HISTORY_MSG"/>">
-                                <div class="toolbarLabel"><p><spring:message code="HISTORY"/></p></div>
-                            </div>
-                        </a>
-                    </fieldset>
-                </c:when>
-                <c:otherwise>
-                    <fieldset>
-                        <legend>
-                            <spring:message code="COLLABORATION"/>
-                        </legend>
-                        <div id="tagIt" class="buttonOn" title="<spring:message code="TAG"/>">
-                            <div class="toolbarLabel"><p><spring:message code="TAG"/></p></div>
-                        </div>
-                        <div id="shareIt" class="buttonOn" title="<spring:message code="COLLABORATE"/>">
-                            <div class="toolbarLabel"><p><spring:message code="SHARE"/></p></div>
-                        </div>
-                        <div id="publishIt" class="buttonOn" title="<spring:message code="PUBLISH"/>">
-                            <div class="toolbarLabel"><p><spring:message code="PUBLISH"/></p></div>
-                        </div>
-                        <div id="history" class="buttonOn" title="<spring:message code="HISTORY_MSG"/>">
-                            <div class="toolbarLabel"><p><spring:message code="HISTORY"/></p></div>
-                        </div>
-                    </fieldset>
-                </c:otherwise>
-            </c:choose>
+        <div id="node" class="buttonContainer">
+            <div id="topicShape" class="buttonExtOn" title="Topic Shape">
+                <img src="../nicons/topic-shape.png"/>
+            </div>
+            <div id="addTopic" class="buttonOn" title="Add Topic">
+                <img src="../nicons/topic-add.png"/>
+            </div>
+            <div id="deleteTopic" class="buttonOn" title="Delete">
+                <img src="../nicons/topic-delete.png"/>
+            </div>
+            <div id="topicBorder" class="buttonOn" title="Border Color">
+                <img src="../nicons/topic-border.png"/>
+            </div>
+            <div id="topicColor" class="buttonExtOn" title="Background Color">
+                <img src="../nicons/topic-color.png"/>
+            </div>
+            <div id="topicIcon" class="buttonExtOn" title="Add Icon">
+                <img src="../nicons/topic-icon.png"/>
+            </div>
+            <div id="topicNote" class="buttonOn" title="Add Note">
+                <img src="../nicons/topic-note.png"/>
+            </div>
+            <div id="topicLink" class="buttonOn" title="Add Link">
+                <img src="../nicons/topic-link.png"/>
+            </div>
+            <div id="topicRelation" class="buttonOn" title="Add Relationship">
+                <img src="../nicons/topic-relation.png"/>
+            </div>
+        </div>
+        <div id="font" class="buttonContainer">
+            <div id="fontFamily" class="buttonOn" title="Font Style">
+                <img src="../nicons/font-type.png"/>
+            </div>
+            <div id="fontSize" class="buttonExtOn" title="Font Size">
+                <img src="../nicons/font-size.png"/>
+            </div>
+            <div id="fontBold" class="buttonOn" title="Bold Style">
+                <img src="../nicons/topic-border.png"/>
+            </div>
+            <div id="fontItalic" class="buttonOn" title="Italic Style">
+                <img src="../nicons/font-italic.png"/>
+            </div>
+            <div id="fontColor" class="buttonExtOn" title="Fond Color">
+                <img src="../nicons/font-color.png"/>
+            </div>
+        </div>
+           <div id="collaboration" class="buttonContainer">
+            <div id="tag" class="buttonOn" title="Tag">
+                <img src="../nicons/tag.png"/>
+            </div>
+            <div id="share" class="buttonExtOn" title="Share">
+                <img src="../nicons/share.png"/>
+            </div>
+            <div id="publish" class="buttonOn" title="Publish">
+                <img src="../nicons/public.png"/>
+            </div>
+            <div id="history" class="buttonOn" title="History">
+                <img src="../nicons/history.png"/>
+            </div>
         </div>
     </div>
 </div>
 
 <div id="mindplot"></div>
-
-<div id="footerEditor">
-    <div style="position:absolute; top:0px; width:100%">
-        <a href="${pageContext.request.contextPath}/c/home.htm">
-            <div id="logo"></div>
-        </a>
-
-        <div id='msgLoggerContainer' class="msgLoggerContainer">
-            <div id="msgStart"></div>
-            <div id='msgLogger'></div>
-            <div id="msgEnd"></div>
-        </div>
-    </div>
-    <div id="helpButtonKeyboard"
-         style="text-align:center; width:100px; height:20px; background-color:#f5f5f5; border: 1px solid #BBB6D6; cursor:pointer; padding-left:5px; margin-left:3px;float:left;">
-        <div style="float:left; position:relative; top:50%; margin-top:-8px; margin-left:5px;"><img
-                src="../images/help.png"/></div>
-        <div style="float:left; position:relative; top:50%; margin-top:-8px; margin-left:4px;">Shortcuts</div>
-    </div>
-</div>
-<c:if test="${editorTryMode==true}">
-    <div id="tryEditorWarning" class="sb">
-        <div class="close" id="tryClose"
-             style="position:absolute;">
-        </div>
-        <div>
-            <h1>Warning</h1>
-            This is a demo editor. That's why you won't be able to save your changes.
-            If you want to start creating your maps, <a href="userRegistration.htm">
-            <spring:message code="JOIN_NOW"/></a>. Registration is free and takes just a moment.
-        </div>
-    </div>
-    <script type="text/javascript">
-        // Register close event ...
-        var tryElem = $('tryEditorWarning');
-        tryElem.addClass('drag').makeDraggable();
-        $('tryClose').addEvent('click', function(event) {
-            tryElem.setStyle('visibility', 'hidden');
-        });
-
-    </script>
-</c:if>
-<div id="ffoxworkarround" style="display:none;"><input id="ffoxWorkarroundInput" type="text"></div>
-<c:if test="${editorTryMode==false}">
-    <script type="text/javascript" src="../dwr/interface/MapEditorService.js"></script>
-</c:if>
 <script type="text/javascript" src="../js/editor.js"></script>
-<%--<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-    _uacct = "UA-2347723-1";
-    urchinTracker();
-</script>--%>
 </body>
 </html>
diff --git a/wise-webapp/src/main/webapp/nicons/btn-bg-hover.png b/wise-webapp/src/main/webapp/nicons/btn-bg-hover.png
new file mode 100644
index 00000000..ee07c4c2
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/btn-bg-hover.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/btn-bg-normal.png b/wise-webapp/src/main/webapp/nicons/btn-bg-normal.png
new file mode 100644
index 00000000..50b333be
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/btn-bg-normal.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/btne-bg-hover.png b/wise-webapp/src/main/webapp/nicons/btne-bg-hover.png
new file mode 100644
index 00000000..5ea2e15b
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/btne-bg-hover.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/btne-bg-normal.png b/wise-webapp/src/main/webapp/nicons/btne-bg-normal.png
new file mode 100644
index 00000000..378476a9
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/btne-bg-normal.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/btne-bg-selected.png b/wise-webapp/src/main/webapp/nicons/btne-bg-selected.png
new file mode 100644
index 00000000..32194e81
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/btne-bg-selected.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/discart.png b/wise-webapp/src/main/webapp/nicons/discart.png
new file mode 100644
index 00000000..63cec6ed
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/discart.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/export.png b/wise-webapp/src/main/webapp/nicons/export.png
new file mode 100644
index 00000000..e8463255
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/export.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/font-bold.png b/wise-webapp/src/main/webapp/nicons/font-bold.png
new file mode 100644
index 00000000..15cfbc16
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/font-bold.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/font-color.png b/wise-webapp/src/main/webapp/nicons/font-color.png
new file mode 100644
index 00000000..1c2761df
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/font-color.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/font-italic.png b/wise-webapp/src/main/webapp/nicons/font-italic.png
new file mode 100644
index 00000000..59e79cf0
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/font-italic.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/font-size.png b/wise-webapp/src/main/webapp/nicons/font-size.png
new file mode 100644
index 00000000..8fa9500f
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/font-size.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/font-type.png b/wise-webapp/src/main/webapp/nicons/font-type.png
new file mode 100644
index 00000000..7b9ba609
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/font-type.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/history.png b/wise-webapp/src/main/webapp/nicons/history.png
new file mode 100644
index 00000000..fa33bab4
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/history.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/iconitos-separados.psd b/wise-webapp/src/main/webapp/nicons/iconitos-separados.psd
new file mode 100644
index 00000000..222e2263
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/iconitos-separados.psd differ
diff --git a/wise-webapp/src/main/webapp/nicons/links.png b/wise-webapp/src/main/webapp/nicons/links.png
new file mode 100644
index 00000000..dd3b830f
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/links.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/logo-small.png b/wise-webapp/src/main/webapp/nicons/logo-small.png
new file mode 100644
index 00000000..107b817b
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/logo-small.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/notes.png b/wise-webapp/src/main/webapp/nicons/notes.png
new file mode 100644
index 00000000..bf438b1d
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/notes.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/print.png b/wise-webapp/src/main/webapp/nicons/print.png
new file mode 100644
index 00000000..6c3788ba
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/print.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/public.png b/wise-webapp/src/main/webapp/nicons/public.png
new file mode 100644
index 00000000..eba5b64f
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/public.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/redo.png b/wise-webapp/src/main/webapp/nicons/redo.png
new file mode 100644
index 00000000..d904c0c4
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/redo.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/save.png b/wise-webapp/src/main/webapp/nicons/save.png
new file mode 100644
index 00000000..174c6d6e
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/save.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/share.png b/wise-webapp/src/main/webapp/nicons/share.png
new file mode 100644
index 00000000..c2aa4494
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/share.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/tag.png b/wise-webapp/src/main/webapp/nicons/tag.png
new file mode 100644
index 00000000..d595a8ba
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/tag.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-add.png b/wise-webapp/src/main/webapp/nicons/topic-add.png
new file mode 100644
index 00000000..3d572e72
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-add.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-border.png b/wise-webapp/src/main/webapp/nicons/topic-border.png
new file mode 100644
index 00000000..e0617e7c
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-border.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-color.png b/wise-webapp/src/main/webapp/nicons/topic-color.png
new file mode 100644
index 00000000..b923d89a
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-color.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-delete.png b/wise-webapp/src/main/webapp/nicons/topic-delete.png
new file mode 100644
index 00000000..1499e58e
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-delete.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-icon.png b/wise-webapp/src/main/webapp/nicons/topic-icon.png
new file mode 100644
index 00000000..1bb8c98d
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-icon.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-link.png b/wise-webapp/src/main/webapp/nicons/topic-link.png
new file mode 100644
index 00000000..e5a05326
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-link.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-note.png b/wise-webapp/src/main/webapp/nicons/topic-note.png
new file mode 100644
index 00000000..5c9aeaae
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-note.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-relation.png b/wise-webapp/src/main/webapp/nicons/topic-relation.png
new file mode 100644
index 00000000..3f8ebcfa
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-relation.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/topic-shape.png b/wise-webapp/src/main/webapp/nicons/topic-shape.png
new file mode 100644
index 00000000..8937ca9b
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/topic-shape.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/undo.png b/wise-webapp/src/main/webapp/nicons/undo.png
new file mode 100644
index 00000000..5133b949
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/undo.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/zoom-in.png b/wise-webapp/src/main/webapp/nicons/zoom-in.png
new file mode 100644
index 00000000..008cfc49
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/zoom-in.png differ
diff --git a/wise-webapp/src/main/webapp/nicons/zoom-out.png b/wise-webapp/src/main/webapp/nicons/zoom-out.png
new file mode 100644
index 00000000..158563a2
Binary files /dev/null and b/wise-webapp/src/main/webapp/nicons/zoom-out.png differ