diff --git a/mindplot/src/main/javascript/widget/Monitor.js b/mindplot/src/main/javascript/widget/ToolbarNotifier.js
similarity index 69%
rename from mindplot/src/main/javascript/widget/Monitor.js
rename to mindplot/src/main/javascript/widget/ToolbarNotifier.js
index 8244ad50..578c191c 100644
--- a/mindplot/src/main/javascript/widget/Monitor.js
+++ b/mindplot/src/main/javascript/widget/ToolbarNotifier.js
@@ -16,35 +16,33 @@
  *   limitations under the License.
  */
 
-mindplot.widget.Monitor = new Class({
-    initialize : function(fadeElem, msgElem) {
-        $assert(fadeElem, "fadeElem can not be null");
-        $assert(msgElem, "msgElem can not be null");
-        this.msgQueue = [];
-
-        this._fadeElem = fadeElem;
-        this._msgElem = msgElem;
+mindplot.widget.ToolbarNotifier = new Class({
+    initialize : function() {
     },
 
     _showMsg : function(msg, msgKind) {
-        if (msgKind == core.Monitor.MsgKind.ERROR) {
+        if (msgKind == core.ToolbarNotifier.MsgKind.ERROR) {
             msg = "<div id='small_error_icon'>" + msg + "</div>";
         }
         this._msgElem.innerHTML = msg;
     },
 
     logError : function(userMsg) {
-        this.logMessage(userMsg, core.Monitor.MsgKind.ERROR);
+        this.logMessage(userMsg, core.ToolbarNotifier.MsgKind.ERROR);
     },
 
     logMessage : function(msg, msgKind) {
         console.log(msg);
-    }
+    },
+
+
 });
 
-core.Monitor.MsgKind = {
+core.ToolbarNotifier.MsgKind = {
     INFO:1,
     WARNING:2,
     ERROR:3,
     FATAL:4
-};
\ No newline at end of file
+};
+
+$notifier = new mindplot.widget.ToolbarNotifier();
\ No newline at end of file
diff --git a/wise-doc/src/main/webapp/css/editor2.css b/wise-doc/src/main/webapp/css/editor.css
similarity index 100%
rename from wise-doc/src/main/webapp/css/editor2.css
rename to wise-doc/src/main/webapp/css/editor.css
diff --git a/wise-webapp/src/main/webapp/css/editor2.css b/wise-doc/src/main/webapp/css/editor.less
similarity index 62%
rename from wise-webapp/src/main/webapp/css/editor2.css
rename to wise-doc/src/main/webapp/css/editor.less
index e6511028..6864151f 100644
--- a/wise-webapp/src/main/webapp/css/editor2.css
+++ b/wise-doc/src/main/webapp/css/editor.less
@@ -1,9 +1,7 @@
-@import "../css/widget/lightbox.css";
-@import "../css/libraries/moodialog/css/MooDialog.css";
+@import "/mindplot/src/main/javascript/widget/lightbox.css";
+@import "/mindplot/src/main/javascript/libraries/moodialog/css/MooDialog.css";
 
-@header-height : 75px;
-@header-toolbar-height : 35px;
-@header-info-height : @header-height - @header-toolbar-height;
+@import "skin.less";
 
 /* Common Default Style */
 html {
@@ -243,270 +241,12 @@ h4 {
 }
 
 /********************************************************************************/
-/* Toolbar Styles */
+/* Header & Toolbar Styles */
 /********************************************************************************/
 
-div#header {
-    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 */
-}
+@import "header.less";
+@import "toolbar.less";
 
-div#headerLogo {
-    background: url(../images/logo-small.png) no-repeat center top;
-    height: 40px;
-    width: 80px;
-    float: left;
-}
-
-div#headerInfo {
-    width: 100%;
-    height: @header-info-height;
-    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:(@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-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;
-    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(../images/btn-bg-hover.png) no-repeat center top;
-}
-
-div#toolbar .buttonOn {
-    opacity: 0.8;
-    background: url(../images/btn-bg-normal.png) no-repeat center top;
-}
-
-div#toolbar .buttonOff {
-    opacity: 0.4;
-    background: url(../images/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(../images/btne-bg-hover.png) no-repeat center top;
-
-}
-
-div#toolbar .buttonExtActive {
-    opacity: 1;
-    background: url(../images/btne-bg-selected.png) no-repeat center top;
-
-}
-
-div#toolbar .buttonExtOn {
-    opacity: 0.8;
-    background: url(../images/btne-bg-normal.png) no-repeat center top;
-}
-
-div#toolbar .buttonExtOff {
-    opacity: 0.4;
-    background: url(../images/btne-bg-normal.png) no-repeat center top;
-}
-
-div#exportAnchor {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-}
-
-/*div#saveButton {*/
-/*background: url(../images/save.png) no-repeat center top;*/
-/*}*/
-
-/*div#undoEdition {*/
-/*background: url(../images/undo.png) no-repeat center top;*/
-/*}*/
-
-/*div#redoEdition {*/
-/*background: url(../images/redo.png) no-repeat center top;*/
-/*}*/
-
-/*div#export {*/
-/*background: url(../images/export.png) no-repeat center top;*/
-/*}*/
-
-/*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-color.png) no-repeat center top;*/
-/*}*/
-
-/*div#topicIcon {*/
-/*background: url(../images/topic-icon.png) no-repeat center top;*/
-/*}*/
-
-/*div#topicNote {*/
-/*background: url(../images/note.png) no-repeat center top;*/
-/*}*/
-
-/*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;*/
-/*}*/
-
-/*div#fontSize {*/
-/*background: url(../images/font-size.png) no-repeat center top;*/
-/*}*/
-
-/*div#shareIt {*/
-/*background: url(../images/share.png) no-repeat center top;*/
-/*}*/
-
-/*div#publishIt {*/
-/*background: url(../images/publish.png) no-repeat center top;*/
-/*}*/
-
-/*div#tagIt {*/
-/*background: url(../images/tag.png) no-repeat center top;*/
-/*}*/
 
 div#topicRelation {
     width: 56px;
diff --git a/wise-doc/src/main/webapp/css/header.less b/wise-doc/src/main/webapp/css/header.less
new file mode 120000
index 00000000..27ff2b71
--- /dev/null
+++ b/wise-doc/src/main/webapp/css/header.less
@@ -0,0 +1 @@
+../../../../../wise-webapp/src/main/webapp/css/header.less
\ No newline at end of file
diff --git a/wise-doc/src/main/webapp/css/skin.less b/wise-doc/src/main/webapp/css/skin.less
new file mode 120000
index 00000000..5771884f
--- /dev/null
+++ b/wise-doc/src/main/webapp/css/skin.less
@@ -0,0 +1 @@
+../../../../../wise-webapp/src/main/webapp/css/skin.less
\ No newline at end of file
diff --git a/wise-doc/src/main/webapp/css/toolbar.less b/wise-doc/src/main/webapp/css/toolbar.less
new file mode 120000
index 00000000..318e7566
--- /dev/null
+++ b/wise-doc/src/main/webapp/css/toolbar.less
@@ -0,0 +1 @@
+../../../../../wise-webapp/src/main/webapp/css/toolbar.less
\ No newline at end of file