--- a/client/js/renderer/nodeeditor.js	Mon Jun 01 11:53:03 2015 +0200
+++ b/client/js/renderer/nodeeditor.js	Tue Jun 02 00:39:47 2015 +0200
@@ -1,5 +1,5 @@
 
-define(['jquery', 'underscore', 'requtils', 'renderer/baseeditor'], function ($, _, requtils, BaseEditor) {
+define(['jquery', 'underscore', 'requtils', 'renderer/baseeditor', 'renderer/shapebuilder'], function ($, _, requtils, BaseEditor, ShapeBuilder) {
     'use strict';
 
     var Utils = requtils.getUtils();
@@ -30,7 +30,8 @@
                     description: _model.get("description"),
                     image: _model.get("image") || "",
                     image_placeholder: _image_placeholder,
-                    color: _model.get("color") || _created_by.get("color"),
+                    color: (_model.has("style") && _model.get("style").color) || _created_by.get("color"),
+                    dash: _model.has("style") && _model.get("style").dash ? "checked" : "",
                     clip_path: _model.get("clip_path") || false,
                     created_by_color: _created_by.get("color"),
                     created_by_title: _created_by.get("title"),
@@ -39,7 +40,8 @@
                 },
                 renkan: this.renkan,
                 options: this.options,
-                shortenText: Utils.shortenText
+                shortenText: Utils.shortenText,
+                shapes : _(ShapeBuilder.builders).omit('svg').keys().value(),
             }));
             this.redraw();
             var _this = this,
@@ -86,6 +88,10 @@
                         if (_this.options.show_node_editor_description) {
                             _data.description = _this.editor_$.find(".Rk-Edit-Description").val();
                         }
+                        if (_this.options.show_node_editor_style) {
+                            var dash = _this.editor_$.find(".Rk-Edit-Dash").is(':checked');
+                            _data.style = _.assign( ((_model.has("style") && _.clone(_model.get("style"))) || {}), {dash: dash});
+                        }
                         if (_this.options.change_shapes) {
                             if(_model.get("shape")!==_this.editor_$.find(".Rk-Edit-Shape").val()){
                                 _data.shape = _this.editor_$.find(".Rk-Edit-Shape").val();
@@ -150,12 +156,12 @@
                         },
                         function(_e) {
                             _e.preventDefault();
-                            _this.editor_$.find(".Rk-Edit-Color").css("background", _model.get("color") || (_model.get("created_by") || Utils._USER_PLACEHOLDER(_this.renkan)).get("color"));
+                            _this.editor_$.find(".Rk-Edit-Color").css("background", (_model.has("style") && _model.get("style").color) || (_model.get("created_by") || Utils._USER_PLACEHOLDER(_this.renkan)).get("color"));
                         }
                 ).click(function(_e) {
                     _e.preventDefault();
                     if (_this.renderer.isEditable()) {
-                        _model.set("color", $(this).attr("data-color"));
+                        _model.set("style", _.assign( ((_model.has("style") && _.clone(_model.get("style"))) || {}), {color: $(this).attr("data-color")}));
                         _picker.hide();
                         paper.view.draw();
                     } else {