diff --git a/d2compiler/compile.go b/d2compiler/compile.go
index 8afb333a8..9214f23ad 100644
--- a/d2compiler/compile.go
+++ b/d2compiler/compile.go
@@ -85,6 +85,10 @@ func (c *compiler) compileLayersField(g *d2graph.Graph, ir *d2ir.Map, fieldName
 		if f.Map() == nil {
 			continue
 		}
+		if g.GetLayer(f.Name) != nil {
+			c.errorf(f.References[0].AST(), "layer name %v already used by another layer", f.Name)
+			continue
+		}
 		g2 := c.compileLayer(f.Map())
 		g2.Name = f.Name
 		switch fieldName {
diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
index 3168c53f0..5e25a92a8 100644
--- a/d2compiler/compile_test.go
+++ b/d2compiler/compile_test.go
@@ -2003,6 +2003,24 @@ layers: {
 				assert.Equal(t, 2, len(g.Layers[1].Steps))
 			},
 		},
+		{
+			name: "recursive",
+			run: func(t *testing.T) {
+				assertCompile(t, `base
+
+layers: {
+  one: {
+    santa
+  }
+}
+steps: {
+	one: {
+		clause
+	}
+}
+`, `d2/testdata/d2compiler/TestCompile2/scenarios/recursive#01.d2:9:2: layer name one already used by another layer`)
+			},
+		},
 	}
 
 	for _, tc := range tca {
diff --git a/d2exporter/export.go b/d2exporter/export.go
index 9706365f0..86b6fc559 100644
--- a/d2exporter/export.go
+++ b/d2exporter/export.go
@@ -4,18 +4,20 @@ import (
 	"context"
 	"strconv"
 
+	"oss.terrastruct.com/util-go/go2"
+
 	"oss.terrastruct.com/d2/d2graph"
 	"oss.terrastruct.com/d2/d2renderers/d2fonts"
 	"oss.terrastruct.com/d2/d2target"
 	"oss.terrastruct.com/d2/d2themes"
 	"oss.terrastruct.com/d2/d2themes/d2themescatalog"
-	"oss.terrastruct.com/util-go/go2"
 )
 
 func Export(ctx context.Context, g *d2graph.Graph, themeID int64, fontFamily *d2fonts.FontFamily) (*d2target.Diagram, error) {
 	theme := d2themescatalog.Find(themeID)
 
 	diagram := d2target.NewDiagram()
+	diagram.Name = g.Name
 	if fontFamily == nil {
 		fontFamily = go2.Pointer(d2fonts.SourceSansPro)
 	}
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
index 8fb930384..ced42fd4f 100644
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@@ -1384,3 +1384,22 @@ func init() {
 		NearConstants[k] = struct{}{}
 	}
 }
+
+func (g *Graph) GetLayer(name string) *Graph {
+	for _, l := range g.Layers {
+		if l.Name == name {
+			return l
+		}
+	}
+	for _, l := range g.Scenarios {
+		if l.Name == name {
+			return l
+		}
+	}
+	for _, l := range g.Steps {
+		if l.Name == name {
+			return l
+		}
+	}
+	return nil
+}
diff --git a/d2lib/d2.go b/d2lib/d2.go
index bfe9713a9..413a5eba8 100644
--- a/d2lib/d2.go
+++ b/d2lib/d2.go
@@ -44,32 +44,68 @@ func Compile(ctx context.Context, input string, opts *CompileOptions) (*d2target
 		return nil, nil, err
 	}
 
+	d, err := compile(ctx, g, opts)
+	if err != nil {
+		return nil, nil, err
+	}
+	return d, g, nil
+}
+
+func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2target.Diagram, error) {
 	if len(g.Objects) > 0 {
-		err = g.SetDimensions(opts.MeasuredTexts, opts.Ruler, opts.FontFamily)
+		err := g.SetDimensions(opts.MeasuredTexts, opts.Ruler, opts.FontFamily)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
 		coreLayout, err := getLayout(opts)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
 		constantNears := d2near.WithoutConstantNears(ctx, g)
 
 		err = d2sequence.Layout(ctx, g, coreLayout)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
 		err = d2near.Layout(ctx, g, constantNears)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 	}
 
-	diagram, err := d2exporter.Export(ctx, g, opts.ThemeID, opts.FontFamily)
-	return diagram, g, err
+	d, err := d2exporter.Export(ctx, g, opts.ThemeID, opts.FontFamily)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, l := range g.Layers {
+		ld, err := compile(ctx, l, opts)
+		if err != nil {
+			return nil, err
+		}
+		ld.Type = "layer"
+		d.Layers = append(d.Layers, ld)
+	}
+	for _, l := range g.Scenarios {
+		ld, err := compile(ctx, l, opts)
+		if err != nil {
+			return nil, err
+		}
+		ld.Type = "scenario"
+		d.Scenarios = append(d.Scenarios, ld)
+	}
+	for _, l := range g.Steps {
+		ld, err := compile(ctx, l, opts)
+		if err != nil {
+			return nil, err
+		}
+		ld.Type = "step"
+		d.Steps = append(d.Steps, ld)
+	}
+	return d, nil
 }
 
 func getLayout(opts *CompileOptions) (func(context.Context, *d2graph.Graph) error, error) {
diff --git a/d2target/d2target.go b/d2target/d2target.go
index 776f777f8..e88a01341 100644
--- a/d2target/d2target.go
+++ b/d2target/d2target.go
@@ -28,11 +28,16 @@ const (
 
 type Diagram struct {
 	Name        string              `json:"name"`
+	Type        string              `json:"type"`
 	Description string              `json:"description,omitempty"`
 	FontFamily  *d2fonts.FontFamily `json:"fontFamily,omitempty"`
 
 	Shapes      []Shape      `json:"shapes"`
 	Connections []Connection `json:"connections"`
+
+	Layers    []*Diagram `json:"layers"`
+	Scenarios []*Diagram `json:"scenarios"`
+	Steps     []*Diagram `json:"steps"`
 }
 
 func (diagram Diagram) HashID() (string, error) {
diff --git a/e2etests/testdata/measured/empty-class/dagre/board.exp.json b/e2etests/testdata/measured/empty-class/dagre/board.exp.json
index 1f92e5b45..d252dc653 100644
--- a/e2etests/testdata/measured/empty-class/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-class/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -45,5 +46,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
index bf4da9d37..2ad6ac348 100644
--- a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
@@ -1,10 +1,11 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
       "id": "a",
-      "type": "",
+      "type": "rectangle",
       "pos": {
         "x": 0,
         "y": 0
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg
index 1acdbb250..e989e9c0d 100644
--- a/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg
+++ b/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg
@@ -39,7 +39,7 @@ width="304" height="304" viewBox="-102 -102 304 304"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="a"><g class="shape" ><rect x="0" y="0" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><mask id="1236167803" maskUnits="userSpaceOnUse" x="-100" y="-100" width="304" height="304">
+]]></script><g id="a"><g class="shape" ><rect x="0" y="0" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><mask id="677029166" maskUnits="userSpaceOnUse" x="-100" y="-100" width="304" height="304">
 <rect x="-100" y="-100" width="304" height="304" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[]]></style></svg>
\ No newline at end of file
diff --git a/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json b/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json
index dcd887dd3..7989809d1 100644
--- a/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -45,5 +46,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json
index 76e98b3ff..415b1eeb0 100644
--- a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json
+++ b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -120,5 +121,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json
index e78e3b9d2..2727081e4 100644
--- a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json
+++ b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -120,5 +121,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json
index fc16fe6f9..19568aff2 100644
--- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -388,5 +389,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json
index b1cb0d7c2..2b9287bfe 100644
--- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -377,5 +378,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json
index e18cc0d32..b63387d1c 100644
--- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -436,5 +437,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json
index 62acfa097..588b6a03f 100644
--- a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -400,5 +401,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json b/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json
index 4809d833b..c6318c709 100644
--- a/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -428,5 +429,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json
index c52bda828..1dfce7f33 100644
--- a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -417,5 +418,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
index b89cea9d4..e1d120f4a 100644
--- a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -948,5 +949,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
index f6e90e546..762eff843 100644
--- a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -876,5 +877,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json
index 2b81df1ac..ab57a4af1 100644
--- a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -103,5 +104,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json
index 2a47be779..754b0c6f6 100644
--- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -103,5 +104,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json
index 4db9f807e..b5d6460d7 100644
--- a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -208,5 +209,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json b/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json
index 301aebfe1..a2d06b8a5 100644
--- a/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -171,5 +172,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/elk_order/dagre/board.exp.json b/e2etests/testdata/regression/elk_order/dagre/board.exp.json
index 04269e594..30cb37b0f 100644
--- a/e2etests/testdata/regression/elk_order/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_order/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -671,5 +672,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/elk_order/elk/board.exp.json b/e2etests/testdata/regression/elk_order/elk/board.exp.json
index 2c9dc79b4..94dbcde40 100644
--- a/e2etests/testdata/regression/elk_order/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_order/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -635,5 +636,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
index 63644901e..e552e75e3 100644
--- a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
+++ b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
index 3fd0b10ce..beab1a1ed 100644
--- a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
+++ b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json b/e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json
+++ b/e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json b/e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json
+++ b/e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
index 3523e0d7e..eda9b7ed0 100644
--- a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
+++ b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/no-lexer/elk/board.exp.json b/e2etests/testdata/regression/no-lexer/elk/board.exp.json
index 5b1bd0c73..d951451e6 100644
--- a/e2etests/testdata/regression/no-lexer/elk/board.exp.json
+++ b/e2etests/testdata/regression/no-lexer/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json b/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json
index c35935f77..ac453a7b7 100644
--- a/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json
+++ b/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -255,5 +256,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json
index 31a428a6c..d3c7c37ef 100644
--- a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json
+++ b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -237,5 +238,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json
index 29da4e673..2c37a06c1 100644
--- a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json
+++ b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -171,5 +172,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json b/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json
index 6a885697a..10c92c6f5 100644
--- a/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json
+++ b/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -162,5 +163,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
index 0f363f7a9..03e6a568a 100644
--- a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
+++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -596,5 +597,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json
index 55b8096e3..22ff09184 100644
--- a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json
+++ b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -584,5 +585,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
index b0147081e..15ad7b8be 100644
--- a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
+++ b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -54,5 +55,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/query_param_escape/elk/board.exp.json b/e2etests/testdata/regression/query_param_escape/elk/board.exp.json
index c73ea8993..96f4dfec1 100644
--- a/e2etests/testdata/regression/query_param_escape/elk/board.exp.json
+++ b/e2etests/testdata/regression/query_param_escape/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -54,5 +55,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json
index f1b5a732a..22688e3d4 100644
--- a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -526,5 +527,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json
index 273695734..01e08934f 100644
--- a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -517,5 +518,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json
index b9fc705da..677699b7a 100644
--- a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -162,5 +163,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json
index b9fc705da..677699b7a 100644
--- a/e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -162,5 +163,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json
index 821108802..ed9eab89e 100644
--- a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -216,5 +217,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json
index 821108802..ed9eab89e 100644
--- a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -216,5 +217,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
index 019dcf923..66a90f66d 100644
--- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
index 6b0307c7c..0eeb1cebf 100644
--- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
+++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json
index ff6ae826c..60eac7648 100644
--- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json
+++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -396,5 +397,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json
index 424b26d84..53a84f9dd 100644
--- a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json
+++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -378,5 +379,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json
index f1989ffca..bd2292653 100644
--- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -220,5 +221,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json
index 9d6fb4521..85d19f8f7 100644
--- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json
+++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -210,5 +211,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/basic/dagre/board.exp.json b/e2etests/testdata/sanity/basic/dagre/board.exp.json
index bfe80ce58..916be1db0 100644
--- a/e2etests/testdata/sanity/basic/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/basic/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/basic/elk/board.exp.json b/e2etests/testdata/sanity/basic/elk/board.exp.json
index 6436ed18d..1983fc784 100644
--- a/e2etests/testdata/sanity/basic/elk/board.exp.json
+++ b/e2etests/testdata/sanity/basic/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json
index 0d7169bfd..5e30e4a01 100644
--- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -224,5 +225,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json
index 09fa35ea3..161d2b11d 100644
--- a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json
+++ b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -203,5 +204,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
index 41ab1cfdb..dd7d4047c 100644
--- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json
index d6fe6c684..d863229fd 100644
--- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json
+++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/empty/dagre/board.exp.json b/e2etests/testdata/sanity/empty/dagre/board.exp.json
index 57a381554..0c4d27d14 100644
--- a/e2etests/testdata/sanity/empty/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/empty/dagre/board.exp.json
@@ -1,6 +1,10 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/sanity/empty/elk/board.exp.json b/e2etests/testdata/sanity/empty/elk/board.exp.json
index 57a381554..0c4d27d14 100644
--- a/e2etests/testdata/sanity/empty/elk/board.exp.json
+++ b/e2etests/testdata/sanity/empty/elk/board.exp.json
@@ -1,6 +1,10 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
index 97f3baf20..61a09a4e3 100644
--- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1212,5 +1213,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json
index a05349cb8..b544c692d 100644
--- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1113,5 +1114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
index a02b7be57..35248416e 100644
--- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1212,5 +1213,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
index 5a2cd296e..f3568d463 100644
--- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1113,5 +1114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
index a02b7be57..35248416e 100644
--- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1212,5 +1213,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
index 5a2cd296e..f3568d463 100644
--- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1113,5 +1114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/animated/dagre/board.exp.json b/e2etests/testdata/stable/animated/dagre/board.exp.json
index 54190534c..3f324de5e 100644
--- a/e2etests/testdata/stable/animated/dagre/board.exp.json
+++ b/e2etests/testdata/stable/animated/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -908,5 +909,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/animated/elk/board.exp.json b/e2etests/testdata/stable/animated/elk/board.exp.json
index c460dca33..5ad929580 100644
--- a/e2etests/testdata/stable/animated/elk/board.exp.json
+++ b/e2etests/testdata/stable/animated/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -860,5 +861,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
index 2f9337bb5..60b2797ce 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -451,5 +452,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
index b7afdc65f..fa20c256d 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -390,5 +391,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
index 05be129dc..1a4bfc32b 100644
--- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
index 2d9c9c8f9..56a6ae4a1 100644
--- a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
index 8e8458ee6..fc2ef080a 100644
--- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
+++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1276,5 +1277,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json
index edae9a020..ee66e16a2 100644
--- a/e2etests/testdata/stable/binary_tree/elk/board.exp.json
+++ b/e2etests/testdata/stable/binary_tree/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1206,5 +1207,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/border-radius/dagre/board.exp.json b/e2etests/testdata/stable/border-radius/dagre/board.exp.json
index 1b10e354e..b3bb6c731 100644
--- a/e2etests/testdata/stable/border-radius/dagre/board.exp.json
+++ b/e2etests/testdata/stable/border-radius/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -83,5 +84,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/border-radius/elk/board.exp.json b/e2etests/testdata/stable/border-radius/elk/board.exp.json
index 48a1e7558..548b6920c 100644
--- a/e2etests/testdata/stable/border-radius/elk/board.exp.json
+++ b/e2etests/testdata/stable/border-radius/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -83,5 +84,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/chaos1/dagre/board.exp.json b/e2etests/testdata/stable/chaos1/dagre/board.exp.json
index c4aa2c236..67b22e432 100644
--- a/e2etests/testdata/stable/chaos1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/chaos1/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -300,5 +301,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/chaos1/elk/board.exp.json b/e2etests/testdata/stable/chaos1/elk/board.exp.json
index 32bffa54e..f36cc966c 100644
--- a/e2etests/testdata/stable/chaos1/elk/board.exp.json
+++ b/e2etests/testdata/stable/chaos1/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -282,5 +283,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
index 0dc37d742..49eb4037f 100644
--- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1231,5 +1232,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json
index 9a58a20cc..1894d8657 100644
--- a/e2etests/testdata/stable/chaos2/elk/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1134,5 +1135,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json
index 6404a9b86..602e988ae 100644
--- a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json
+++ b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -371,5 +372,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json
index d19f7a4d8..942b6f15a 100644
--- a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json
+++ b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -289,5 +290,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
index 834dde685..6631e510b 100644
--- a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -260,5 +261,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
index 7bd3342e9..319ce35e1 100644
--- a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -242,5 +243,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
index 2c67e2181..8edc1c9d8 100644
--- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
+++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -316,5 +317,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
index 98feb0c0c..f32c59517 100644
--- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
+++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -280,5 +281,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/class/dagre/board.exp.json b/e2etests/testdata/stable/class/dagre/board.exp.json
index ada2bfc60..2723662c5 100644
--- a/e2etests/testdata/stable/class/dagre/board.exp.json
+++ b/e2etests/testdata/stable/class/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -77,5 +78,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json
index 438953ee7..af79e723c 100644
--- a/e2etests/testdata/stable/class/elk/board.exp.json
+++ b/e2etests/testdata/stable/class/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -77,5 +78,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
index b4947b21e..b8d35c729 100644
--- a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
+++ b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json
index 82dbf2ea8..c5fef80e3 100644
--- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json
+++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json
index bfb88a5d4..cd70e20c9 100644
--- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json
+++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -416,5 +417,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json
index 5bba23384..ca87dd8fe 100644
--- a/e2etests/testdata/stable/connected_container/elk/board.exp.json
+++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -362,5 +363,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json b/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json
index cb631d590..e4c914df7 100644
--- a/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -452,5 +453,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json b/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json
index 8c19dd34b..931187387 100644
--- a/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -443,5 +444,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json
index 2e7100d8a..2a98aaeaa 100644
--- a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -496,5 +497,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json
index 164571833..d4777805a 100644
--- a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -455,5 +456,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json
index dbd00d8b1..61537365f 100644
--- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json
+++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -615,5 +616,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json
index 37be8bc83..fa806d02e 100644
--- a/e2etests/testdata/stable/container_edges/elk/board.exp.json
+++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -590,5 +591,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json
index f888b903a..5f6e964d6 100644
--- a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -564,5 +565,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json
index 875e81938..a452e91d1 100644
--- a/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -527,5 +528,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json
index 72ebecd6f..79ba3c764 100644
--- a/e2etests/testdata/stable/dense/dagre/board.exp.json
+++ b/e2etests/testdata/stable/dense/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1968,5 +1969,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json
index 397eff492..b490c0024 100644
--- a/e2etests/testdata/stable/dense/elk/board.exp.json
+++ b/e2etests/testdata/stable/dense/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1772,5 +1773,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
index 0cd930c75..f9c2c5d9f 100644
--- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
+++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1730,5 +1731,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
index 89b278577..47836714b 100644
--- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
+++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1634,5 +1635,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json
index 400037184..66982db66 100644
--- a/e2etests/testdata/stable/direction/dagre/board.exp.json
+++ b/e2etests/testdata/stable/direction/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1162,5 +1163,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/direction/elk/board.exp.json b/e2etests/testdata/stable/direction/elk/board.exp.json
index 51999a6e1..36f6fbd02 100644
--- a/e2etests/testdata/stable/direction/elk/board.exp.json
+++ b/e2etests/testdata/stable/direction/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1072,5 +1073,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json
index e97910b6e..9752a0099 100644
--- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json
index a5fc0a67b..f5617e371 100644
--- a/e2etests/testdata/stable/font_colors/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_colors/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
index 2f991d687..c6527ee2e 100644
--- a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -629,5 +630,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json
index 9a3d1ae90..c9ab8ccd6 100644
--- a/e2etests/testdata/stable/font_sizes/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -602,5 +603,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json
+++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json
+++ b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/hr/dagre/board.exp.json b/e2etests/testdata/stable/hr/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/hr/dagre/board.exp.json
+++ b/e2etests/testdata/stable/hr/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/hr/elk/board.exp.json
+++ b/e2etests/testdata/stable/hr/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/icon-label/dagre/board.exp.json b/e2etests/testdata/stable/icon-label/dagre/board.exp.json
index bb215f1b9..8092ead34 100644
--- a/e2etests/testdata/stable/icon-label/dagre/board.exp.json
+++ b/e2etests/testdata/stable/icon-label/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -54,5 +55,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/icon-label/elk/board.exp.json b/e2etests/testdata/stable/icon-label/elk/board.exp.json
index 0ff31a1ea..23ac4e165 100644
--- a/e2etests/testdata/stable/icon-label/elk/board.exp.json
+++ b/e2etests/testdata/stable/icon-label/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -54,5 +55,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json
index 27fa73e64..6d7b18e42 100644
--- a/e2etests/testdata/stable/images/dagre/board.exp.json
+++ b/e2etests/testdata/stable/images/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -154,5 +155,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/images/elk/board.exp.json b/e2etests/testdata/stable/images/elk/board.exp.json
index 7594c85d2..56df7d02c 100644
--- a/e2etests/testdata/stable/images/elk/board.exp.json
+++ b/e2etests/testdata/stable/images/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -145,5 +146,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json
index 4bc80bb52..0e8726e71 100644
--- a/e2etests/testdata/stable/investigate/dagre/board.exp.json
+++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -3246,5 +3247,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json
index ebee05a63..3406a3237 100644
--- a/e2etests/testdata/stable/investigate/elk/board.exp.json
+++ b/e2etests/testdata/stable/investigate/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -2400,5 +2401,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json
index a9e93d188..fd31093d9 100644
--- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json
+++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -2632,5 +2633,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json
index 31c512aed..5b1f95e4a 100644
--- a/e2etests/testdata/stable/large_arch/elk/board.exp.json
+++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -2145,5 +2146,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json
index 7ac08fb00..58515b144 100644
--- a/e2etests/testdata/stable/latex/dagre/board.exp.json
+++ b/e2etests/testdata/stable/latex/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -529,5 +530,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json
index 14be2fd2d..e3cf521a7 100644
--- a/e2etests/testdata/stable/latex/elk/board.exp.json
+++ b/e2etests/testdata/stable/latex/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -499,5 +500,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/li1/dagre/board.exp.json b/e2etests/testdata/stable/li1/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/li1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li1/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/li1/elk/board.exp.json b/e2etests/testdata/stable/li1/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/li1/elk/board.exp.json
+++ b/e2etests/testdata/stable/li1/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/li2/dagre/board.exp.json b/e2etests/testdata/stable/li2/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/li2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li2/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/li2/elk/board.exp.json b/e2etests/testdata/stable/li2/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/li2/elk/board.exp.json
+++ b/e2etests/testdata/stable/li2/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/li3/dagre/board.exp.json b/e2etests/testdata/stable/li3/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/li3/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li3/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/li3/elk/board.exp.json b/e2etests/testdata/stable/li3/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/li3/elk/board.exp.json
+++ b/e2etests/testdata/stable/li3/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/li4/dagre/board.exp.json b/e2etests/testdata/stable/li4/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/li4/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li4/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/li4/elk/board.exp.json b/e2etests/testdata/stable/li4/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/li4/elk/board.exp.json
+++ b/e2etests/testdata/stable/li4/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/links/dagre/board.exp.json b/e2etests/testdata/stable/links/dagre/board.exp.json
index 81d877183..600f94c66 100644
--- a/e2etests/testdata/stable/links/dagre/board.exp.json
+++ b/e2etests/testdata/stable/links/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/links/elk/board.exp.json b/e2etests/testdata/stable/links/elk/board.exp.json
index de7f6b024..7af95fe9e 100644
--- a/e2etests/testdata/stable/links/elk/board.exp.json
+++ b/e2etests/testdata/stable/links/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/lone_h1/elk/board.exp.json b/e2etests/testdata/stable/lone_h1/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/lone_h1/elk/board.exp.json
+++ b/e2etests/testdata/stable/lone_h1/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/markdown/dagre/board.exp.json b/e2etests/testdata/stable/markdown/dagre/board.exp.json
index 2f0ec56b3..6a82972e4 100644
--- a/e2etests/testdata/stable/markdown/dagre/board.exp.json
+++ b/e2etests/testdata/stable/markdown/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/markdown/elk/board.exp.json b/e2etests/testdata/stable/markdown/elk/board.exp.json
index 4208359a7..763ebc6af 100644
--- a/e2etests/testdata/stable/markdown/elk/board.exp.json
+++ b/e2etests/testdata/stable/markdown/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json
index ef95474c4..751968efb 100644
--- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json
+++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -170,5 +171,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json b/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json
index 813f43923..c3db623bf 100644
--- a/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json
+++ b/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -161,5 +162,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json
index 539f204b8..319b061c4 100644
--- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -82,5 +83,8 @@
       "level": 2
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json
index be11d7dee..bbd6f48b6 100644
--- a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -82,5 +83,8 @@
       "level": 2
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json
index 539f204b8..319b061c4 100644
--- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -82,5 +83,8 @@
       "level": 2
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json
index be11d7dee..bbd6f48b6 100644
--- a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -82,5 +83,8 @@
       "level": 2
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
index 381276777..a56ddae05 100644
--- a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
+++ b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -43,5 +44,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/multiline_text/elk/board.exp.json b/e2etests/testdata/stable/multiline_text/elk/board.exp.json
index 02cc8b2cd..b29f59c45 100644
--- a/e2etests/testdata/stable/multiline_text/elk/board.exp.json
+++ b/e2etests/testdata/stable/multiline_text/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -43,5 +44,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
index 257aa261d..a436e1948 100644
--- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
+++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1980,5 +1981,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
index 110d86098..75a095705 100644
--- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
+++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1878,5 +1879,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
index 7b19244a3..eb337961a 100644
--- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
+++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -2812,5 +2813,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json
index 0fd7c3bcc..e8364ae4b 100644
--- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json
+++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -2315,5 +2316,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/near-alone/dagre/board.exp.json b/e2etests/testdata/stable/near-alone/dagre/board.exp.json
index 846ace044..efcaa08d9 100644
--- a/e2etests/testdata/stable/near-alone/dagre/board.exp.json
+++ b/e2etests/testdata/stable/near-alone/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/near-alone/elk/board.exp.json b/e2etests/testdata/stable/near-alone/elk/board.exp.json
index 846ace044..efcaa08d9 100644
--- a/e2etests/testdata/stable/near-alone/elk/board.exp.json
+++ b/e2etests/testdata/stable/near-alone/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/number_connections/dagre/board.exp.json b/e2etests/testdata/stable/number_connections/dagre/board.exp.json
index ae219240e..1d9dcd359 100644
--- a/e2etests/testdata/stable/number_connections/dagre/board.exp.json
+++ b/e2etests/testdata/stable/number_connections/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -260,5 +261,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/number_connections/elk/board.exp.json b/e2etests/testdata/stable/number_connections/elk/board.exp.json
index 6470faf82..038d87549 100644
--- a/e2etests/testdata/stable/number_connections/elk/board.exp.json
+++ b/e2etests/testdata/stable/number_connections/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -242,5 +243,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json
index c37488b62..b75872a87 100644
--- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json
+++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -768,5 +769,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json
index cdee99f5c..c2f9e090e 100644
--- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json
+++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -629,5 +630,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json
index 7fa966e71..cc9fb991e 100644
--- a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json
+++ b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -572,5 +573,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json
index 95c206b34..401287523 100644
--- a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json
+++ b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -550,5 +551,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
index 699e36fdc..936ba5864 100644
--- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
+++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -948,5 +949,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json
index 68d5257a3..b6ef26727 100644
--- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json
+++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -925,5 +926,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/p/dagre/board.exp.json b/e2etests/testdata/stable/p/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/p/dagre/board.exp.json
+++ b/e2etests/testdata/stable/p/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/p/elk/board.exp.json b/e2etests/testdata/stable/p/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/p/elk/board.exp.json
+++ b/e2etests/testdata/stable/p/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/pre/dagre/board.exp.json b/e2etests/testdata/stable/pre/dagre/board.exp.json
index bdae01f3e..6018807a4 100644
--- a/e2etests/testdata/stable/pre/dagre/board.exp.json
+++ b/e2etests/testdata/stable/pre/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json
index 80332ab06..a5886f5ec 100644
--- a/e2etests/testdata/stable/pre/elk/board.exp.json
+++ b/e2etests/testdata/stable/pre/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
index 2934816a9..7bedfa2bf 100644
--- a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
+++ b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -472,5 +473,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/self-referencing/elk/board.exp.json b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
index aa4c3d033..16b70dec8 100644
--- a/e2etests/testdata/stable/self-referencing/elk/board.exp.json
+++ b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -351,5 +352,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json b/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json
index 040f3424f..970ef19c1 100644
--- a/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -365,5 +366,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json b/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json
index 040f3424f..970ef19c1 100644
--- a/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -365,5 +366,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json
index 53ab2c525..d5116b11d 100644
--- a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -712,5 +713,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json
index 53ab2c525..d5116b11d 100644
--- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -712,5 +713,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json
index 1ef7565ef..f028c85e8 100644
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -2410,5 +2411,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json
index 1ef7565ef..f028c85e8 100644
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -2410,5 +2411,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json
index f31b189bf..4e3dd1cd8 100644
--- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -240,5 +241,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json
index f31b189bf..4e3dd1cd8 100644
--- a/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -240,5 +241,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json
index 7b5863078..a1fa23247 100644
--- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1107,5 +1108,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json
index 7b5863078..a1fa23247 100644
--- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1107,5 +1108,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json
index 5a1afad45..e3122c216 100644
--- a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -281,5 +282,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json
index 5a1afad45..e3122c216 100644
--- a/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -281,5 +282,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json
index 458c11dd2..f8c0521bb 100644
--- a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1112,5 +1113,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json
index 458c11dd2..f8c0521bb 100644
--- a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1112,5 +1113,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json
index 6c4f8770e..07a4f2555 100644
--- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1492,5 +1493,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json
index 6c4f8770e..07a4f2555 100644
--- a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1492,5 +1493,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json
index 8009e568a..ac256f8da 100644
--- a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -597,5 +598,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json
index 8009e568a..ac256f8da 100644
--- a/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -597,5 +598,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json
index c05cedfc3..7dcd02919 100644
--- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1420,5 +1421,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json
index 58d38946a..ffb737d4e 100644
--- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1420,5 +1421,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json
index 809a1ab6f..cd5114e86 100644
--- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -662,5 +663,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json
index 809a1ab6f..cd5114e86 100644
--- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -662,5 +663,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json
index 12151f27a..895b55245 100644
--- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -789,5 +790,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json
index 12151f27a..895b55245 100644
--- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -789,5 +790,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json
index 565fc7f8a..dc023ebc9 100644
--- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1414,5 +1415,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json
index 565fc7f8a..dc023ebc9 100644
--- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1414,5 +1415,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
index 0da668641..69b34c10a 100644
--- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -4853,5 +4854,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
index 90a925c15..2bd14b56f 100644
--- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -4772,5 +4773,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json
index 988bba089..a9c503abb 100644
--- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -194,5 +195,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json
index 171b1c0f4..bcb65d699 100644
--- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json
+++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -185,5 +186,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
index 915cc0342..6a69a3d89 100644
--- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -768,5 +769,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json
index c7c9d439b..0ac1851b6 100644
--- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json
+++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -757,5 +758,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json
index cfa632b85..a3b08f953 100644
--- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json
index 50ec0be16..23f9a54e3 100644
--- a/e2etests/testdata/stable/square_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json
index e0805d465..67cd5e07a 100644
--- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json
+++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1724,5 +1725,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json
index 5ab316496..2a1467631 100644
--- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json
+++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1512,5 +1513,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json
index 4a84becbc..442979fff 100644
--- a/e2etests/testdata/stable/stylish/dagre/board.exp.json
+++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -133,5 +134,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json
index a8e49ddec..3ab9fd6a7 100644
--- a/e2etests/testdata/stable/stylish/elk/board.exp.json
+++ b/e2etests/testdata/stable/stylish/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -124,5 +125,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json
index fdb475c2b..2494c51f5 100644
--- a/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -217,5 +218,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json b/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json
index ae4e7c84e..869e454ee 100644
--- a/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json
+++ b/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -207,5 +208,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/tooltips/dagre/board.exp.json b/e2etests/testdata/stable/tooltips/dagre/board.exp.json
index 8baf9da0c..50104fd68 100644
--- a/e2etests/testdata/stable/tooltips/dagre/board.exp.json
+++ b/e2etests/testdata/stable/tooltips/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/tooltips/elk/board.exp.json b/e2etests/testdata/stable/tooltips/elk/board.exp.json
index b0c096ebc..390267cf5 100644
--- a/e2etests/testdata/stable/tooltips/elk/board.exp.json
+++ b/e2etests/testdata/stable/tooltips/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
index bfac93f00..76d3cfce0 100644
--- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -43,5 +44,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
index f1fbff7e1..4ed4149f9 100644
--- a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -43,5 +44,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
index 253b0fbc0..b4627ce5f 100644
--- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -570,5 +571,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
index ca6884730..694baca33 100644
--- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -534,5 +535,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
index ce23b283a..681d02d92 100644
--- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -570,5 +571,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
index 371e7c33f..70c5a09ec 100644
--- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -534,5 +535,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json
index bbbab7732..73b5b191c 100644
--- a/e2etests/testdata/stable/us_map/dagre/board.exp.json
+++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -8280,5 +8281,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json
index a4e050175..fff8ac0b5 100644
--- a/e2etests/testdata/stable/us_map/elk/board.exp.json
+++ b/e2etests/testdata/stable/us_map/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -6904,5 +6905,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json
index 7474c5012..fc6a19cd7 100644
--- a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -220,5 +221,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json
index 9a6ab6934..35d9ae4c7 100644
--- a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -210,5 +211,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/font_sizes_containers_large/dagre/board.exp.json b/e2etests/testdata/todo/font_sizes_containers_large/dagre/board.exp.json
index 31501e6eb..7684b169b 100644
--- a/e2etests/testdata/todo/font_sizes_containers_large/dagre/board.exp.json
+++ b/e2etests/testdata/todo/font_sizes_containers_large/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -203,5 +204,8 @@
       "level": 5
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json
index 2761a62eb..af6246d23 100644
--- a/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json
+++ b/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -203,5 +204,8 @@
       "level": 5
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json b/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json
index 6ec6659b7..f005ce3d2 100644
--- a/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json
+++ b/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -396,5 +397,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json
index d08c6cfa1..25bc0c38a 100644
--- a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json
+++ b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -360,5 +361,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json
index a5a0b22d3..35086f0c1 100644
--- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json
+++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -675,5 +676,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json
index a5a0b22d3..35086f0c1 100644
--- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json
+++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -675,5 +676,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
index f6298e97f..20308e9ee 100644
--- a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
+++ b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1170,5 +1171,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json
index 6cd8b7964..321aed038 100644
--- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json
+++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1092,5 +1093,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json b/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json
index 939a81a70..ef7c1b567 100644
--- a/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json
+++ b/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json b/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json
index 112bd9e93..cc2d161af 100644
--- a/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json
+++ b/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/main.go b/main.go
index c7a0429d9..c81bfa8af 100644
--- a/main.go
+++ b/main.go
@@ -22,6 +22,7 @@ import (
 	"oss.terrastruct.com/d2/d2renderers/d2fonts"
 	"oss.terrastruct.com/d2/d2renderers/d2svg"
 	"oss.terrastruct.com/d2/d2renderers/d2svg/appendix"
+	"oss.terrastruct.com/d2/d2target"
 	"oss.terrastruct.com/d2/d2themes"
 	"oss.terrastruct.com/d2/d2themes/d2themescatalog"
 	"oss.terrastruct.com/d2/lib/imgbundler"
@@ -218,7 +219,6 @@ func run(ctx context.Context, ms *xmain.State) (err error) {
 		}
 		return fmt.Errorf("failed to compile: %w", err)
 	}
-	ms.Log.Success.Printf("successfully compiled %v to %v", inputPath, outputPath)
 	return nil
 }
 
