diff --git a/Nasal/canvas/api.nas b/Nasal/canvas/api.nas
index b63dcc5d9..6e575d5d3 100644
--- a/Nasal/canvas/api.nas
+++ b/Nasal/canvas/api.nas
@@ -833,10 +833,12 @@ var Canvas = {
   # @param id Optional id/name for the group
   createGroup: func(id = nil)
   {
-    var ghost = me._createGroup();
-    return {
-      parents: [ Group.new(ghost) ]
-    };
+    return Group.new(me._createGroup(id));
+  },
+  # Get the group with the given name
+  getGroup: func(id)
+  {
+    return Group.new(me._getGroup(id));
   },
   # Set the background color
   #
@@ -859,10 +861,12 @@ var Canvas = {
 
 var wrapCanvas = func(canvas_ghost)
 {
-  return {
-    parents: [Canvas, canvas_ghost],
+  var m = {
+    parents: [PropertyElement, Canvas, canvas_ghost],
     texture: props.wrapNode(canvas_ghost._node_ghost)
   };
+  m._node = m.texture;
+  return m;
 }
 
 # Create a new canvas. Pass parameters as hash, eg:
diff --git a/Nasal/canvas/gui.nas b/Nasal/canvas/gui.nas
index 8cf66dc0e..6c66ac0ab 100644
--- a/Nasal/canvas/gui.nas
+++ b/Nasal/canvas/gui.nas
@@ -2,23 +2,31 @@ var Window = {
   # Constructor
   #
   # @param size ([width, height])
-  new: func(size, id = nil)
+  new: func(size, type = nil, id = nil)
   {
+    var ghost = _newWindowGhost(id);
     var m = {
-      parents: [Window, PropertyElement.new(["/sim/gui/canvas", "window"], id)]
+      parents: [Window, PropertyElement, ghost],
+      _node: props.wrapNode(ghost._node_ghost)
     };
+
     m.setInt("size[0]", size[0]);
     m.setInt("size[1]", size[1]);
 
+    # TODO better default position
+    m.move(0,0);
+
     # arg = [child, listener_node, mode, is_child_event]
     setlistener(m._node, func m._propCallback(arg[0], arg[2]), 0, 2);
+    if( type )
+      m.set("type", type);
 
     return m;
   },
   # Destructor
   del: func
   {
-    me.parents[1].del();
+    me._node.remove();
     if( me["_canvas"] != nil )
       me._canvas.del();
   },
@@ -58,15 +66,19 @@ var Window = {
   {
     return me['_canvas'];
   },
+  getCanvasDecoration: func()
+  {
+    return wrapCanvas(me._getCanvasDecoration());
+  },
   setPosition: func(x, y)
   {
-    me.setInt("x", x);
-    me.setInt("y", y);
+    me.setInt("tf/t[0]", x);
+    me.setInt("tf/t[1]", y);
   },
   move: func(x, y)
   {
-    me.setInt("x", me.get("x", 0) + x);
-    me.setInt("y", me.get("y", 0) + y);
+    me.setInt("tf/t[0]", me.get("tf/t[0]", 10) + x);
+    me.setInt("tf/t[1]", me.get("tf/t[1]", 30) + y);
   },
   # Raise to top of window stack
   raise: func()
@@ -76,11 +88,22 @@ var Window = {
 # private:
   _propCallback: func(child, mode)
   {
+    if( !me._node.equals(child.getParent()) )
+      return;
+    var name = child.getName();
+
     # support for CSS like position: absolute; with right and/or bottom margin
-    if( child.getName() == "right" )
-      me._handlePositionAbsolute(child, mode, child.getName(), 0);
-    else if( child.getName() == "bottom" )
-      me._handlePositionAbsolute(child, mode, child.getName(), 1);
+    if( name == "right" )
+      me._handlePositionAbsolute(child, mode, name, 0);
+    else if( name == "bottom" )
+      me._handlePositionAbsolute(child, mode, name, 1);
+
+    # update decoration on type change
+    else if( name == "type" )
+    {
+      if( mode == 0 )
+        settimer(func me._updateDecoration(), 0);
+    }
   },
   _handlePositionAbsolute: func(child, mode, name, index)
   {
@@ -112,10 +135,61 @@ var Window = {
   {
     me.setInt
     (
-      index == 0 ? "x" : "y",
+      "tf/t[" ~ index ~ "]",
       getprop("/sim/gui/canvas/size[" ~ index ~ "]")
       - me.get(name)
       - me.get("size[" ~ index ~ "]")
     );
+  },
+  _updateDecoration: func()
+  {
+    var border_radius = 9;
+    me.set("decoration-border", "25 1 1");
+    me.set("shadow-inset", int((1 - math.cos(45 * D2R)) * border_radius + 0.5));
+    me.set("shadow-radius", 5);
+
+    var canvas_deco = me.getCanvasDecoration();
+    canvas_deco.addEventListener("mousedown", func me.raise());
+    canvas_deco.set("blend-source-rgb", "src-alpha");
+    canvas_deco.set("blend-destination-rgb", "one-minus-src-alpha");
+    canvas_deco.set("blend-source-alpha", "one");
+    canvas_deco.set("blend-destination-alpha", "one");
+
+    var group_deco = canvas_deco.getGroup("decoration");
+    var title_bar = group_deco.createChild("group", "title_bar");
+    title_bar.addEventListener("drag", func(e) { me.move(e.deltaX, e.deltaY); });
+    title_bar
+      .rect( 0, 0,
+             me.get("size[0]"),
+             me.get("size[1]"), #25,
+             {"border-top-radius": border_radius} )
+      .setColorFill(0.25,0.24,0.22)
+      .setStrokeLineWidth(0);
+
+    var style_dir = "gui/styles/AmbianceClassic/";
+
+    # close icon
+    var x = 10;
+    var y = 3;
+    var w = 19;
+    var h = 19;
+    var ico = title_bar.createChild("image", "icon-close")
+                       .set("file", style_dir ~ "close_focused_normal.png")
+                       .setTranslation(x,y);
+    ico.addEventListener("click", func me.del());
+    ico.addEventListener("mouseover", func ico.set("file", style_dir ~ "close_focused_prelight.png"));
+    ico.addEventListener("mousedown", func ico.set("file", style_dir ~ "close_focused_pressed.png"));
+    ico.addEventListener("mouseout",  func ico.set("file", style_dir ~ "close_focused_normal.png"));
+
+    # title
+    me._title = title_bar.createChild("text", "title")
+                         .set("alignment", "left-center")
+                         .set("character-size", 14)
+                         .set("font", "LiberationFonts/LiberationSans-Bold.ttf")
+                         .setTranslation(x + 1.5 * w, y + 0.5 * h);
+
+    var title = me.get("title", "Canvas Dialog");
+    me._node.getNode("title", 1).alias(me._title._node.getPath() ~ "/text");
+    me.set("title", title);
   }
 };
diff --git a/gui/images/shadow.png b/gui/images/shadow.png
new file mode 100644
index 000000000..597d7a7c6
Binary files /dev/null and b/gui/images/shadow.png differ
diff --git a/gui/styles/AmbianceClassic/close_focused_normal.png b/gui/styles/AmbianceClassic/close_focused_normal.png
new file mode 100644
index 000000000..72e3b9cb3
Binary files /dev/null and b/gui/styles/AmbianceClassic/close_focused_normal.png differ
diff --git a/gui/styles/AmbianceClassic/close_focused_prelight.png b/gui/styles/AmbianceClassic/close_focused_prelight.png
new file mode 100644
index 000000000..5768c54c1
Binary files /dev/null and b/gui/styles/AmbianceClassic/close_focused_prelight.png differ
diff --git a/gui/styles/AmbianceClassic/close_focused_pressed.png b/gui/styles/AmbianceClassic/close_focused_pressed.png
new file mode 100644
index 000000000..590a7c312
Binary files /dev/null and b/gui/styles/AmbianceClassic/close_focused_pressed.png differ