@@ -247,17 +247,53 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketc
 		return nil, false, err
 	}
 
+	svg, err := render(ctx, ms, plugin, sketch, pad, inputPath, outputPath, bundle, page, ruler, diagram)
+	if err != nil {
+		return svg, false, err
+	}
+	return svg, true, nil
+}
+
+func render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketch bool, pad int64, inputPath, outputPath string, bundle bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([]byte, error) {
+	outputPath = layerOutputPath(outputPath, diagram)
+	for _, dl := range diagram.Layers {
+		_, err := render(ctx, ms, plugin, sketch, pad, inputPath, outputPath, bundle, page, ruler, dl)
+		if err != nil {
+			return nil, err
+		}
+	}
+	for _, dl := range diagram.Scenarios {
+		_, err := render(ctx, ms, plugin, sketch, pad, inputPath, outputPath, bundle, page, ruler, dl)
+		if err != nil {
+			return nil, err
+		}
+	}
+	for _, dl := range diagram.Steps {
+		_, err := render(ctx, ms, plugin, sketch, pad, inputPath, outputPath, bundle, page, ruler, dl)
+		if err != nil {
+			return nil, err
+		}
+	}
+	svg, err := _render(ctx, ms, plugin, sketch, pad, outputPath, bundle, page, ruler, diagram)
+	if err != nil {
+		return svg, err
+	}
+	ms.Log.Success.Printf("successfully compiled %v to %v", inputPath, outputPath)
+	return svg, nil
+}
+
+func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketch bool, pad int64, outputPath string, bundle bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([]byte, error) {
 	svg, err := d2svg.Render(diagram, &d2svg.RenderOpts{
 		Pad:    int(pad),
 		Sketch: sketch,
 	})
 	if err != nil {
-		return nil, false, err
+		return nil, err
 	}
 
 	svg, err = plugin.PostProcess(ctx, svg)
 	if err != nil {
-		return svg, false, err
+		return svg, err
 	}
 
 	svg, bundleErr := imgbundler.BundleLocal(ctx, ms, svg)
@@ -279,7 +315,7 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketc
 
 		out, err = png.ConvertSVG(ms, page, svg)
 		if err != nil {
-			return svg, false, err
+			return svg, err
 		}
 	} else {
 		if len(out) > 0 && out[len(out)-1] != '\n' {
@@ -287,12 +323,26 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketc
 		}
 	}
 
+	outputPath = layerOutputPath(outputPath, diagram)
 	err = ms.WritePath(outputPath, out)
 	if err != nil {
-		return svg, false, err
+		return svg, err
 	}
+	if bundleErr != nil {
+		return svg, bundleErr
+	}
+	return svg, nil
+}
 
-	return svg, true, bundleErr
+func layerOutputPath(outputPath string, d *d2target.Diagram) string {
+	if d.Name == "" {
+		return outputPath
+	}
+	ext := filepath.Ext(outputPath)
+	outputPath = strings.TrimSuffix(outputPath, ext)
+	outputPath += "-" + d.Name
+	outputPath += ext
+	return outputPath
 }
 
 // newExt must include leading .
diff --git a/testdata/d2compiler/TestCompile2/scenarios/recursive#01.exp.json b/testdata/d2compiler/TestCompile2/scenarios/recursive#01.exp.json
new file mode 100644
index 000000000..22fa2ae4c
--- /dev/null
+++ b/testdata/d2compiler/TestCompile2/scenarios/recursive#01.exp.json
@@ -0,0 +1,12 @@
+{
+  "graph": null,
+  "err": {
+    "ioerr": null,
+    "errs": [
+      {
+        "range": "d2/testdata/d2compiler/TestCompile2/scenarios/recursive#01.d2,8:1:51-8:4:54",
+        "errmsg": "d2/testdata/d2compiler/TestCompile2/scenarios/recursive#01.d2:9:2: layer name one already used by another layer"
+      }
+    ]
+  }
+}
diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
index d4312d7a6..62458de08 100644
--- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
+++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -113,5 +114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json
index f90c5fb7b..fdc226f93 100644
--- a/testdata/d2exporter/TestExport/connection/basic.exp.json
+++ b/testdata/d2exporter/TestExport/connection/basic.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -113,5 +114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
index 650dffe51..58c13efc0 100644
--- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
+++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -113,5 +114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
index e4381a7a7..632242a0a 100644
--- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
+++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -144,5 +145,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json
index 4722c29fd..9012100b0 100644
--- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json
+++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
index d14209596..93a956338 100644
--- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
+++ b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -113,5 +114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
index f271d7676..191f4545a 100644
--- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
+++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json
index 0b4338e74..002d726a4 100644
--- a/testdata/d2exporter/TestExport/shape/basic.exp.json
+++ b/testdata/d2exporter/TestExport/shape/basic.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json
index b38fe2c44..fe791f3c6 100644
--- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json
+++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
index 1184300e9..beb868d1a 100644
--- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
+++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -53,5 +54,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
index 7408bcaa7..9dde517ed 100644
--- a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
+++ b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -250,5 +251,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json
index 820282971..95e0a72f3 100644
--- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json
+++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -81,5 +82,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json
index b45f95aac..c50980d6f 100644
--- a/testdata/d2exporter/TestExport/shape/text_color.exp.json
+++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
index 23ba623a2..4ad1ec939 100644
--- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -113,5 +114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
index 8b33587da..3f6cb0879 100644
--- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -113,5 +114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
index 148b1cf63..a892c2430 100644
--- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -113,5 +114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
index 36f8f9dde..74898664a 100644
--- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }
diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
index 5d6653b04..da69ad0aa 100644
--- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
+++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }