From e4fac7840f3ac6f6aedec8153fe6b6a916cb82fc Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Mon, 27 Feb 2023 13:34:03 -0800
Subject: [PATCH 1/5] cli: Improve multiboard output

- Boards with subboards are now selfcontained folders with index.svg/png as
  the root board render.
- Boards that are only containers of other boards are not rendered. For example a
  scenario with no modifications and only steps only has its steps
  rendered.
- Boards with sibling boards of another type are rendered under a
  subdirectory indicating their type to separate them. For example a
  board with layers and scenarios has its layers rendered into subfolder
  layers and scenarios into subfolder scenarios.

cc @berniexie see BoardContainer field on d2target.Board for the field
you were looking for to skip renders for PDFs too.
---
 ci/sub                                        |    2 +-
 d2compiler/compile.go                         |    5 +
 d2compiler/compile_test.go                    |   37 +-
 d2exporter/export.go                          |    1 +
 d2graph/d2graph.go                            |    9 +-
 d2ir/d2ir.go                                  |   78 +-
 .../d2sketch/testdata/animated/sketch.exp.svg |    2 +-
 .../testdata/animated_dark/sketch.exp.svg     |    2 +-
 d2target/d2target.go                          |    8 +-
 .../measured/empty-class/dagre/board.exp.json |    1 +
 .../measured/empty-shape/dagre/board.exp.json |    1 +
 .../empty-sql_table/dagre/board.exp.json      |    1 +
 .../ampersand-escape/dagre/board.exp.json     |    1 +
 .../ampersand-escape/elk/board.exp.json       |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre-disconnect/dagre/board.exp.json     |    1 +
 .../dagre-disconnect/elk/board.exp.json       |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../dagre_broken_arrowhead/elk/board.exp.json |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre_special_ids/dagre/board.exp.json    |    1 +
 .../dagre_special_ids/elk/board.exp.json      |    1 +
 .../elk_alignment/dagre/board.exp.json        |    1 +
 .../elk_alignment/elk/board.exp.json          |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../elk_loop_panic/dagre/board.exp.json       |    1 +
 .../elk_loop_panic/elk/board.exp.json         |    1 +
 .../regression/elk_order/dagre/board.exp.json |    1 +
 .../regression/elk_order/elk/board.exp.json   |    1 +
 .../empty_class_height/dagre/board.exp.json   |    1 +
 .../empty_class_height/elk/board.exp.json     |    1 +
 .../empty_sequence/dagre/board.exp.json       |    1 +
 .../empty_sequence/elk/board.exp.json         |    1 +
 .../regression/hex-fill/dagre/board.exp.json  |    1 +
 .../regression/hex-fill/elk/board.exp.json    |    1 +
 .../just-width/dagre/board.exp.json           |    1 +
 .../regression/just-width/elk/board.exp.json  |    1 +
 .../md_h1_li_li/dagre/board.exp.json          |    1 +
 .../regression/md_h1_li_li/elk/board.exp.json |    1 +
 .../nested_steps/dagre/board.exp.json         |    1 +
 .../nested_steps/elk/board.exp.json           |    1 +
 .../regression/no-lexer/dagre/board.exp.json  |    1 +
 .../regression/no-lexer/elk/board.exp.json    |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../opacity-on-label/dagre/board.exp.json     |    1 +
 .../opacity-on-label/elk/board.exp.json       |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../overlapping-edge-label/elk/board.exp.json |    1 +
 .../query_param_escape/dagre/board.exp.json   |    1 +
 .../query_param_escape/elk/board.exp.json     |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../sql_table_overflow/dagre/board.exp.json   |    1 +
 .../sql_table_overflow/elk/board.exp.json     |    1 +
 .../unconnected/dagre/board.exp.json          |    1 +
 .../regression/unconnected/elk/board.exp.json |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../root/border-radius/dagre/board.exp.json   |    1 +
 .../root/border-radius/elk/board.exp.json     |    1 +
 .../root/double-border/dagre/board.exp.json   |    1 +
 .../root/double-border/elk/board.exp.json     |    1 +
 .../even-stroke-width/dagre/board.exp.json    |    1 +
 .../root/even-stroke-width/elk/board.exp.json |    1 +
 .../testdata/root/fill/dagre/board.exp.json   |    1 +
 .../testdata/root/fill/elk/board.exp.json     |    1 +
 .../root/stroke-dash/dagre/board.exp.json     |    1 +
 .../root/stroke-dash/elk/board.exp.json       |    1 +
 .../root/stroke-no-width/dagre/board.exp.json |    1 +
 .../root/stroke-no-width/elk/board.exp.json   |    1 +
 .../root/stroke-width/dagre/board.exp.json    |    1 +
 .../root/stroke-width/elk/board.exp.json      |    1 +
 .../sanity/1_to_2/dagre/board.exp.json        |    1 +
 .../testdata/sanity/1_to_2/elk/board.exp.json |    1 +
 .../sanity/basic/dagre/board.exp.json         |    1 +
 .../testdata/sanity/basic/elk/board.exp.json  |    1 +
 .../child_to_child/dagre/board.exp.json       |    1 +
 .../sanity/child_to_child/elk/board.exp.json  |    1 +
 .../connection_label/dagre/board.exp.json     |    1 +
 .../connection_label/elk/board.exp.json       |    1 +
 .../sanity/empty/dagre/board.exp.json         |    1 +
 .../testdata/sanity/empty/elk/board.exp.json  |    1 +
 .../3d_fill_and_stroke/dagre/board.exp.json   |    1 +
 .../3d_fill_and_stroke/elk/board.exp.json     |    1 +
 .../stable/all_shapes/dagre/board.exp.json    |    1 +
 .../stable/all_shapes/elk/board.exp.json      |    1 +
 .../all_shapes_multiple/dagre/board.exp.json  |    1 +
 .../all_shapes_multiple/elk/board.exp.json    |    1 +
 .../all_shapes_shadow/dagre/board.exp.json    |    1 +
 .../all_shapes_shadow/elk/board.exp.json      |    1 +
 .../stable/animated/dagre/board.exp.json      |    1 +
 .../stable/animated/elk/board.exp.json        |    1 +
 .../arrowhead_adjustment/dagre/board.exp.json |    1 +
 .../arrowhead_adjustment/elk/board.exp.json   |    1 +
 .../arrowhead_labels/dagre/board.exp.json     |    1 +
 .../arrowhead_labels/elk/board.exp.json       |    1 +
 .../stable/binary_tree/dagre/board.exp.json   |    1 +
 .../stable/binary_tree/elk/board.exp.json     |    1 +
 .../stable/border-radius/dagre/board.exp.json |    1 +
 .../stable/border-radius/elk/board.exp.json   |    1 +
 .../stable/chaos2/dagre/board.exp.json        |    1 +
 .../testdata/stable/chaos2/elk/board.exp.json |    1 +
 .../circle_arrowhead/dagre/board.exp.json     |    1 +
 .../circle_arrowhead/elk/board.exp.json       |    1 +
 .../circular_dependency/dagre/board.exp.json  |    1 +
 .../circular_dependency/elk/board.exp.json    |    1 +
 .../stable/class/dagre/board.exp.json         |    1 +
 .../testdata/stable/class/elk/board.exp.json  |    1 +
 .../stable/code_snippet/dagre/board.exp.json  |    1 +
 .../stable/code_snippet/elk/board.exp.json    |    1 +
 .../complex-layers/dagre/board.exp.json       |   10 +
 .../stable/complex-layers/elk/board.exp.json  |   10 +
 .../connected_container/dagre/board.exp.json  |    1 +
 .../connected_container/elk/board.exp.json    |    1 +
 .../constant_near_stress/dagre/board.exp.json |    1 +
 .../constant_near_stress/elk/board.exp.json   |    1 +
 .../constant_near_title/dagre/board.exp.json  |    1 +
 .../constant_near_title/elk/board.exp.json    |    1 +
 .../container_edges/dagre/board.exp.json      |    1 +
 .../stable/container_edges/elk/board.exp.json |    1 +
 .../crow_foot_arrowhead/dagre/board.exp.json  |    1 +
 .../crow_foot_arrowhead/elk/board.exp.json    |    1 +
 .../stable/dense/dagre/board.exp.json         |    1 +
 .../testdata/stable/dense/elk/board.exp.json  |    1 +
 .../different_subgraphs/dagre/board.exp.json  |    1 +
 .../different_subgraphs/elk/board.exp.json    |    1 +
 .../stable/direction/dagre/board.exp.json     |    1 +
 .../stable/direction/elk/board.exp.json       |    1 +
 .../stable/font_colors/dagre/board.exp.json   |    1 +
 .../stable/font_colors/elk/board.exp.json     |    1 +
 .../stable/font_sizes/dagre/board.exp.json    |    1 +
 .../stable/font_sizes/elk/board.exp.json      |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../giant_markdown_test/dagre/board.exp.json  |    1 +
 .../giant_markdown_test/elk/board.exp.json    |    1 +
 .../stable/hexagon_3d/dagre/board.exp.json    |    1 +
 .../stable/hexagon_3d/elk/board.exp.json      |    1 +
 .../testdata/stable/hr/dagre/board.exp.json   |    1 +
 .../testdata/stable/hr/elk/board.exp.json     |    1 +
 .../icon-containers/dagre/board.exp.json      |    1 +
 .../stable/icon-containers/elk/board.exp.json |    1 +
 .../stable/icon-label/dagre/board.exp.json    |    1 +
 .../stable/icon-label/elk/board.exp.json      |    1 +
 .../stable/images/dagre/board.exp.json        |    1 +
 .../testdata/stable/images/elk/board.exp.json |    1 +
 .../stable/investigate/dagre/board.exp.json   |    1 +
 .../stable/investigate/elk/board.exp.json     |    1 +
 .../stable/large_arch/dagre/board.exp.json    |    1 +
 .../stable/large_arch/elk/board.exp.json      |    1 +
 .../stable/latex/dagre/board.exp.json         |    1 +
 .../testdata/stable/latex/elk/board.exp.json  |    1 +
 .../testdata/stable/li1/dagre/board.exp.json  |    1 +
 .../testdata/stable/li1/elk/board.exp.json    |    1 +
 .../testdata/stable/li2/dagre/board.exp.json  |    1 +
 .../testdata/stable/li2/elk/board.exp.json    |    1 +
 .../testdata/stable/li3/dagre/board.exp.json  |    1 +
 .../testdata/stable/li3/elk/board.exp.json    |    1 +
 .../testdata/stable/li4/dagre/board.exp.json  |    1 +
 .../testdata/stable/li4/elk/board.exp.json    |    1 +
 .../stable/links/dagre/board.exp.json         |    1 +
 .../testdata/stable/links/elk/board.exp.json  |    1 +
 .../stable/lone_h1/dagre/board.exp.json       |    1 +
 .../stable/lone_h1/elk/board.exp.json         |    1 +
 .../stable/markdown/dagre/board.exp.json      |    1 +
 .../stable/markdown/elk/board.exp.json        |    1 +
 .../markdown_stroke_fill/dagre/board.exp.json |    1 +
 .../markdown_stroke_fill/elk/board.exp.json   |    1 +
 .../md_2space_newline/dagre/board.exp.json    |    1 +
 .../md_2space_newline/elk/board.exp.json      |    1 +
 .../md_backslash_newline/dagre/board.exp.json |    1 +
 .../md_backslash_newline/elk/board.exp.json   |    1 +
 .../md_code_block_fenced/dagre/board.exp.json |    1 +
 .../md_code_block_fenced/elk/board.exp.json   |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../md_code_block_indented/elk/board.exp.json |    1 +
 .../md_code_inline/dagre/board.exp.json       |    1 +
 .../stable/md_code_inline/elk/board.exp.json  |    1 +
 .../multiline_text/dagre/board.exp.json       |    1 +
 .../stable/multiline_text/elk/board.exp.json  |    1 +
 .../multiple_trees/dagre/board.exp.json       |    1 +
 .../stable/multiple_trees/elk/board.exp.json  |    1 +
 .../stable/n22_e32/dagre/board.exp.json       |    1 +
 .../stable/n22_e32/elk/board.exp.json         |    1 +
 .../stable/near-alone/dagre/board.exp.json    |    1 +
 .../stable/near-alone/elk/board.exp.json      |    1 +
 .../number_connections/dagre/board.exp.json   |    1 +
 .../number_connections/elk/board.exp.json     |    1 +
 .../one_container_loop/dagre/board.exp.json   |    1 +
 .../one_container_loop/elk/board.exp.json     |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../stable/ovals/dagre/board.exp.json         |    1 +
 .../testdata/stable/ovals/elk/board.exp.json  |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../testdata/stable/p/dagre/board.exp.json    |    1 +
 e2etests/testdata/stable/p/elk/board.exp.json |    1 +
 .../stable/people/dagre/board.exp.json        |    1 +
 .../testdata/stable/people/elk/board.exp.json |    1 +
 .../testdata/stable/pre/dagre/board.exp.json  |    1 +
 .../testdata/stable/pre/elk/board.exp.json    |    1 +
 .../self-referencing/dagre/board.exp.json     |    1 +
 .../self-referencing/elk/board.exp.json       |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../sequence_diagram_note/elk/board.exp.json  |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../sequence_diagram_real/elk/board.exp.json  |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../sequence_diagram_span/elk/board.exp.json  |    1 +
 .../sequence_diagrams/dagre/board.exp.json    |    1 +
 .../sequence_diagrams/elk/board.exp.json      |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../stable/sql_tables/dagre/board.exp.json    |    1 +
 .../stable/sql_tables/elk/board.exp.json      |    1 +
 .../stable/square_3d/dagre/board.exp.json     |    1 +
 .../stable/square_3d/elk/board.exp.json       |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../stable/stylish/dagre/board.exp.json       |    1 +
 .../stable/stylish/elk/board.exp.json         |    1 +
 .../text_font_sizes/dagre/board.exp.json      |    1 +
 .../stable/text_font_sizes/elk/board.exp.json |    1 +
 .../stable/tooltips/dagre/board.exp.json      |    1 +
 .../stable/tooltips/elk/board.exp.json        |    1 +
 .../transparent_3d/dagre/board.exp.json       |    1 +
 .../stable/transparent_3d/elk/board.exp.json  |    1 +
 .../unnamed_only_height/dagre/board.exp.json  |    1 +
 .../unnamed_only_height/elk/board.exp.json    |    1 +
 .../unnamed_only_width/dagre/board.exp.json   |    1 +
 .../unnamed_only_width/elk/board.exp.json     |    1 +
 .../stable/us_map/dagre/board.exp.json        |    1 +
 .../testdata/stable/us_map/elk/board.exp.json |    1 +
 .../container_icon_label/dagre/board.exp.json |    1 +
 .../container_icon_label/elk/board.exp.json   |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../elk/board.exp.json                        |    1 +
 .../dagre/board.exp.json                      |    1 +
 .../shape_set_width_height/elk/board.exp.json |    1 +
 .../unicode/chinese/dagre/board.exp.json      |    1 +
 .../unicode/chinese/elk/board.exp.json        |    1 +
 .../unicode/emojis/dagre/board.exp.json       |    1 +
 .../unicode/emojis/elk/board.exp.json         |    1 +
 .../japanese-basic/dagre/board.exp.json       |    1 +
 .../unicode/japanese-basic/elk/board.exp.json |    1 +
 .../japanese-full/dagre/board.exp.json        |    1 +
 .../unicode/japanese-full/elk/board.exp.json  |    1 +
 .../japanese-mixed/dagre/board.exp.json       |    1 +
 .../unicode/japanese-mixed/elk/board.exp.json |    1 +
 .../unicode/korean/dagre/board.exp.json       |    1 +
 .../unicode/korean/elk/board.exp.json         |    1 +
 .../mixed-language-2/dagre/board.exp.json     |    1 +
 .../mixed-language-2/elk/board.exp.json       |    1 +
 .../mixed-language/dagre/board.exp.json       |    1 +
 .../unicode/mixed-language/elk/board.exp.json |    1 +
 .../unicode/with-style/dagre/board.exp.json   |    1 +
 .../unicode/with-style/elk/board.exp.json     |    1 +
 go.mod                                        |    2 +-
 go.sum                                        |    4 +-
 main.go                                       |   76 +-
 .../TestCompile/basic_icon.exp.json           |    1 +
 .../TestCompile/basic_sequence.exp.json       |    1 +
 .../TestCompile/basic_shape.exp.json          |    1 +
 .../TestCompile/basic_style.exp.json          |    1 +
 .../TestCompile/class_paren.exp.json          |    1 +
 .../TestCompile/class_style.exp.json          |    1 +
 .../TestCompile/constraint_label.exp.json     |    1 +
 .../TestCompile/default_direction.exp.json    |    1 +
 .../TestCompile/dimension_with_style.exp.json |    1 +
 .../dimensions_on_containers.exp.json         |    1 +
 .../dimensions_on_nonimage.exp.json           |    1 +
 testdata/d2compiler/TestCompile/edge.exp.json |    1 +
 .../edge_arrowhead_fields.exp.json            |    1 +
 .../TestCompile/edge_chain.exp.json           |    1 +
 .../TestCompile/edge_chain_map.exp.json       |    1 +
 .../TestCompile/edge_column_index.exp.json    |    1 +
 .../TestCompile/edge_exclusive_style.exp.json |    1 +
 .../TestCompile/edge_flat_arrowhead.exp.json  |    1 +
 .../edge_flat_label_arrowhead.exp.json        |    1 +
 .../TestCompile/edge_index.exp.json           |    1 +
 .../TestCompile/edge_index_map.exp.json       |    1 +
 .../TestCompile/edge_index_nested.exp.json    |    1 +
 .../edge_index_nested_cross_scope.exp.json    |    1 +
 .../edge_key_group_flat_nested.exp.json       |    1 +
 ..._key_group_flat_nested_underscore.exp.json |    1 +
 ..._group_map_flat_nested_underscore.exp.json |    1 +
 ...e_key_group_map_nested_underscore.exp.json |    1 +
 .../TestCompile/edge_label_map.exp.json       |    1 +
 .../d2compiler/TestCompile/edge_map.exp.json  |    1 +
 .../TestCompile/edge_map_arrowhead.exp.json   |    1 +
 .../TestCompile/edge_map_group_flat.exp.json  |    1 +
 .../edge_map_group_semiflat.exp.json          |    1 +
 .../TestCompile/edge_map_nested.exp.json      |    1 +
 .../TestCompile/edge_map_nested_flat.exp.json |    1 +
 .../TestCompile/edge_mixed_arrowhead.exp.json |    1 +
 .../edge_non_shape_arrowhead.exp.json         |    1 +
 .../edge_semiflat_arrowhead.exp.json          |    1 +
 .../TestCompile/escaped_id.exp.json           |    1 +
 .../TestCompile/image_style.exp.json          |    1 +
 .../TestCompile/near_constant.exp.json        |    1 +
 .../TestCompile/nested_sql.exp.json           |    1 +
 .../nil_scope_obj_regression.exp.json         |    1 +
 testdata/d2compiler/TestCompile/null.exp.json |    1 +
 .../d2compiler/TestCompile/path_link.exp.json |    1 +
 .../d2compiler/TestCompile/positions.exp.json |    1 +
 .../reserved_icon_near_style.exp.json         |    1 +
 .../TestCompile/root_direction.exp.json       |    1 +
 .../TestCompile/root_sequence.exp.json        |    1 +
 .../TestCompile/self-referencing.exp.json     |    1 +
 .../TestCompile/sequence-timestamp.exp.json   |    1 +
 .../TestCompile/sequence_container.exp.json   |    1 +
 .../TestCompile/sequence_container_2.exp.json |    1 +
 .../sequence_grouped_note.exp.json            |    1 +
 .../TestCompile/sequence_scoping.exp.json     |    1 +
 .../TestCompile/set_direction.exp.json        |    1 +
 .../single_dimension_on_circle.exp.json       |    1 +
 .../TestCompile/sql-regression.exp.json       |    1 +
 .../d2compiler/TestCompile/sql_paren.exp.json |    1 +
 .../TestCompile/stroke-width.exp.json         |    1 +
 .../table_connection_attr.exp.json            |    1 +
 .../TestCompile/table_style.exp.json          |    1 +
 .../TestCompile/table_style_map.exp.json      |    1 +
 .../underscore_connection.exp.json            |    1 +
 .../TestCompile/underscore_edge.exp.json      |    1 +
 .../underscore_edge_chain.exp.json            |    1 +
 .../underscore_edge_existing.exp.json         |    1 +
 .../underscore_edge_index.exp.json            |    1 +
 .../underscore_edge_nested.exp.json           |    1 +
 .../underscore_parent_create.exp.json         |    1 +
 .../underscore_parent_not_root.exp.json       |    1 +
 .../underscore_parent_preference_1.exp.json   |    1 +
 .../underscore_parent_preference_2.exp.json   |    1 +
 .../underscore_parent_squared.exp.json        |    1 +
 .../underscore_unresolved_obj.exp.json        |    1 +
 .../TestCompile/unescaped_id_cr.exp.json      |    1 +
 .../d2compiler/TestCompile/url_link.exp.json  |    1 +
 .../TestCompile/wrong_column_index.exp.json   |    1 +
 .../boards/boardContainer.exp.json            | 1688 +++++++++++++++++
 .../TestCompile2/boards/recursive.exp.json    |    5 +
 .../TestCompile2/boards/root.exp.json         |    3 +
 .../TestExport/connection/arrowhead.exp.json  |    1 +
 .../TestExport/connection/basic.exp.json      |    1 +
 .../connection/stroke-dash.exp.json           |    1 +
 .../connection/theme_stroke-dash.exp.json     |    1 +
 .../TestExport/label/basic_shape.exp.json     |    1 +
 .../label/connection_font_color.exp.json      |    1 +
 .../label/shape_font_color.exp.json           |    1 +
 .../TestExport/shape/basic.exp.json           |    1 +
 .../TestExport/shape/border-radius.exp.json   |    1 +
 .../shape/image_dimensions.exp.json           |    1 +
 .../shape/sequence_group_position.exp.json    |    1 +
 .../TestExport/shape/synonyms.exp.json        |    1 +
 .../TestExport/shape/text_color.exp.json      |    1 +
 .../theme/connection_with_bold.exp.json       |    1 +
 .../theme/connection_with_italic.exp.json     |    1 +
 .../theme/connection_without_italic.exp.json  |    1 +
 .../theme/shape_with_italic.exp.json          |    1 +
 .../theme/shape_without_bold.exp.json         |    1 +
 testdata/d2oracle/TestCreate/base.exp.json    |    1 +
 .../d2oracle/TestCreate/container.exp.json    |    1 +
 .../TestCreate/container_edge.exp.json        |    1 +
 .../TestCreate/container_edge_label.exp.json  |    1 +
 testdata/d2oracle/TestCreate/edge.exp.json    |    1 +
 .../d2oracle/TestCreate/edge_nested.exp.json  |    1 +
 .../d2oracle/TestCreate/edge_scope.exp.json   |    1 +
 .../TestCreate/edge_scope_flat.exp.json       |    1 +
 .../TestCreate/edge_scope_nested.exp.json     |    1 +
 .../d2oracle/TestCreate/edge_unique.exp.json  |    1 +
 testdata/d2oracle/TestCreate/gen_key.exp.json |    1 +
 .../d2oracle/TestCreate/gen_key_n.exp.json    |    1 +
 .../TestCreate/gen_key_nested.exp.json        |    1 +
 .../TestCreate/gen_key_scope.exp.json         |    1 +
 .../TestCreate/gen_key_suffix.exp.json        |    1 +
 .../TestCreate/make_scope_multiline.exp.json  |    1 +
 .../make_scope_multiline_spacing_1.exp.json   |    1 +
 .../make_scope_multiline_spacing_2.exp.json   |    1 +
 testdata/d2oracle/TestCreate/nested.exp.json  |    1 +
 testdata/d2oracle/TestCreate/scope.exp.json   |    1 +
 .../d2oracle/TestDelete/arrowhead.exp.json    |    1 +
 .../TestDelete/arrowhead_label.exp.json       |    1 +
 .../TestDelete/arrowhead_map.exp.json         |    1 +
 .../TestDelete/arrowhead_shape.exp.json       |    1 +
 .../TestDelete/breakup_arrowhead.exp.json     |    1 +
 testdata/d2oracle/TestDelete/chaos_1.exp.json |    1 +
 .../d2oracle/TestDelete/children.exp.json     |    1 +
 .../TestDelete/children_conflicts.exp.json    |    1 +
 .../children_edge_conflicts.exp.json          |    1 +
 .../children_edges_flat_conflicts.exp.json    |    1 +
 .../children_flat_conflicts.exp.json          |    1 +
 .../children_multiple_conflicts.exp.json      |    1 +
 .../children_nested_conflicts.exp.json        |    1 +
 ...ldren_nested_referenced_conflicts.exp.json |    1 +
 .../children_no_self_conflict.exp.json        |    1 +
 .../TestDelete/children_order.exp.json        |    1 +
 .../children_referenced_conflicts.exp.json    |    1 +
 .../TestDelete/children_scope.exp.json        |    1 +
 .../TestDelete/container_near.exp.json        |    1 +
 .../delete_container_of_near.exp.json         |    1 +
 .../d2oracle/TestDelete/delete_icon.exp.json  |    1 +
 .../d2oracle/TestDelete/delete_link.exp.json  |    1 +
 .../d2oracle/TestDelete/delete_near.exp.json  |    1 +
 .../delete_needed_flat_near.exp.json          |    1 +
 .../delete_redundant_flat_near.exp.json       |    1 +
 .../TestDelete/delete_tooltip.exp.json        |    1 +
 .../TestDelete/edge-only-style.exp.json       |    1 +
 .../edge_both_identical_childs.exp.json       |    1 +
 .../d2oracle/TestDelete/edge_common.exp.json  |    1 +
 .../TestDelete/edge_common_2.exp.json         |    1 +
 .../TestDelete/edge_common_3.exp.json         |    1 +
 .../TestDelete/edge_common_4.exp.json         |    1 +
 .../TestDelete/edge_conflict.exp.json         |    1 +
 .../TestDelete/edge_decrement.exp.json        |    1 +
 .../d2oracle/TestDelete/edge_first.exp.json   |    1 +
 .../TestDelete/edge_flat_style.exp.json       |    1 +
 .../TestDelete/edge_identical_child.exp.json  |    1 +
 .../TestDelete/edge_key_style.exp.json        |    1 +
 .../d2oracle/TestDelete/edge_last.exp.json    |    1 +
 .../TestDelete/edge_map_style.exp.json        |    1 +
 .../d2oracle/TestDelete/edge_middle.exp.json  |    1 +
 .../d2oracle/TestDelete/empty_map.exp.json    |    1 +
 testdata/d2oracle/TestDelete/flat.exp.json    |    1 +
 .../TestDelete/flat_reserved.exp.json         |    1 +
 .../TestDelete/hoist_children.exp.json        |    1 +
 .../TestDelete/hoist_edge_children.exp.json   |    1 +
 .../TestDelete/key_with_edges.exp.json        |    1 +
 .../TestDelete/key_with_edges_2.exp.json      |    1 +
 .../TestDelete/key_with_edges_3.exp.json      |    1 +
 .../TestDelete/key_with_edges_4.exp.json      |    1 +
 testdata/d2oracle/TestDelete/left.exp.json    |    1 +
 .../d2oracle/TestDelete/multi_near.exp.json   |    1 +
 .../multi_path_map_conflict.exp.json          |    1 +
 .../multi_path_map_no_conflict.exp.json       |    1 +
 .../multiple_flat_middle_container.exp.json   |    1 +
 .../TestDelete/multiple_flat_style.exp.json   |    1 +
 .../TestDelete/multiple_map_styles.exp.json   |    1 +
 testdata/d2oracle/TestDelete/near.exp.json    |    1 +
 testdata/d2oracle/TestDelete/nested.exp.json  |    1 +
 .../d2oracle/TestDelete/nested_2.exp.json     |    1 +
 .../TestDelete/nested_edge_key_style.exp.json |    1 +
 .../TestDelete/nested_flat_style.exp.json     |    1 +
 .../TestDelete/nested_reserved.exp.json       |    1 +
 .../nested_underscore_update.exp.json         |    1 +
 .../d2oracle/TestDelete/node_in_edge.exp.json |    1 +
 .../TestDelete/node_in_edge_last.exp.json     |    1 +
 .../only-underscore-nested.exp.json           |    1 +
 .../TestDelete/only-underscore.exp.json       |    1 +
 .../only_delete_edge_reserved.exp.json        |    1 +
 .../only_delete_obj_reserved.exp.json         |    1 +
 testdata/d2oracle/TestDelete/order_1.exp.json |    1 +
 testdata/d2oracle/TestDelete/order_2.exp.json |    1 +
 testdata/d2oracle/TestDelete/order_3.exp.json |    1 +
 testdata/d2oracle/TestDelete/order_4.exp.json |    1 +
 testdata/d2oracle/TestDelete/order_5.exp.json |    1 +
 testdata/d2oracle/TestDelete/order_6.exp.json |    1 +
 testdata/d2oracle/TestDelete/order_7.exp.json |    1 +
 testdata/d2oracle/TestDelete/order_8.exp.json |    1 +
 .../d2oracle/TestDelete/shape_class.exp.json  |    1 +
 .../TestDelete/shape_sql_table.exp.json       |    1 +
 .../TestDelete/singular_flat_style.exp.json   |    1 +
 .../TestDelete/singular_map_style.exp.json    |    1 +
 .../underscore_no_conflict.exp.json           |    1 +
 .../TestDelete/underscore_remove.exp.json     |    1 +
 testdata/d2oracle/TestDelete/width.exp.json   |    1 +
 .../TestMove/append_multiple_styles.exp.json  |    1 +
 testdata/d2oracle/TestMove/basic.exp.json     |    1 +
 .../d2oracle/TestMove/basic_nested.exp.json   |    1 +
 .../TestMove/basic_out_of_container.exp.json  |    1 +
 .../TestMove/between_containers.exp.json      |    1 +
 .../TestMove/chain_connected_nested.exp.json  |    1 +
 ..._connected_nested_no_extra_create.exp.json |    1 +
 .../TestMove/connected_nested.exp.json        |    1 +
 ...ner_multiple_refs_with_underscore.exp.json |    1 +
 .../d2oracle/TestMove/container_near.exp.json |    1 +
 .../TestMove/edge_across_containers.exp.json  |    1 +
 .../d2oracle/TestMove/edge_basic.exp.json     |    1 +
 .../TestMove/edge_chain_basic.exp.json        |    1 +
 .../TestMove/edge_chain_circular.exp.json     |    1 +
 .../edge_chain_into_container.exp.json        |    1 +
 .../edge_chain_out_container.exp.json         |    1 +
 .../d2oracle/TestMove/edge_conflict.exp.json  |    1 +
 .../TestMove/edge_into_container.exp.json     |    1 +
 .../TestMove/edge_nested_basic.exp.json       |    1 +
 .../TestMove/edge_out_of_container.exp.json   |    1 +
 .../d2oracle/TestMove/extend_map.exp.json     |    1 +
 .../TestMove/extend_stationary_path.exp.json  |    1 +
 .../TestMove/flat_between_containers.exp.json |    1 +
 .../d2oracle/TestMove/flat_merge.exp.json     |    1 +
 .../TestMove/flat_middle_container.exp.json   |    1 +
 .../TestMove/flat_nested_merge.exp.json       |    1 +
 .../flat_nested_merge_multiple_refs.exp.json  |    1 +
 .../flat_reparent_with_map_value.exp.json     |    1 +
 ...lat_reparent_with_mixed_map_value.exp.json |    1 +
 .../flat_reparent_with_value.exp.json         |    1 +
 .../d2oracle/TestMove/flat_style.exp.json     |    1 +
 .../TestMove/full_edge_slice.exp.json         |    1 +
 .../d2oracle/TestMove/full_slice.exp.json     |    1 +
 testdata/d2oracle/TestMove/gnarly_1.exp.json  |    1 +
 .../hoist_container_children.exp.json         |    1 +
 .../into_container_existing_map.exp.json      |    1 +
 .../into_container_nonexisting_map.exp.json   |    1 +
 .../into_container_with_flat_keys.exp.json    |    1 +
 .../into_container_with_flat_style.exp.json   |    1 +
 .../d2oracle/TestMove/map_transplant.exp.json |    1 +
 .../d2oracle/TestMove/map_with_label.exp.json |    1 +
 .../TestMove/merge_nested_maps.exp.json       |    1 +
 .../d2oracle/TestMove/merge_reserved.exp.json |    1 +
 .../TestMove/middle_container.exp.json        |    1 +
 .../TestMove/move_container_children.exp.json |    1 +
 .../move_container_conflict_children.exp.json |    1 +
 .../move_into_key_with_value.exp.json         |    1 +
 .../TestMove/move_out_of_edge.exp.json        |    1 +
 .../TestMove/move_out_of_nested_edge.exp.json |    1 +
 .../TestMove/multiple_nesting_levels.exp.json |    1 +
 testdata/d2oracle/TestMove/near.exp.json      |    1 +
 .../nested-underscore-move-out.exp.json       |    1 +
 .../d2oracle/TestMove/nhooyr_one.exp.json     |    1 +
 .../d2oracle/TestMove/nhooyr_two.exp.json     |    1 +
 .../out_of_newline_container.exp.json         |    1 +
 .../d2oracle/TestMove/parentheses.exp.json    |    1 +
 .../TestMove/partial_edge_slice.exp.json      |    1 +
 .../d2oracle/TestMove/partial_slice.exp.json  |    1 +
 testdata/d2oracle/TestMove/rename_2.exp.json  |    1 +
 testdata/d2oracle/TestMove/reuse_map.exp.json |    1 +
 .../d2oracle/TestMove/slice_style.exp.json    |    1 +
 .../TestMove/underscore-connection.exp.json   |    1 +
 .../TestMove/underscore_children.exp.json     |    1 +
 .../underscore_edge_children.exp.json         |    1 +
 .../underscore_edge_container_1.exp.json      |    1 +
 .../underscore_edge_container_2.exp.json      |    1 +
 .../underscore_edge_container_3.exp.json      |    1 +
 .../underscore_edge_container_4.exp.json      |    1 +
 .../underscore_edge_container_5.exp.json      |    1 +
 .../TestMove/underscore_edge_split.exp.json   |    1 +
 .../TestMove/underscore_merge.exp.json        |    1 +
 .../TestMove/underscore_split.exp.json        |    1 +
 .../TestMove/underscore_split_out.exp.json    |    1 +
 .../TestMove/underscore_transplant.exp.json   |    1 +
 .../d2oracle/TestMove/unique_name.exp.json    |    1 +
 .../unique_name_with_references.exp.json      |    1 +
 testdata/d2oracle/TestRename/arrows.exp.json  |    1 +
 .../d2oracle/TestRename/arrows_chain.exp.json |    1 +
 .../TestRename/arrows_complex.exp.json        |    1 +
 .../TestRename/arrows_trim_common.exp.json    |    1 +
 .../TestRename/arrows_trim_common_2.exp.json  |    1 +
 .../TestRename/complex_edge_1.exp.json        |    1 +
 .../TestRename/complex_edge_2.exp.json        |    1 +
 .../d2oracle/TestRename/conflict.exp.json     |    1 +
 .../d2oracle/TestRename/conflict_2.exp.json   |    1 +
 .../TestRename/conflict_with_dots.exp.json    |    1 +
 .../d2oracle/TestRename/container.exp.json    |    1 +
 testdata/d2oracle/TestRename/edges.exp.json   |    1 +
 testdata/d2oracle/TestRename/flat.exp.json    |    1 +
 .../d2oracle/TestRename/generated.exp.json    |    1 +
 testdata/d2oracle/TestRename/near.exp.json    |    1 +
 testdata/d2oracle/TestRename/nested.exp.json  |    1 +
 testdata/d2oracle/TestSet/base.exp.json       |    1 +
 .../TestSet/block_string_multiline.exp.json   |    1 +
 .../TestSet/block_string_oneline.exp.json     |    1 +
 testdata/d2oracle/TestSet/edge.exp.json       |    1 +
 .../TestSet/edge_append_style.exp.json        |    1 +
 testdata/d2oracle/TestSet/edge_chain.exp.json |    1 +
 .../TestSet/edge_chain_append_style.exp.json  |    1 +
 .../edge_chain_existing_style.exp.json        |    1 +
 .../TestSet/edge_chain_nested_set.exp.json    |    1 +
 .../edge_flat_merge_arrowhead.exp.json        |    1 +
 .../d2oracle/TestSet/edge_index_case.exp.json |    1 +
 .../TestSet/edge_index_merge_style.exp.json   |    1 +
 .../TestSet/edge_index_nested.exp.json        |    1 +
 .../TestSet/edge_key_and_key.exp.json         |    1 +
 testdata/d2oracle/TestSet/edge_label.exp.json |    1 +
 .../TestSet/edge_merge_arrowhead.exp.json     |    1 +
 .../TestSet/edge_merge_style.exp.json         |    1 +
 .../TestSet/edge_nested_label_set.exp.json    |    1 +
 .../TestSet/edge_nested_style_set.exp.json    |    1 +
 .../TestSet/edge_replace_arrowhead.exp.json   |    1 +
 .../edge_replace_arrowhead_indexed.exp.json   |    1 +
 .../TestSet/edge_set_arrowhead.exp.json       |    1 +
 .../TestSet/expanded_map_style.exp.json       |    1 +
 testdata/d2oracle/TestSet/icon.exp.json       |    1 +
 .../d2oracle/TestSet/inline_style.exp.json    |    1 +
 testdata/d2oracle/TestSet/label.exp.json      |    1 +
 .../d2oracle/TestSet/label_primary.exp.json   |    1 +
 .../d2oracle/TestSet/label_replace.exp.json   |    1 +
 .../d2oracle/TestSet/label_unset.exp.json     |    1 +
 .../d2oracle/TestSet/map_key_missing.exp.json |    1 +
 .../d2oracle/TestSet/nested_alex.exp.json     |    1 +
 testdata/d2oracle/TestSet/new_style.exp.json  |    1 +
 .../TestSet/replace_arrowhead.exp.json        |    1 +
 .../TestSet/replace_arrowhead_map.exp.json    |    1 +
 .../TestSet/replace_dimensions.exp.json       |    1 +
 .../TestSet/replace_edge_style.exp.json       |    1 +
 .../TestSet/replace_edge_style_map.exp.json   |    1 +
 .../d2oracle/TestSet/replace_link.exp.json    |    1 +
 .../TestSet/replace_position.exp.json         |    1 +
 .../d2oracle/TestSet/replace_shape.exp.json   |    1 +
 .../d2oracle/TestSet/replace_style.exp.json   |    1 +
 .../TestSet/replace_style_edgecase.exp.json   |    1 +
 .../d2oracle/TestSet/replace_tooltip.exp.json |    1 +
 .../d2oracle/TestSet/set_dimensions.exp.json  |    1 +
 .../d2oracle/TestSet/set_position.exp.json    |    1 +
 .../d2oracle/TestSet/set_tooltip.exp.json     |    1 +
 testdata/d2oracle/TestSet/shape.exp.json      |    1 +
 .../TestSet/shape_nested_style_set.exp.json   |    1 +
 646 files changed, 2534 insertions(+), 37 deletions(-)
 create mode 100644 testdata/d2compiler/TestCompile2/boards/boardContainer.exp.json

diff --git a/ci/sub b/ci/sub
index cb8a9993d..512bad5a9 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit cb8a9993d7e1d91815650c5baade7658622189b9
+Subproject commit 512bad5a958c5e33ba9b3e89dfac1bfd6002f98c
diff --git a/d2compiler/compile.go b/d2compiler/compile.go
index 9de5f12c8..35118331a 100644
--- a/d2compiler/compile.go
+++ b/d2compiler/compile.go
@@ -71,6 +71,11 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph {
 	c.compileBoardsField(g, ir, "layers")
 	c.compileBoardsField(g, ir, "scenarios")
 	c.compileBoardsField(g, ir, "steps")
+	if d2ir.ParentMap(ir).CopyBase(nil).Equal(ir.CopyBase(nil)) {
+		if len(g.Layers) > 0 || len(g.Scenarios) > 0 || len(g.Steps) > 0 {
+			g.BoardContainer = true
+		}
+	}
 	return g
 }
 
diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
index 52da3f916..a7a5c24fd 100644
--- a/d2compiler/compile_test.go
+++ b/d2compiler/compile_test.go
@@ -2099,9 +2099,9 @@ layers: {
   }
 }
 `, "")
-				assert.JSON(t, 2, len(g.Layers))
-				assert.JSON(t, "one", g.Layers[0].Name)
-				assert.JSON(t, "two", g.Layers[1].Name)
+				assert.Equal(t, 2, len(g.Layers))
+				assert.Equal(t, "one", g.Layers[0].Name)
+				assert.Equal(t, "two", g.Layers[1].Name)
 			},
 		},
 		{
@@ -2132,6 +2132,37 @@ layers: {
 				assert.Equal(t, 2, len(g.Layers[1].Steps))
 			},
 		},
+		{
+			name: "boardContainer",
+			run: func(t *testing.T) {
+				g := assertCompile(t, `
+layers: {
+  one: {
+    santa
+  }
+  two: {
+    clause
+		scenarios: {
+			seinfeld: {
+			}
+			missoula: {
+				steps: {
+					missus: one two three
+				}
+			}
+		}
+  }
+}
+`, "")
+				assert.True(t, g.BoardContainer)
+				assert.Equal(t, 2, len(g.Layers))
+				assert.Equal(t, "one", g.Layers[0].Name)
+				assert.Equal(t, "two", g.Layers[1].Name)
+				assert.Equal(t, 2, len(g.Layers[1].Scenarios))
+				assert.False(t, g.Layers[1].Scenarios[0].BoardContainer)
+				assert.False(t, g.Layers[1].Scenarios[1].BoardContainer)
+			},
+		},
 		{
 			name: "errs/duplicate_board",
 			run: func(t *testing.T) {
diff --git a/d2exporter/export.go b/d2exporter/export.go
index 4357f914d..c238ba746 100644
--- a/d2exporter/export.go
+++ b/d2exporter/export.go
@@ -16,6 +16,7 @@ func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamil
 	diagram := d2target.NewDiagram()
 	applyStyles(&diagram.Root, g.Root)
 	diagram.Name = g.Name
+	diagram.BoardContainer = g.BoardContainer
 	if fontFamily == nil {
 		fontFamily = go2.Pointer(d2fonts.SourceSansPro)
 	}
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
index a19487ee2..2d26954b7 100644
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@@ -28,8 +28,13 @@ const DEFAULT_SHAPE_SIZE = 100.
 const MIN_SHAPE_SIZE = 5
 
 type Graph struct {
-	Name string     `json:"name"`
-	AST  *d2ast.Map `json:"ast"`
+	Name string `json:"name"`
+	// A BoardContainer is a board or scenario itself contains nothing
+	// but its base and more boards, scenarios or steps.
+	// boardContainers do not have a render and are used purely for organizing the board
+	// tree.
+	BoardContainer bool       `json:"boardContainer"`
+	AST            *d2ast.Map `json:"ast"`
 
 	Root    *Object   `json:"root"`
 	Edges   []*Edge   `json:"edges"`
diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go
index b105e4e72..72deedb38 100644
--- a/d2ir/d2ir.go
+++ b/d2ir/d2ir.go
@@ -23,6 +23,7 @@ type Node interface {
 	Parent() Node
 	Primary() *Scalar
 	Map() *Map
+	Equal(n2 Node) bool
 
 	ast() d2ast.Node
 	fmt.Stringer
@@ -139,7 +140,8 @@ func (s *Scalar) Copy(newParent Node) Node {
 	return s
 }
 
-func (s *Scalar) Equal(s2 *Scalar) bool {
+func (s *Scalar) Equal(n2 Node) bool {
+	s2 := n2.(*Scalar)
 	if _, ok := s.Value.(d2ast.String); ok {
 		if _, ok = s2.Value.(d2ast.String); ok {
 			return s.Value.ScalarString() == s2.Value.ScalarString()
@@ -187,6 +189,10 @@ func (m *Map) Copy(newParent Node) Node {
 
 // CopyBase copies the map m without layers/scenarios/steps.
 func (m *Map) CopyBase(newParent Node) *Map {
+	if m == nil {
+		return (&Map{}).Copy(newParent).(*Map)
+	}
+
 	layers := m.DeleteField("layers")
 	scenarios := m.DeleteField("scenarios")
 	steps := m.DeleteField("steps")
@@ -1054,3 +1060,73 @@ func reverseIDA(ida []string) {
 		ida[len(ida)-i-1] = tmp
 	}
 }
+
+func (f *Field) Equal(n2 Node) bool {
+	f2 := n2.(*Field)
+
+	if f.Name != f2.Name {
+		return false
+	}
+	if !f.Primary_.Equal(f2.Primary_) {
+		return false
+	}
+	if !f.Composite.Equal(f2.Composite) {
+		return false
+	}
+	return true
+}
+
+func (e *Edge) Equal(n2 Node) bool {
+	e2 := n2.(*Edge)
+
+	if !e.ID.Match(e2.ID) {
+		return false
+	}
+	if !e.Primary_.Equal(e2.Primary_) {
+		return false
+	}
+	if !e.Map_.Equal(e2.Map_) {
+		return false
+	}
+	return true
+}
+
+func (a *Array) Equal(n2 Node) bool {
+	a2 := n2.(*Array)
+
+	if len(a.Values) != len(a2.Values) {
+		return false
+	}
+
+	for i := range a.Values {
+		if !a.Values[i].Equal(a2.Values[i]) {
+			return false
+		}
+	}
+
+	return true
+}
+
+func (m *Map) Equal(n2 Node) bool {
+	m2 := n2.(*Map)
+
+	if len(m.Fields) != len(m2.Fields) {
+		return false
+	}
+	if len(m.Edges) != len(m2.Edges) {
+		return false
+	}
+
+	for i := range m.Fields {
+		if !m.Fields[i].Equal(m2.Fields[i]) {
+			return false
+		}
+	}
+	for i := range m.Edges {
+		if !m.Edges[i].Equal(m2.Edges[i]) {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg
index b5c982c3f..4f34dadef 100644
--- a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg
@@ -30,7 +30,7 @@
   mix-blend-mode: multiply;
   opacity: 0.5;
 }
-.fill-N1{fill:#0A0F25;}.fill-N2{fill:#676C7E;}.fill-N3{fill:#9499AB;}.fill-N4{fill:#CFD2DD;}.fill-N5{fill:#DEE1EB;}.fill-N6{fill:#EEF1F8;}.fill-N7{fill:#FFFFFF;}.fill-B1{fill:#0D32B2;}.fill-B2{fill:#0D32B2;}.fill-B3{fill:#E3E9FD;}.fill-B4{fill:#E3E9FD;}.fill-B5{fill:#EDF0FD;}.fill-B6{fill:#F7F8FE;}.fill-AA2{fill:#4A6FF3;}.fill-AA4{fill:#EDF0FD;}.fill-AA5{fill:#F7F8FE;}.fill-AB4{fill:#EDF0FD;}.fill-AB5{fill:#F7F8FE;}.stroke-N1{stroke:#0A0F25;}.stroke-N2{stroke:#676C7E;}.stroke-N3{stroke:#9499AB;}.stroke-N4{stroke:#CFD2DD;}.stroke-N5{stroke:#DEE1EB;}.stroke-N6{stroke:#EEF1F8;}.stroke-N7{stroke:#FFFFFF;}.stroke-B1{stroke:#0D32B2;}.stroke-B2{stroke:#0D32B2;}.stroke-B3{stroke:#E3E9FD;}.stroke-B4{stroke:#E3E9FD;}.stroke-B5{stroke:#EDF0FD;}.stroke-B6{stroke:#F7F8FE;}.stroke-AA2{stroke:#4A6FF3;}.stroke-AA4{stroke:#EDF0FD;}.stroke-AA5{stroke:#F7F8FE;}.stroke-AB4{stroke:#EDF0FD;}.stroke-AB5{stroke:#F7F8FE;}.background-color-N1{background-color:#0A0F25;}.background-color-N2{background-color:#676C7E;}.background-color-N3{background-color:#9499AB;}.background-color-N4{background-color:#CFD2DD;}.background-color-N5{background-color:#DEE1EB;}.background-color-N6{background-color:#EEF1F8;}.background-color-N7{background-color:#FFFFFF;}.background-color-B1{background-color:#0D32B2;}.background-color-B2{background-color:#0D32B2;}.background-color-B3{background-color:#E3E9FD;}.background-color-B4{background-color:#E3E9FD;}.background-color-B5{background-color:#EDF0FD;}.background-color-B6{background-color:#F7F8FE;}.background-color-AA2{background-color:#4A6FF3;}.background-color-AA4{background-color:#EDF0FD;}.background-color-AA5{background-color:#F7F8FE;}.background-color-AB4{background-color:#EDF0FD;}.background-color-AB5{background-color:#F7F8FE;}.color-N1{color:#0A0F25;}.color-N2{color:#676C7E;}.color-N3{color:#9499AB;}.color-N4{color:#CFD2DD;}.color-N5{color:#DEE1EB;}.color-N6{color:#EEF1F8;}.color-N7{color:#FFFFFF;}.color-B1{color:#0D32B2;}.color-B2{color:#0D32B2;}.color-B3{color:#E3E9FD;}.color-B4{color:#E3E9FD;}.color-B5{color:#EDF0FD;}.color-B6{color:#F7F8FE;}.color-AA2{color:#4A6FF3;}.color-AA4{color:#EDF0FD;}.color-AA5{color:#F7F8FE;}.color-AB4{color:#EDF0FD;}.color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}]]></style><g id="winter"><g class="shape" ><path d="M-1.600310 -0.578379 L212.045551 1.811030 L211.253697 120.234072 L0.925556 123.532483" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.755797 0.849798 C41.919041 0.271510, 83.908070 -2.279368, 210.300335 0.345898 M-0.571888 0.233280 C47.092687 -0.888816, 93.486665 -1.391062, 210.488319 0.663711 M212.536704 -1.749433 C210.972303 27.765539, 211.663839 51.429772, 212.390547 121.130645 M211.297677 -0.799274 C212.010129 31.884164, 211.033660 65.515876, 211.406876 122.352243 M211.928191 121.811822 C166.401573 125.510374, 118.501892 125.031181, 1.619092 121.644237 M210.168238 121.873280 C131.604972 122.658440, 53.066606 122.419106, 0.827814 122.036891 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="211.000000" height="122.000000" transform="translate(16.000000 44.000000)" class=" sketch-overlay-B4" /></g><text x="121.500000" y="28.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><path d="M-1.600310 -0.578379 L156.045551 1.811030 L155.253697 120.234072 L0.925556 123.532483" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.857263 0.963884 C30.680942 0.534936, 61.441269 -2.358399, 154.206405 0.392335 M-0.648665 0.264598 C34.748995 -0.524619, 68.705478 -1.094292, 154.419625 0.752815 M156.536704 -1.749433 C154.972303 27.765539, 155.663839 51.429772, 156.390547 121.130645 M155.297677 -0.799274 C156.010129 31.884164, 155.033660 65.515876, 155.406876 122.352243 M156.052801 121.786559 C122.601194 124.873674, 86.457938 124.330149, 1.836456 121.596476 M154.056573 121.856267 C96.645676 122.618642, 39.263022 122.347177, 0.938949 122.041844 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="155.000000" height="122.000000" transform="translate(0.000000 310.000000)" class=" sketch-overlay-B4" /></g><text x="77.500000" y="294.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="trees"><g class="shape" ><path d="M-1.600310 -0.578379 L86.045551 1.811030 L85.253697 64.234072 L0.925556 67.532483" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><path d="M0.857263 0.963884 C16.680628 0.818655, 33.440640 -2.074680, 84.206405 0.392335 M-0.648665 0.264598 C19.254363 0.079782, 37.716213 -0.489889, 84.419625 0.752815 M86.536704 -1.749433 C85.489431 15.585410, 86.180967 27.069513, 86.390547 65.130645 M85.297677 -0.799274 C85.657560 16.854002, 84.681091 35.455552, 85.406876 66.352243 M86.052801 65.786559 C67.698267 67.488711, 46.652085 66.945187, 1.836456 65.596476 M84.056573 65.856267 C52.959557 66.458399, 21.890783 66.186934, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><rect width="85.000000" height="66.000000" transform="translate(84.000000 532.000000)" class=" sketch-overlay-B6" /></g><text x="126.500000" y="570.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">trees</text></g><g id="winter.snow"><g class="shape" ><path d="M-1.600310 -0.578379 L89.045551 1.811030 L88.253697 64.234072 L0.925556 67.532483" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C17.280641 0.806495, 34.640667 -2.086840, 87.206405 0.392335 M-0.648665 0.264598 C19.918419 0.053879, 39.044325 -0.515792, 87.419625 0.752815 M89.536704 -1.749433 C88.489431 15.585410, 89.180967 27.069513, 89.390547 65.130645 M88.297677 -0.799274 C88.657560 16.854002, 87.681091 35.455552, 88.406876 66.352243 M89.052801 65.786559 C70.051250 67.548067, 48.358050 67.004542, 1.836456 65.596476 M87.056573 65.856267 C54.831819 66.465266, 22.635308 66.193802, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="88.000000" height="66.000000" transform="translate(82.000000 72.000000)" class=" sketch-overlay-B5" /></g><text x="126.000000" y="110.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><path d="M-1.600310 -0.578379 L76.045551 1.811030 L75.253697 64.234072 L0.925556 67.532483" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C14.680583 0.859186, 29.440550 -2.034149, 74.206405 0.392335 M-0.648665 0.264598 C17.040844 0.166125, 33.289176 -0.403546, 74.419625 0.752815 M76.536704 -1.749433 C75.489431 15.585410, 76.180967 27.069513, 76.390547 65.130645 M75.297677 -0.799274 C75.657560 16.854002, 74.681091 35.455552, 75.406876 66.352243 M76.052801 65.786559 C59.854992 67.290860, 40.965535 66.747335, 1.836456 65.596476 M74.056573 65.856267 C46.718682 66.435507, 19.409035 66.164043, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="75.000000" height="66.000000" transform="translate(40.000000 338.000000)" class=" sketch-overlay-B5" /></g><text x="77.500000" y="376.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M103.420046 137.720240 M103.420046 137.720240 C84.337378 160.080246, 78.663171 175.439876, 77.905312 191.857263 M101.689881 136.926646 C82.802780 161.479289, 75.878336 176.661496, 77.990419 189.033797 M77.990419 189.033797 C77.672784 206.488053, 76.339251 281.905631, 78.378905 335.627398 M76.340465 188.110353 C75.313208 207.373630, 79.037822 282.638050, 78.070257 335.920880" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(77.500000 334.000000) rotate(90)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(77.500000 334.000000) rotate(90)" /></g><g id="(summer.sun -&gt; trees)[0]"><path d="M75.500089 404.340129 M75.500089 404.340129 C78.463884 426.080246, 84.463171 491.439876, 104.898440 529.397138 M73.769924 403.546535 C76.929286 427.479289, 81.678336 492.661496, 104.983547 526.573672" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(104.493128 528.539875) rotate(59.886266849017574)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(104.493128 528.539875) rotate(59.886266849017574)" /></g><g id="(trees -&gt; winter.snow)[0]"><path d="M144.645524 528.615593 M144.645524 528.615593 C170.090390 491.680246, 176.163171 471.439876, 175.405312 457.857263 M142.915359 527.821999 C168.555792 493.079289, 173.378336 472.661496, 175.490419 455.033797 M175.490419 455.033797 C175.172784 442.488053, 173.839251 416.905631, 175.878905 392.127398 M173.840465 454.110353 C172.813208 443.373630, 176.537822 417.638050, 175.570257 392.420880 M175.570257 392.420880 C174.130645 364.967915, 175.629587 331.218184, 173.359209 308.890547 M176.165613 390.822332 C173.163909 365.668281, 176.017192 333.280609, 175.605080 305.349706 M175.605080 305.349706 C176.978518 283.652801, 174.786559 257.030428, 173.313449 241.522259 M175.412052 303.666112 C174.495595 284.497814, 174.407310 256.286147, 174.079308 243.295570 M174.079308 243.295570 C174.824253 226.527637, 170.791845 160.384708, 146.990752 140.490913 M175.957207 243.379259 C174.843469 225.099244, 168.848165 161.975958, 148.547838 142.592714" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /></g><mask id="1960707820" maskUnits="userSpaceOnUse" x="-101" y="-100" width="429" height="799">
+.fill-N1{fill:#0A0F25;}.fill-N2{fill:#676C7E;}.fill-N3{fill:#9499AB;}.fill-N4{fill:#CFD2DD;}.fill-N5{fill:#DEE1EB;}.fill-N6{fill:#EEF1F8;}.fill-N7{fill:#FFFFFF;}.fill-B1{fill:#0D32B2;}.fill-B2{fill:#0D32B2;}.fill-B3{fill:#E3E9FD;}.fill-B4{fill:#E3E9FD;}.fill-B5{fill:#EDF0FD;}.fill-B6{fill:#F7F8FE;}.fill-AA2{fill:#4A6FF3;}.fill-AA4{fill:#EDF0FD;}.fill-AA5{fill:#F7F8FE;}.fill-AB4{fill:#EDF0FD;}.fill-AB5{fill:#F7F8FE;}.stroke-N1{stroke:#0A0F25;}.stroke-N2{stroke:#676C7E;}.stroke-N3{stroke:#9499AB;}.stroke-N4{stroke:#CFD2DD;}.stroke-N5{stroke:#DEE1EB;}.stroke-N6{stroke:#EEF1F8;}.stroke-N7{stroke:#FFFFFF;}.stroke-B1{stroke:#0D32B2;}.stroke-B2{stroke:#0D32B2;}.stroke-B3{stroke:#E3E9FD;}.stroke-B4{stroke:#E3E9FD;}.stroke-B5{stroke:#EDF0FD;}.stroke-B6{stroke:#F7F8FE;}.stroke-AA2{stroke:#4A6FF3;}.stroke-AA4{stroke:#EDF0FD;}.stroke-AA5{stroke:#F7F8FE;}.stroke-AB4{stroke:#EDF0FD;}.stroke-AB5{stroke:#F7F8FE;}.background-color-N1{background-color:#0A0F25;}.background-color-N2{background-color:#676C7E;}.background-color-N3{background-color:#9499AB;}.background-color-N4{background-color:#CFD2DD;}.background-color-N5{background-color:#DEE1EB;}.background-color-N6{background-color:#EEF1F8;}.background-color-N7{background-color:#FFFFFF;}.background-color-B1{background-color:#0D32B2;}.background-color-B2{background-color:#0D32B2;}.background-color-B3{background-color:#E3E9FD;}.background-color-B4{background-color:#E3E9FD;}.background-color-B5{background-color:#EDF0FD;}.background-color-B6{background-color:#F7F8FE;}.background-color-AA2{background-color:#4A6FF3;}.background-color-AA4{background-color:#EDF0FD;}.background-color-AA5{background-color:#F7F8FE;}.background-color-AB4{background-color:#EDF0FD;}.background-color-AB5{background-color:#F7F8FE;}.color-N1{color:#0A0F25;}.color-N2{color:#676C7E;}.color-N3{color:#9499AB;}.color-N4{color:#CFD2DD;}.color-N5{color:#DEE1EB;}.color-N6{color:#EEF1F8;}.color-N7{color:#FFFFFF;}.color-B1{color:#0D32B2;}.color-B2{color:#0D32B2;}.color-B3{color:#E3E9FD;}.color-B4{color:#E3E9FD;}.color-B5{color:#EDF0FD;}.color-B6{color:#F7F8FE;}.color-AA2{color:#4A6FF3;}.color-AA4{color:#EDF0FD;}.color-AA5{color:#F7F8FE;}.color-AB4{color:#EDF0FD;}.color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}]]></style><g id="winter"><g class="shape" ><path d="M-1.600310 -0.578379 L212.045551 1.811030 L211.253697 120.234072 L0.925556 123.532483" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.755797 0.849798 C41.919041 0.271510, 83.908070 -2.279368, 210.300335 0.345898 M-0.571888 0.233280 C47.092687 -0.888816, 93.486665 -1.391062, 210.488319 0.663711 M212.536704 -1.749433 C210.972303 27.765539, 211.663839 51.429772, 212.390547 121.130645 M211.297677 -0.799274 C212.010129 31.884164, 211.033660 65.515876, 211.406876 122.352243 M211.928191 121.811822 C166.401573 125.510374, 118.501892 125.031181, 1.619092 121.644237 M210.168238 121.873280 C131.604972 122.658440, 53.066606 122.419106, 0.827814 122.036891 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="211.000000" height="122.000000" transform="translate(16.000000 44.000000)" class=" sketch-overlay-B4" /></g><text x="121.500000" y="28.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><path d="M-1.600310 -0.578379 L156.045551 1.811030 L155.253697 120.234072 L0.925556 123.532483" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.857263 0.963884 C30.680942 0.534936, 61.441269 -2.358399, 154.206405 0.392335 M-0.648665 0.264598 C34.748995 -0.524619, 68.705478 -1.094292, 154.419625 0.752815 M156.536704 -1.749433 C154.972303 27.765539, 155.663839 51.429772, 156.390547 121.130645 M155.297677 -0.799274 C156.010129 31.884164, 155.033660 65.515876, 155.406876 122.352243 M156.052801 121.786559 C122.601194 124.873674, 86.457938 124.330149, 1.836456 121.596476 M154.056573 121.856267 C96.645676 122.618642, 39.263022 122.347177, 0.938949 122.041844 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="155.000000" height="122.000000" transform="translate(0.000000 310.000000)" class=" sketch-overlay-B4" /></g><text x="77.500000" y="294.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="trees"><g class="shape" ><path d="M-1.600310 -0.578379 L86.045551 1.811030 L85.253697 64.234072 L0.925556 67.532483" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><path d="M0.857263 0.963884 C16.680628 0.818655, 33.440640 -2.074680, 84.206405 0.392335 M-0.648665 0.264598 C19.254363 0.079782, 37.716213 -0.489889, 84.419625 0.752815 M86.536704 -1.749433 C85.489431 15.585410, 86.180967 27.069513, 86.390547 65.130645 M85.297677 -0.799274 C85.657560 16.854002, 84.681091 35.455552, 85.406876 66.352243 M86.052801 65.786559 C67.698267 67.488711, 46.652085 66.945187, 1.836456 65.596476 M84.056573 65.856267 C52.959557 66.458399, 21.890783 66.186934, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><rect width="85.000000" height="66.000000" transform="translate(84.000000 532.000000)" class=" sketch-overlay-B6" /></g><text x="126.500000" y="570.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">trees</text></g><g id="winter.snow"><g class="shape" ><path d="M-1.600310 -0.578379 L89.045551 1.811030 L88.253697 64.234072 L0.925556 67.532483" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C17.280641 0.806495, 34.640667 -2.086840, 87.206405 0.392335 M-0.648665 0.264598 C19.918419 0.053879, 39.044325 -0.515792, 87.419625 0.752815 M89.536704 -1.749433 C88.489431 15.585410, 89.180967 27.069513, 89.390547 65.130645 M88.297677 -0.799274 C88.657560 16.854002, 87.681091 35.455552, 88.406876 66.352243 M89.052801 65.786559 C70.051250 67.548067, 48.358050 67.004542, 1.836456 65.596476 M87.056573 65.856267 C54.831819 66.465266, 22.635308 66.193802, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="88.000000" height="66.000000" transform="translate(82.000000 72.000000)" class=" sketch-overlay-B5" /></g><text x="126.000000" y="110.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><path d="M-1.600310 -0.578379 L76.045551 1.811030 L75.253697 64.234072 L0.925556 67.532483" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C14.680583 0.859186, 29.440550 -2.034149, 74.206405 0.392335 M-0.648665 0.264598 C17.040844 0.166125, 33.289176 -0.403546, 74.419625 0.752815 M76.536704 -1.749433 C75.489431 15.585410, 76.180967 27.069513, 76.390547 65.130645 M75.297677 -0.799274 C75.657560 16.854002, 74.681091 35.455552, 75.406876 66.352243 M76.052801 65.786559 C59.854992 67.290860, 40.965535 66.747335, 1.836456 65.596476 M74.056573 65.856267 C46.718682 66.435507, 19.409035 66.164043, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="75.000000" height="66.000000" transform="translate(40.000000 338.000000)" class=" sketch-overlay-B5" /></g><text x="77.500000" y="376.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M103.420046 137.720240 M103.420046 137.720240 C84.337378 160.080246, 78.663171 175.439876, 77.905312 191.857263 M101.689881 136.926646 C82.802780 161.479289, 75.878336 176.661496, 77.990419 189.033797 M77.990419 189.033797 C77.672784 206.488053, 76.339251 281.905631, 78.378905 335.627398 M76.340465 188.110353 C75.313208 207.373630, 79.037822 282.638050, 78.070257 335.920880" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(77.500000 334.000000) rotate(90)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(77.500000 334.000000) rotate(90)" /></g><g id="(summer.sun -&gt; trees)[0]"><path d="M75.500089 404.340129 M75.500089 404.340129 C78.463884 426.080246, 84.463171 491.439876, 104.898440 529.397138 M73.769924 403.546535 C76.929286 427.479289, 81.678336 492.661496, 104.983547 526.573672" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(104.493128 528.539875) rotate(59.88626684901755)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(104.493128 528.539875) rotate(59.88626684901755)" /></g><g id="(trees -&gt; winter.snow)[0]"><path d="M144.645524 528.615593 M144.645524 528.615593 C170.090390 491.680246, 176.163171 471.439876, 175.405312 457.857263 M142.915359 527.821999 C168.555792 493.079289, 173.378336 472.661496, 175.490419 455.033797 M175.490419 455.033797 C175.172784 442.488053, 173.839251 416.905631, 175.878905 392.127398 M173.840465 454.110353 C172.813208 443.373630, 176.537822 417.638050, 175.570257 392.420880 M175.570257 392.420880 C174.130645 364.967915, 175.629587 331.218184, 173.359209 308.890547 M176.165613 390.822332 C173.163909 365.668281, 176.017192 333.280609, 175.605080 305.349706 M175.605080 305.349706 C176.978518 283.652801, 174.786559 257.030428, 173.313449 241.522259 M175.412052 303.666112 C174.495595 284.497814, 174.407310 256.286147, 174.079308 243.295570 M174.079308 243.295570 C174.824253 226.527637, 170.791845 160.384708, 146.990752 140.490913 M175.957207 243.379259 C174.843469 225.099244, 168.848165 161.975958, 148.547838 142.592714" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /></g><mask id="1960707820" maskUnits="userSpaceOnUse" x="-101" y="-100" width="429" height="799">
 <rect x="-101" y="-100" width="429" height="799" fill="white"></rect>
 
 </mask></svg></svg>
\ No newline at end of file
diff --git a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg
index d5dbfaf35..87ddf699b 100644
--- a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg
@@ -30,7 +30,7 @@
   mix-blend-mode: multiply;
   opacity: 0.5;
 }
-.fill-N1{fill:#CDD6F4;}.fill-N2{fill:#BAC2DE;}.fill-N3{fill:#A6ADC8;}.fill-N4{fill:#585B70;}.fill-N5{fill:#45475A;}.fill-N6{fill:#313244;}.fill-N7{fill:#1E1E2E;}.fill-B1{fill:#CBA6f7;}.fill-B2{fill:#CBA6f7;}.fill-B3{fill:#6C7086;}.fill-B4{fill:#585B70;}.fill-B5{fill:#45475A;}.fill-B6{fill:#313244;}.fill-AA2{fill:#f38BA8;}.fill-AA4{fill:#45475A;}.fill-AA5{fill:#313244;}.fill-AB4{fill:#45475A;}.fill-AB5{fill:#313244;}.stroke-N1{stroke:#CDD6F4;}.stroke-N2{stroke:#BAC2DE;}.stroke-N3{stroke:#A6ADC8;}.stroke-N4{stroke:#585B70;}.stroke-N5{stroke:#45475A;}.stroke-N6{stroke:#313244;}.stroke-N7{stroke:#1E1E2E;}.stroke-B1{stroke:#CBA6f7;}.stroke-B2{stroke:#CBA6f7;}.stroke-B3{stroke:#6C7086;}.stroke-B4{stroke:#585B70;}.stroke-B5{stroke:#45475A;}.stroke-B6{stroke:#313244;}.stroke-AA2{stroke:#f38BA8;}.stroke-AA4{stroke:#45475A;}.stroke-AA5{stroke:#313244;}.stroke-AB4{stroke:#45475A;}.stroke-AB5{stroke:#313244;}.background-color-N1{background-color:#CDD6F4;}.background-color-N2{background-color:#BAC2DE;}.background-color-N3{background-color:#A6ADC8;}.background-color-N4{background-color:#585B70;}.background-color-N5{background-color:#45475A;}.background-color-N6{background-color:#313244;}.background-color-N7{background-color:#1E1E2E;}.background-color-B1{background-color:#CBA6f7;}.background-color-B2{background-color:#CBA6f7;}.background-color-B3{background-color:#6C7086;}.background-color-B4{background-color:#585B70;}.background-color-B5{background-color:#45475A;}.background-color-B6{background-color:#313244;}.background-color-AA2{background-color:#f38BA8;}.background-color-AA4{background-color:#45475A;}.background-color-AA5{background-color:#313244;}.background-color-AB4{background-color:#45475A;}.background-color-AB5{background-color:#313244;}.color-N1{color:#CDD6F4;}.color-N2{color:#BAC2DE;}.color-N3{color:#A6ADC8;}.color-N4{color:#585B70;}.color-N5{color:#45475A;}.color-N6{color:#313244;}.color-N7{color:#1E1E2E;}.color-B1{color:#CBA6f7;}.color-B2{color:#CBA6f7;}.color-B3{color:#6C7086;}.color-B4{color:#585B70;}.color-B5{color:#45475A;}.color-B6{color:#313244;}.color-AA2{color:#f38BA8;}.color-AA4{color:#45475A;}.color-AA5{color:#313244;}.color-AB4{color:#45475A;}.color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}]]></style><g id="winter"><g class="shape" ><path d="M-1.600310 -0.578379 L212.045551 1.811030 L211.253697 120.234072 L0.925556 123.532483" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.755797 0.849798 C41.919041 0.271510, 83.908070 -2.279368, 210.300335 0.345898 M-0.571888 0.233280 C47.092687 -0.888816, 93.486665 -1.391062, 210.488319 0.663711 M212.536704 -1.749433 C210.972303 27.765539, 211.663839 51.429772, 212.390547 121.130645 M211.297677 -0.799274 C212.010129 31.884164, 211.033660 65.515876, 211.406876 122.352243 M211.928191 121.811822 C166.401573 125.510374, 118.501892 125.031181, 1.619092 121.644237 M210.168238 121.873280 C131.604972 122.658440, 53.066606 122.419106, 0.827814 122.036891 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="211.000000" height="122.000000" transform="translate(16.000000 44.000000)" class=" sketch-overlay-B4" /></g><text x="121.500000" y="28.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><path d="M-1.600310 -0.578379 L156.045551 1.811030 L155.253697 120.234072 L0.925556 123.532483" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.857263 0.963884 C30.680942 0.534936, 61.441269 -2.358399, 154.206405 0.392335 M-0.648665 0.264598 C34.748995 -0.524619, 68.705478 -1.094292, 154.419625 0.752815 M156.536704 -1.749433 C154.972303 27.765539, 155.663839 51.429772, 156.390547 121.130645 M155.297677 -0.799274 C156.010129 31.884164, 155.033660 65.515876, 155.406876 122.352243 M156.052801 121.786559 C122.601194 124.873674, 86.457938 124.330149, 1.836456 121.596476 M154.056573 121.856267 C96.645676 122.618642, 39.263022 122.347177, 0.938949 122.041844 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="155.000000" height="122.000000" transform="translate(0.000000 310.000000)" class=" sketch-overlay-B4" /></g><text x="77.500000" y="294.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="trees"><g class="shape" ><path d="M-1.600310 -0.578379 L86.045551 1.811030 L85.253697 64.234072 L0.925556 67.532483" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><path d="M0.857263 0.963884 C16.680628 0.818655, 33.440640 -2.074680, 84.206405 0.392335 M-0.648665 0.264598 C19.254363 0.079782, 37.716213 -0.489889, 84.419625 0.752815 M86.536704 -1.749433 C85.489431 15.585410, 86.180967 27.069513, 86.390547 65.130645 M85.297677 -0.799274 C85.657560 16.854002, 84.681091 35.455552, 85.406876 66.352243 M86.052801 65.786559 C67.698267 67.488711, 46.652085 66.945187, 1.836456 65.596476 M84.056573 65.856267 C52.959557 66.458399, 21.890783 66.186934, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><rect width="85.000000" height="66.000000" transform="translate(84.000000 532.000000)" class=" sketch-overlay-B6" /></g><text x="126.500000" y="570.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">trees</text></g><g id="winter.snow"><g class="shape" ><path d="M-1.600310 -0.578379 L89.045551 1.811030 L88.253697 64.234072 L0.925556 67.532483" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C17.280641 0.806495, 34.640667 -2.086840, 87.206405 0.392335 M-0.648665 0.264598 C19.918419 0.053879, 39.044325 -0.515792, 87.419625 0.752815 M89.536704 -1.749433 C88.489431 15.585410, 89.180967 27.069513, 89.390547 65.130645 M88.297677 -0.799274 C88.657560 16.854002, 87.681091 35.455552, 88.406876 66.352243 M89.052801 65.786559 C70.051250 67.548067, 48.358050 67.004542, 1.836456 65.596476 M87.056573 65.856267 C54.831819 66.465266, 22.635308 66.193802, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="88.000000" height="66.000000" transform="translate(82.000000 72.000000)" class=" sketch-overlay-B5" /></g><text x="126.000000" y="110.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><path d="M-1.600310 -0.578379 L76.045551 1.811030 L75.253697 64.234072 L0.925556 67.532483" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C14.680583 0.859186, 29.440550 -2.034149, 74.206405 0.392335 M-0.648665 0.264598 C17.040844 0.166125, 33.289176 -0.403546, 74.419625 0.752815 M76.536704 -1.749433 C75.489431 15.585410, 76.180967 27.069513, 76.390547 65.130645 M75.297677 -0.799274 C75.657560 16.854002, 74.681091 35.455552, 75.406876 66.352243 M76.052801 65.786559 C59.854992 67.290860, 40.965535 66.747335, 1.836456 65.596476 M74.056573 65.856267 C46.718682 66.435507, 19.409035 66.164043, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="75.000000" height="66.000000" transform="translate(40.000000 338.000000)" class=" sketch-overlay-B5" /></g><text x="77.500000" y="376.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M103.420046 137.720240 M103.420046 137.720240 C84.337378 160.080246, 78.663171 175.439876, 77.905312 191.857263 M101.689881 136.926646 C82.802780 161.479289, 75.878336 176.661496, 77.990419 189.033797 M77.990419 189.033797 C77.672784 206.488053, 76.339251 281.905631, 78.378905 335.627398 M76.340465 188.110353 C75.313208 207.373630, 79.037822 282.638050, 78.070257 335.920880" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(77.500000 334.000000) rotate(90)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(77.500000 334.000000) rotate(90)" /></g><g id="(summer.sun -&gt; trees)[0]"><path d="M75.500089 404.340129 M75.500089 404.340129 C78.463884 426.080246, 84.463171 491.439876, 104.898440 529.397138 M73.769924 403.546535 C76.929286 427.479289, 81.678336 492.661496, 104.983547 526.573672" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(104.493128 528.539875) rotate(59.886266849017574)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(104.493128 528.539875) rotate(59.886266849017574)" /></g><g id="(trees -&gt; winter.snow)[0]"><path d="M144.645524 528.615593 M144.645524 528.615593 C170.090390 491.680246, 176.163171 471.439876, 175.405312 457.857263 M142.915359 527.821999 C168.555792 493.079289, 173.378336 472.661496, 175.490419 455.033797 M175.490419 455.033797 C175.172784 442.488053, 173.839251 416.905631, 175.878905 392.127398 M173.840465 454.110353 C172.813208 443.373630, 176.537822 417.638050, 175.570257 392.420880 M175.570257 392.420880 C174.130645 364.967915, 175.629587 331.218184, 173.359209 308.890547 M176.165613 390.822332 C173.163909 365.668281, 176.017192 333.280609, 175.605080 305.349706 M175.605080 305.349706 C176.978518 283.652801, 174.786559 257.030428, 173.313449 241.522259 M175.412052 303.666112 C174.495595 284.497814, 174.407310 256.286147, 174.079308 243.295570 M174.079308 243.295570 C174.824253 226.527637, 170.791845 160.384708, 146.990752 140.490913 M175.957207 243.379259 C174.843469 225.099244, 168.848165 161.975958, 148.547838 142.592714" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /></g><mask id="1960707820" maskUnits="userSpaceOnUse" x="-101" y="-100" width="429" height="799">
+.fill-N1{fill:#CDD6F4;}.fill-N2{fill:#BAC2DE;}.fill-N3{fill:#A6ADC8;}.fill-N4{fill:#585B70;}.fill-N5{fill:#45475A;}.fill-N6{fill:#313244;}.fill-N7{fill:#1E1E2E;}.fill-B1{fill:#CBA6f7;}.fill-B2{fill:#CBA6f7;}.fill-B3{fill:#6C7086;}.fill-B4{fill:#585B70;}.fill-B5{fill:#45475A;}.fill-B6{fill:#313244;}.fill-AA2{fill:#f38BA8;}.fill-AA4{fill:#45475A;}.fill-AA5{fill:#313244;}.fill-AB4{fill:#45475A;}.fill-AB5{fill:#313244;}.stroke-N1{stroke:#CDD6F4;}.stroke-N2{stroke:#BAC2DE;}.stroke-N3{stroke:#A6ADC8;}.stroke-N4{stroke:#585B70;}.stroke-N5{stroke:#45475A;}.stroke-N6{stroke:#313244;}.stroke-N7{stroke:#1E1E2E;}.stroke-B1{stroke:#CBA6f7;}.stroke-B2{stroke:#CBA6f7;}.stroke-B3{stroke:#6C7086;}.stroke-B4{stroke:#585B70;}.stroke-B5{stroke:#45475A;}.stroke-B6{stroke:#313244;}.stroke-AA2{stroke:#f38BA8;}.stroke-AA4{stroke:#45475A;}.stroke-AA5{stroke:#313244;}.stroke-AB4{stroke:#45475A;}.stroke-AB5{stroke:#313244;}.background-color-N1{background-color:#CDD6F4;}.background-color-N2{background-color:#BAC2DE;}.background-color-N3{background-color:#A6ADC8;}.background-color-N4{background-color:#585B70;}.background-color-N5{background-color:#45475A;}.background-color-N6{background-color:#313244;}.background-color-N7{background-color:#1E1E2E;}.background-color-B1{background-color:#CBA6f7;}.background-color-B2{background-color:#CBA6f7;}.background-color-B3{background-color:#6C7086;}.background-color-B4{background-color:#585B70;}.background-color-B5{background-color:#45475A;}.background-color-B6{background-color:#313244;}.background-color-AA2{background-color:#f38BA8;}.background-color-AA4{background-color:#45475A;}.background-color-AA5{background-color:#313244;}.background-color-AB4{background-color:#45475A;}.background-color-AB5{background-color:#313244;}.color-N1{color:#CDD6F4;}.color-N2{color:#BAC2DE;}.color-N3{color:#A6ADC8;}.color-N4{color:#585B70;}.color-N5{color:#45475A;}.color-N6{color:#313244;}.color-N7{color:#1E1E2E;}.color-B1{color:#CBA6f7;}.color-B2{color:#CBA6f7;}.color-B3{color:#6C7086;}.color-B4{color:#585B70;}.color-B5{color:#45475A;}.color-B6{color:#313244;}.color-AA2{color:#f38BA8;}.color-AA4{color:#45475A;}.color-AA5{color:#313244;}.color-AB4{color:#45475A;}.color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}]]></style><g id="winter"><g class="shape" ><path d="M-1.600310 -0.578379 L212.045551 1.811030 L211.253697 120.234072 L0.925556 123.532483" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.755797 0.849798 C41.919041 0.271510, 83.908070 -2.279368, 210.300335 0.345898 M-0.571888 0.233280 C47.092687 -0.888816, 93.486665 -1.391062, 210.488319 0.663711 M212.536704 -1.749433 C210.972303 27.765539, 211.663839 51.429772, 212.390547 121.130645 M211.297677 -0.799274 C212.010129 31.884164, 211.033660 65.515876, 211.406876 122.352243 M211.928191 121.811822 C166.401573 125.510374, 118.501892 125.031181, 1.619092 121.644237 M210.168238 121.873280 C131.604972 122.658440, 53.066606 122.419106, 0.827814 122.036891 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="211.000000" height="122.000000" transform="translate(16.000000 44.000000)" class=" sketch-overlay-B4" /></g><text x="121.500000" y="28.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><path d="M-1.600310 -0.578379 L156.045551 1.811030 L155.253697 120.234072 L0.925556 123.532483" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.857263 0.963884 C30.680942 0.534936, 61.441269 -2.358399, 154.206405 0.392335 M-0.648665 0.264598 C34.748995 -0.524619, 68.705478 -1.094292, 154.419625 0.752815 M156.536704 -1.749433 C154.972303 27.765539, 155.663839 51.429772, 156.390547 121.130645 M155.297677 -0.799274 C156.010129 31.884164, 155.033660 65.515876, 155.406876 122.352243 M156.052801 121.786559 C122.601194 124.873674, 86.457938 124.330149, 1.836456 121.596476 M154.056573 121.856267 C96.645676 122.618642, 39.263022 122.347177, 0.938949 122.041844 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="155.000000" height="122.000000" transform="translate(0.000000 310.000000)" class=" sketch-overlay-B4" /></g><text x="77.500000" y="294.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="trees"><g class="shape" ><path d="M-1.600310 -0.578379 L86.045551 1.811030 L85.253697 64.234072 L0.925556 67.532483" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><path d="M0.857263 0.963884 C16.680628 0.818655, 33.440640 -2.074680, 84.206405 0.392335 M-0.648665 0.264598 C19.254363 0.079782, 37.716213 -0.489889, 84.419625 0.752815 M86.536704 -1.749433 C85.489431 15.585410, 86.180967 27.069513, 86.390547 65.130645 M85.297677 -0.799274 C85.657560 16.854002, 84.681091 35.455552, 85.406876 66.352243 M86.052801 65.786559 C67.698267 67.488711, 46.652085 66.945187, 1.836456 65.596476 M84.056573 65.856267 C52.959557 66.458399, 21.890783 66.186934, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><rect width="85.000000" height="66.000000" transform="translate(84.000000 532.000000)" class=" sketch-overlay-B6" /></g><text x="126.500000" y="570.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">trees</text></g><g id="winter.snow"><g class="shape" ><path d="M-1.600310 -0.578379 L89.045551 1.811030 L88.253697 64.234072 L0.925556 67.532483" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C17.280641 0.806495, 34.640667 -2.086840, 87.206405 0.392335 M-0.648665 0.264598 C19.918419 0.053879, 39.044325 -0.515792, 87.419625 0.752815 M89.536704 -1.749433 C88.489431 15.585410, 89.180967 27.069513, 89.390547 65.130645 M88.297677 -0.799274 C88.657560 16.854002, 87.681091 35.455552, 88.406876 66.352243 M89.052801 65.786559 C70.051250 67.548067, 48.358050 67.004542, 1.836456 65.596476 M87.056573 65.856267 C54.831819 66.465266, 22.635308 66.193802, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="88.000000" height="66.000000" transform="translate(82.000000 72.000000)" class=" sketch-overlay-B5" /></g><text x="126.000000" y="110.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><path d="M-1.600310 -0.578379 L76.045551 1.811030 L75.253697 64.234072 L0.925556 67.532483" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C14.680583 0.859186, 29.440550 -2.034149, 74.206405 0.392335 M-0.648665 0.264598 C17.040844 0.166125, 33.289176 -0.403546, 74.419625 0.752815 M76.536704 -1.749433 C75.489431 15.585410, 76.180967 27.069513, 76.390547 65.130645 M75.297677 -0.799274 C75.657560 16.854002, 74.681091 35.455552, 75.406876 66.352243 M76.052801 65.786559 C59.854992 67.290860, 40.965535 66.747335, 1.836456 65.596476 M74.056573 65.856267 C46.718682 66.435507, 19.409035 66.164043, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="75.000000" height="66.000000" transform="translate(40.000000 338.000000)" class=" sketch-overlay-B5" /></g><text x="77.500000" y="376.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M103.420046 137.720240 M103.420046 137.720240 C84.337378 160.080246, 78.663171 175.439876, 77.905312 191.857263 M101.689881 136.926646 C82.802780 161.479289, 75.878336 176.661496, 77.990419 189.033797 M77.990419 189.033797 C77.672784 206.488053, 76.339251 281.905631, 78.378905 335.627398 M76.340465 188.110353 C75.313208 207.373630, 79.037822 282.638050, 78.070257 335.920880" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(77.500000 334.000000) rotate(90)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(77.500000 334.000000) rotate(90)" /></g><g id="(summer.sun -&gt; trees)[0]"><path d="M75.500089 404.340129 M75.500089 404.340129 C78.463884 426.080246, 84.463171 491.439876, 104.898440 529.397138 M73.769924 403.546535 C76.929286 427.479289, 81.678336 492.661496, 104.983547 526.573672" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(104.493128 528.539875) rotate(59.88626684901755)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(104.493128 528.539875) rotate(59.88626684901755)" /></g><g id="(trees -&gt; winter.snow)[0]"><path d="M144.645524 528.615593 M144.645524 528.615593 C170.090390 491.680246, 176.163171 471.439876, 175.405312 457.857263 M142.915359 527.821999 C168.555792 493.079289, 173.378336 472.661496, 175.490419 455.033797 M175.490419 455.033797 C175.172784 442.488053, 173.839251 416.905631, 175.878905 392.127398 M173.840465 454.110353 C172.813208 443.373630, 176.537822 417.638050, 175.570257 392.420880 M175.570257 392.420880 C174.130645 364.967915, 175.629587 331.218184, 173.359209 308.890547 M176.165613 390.822332 C173.163909 365.668281, 176.017192 333.280609, 175.605080 305.349706 M175.605080 305.349706 C176.978518 283.652801, 174.786559 257.030428, 173.313449 241.522259 M175.412052 303.666112 C174.495595 284.497814, 174.407310 256.286147, 174.079308 243.295570 M174.079308 243.295570 C174.824253 226.527637, 170.791845 160.384708, 146.990752 140.490913 M175.957207 243.379259 C174.843469 225.099244, 168.848165 161.975958, 148.547838 142.592714" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /></g><mask id="1960707820" maskUnits="userSpaceOnUse" x="-101" y="-100" width="429" height="799">
 <rect x="-101" y="-100" width="429" height="799" fill="white"></rect>
 
 </mask></svg></svg>
\ No newline at end of file
diff --git a/d2target/d2target.go b/d2target/d2target.go
index 7929b1667..390d0ecce 100644
--- a/d2target/d2target.go
+++ b/d2target/d2target.go
@@ -34,9 +34,11 @@ const (
 var BorderOffset = geo.NewVector(5, 5)
 
 type Diagram struct {
-	Name        string              `json:"name"`
-	Description string              `json:"description,omitempty"`
-	FontFamily  *d2fonts.FontFamily `json:"fontFamily,omitempty"`
+	Name string `json:"name"`
+	// See docs on the same field in d2graph to understand what it means.
+	BoardContainer bool                `json:"boardContainer"`
+	Description    string              `json:"description,omitempty"`
+	FontFamily     *d2fonts.FontFamily `json:"fontFamily,omitempty"`
 
 	Shapes      []Shape      `json:"shapes"`
 	Connections []Connection `json:"connections"`
diff --git a/e2etests/testdata/measured/empty-class/dagre/board.exp.json b/e2etests/testdata/measured/empty-class/dagre/board.exp.json
index 8f008b3bd..6231b1bb2 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
index 9df6098e0..952ca74f2 100644
--- a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 21eb920ee..36d689a78 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
index bab768d10..01954fa35 100644
--- a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
+++ b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
index 2835921d2..a26383b03 100644
--- a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
+++ b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json b/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
index ea6714cf2..a51931b4c 100644
--- a/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
+++ b/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json b/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
index ea6714cf2..a51931b4c 100644
--- a/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
+++ b/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c8e25818f..94b0967b4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3fe24115e..ead40ad85 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
index 2104bdbcf..0772e95da 100644
--- a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
index 8ef43b8e9..330651cc0 100644
--- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 07664ab44..c1dd11f38 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 68effc6e6..899dc4c98 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7dceeb958..3b42ffcf7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f3f62bb09..c32145e28 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ee1642420..ddeecaaa8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3aa86e911..c32fcfc3b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
index 77fc6fba0..13df18f0e 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
index 8bfc596b6..ac78a0014 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c683e02a2..d28c5574f 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d75d74634..96337fcd5 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cf77df5ec..60f8c02eb 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 eb88b9b0c..24a2f7a2a 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_order/dagre/board.exp.json b/e2etests/testdata/regression/elk_order/dagre/board.exp.json
index 03921d389..a6290e2f0 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_order/elk/board.exp.json b/e2etests/testdata/regression/elk_order/elk/board.exp.json
index 8b728a07f..a70155b9f 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
index 675aaf3b8..67064b7db 100644
--- a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
+++ b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
index af1fca5d6..106ec1f0f 100644
--- a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
+++ b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
index 3b264a114..a82697ebf 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
index 7e8f12e00..392451abd 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/hex-fill/dagre/board.exp.json b/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
index e845adb1c..c52a3dbac 100644
--- a/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
+++ b/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/hex-fill/elk/board.exp.json b/e2etests/testdata/regression/hex-fill/elk/board.exp.json
index 6f464573e..d6c06e77d 100644
--- a/e2etests/testdata/regression/hex-fill/elk/board.exp.json
+++ b/e2etests/testdata/regression/hex-fill/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/just-width/dagre/board.exp.json b/e2etests/testdata/regression/just-width/dagre/board.exp.json
index 27c3f2e81..533bfb17e 100644
--- a/e2etests/testdata/regression/just-width/dagre/board.exp.json
+++ b/e2etests/testdata/regression/just-width/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/just-width/elk/board.exp.json b/e2etests/testdata/regression/just-width/elk/board.exp.json
index b2140ffda..0c82f6815 100644
--- a/e2etests/testdata/regression/just-width/elk/board.exp.json
+++ b/e2etests/testdata/regression/just-width/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7f2a7e583..c0f9e6a87 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 da2815d76..810b4bc6b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
index e14c59d9c..7f48836c0 100644
--- a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
+++ b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/nested_steps/elk/board.exp.json b/e2etests/testdata/regression/nested_steps/elk/board.exp.json
index e772149a3..baf8897ca 100644
--- a/e2etests/testdata/regression/nested_steps/elk/board.exp.json
+++ b/e2etests/testdata/regression/nested_steps/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
index e94566f9e..1f3bfeba8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/no-lexer/elk/board.exp.json b/e2etests/testdata/regression/no-lexer/elk/board.exp.json
index e8a6254b7..a6a6366b2 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 392acc370..202d7c773 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c2e05ad4f..e063f7685 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 dd44ef429..2021d2f45 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7c12ce366..3b33e68ed 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 637fc6a33..bd945ee1e 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 95190f60b..38f416855 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a4a259edc..9ecc80f17 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 bcee914d9..53dacf9a9 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json b/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
index 97f48370c..f2f3d8dcb 100644
--- a/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json b/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
index 97f48370c..f2f3d8dcb 100644
--- a/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 28e67c148..a906a104b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a706e3d51..c93a79135 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 55da190fc..de36f0fbd 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 55da190fc..de36f0fbd 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
index 8e9de4b92..05a42f07b 100644
--- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
index 8e9de4b92..05a42f07b 100644
--- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1c8498c99..cd08783a8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1c8498c99..cd08783a8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f13da7f09..5d15ab6dc 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 328e38149..8d83a9dd5 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json
index ee106cbd9..f381804d8 100644
--- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json
+++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json
index b5030a2c4..2cffc639b 100644
--- a/e2etests/testdata/regression/unconnected/elk/board.exp.json
+++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 093f58d94..b42f3c4c8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b8244975d..3145187d7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/border-radius/dagre/board.exp.json b/e2etests/testdata/root/border-radius/dagre/board.exp.json
index 299f5e9b8..ca4629c76 100644
--- a/e2etests/testdata/root/border-radius/dagre/board.exp.json
+++ b/e2etests/testdata/root/border-radius/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/border-radius/elk/board.exp.json b/e2etests/testdata/root/border-radius/elk/board.exp.json
index 15d0425a0..12a643863 100644
--- a/e2etests/testdata/root/border-radius/elk/board.exp.json
+++ b/e2etests/testdata/root/border-radius/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/double-border/dagre/board.exp.json b/e2etests/testdata/root/double-border/dagre/board.exp.json
index 972cba46b..536ef6ec8 100644
--- a/e2etests/testdata/root/double-border/dagre/board.exp.json
+++ b/e2etests/testdata/root/double-border/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/double-border/elk/board.exp.json b/e2etests/testdata/root/double-border/elk/board.exp.json
index d10cd1368..c14094633 100644
--- a/e2etests/testdata/root/double-border/elk/board.exp.json
+++ b/e2etests/testdata/root/double-border/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json b/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
index 24b35b4b8..30c416d4a 100644
--- a/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/even-stroke-width/elk/board.exp.json b/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
index edcbef831..95eb93e8a 100644
--- a/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
+++ b/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/fill/dagre/board.exp.json b/e2etests/testdata/root/fill/dagre/board.exp.json
index 504539b1e..e53ba605f 100644
--- a/e2etests/testdata/root/fill/dagre/board.exp.json
+++ b/e2etests/testdata/root/fill/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/fill/elk/board.exp.json b/e2etests/testdata/root/fill/elk/board.exp.json
index 87a2c87dc..710acbd9b 100644
--- a/e2etests/testdata/root/fill/elk/board.exp.json
+++ b/e2etests/testdata/root/fill/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-dash/dagre/board.exp.json b/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
index a70da62b0..958c309f4 100644
--- a/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-dash/elk/board.exp.json b/e2etests/testdata/root/stroke-dash/elk/board.exp.json
index 42dc62695..21830ad7d 100644
--- a/e2etests/testdata/root/stroke-dash/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-dash/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json b/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
index cebdbd24b..9eabe67d3 100644
--- a/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-no-width/elk/board.exp.json b/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
index ed0120575..cfa88c214 100644
--- a/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-width/dagre/board.exp.json b/e2etests/testdata/root/stroke-width/dagre/board.exp.json
index f8f657b4b..3be01ea19 100644
--- a/e2etests/testdata/root/stroke-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-width/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-width/elk/board.exp.json b/e2etests/testdata/root/stroke-width/elk/board.exp.json
index c075425bd..4470f2722 100644
--- a/e2etests/testdata/root/stroke-width/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-width/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d72efee19..aa843643c 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 faaa15648..3b9baf1d2 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/basic/dagre/board.exp.json b/e2etests/testdata/sanity/basic/dagre/board.exp.json
index 424a2f40d..4b6ba7d06 100644
--- a/e2etests/testdata/sanity/basic/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/basic/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/basic/elk/board.exp.json b/e2etests/testdata/sanity/basic/elk/board.exp.json
index 380f90c86..7b5172c33 100644
--- a/e2etests/testdata/sanity/basic/elk/board.exp.json
+++ b/e2etests/testdata/sanity/basic/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ab6f71aa6..6dbcb3ca3 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 fba244d70..ff5e8c00c 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
index da6a8478e..70110085f 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json
index b84611862..e80f114f4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/empty/dagre/board.exp.json b/e2etests/testdata/sanity/empty/dagre/board.exp.json
index 96894858a..fb8672f6b 100644
--- a/e2etests/testdata/sanity/empty/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/empty/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [],
   "connections": [],
diff --git a/e2etests/testdata/sanity/empty/elk/board.exp.json b/e2etests/testdata/sanity/empty/elk/board.exp.json
index 96894858a..fb8672f6b 100644
--- a/e2etests/testdata/sanity/empty/elk/board.exp.json
+++ b/e2etests/testdata/sanity/empty/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [],
   "connections": [],
diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
index 6a734dc6d..c81c344ab 100644
--- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
+++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
index f2d0e8745..e1a5484d4 100644
--- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
+++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
index cec0d4aec..7182353a4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json
index 8523e8c89..1322655ba 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e8411fccd..5b470e291 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ddcf653ec..45f7f64e4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 4f34164a1..45b34f835 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 70b001e2c..9ae6f8e51 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/animated/dagre/board.exp.json b/e2etests/testdata/stable/animated/dagre/board.exp.json
index 436bfbd96..fe344cd5f 100644
--- a/e2etests/testdata/stable/animated/dagre/board.exp.json
+++ b/e2etests/testdata/stable/animated/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/animated/elk/board.exp.json b/e2etests/testdata/stable/animated/elk/board.exp.json
index f2f873df9..e1bebebb9 100644
--- a/e2etests/testdata/stable/animated/elk/board.exp.json
+++ b/e2etests/testdata/stable/animated/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
index 480e18cdc..4b0a3492a 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
index 936048621..74d42e754 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
index 7484960db..5c453af9b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
index 75a260b6d..33553369a 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
index de869c6c8..0837fe23d 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json
index ff0f0caf0..0a20df0d7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/border-radius/dagre/board.exp.json b/e2etests/testdata/stable/border-radius/dagre/board.exp.json
index 03de30437..a7a95516c 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/border-radius/elk/board.exp.json b/e2etests/testdata/stable/border-radius/elk/board.exp.json
index fbcb76768..7bf28caa0 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
index 4b42592ad..790c6cab9 100644
--- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json
index 7915c6c46..f3374690e 100644
--- a/e2etests/testdata/stable/chaos2/elk/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
index 5c9274866..e40e60c03 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
index da5400099..6a9d70baa 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
index 06afc35d9..6db120ab8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
index c49b54c57..737d77c51 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/class/dagre/board.exp.json b/e2etests/testdata/stable/class/dagre/board.exp.json
index 8a8419254..a4642c01d 100644
--- a/e2etests/testdata/stable/class/dagre/board.exp.json
+++ b/e2etests/testdata/stable/class/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json
index f3240d194..3b9393e55 100644
--- a/e2etests/testdata/stable/class/elk/board.exp.json
+++ b/e2etests/testdata/stable/class/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
index 4c8f8788c..6a958bd4a 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json
index d2f197cce..9725399e1 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
index fd8602b3c..f81f29157 100644
--- a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
+++ b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -170,6 +171,7 @@
   "layers": [
     {
       "name": "window",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -299,6 +301,7 @@
     },
     {
       "name": "roof",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -469,6 +472,7 @@
     },
     {
       "name": "garage",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -598,6 +602,7 @@
     },
     {
       "name": "repair",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [],
       "connections": [],
@@ -644,6 +649,7 @@
       "steps": [
         {
           "name": "1",
+          "boardContainer": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -814,6 +820,7 @@
         },
         {
           "name": "2",
+          "boardContainer": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -992,6 +999,7 @@
         },
         {
           "name": "3",
+          "boardContainer": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1170,6 +1178,7 @@
         },
         {
           "name": "4",
+          "boardContainer": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1352,6 +1361,7 @@
   "scenarios": [
     {
       "name": "storm",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
diff --git a/e2etests/testdata/stable/complex-layers/elk/board.exp.json b/e2etests/testdata/stable/complex-layers/elk/board.exp.json
index 148a3ee4d..1758f3797 100644
--- a/e2etests/testdata/stable/complex-layers/elk/board.exp.json
+++ b/e2etests/testdata/stable/complex-layers/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -170,6 +171,7 @@
   "layers": [
     {
       "name": "window",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -299,6 +301,7 @@
     },
     {
       "name": "roof",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -469,6 +472,7 @@
     },
     {
       "name": "garage",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -598,6 +602,7 @@
     },
     {
       "name": "repair",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [],
       "connections": [],
@@ -644,6 +649,7 @@
       "steps": [
         {
           "name": "1",
+          "boardContainer": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -814,6 +820,7 @@
         },
         {
           "name": "2",
+          "boardContainer": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -983,6 +990,7 @@
         },
         {
           "name": "3",
+          "boardContainer": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1152,6 +1160,7 @@
         },
         {
           "name": "4",
+          "boardContainer": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1325,6 +1334,7 @@
   "scenarios": [
     {
       "name": "storm",
+      "boardContainer": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json
index e400ccc13..7a93813b7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json
index b03aabb04..919165744 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cdf7a33ee..119cad4c8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cd10f031f..bd09f24e8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 39e6e31cc..d46129be2 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f79d4c30d..198eb8525 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json
index 3cad345d1..0b4a8e2d6 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json
index a0337524b..993929023 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3baeb79c2..01843fda6 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9c5f86db8..650639a6e 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json
index 31c3abb47..cd7945594 100644
--- a/e2etests/testdata/stable/dense/dagre/board.exp.json
+++ b/e2etests/testdata/stable/dense/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json
index e25b383da..2cd12cfda 100644
--- a/e2etests/testdata/stable/dense/elk/board.exp.json
+++ b/e2etests/testdata/stable/dense/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
index f754ecb83..34f8e812c 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
index 2d9d74555..45e7f4aaa 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json
index efa37c3ad..1e06050f8 100644
--- a/e2etests/testdata/stable/direction/dagre/board.exp.json
+++ b/e2etests/testdata/stable/direction/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/direction/elk/board.exp.json b/e2etests/testdata/stable/direction/elk/board.exp.json
index a1b3a6af1..f0cdbeadc 100644
--- a/e2etests/testdata/stable/direction/elk/board.exp.json
+++ b/e2etests/testdata/stable/direction/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json
index 058f22c0c..a407d3b9c 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json
index b3cc6f58b..b5eb06395 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
index b5c62ae80..3e0e925d0 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json
index 876dd548f..06f0bea63 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
index da94baf6b..5d58e92b6 100644
--- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
index a41cb42c9..93c0e1d69 100644
--- a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 8bd643334..14396fe00 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3e155200a..99c53a54b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
index 190cab813..9f0db2a38 100644
--- a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json b/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
index 456ec1a8d..5c53236da 100644
--- a/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hr/dagre/board.exp.json b/e2etests/testdata/stable/hr/dagre/board.exp.json
index b7d3fb0a9..f3b845588 100644
--- a/e2etests/testdata/stable/hr/dagre/board.exp.json
+++ b/e2etests/testdata/stable/hr/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json
index a23ac2d29..21804cee6 100644
--- a/e2etests/testdata/stable/hr/elk/board.exp.json
+++ b/e2etests/testdata/stable/hr/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
index 6a9766e85..54b8b2c3a 100644
--- a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
+++ b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-containers/elk/board.exp.json b/e2etests/testdata/stable/icon-containers/elk/board.exp.json
index 044e36d83..1c4511741 100644
--- a/e2etests/testdata/stable/icon-containers/elk/board.exp.json
+++ b/e2etests/testdata/stable/icon-containers/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-label/dagre/board.exp.json b/e2etests/testdata/stable/icon-label/dagre/board.exp.json
index fa5b9fc74..4ab131247 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-label/elk/board.exp.json b/e2etests/testdata/stable/icon-label/elk/board.exp.json
index ee6850ad7..fd319a7b7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json
index b319fbf21..f20a98616 100644
--- a/e2etests/testdata/stable/images/dagre/board.exp.json
+++ b/e2etests/testdata/stable/images/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/images/elk/board.exp.json b/e2etests/testdata/stable/images/elk/board.exp.json
index 26ed14a85..975aeb591 100644
--- a/e2etests/testdata/stable/images/elk/board.exp.json
+++ b/e2etests/testdata/stable/images/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json
index 2101879fc..05ba5a1ce 100644
--- a/e2etests/testdata/stable/investigate/dagre/board.exp.json
+++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json
index ace8734f2..c4963c6ae 100644
--- a/e2etests/testdata/stable/investigate/elk/board.exp.json
+++ b/e2etests/testdata/stable/investigate/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json
index f642b2721..f8b1ea204 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json
index d19f3bcac..a0a6290d3 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json
index b9b9031c4..463ab2df1 100644
--- a/e2etests/testdata/stable/latex/dagre/board.exp.json
+++ b/e2etests/testdata/stable/latex/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json
index 69f1b6197..375a315e3 100644
--- a/e2etests/testdata/stable/latex/elk/board.exp.json
+++ b/e2etests/testdata/stable/latex/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li1/dagre/board.exp.json b/e2etests/testdata/stable/li1/dagre/board.exp.json
index 30e005dc5..d64df2dfe 100644
--- a/e2etests/testdata/stable/li1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li1/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li1/elk/board.exp.json b/e2etests/testdata/stable/li1/elk/board.exp.json
index 51148dcb8..485e8f7ad 100644
--- a/e2etests/testdata/stable/li1/elk/board.exp.json
+++ b/e2etests/testdata/stable/li1/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li2/dagre/board.exp.json b/e2etests/testdata/stable/li2/dagre/board.exp.json
index 3e4110b2f..26ad64521 100644
--- a/e2etests/testdata/stable/li2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li2/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li2/elk/board.exp.json b/e2etests/testdata/stable/li2/elk/board.exp.json
index fecd92d2e..ab3071df0 100644
--- a/e2etests/testdata/stable/li2/elk/board.exp.json
+++ b/e2etests/testdata/stable/li2/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li3/dagre/board.exp.json b/e2etests/testdata/stable/li3/dagre/board.exp.json
index be548651c..c57e40df9 100644
--- a/e2etests/testdata/stable/li3/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li3/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li3/elk/board.exp.json b/e2etests/testdata/stable/li3/elk/board.exp.json
index 5d2436b8b..070ee20d6 100644
--- a/e2etests/testdata/stable/li3/elk/board.exp.json
+++ b/e2etests/testdata/stable/li3/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li4/dagre/board.exp.json b/e2etests/testdata/stable/li4/dagre/board.exp.json
index ba878a443..2313060cb 100644
--- a/e2etests/testdata/stable/li4/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li4/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li4/elk/board.exp.json b/e2etests/testdata/stable/li4/elk/board.exp.json
index f88624383..9d5a5ad46 100644
--- a/e2etests/testdata/stable/li4/elk/board.exp.json
+++ b/e2etests/testdata/stable/li4/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/links/dagre/board.exp.json b/e2etests/testdata/stable/links/dagre/board.exp.json
index 89a40210f..fba2b69ba 100644
--- a/e2etests/testdata/stable/links/dagre/board.exp.json
+++ b/e2etests/testdata/stable/links/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/links/elk/board.exp.json b/e2etests/testdata/stable/links/elk/board.exp.json
index c5f595fa6..5b0689d08 100644
--- a/e2etests/testdata/stable/links/elk/board.exp.json
+++ b/e2etests/testdata/stable/links/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
index 727252981..5046f309c 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/lone_h1/elk/board.exp.json b/e2etests/testdata/stable/lone_h1/elk/board.exp.json
index e3e1c4f11..16ee84b9a 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/markdown/dagre/board.exp.json b/e2etests/testdata/stable/markdown/dagre/board.exp.json
index d3815d57f..3ca56e341 100644
--- a/e2etests/testdata/stable/markdown/dagre/board.exp.json
+++ b/e2etests/testdata/stable/markdown/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/markdown/elk/board.exp.json b/e2etests/testdata/stable/markdown/elk/board.exp.json
index d4932c3ff..827783b59 100644
--- a/e2etests/testdata/stable/markdown/elk/board.exp.json
+++ b/e2etests/testdata/stable/markdown/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 859e2d036..f0cbc7d62 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 283bdcbe6..7cd367a8e 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 5fb40f77f..70e155cc4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 99aba2faf..01b1bf9bc 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a7c93f7d7..6ed78f708 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 090068c1b..09fe4c5a9 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 6a854148a..11eb0cd3c 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 8d993680e..a0646cd76 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 0b3acf60f..76107a787 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 abff0cf62..ab50aa02f 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cf64ddd66..ac4f11922 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 97cf0d7c8..b5a097af0 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
index e861dc3b8..6cae4e1fb 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiline_text/elk/board.exp.json b/e2etests/testdata/stable/multiline_text/elk/board.exp.json
index 57843b510..5dd8c3ee4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
index b1b0fe6e4..6bfd0338e 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
index f261a7a2f..ba69368bd 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
index e9b076501..f610a31dd 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json
index 9b8914f03..60a9842c9 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/near-alone/dagre/board.exp.json b/e2etests/testdata/stable/near-alone/dagre/board.exp.json
index 93072965d..68a75843b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/near-alone/elk/board.exp.json b/e2etests/testdata/stable/near-alone/elk/board.exp.json
index 93072965d..68a75843b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/number_connections/dagre/board.exp.json b/e2etests/testdata/stable/number_connections/dagre/board.exp.json
index 60bbb6690..fb86cb480 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/number_connections/elk/board.exp.json b/e2etests/testdata/stable/number_connections/elk/board.exp.json
index 6ba6dbe7b..71d3eae76 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ee04039c5..f5925a7fd 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1ecd26c36..8b56a4f21 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2de0c4ed4..106747a0a 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7a5fdbbda..e6ef206b0 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/ovals/dagre/board.exp.json b/e2etests/testdata/stable/ovals/dagre/board.exp.json
index 08946aa7b..72b9a89a7 100644
--- a/e2etests/testdata/stable/ovals/dagre/board.exp.json
+++ b/e2etests/testdata/stable/ovals/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/ovals/elk/board.exp.json b/e2etests/testdata/stable/ovals/elk/board.exp.json
index ba3ed3869..306644b2f 100644
--- a/e2etests/testdata/stable/ovals/elk/board.exp.json
+++ b/e2etests/testdata/stable/ovals/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2ca959e55..ac4676501 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e2bf4dda7..3f68b451b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/p/dagre/board.exp.json b/e2etests/testdata/stable/p/dagre/board.exp.json
index f2d4c3369..1c942f945 100644
--- a/e2etests/testdata/stable/p/dagre/board.exp.json
+++ b/e2etests/testdata/stable/p/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/p/elk/board.exp.json b/e2etests/testdata/stable/p/elk/board.exp.json
index 618c4c13f..c678af1b3 100644
--- a/e2etests/testdata/stable/p/elk/board.exp.json
+++ b/e2etests/testdata/stable/p/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/people/dagre/board.exp.json b/e2etests/testdata/stable/people/dagre/board.exp.json
index 5ab47d594..44961c7db 100644
--- a/e2etests/testdata/stable/people/dagre/board.exp.json
+++ b/e2etests/testdata/stable/people/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/people/elk/board.exp.json b/e2etests/testdata/stable/people/elk/board.exp.json
index b5ace7d95..d872830ec 100644
--- a/e2etests/testdata/stable/people/elk/board.exp.json
+++ b/e2etests/testdata/stable/people/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/pre/dagre/board.exp.json b/e2etests/testdata/stable/pre/dagre/board.exp.json
index 8d2db1d73..e21d1e5b0 100644
--- a/e2etests/testdata/stable/pre/dagre/board.exp.json
+++ b/e2etests/testdata/stable/pre/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json
index d9a2e5fcc..c34ba54ce 100644
--- a/e2etests/testdata/stable/pre/elk/board.exp.json
+++ b/e2etests/testdata/stable/pre/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
index 5a870fe1f..bfd578f08 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/self-referencing/elk/board.exp.json b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
index 57b5e7a6e..a5f367899 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c9d5e6336..017e9012a 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c9d5e6336..017e9012a 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3c5f512f9..1c68d7344 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3c5f512f9..1c68d7344 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 002420091..50728400d 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 002420091..50728400d 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ba648e6d1..872698fa4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ba648e6d1..872698fa4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 74cd3a454..ccdd5e0e7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 74cd3a454..ccdd5e0e7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d38fe5e51..18cc4d71d 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d38fe5e51..18cc4d71d 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 19f5d79db..2f55aa1f8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 19f5d79db..2f55aa1f8 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 0761baae8..9ba1dd3e7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 0761baae8..9ba1dd3e7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c93f26e22..e34c26bc4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c93f26e22..e34c26bc4 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7fca0b258..d4efaa1e0 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 5c0a10f91..fab9599d9 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f42a57415..a2170b053 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f42a57415..a2170b053 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 eb7dd4b56..6a314506b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 eb7dd4b56..6a314506b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b3da75484..e1247de23 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b3da75484..e1247de23 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
index ad44ae2dd..eba38ab7e 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
index 9d0a3e81e..09e9f9875 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
index e3f09f780..fadd77f24 100644
--- a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
index 990dda0e3..da6bae686 100644
--- a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
+++ b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 8474447cb..852c6d887 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 be3bff3ef..d514baf01 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
index b2ff36297..ddb9b58b0 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json
index d5f685c6b..a63bc0c9c 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json
index 20c75587d..f03ee32c2 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json
index 50765bc6f..f2ece7f23 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3901e45d7..2e2252cc7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ed5a0816f..77b8d06d2 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json
index 1a10ef85c..15914d519 100644
--- a/e2etests/testdata/stable/stylish/dagre/board.exp.json
+++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json
index f19dab9df..b9d707aae 100644
--- a/e2etests/testdata/stable/stylish/elk/board.exp.json
+++ b/e2etests/testdata/stable/stylish/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 6f48045b4..e2cd3ef08 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b346fece9..d2effa063 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/tooltips/dagre/board.exp.json b/e2etests/testdata/stable/tooltips/dagre/board.exp.json
index 9c12ef4b1..e64c8389d 100644
--- a/e2etests/testdata/stable/tooltips/dagre/board.exp.json
+++ b/e2etests/testdata/stable/tooltips/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/tooltips/elk/board.exp.json b/e2etests/testdata/stable/tooltips/elk/board.exp.json
index 01686859d..c2d28b3d2 100644
--- a/e2etests/testdata/stable/tooltips/elk/board.exp.json
+++ b/e2etests/testdata/stable/tooltips/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
index 7ae3737ab..681a68515 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
index f67929f97..a2811af3f 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 4e9b35c3c..a64b7c5f2 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3305e3fb0..61bd31f20 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b2c996942..9c89f62e1 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1b4f6e633..cd7b0c25b 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json
index 0852faee1..c735c7506 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json
index 72255e773..7cfe72081 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json b/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
index d1227105a..d65907f94 100644
--- a/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_icon_label/elk/board.exp.json b/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
index 2d9d86715..758b7efb2 100644
--- a/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
index 334089833..7b892f5e4 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
index 95c392c1e..7727264e2 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
index f73036e74..211709f94 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
index 9d19df3fd..2c0529d02 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 fd20181e5..cf70b6ad7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 fd20181e5..cf70b6ad7 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
index 6e11589ff..78cbf6abd 100644
--- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
+++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
index ae0771831..158406d1c 100644
--- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
+++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 18ae97e15..3a2030839 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 5dd3a43d6..0eaed615e 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/chinese/dagre/board.exp.json b/e2etests/testdata/unicode/chinese/dagre/board.exp.json
index 00a8db699..b1f6b1813 100644
--- a/e2etests/testdata/unicode/chinese/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/chinese/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/chinese/elk/board.exp.json b/e2etests/testdata/unicode/chinese/elk/board.exp.json
index 07eed819e..274dddcd8 100644
--- a/e2etests/testdata/unicode/chinese/elk/board.exp.json
+++ b/e2etests/testdata/unicode/chinese/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/emojis/dagre/board.exp.json b/e2etests/testdata/unicode/emojis/dagre/board.exp.json
index 7199b5c33..fb6b4908d 100644
--- a/e2etests/testdata/unicode/emojis/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/emojis/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/emojis/elk/board.exp.json b/e2etests/testdata/unicode/emojis/elk/board.exp.json
index 9afb3848c..a82419203 100644
--- a/e2etests/testdata/unicode/emojis/elk/board.exp.json
+++ b/e2etests/testdata/unicode/emojis/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
index 02b9cedc4..84e505290 100644
--- a/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json b/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
index 092ed81c1..a0413515c 100644
--- a/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
index c7c04b59a..bb165da1b 100644
--- a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-full/elk/board.exp.json b/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
index 388913be5..ee7531a40 100644
--- a/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
index 74ca5efa0..2d83ce493 100644
--- a/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json b/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
index 8bbc66a45..9dafa63d5 100644
--- a/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/korean/dagre/board.exp.json b/e2etests/testdata/unicode/korean/dagre/board.exp.json
index 8814404c9..a04b66131 100644
--- a/e2etests/testdata/unicode/korean/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/korean/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/korean/elk/board.exp.json b/e2etests/testdata/unicode/korean/elk/board.exp.json
index 3bff4788e..aac2016f0 100644
--- a/e2etests/testdata/unicode/korean/elk/board.exp.json
+++ b/e2etests/testdata/unicode/korean/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
index 5dcd39272..5aa64d0a4 100644
--- a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
index 6a8c52980..5303af0c2 100644
--- a/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
index 678d9ae41..4a6fb24c2 100644
--- a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
index 48de8bd2b..3ab37d0ea 100644
--- a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/with-style/dagre/board.exp.json b/e2etests/testdata/unicode/with-style/dagre/board.exp.json
index 1b150187c..edb70cab7 100644
--- a/e2etests/testdata/unicode/with-style/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/with-style/dagre/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/with-style/elk/board.exp.json b/e2etests/testdata/unicode/with-style/elk/board.exp.json
index ef37abcaa..5e3c9f318 100644
--- a/e2etests/testdata/unicode/with-style/elk/board.exp.json
+++ b/e2etests/testdata/unicode/with-style/elk/board.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/go.mod b/go.mod
index 02ded6971..3d996c072 100644
--- a/go.mod
+++ b/go.mod
@@ -23,7 +23,7 @@ require (
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
 	gonum.org/v1/plot v0.12.0
 	nhooyr.io/websocket v1.8.7
-	oss.terrastruct.com/util-go v0.0.0-20230212154233-14479bbd1147
+	oss.terrastruct.com/util-go v0.0.0-20230224133755-305bb6ab7844
 )
 
 require (
diff --git a/go.sum b/go.sum
index 1d9faae0c..07e2008cc 100644
--- a/go.sum
+++ b/go.sum
@@ -277,6 +277,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
-oss.terrastruct.com/util-go v0.0.0-20230212154233-14479bbd1147 h1:h7G8ozAxp7Uh7z7CSmBkqy5/j06vYVED150009fmN4I=
-oss.terrastruct.com/util-go v0.0.0-20230212154233-14479bbd1147/go.mod h1:Fwy72FDIOOM4K8F96ScXkxHHppR1CPfUyo9+x9c1PBU=
+oss.terrastruct.com/util-go v0.0.0-20230224133755-305bb6ab7844 h1:VPvvOad7FchgCtBw9p2R1/0KQAl2ot/HoeYFpb9C82I=
+oss.terrastruct.com/util-go v0.0.0-20230224133755-305bb6ab7844/go.mod h1:Fwy72FDIOOM4K8F96ScXkxHHppR1CPfUyo9+x9c1PBU=
 rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=
diff --git a/main.go b/main.go
index b23ed4d43..de0a0a4e9 100644
--- a/main.go
+++ b/main.go
@@ -306,33 +306,76 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketc
 }
 
 func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plugin d2plugin.Plugin, sketch bool, pad int64, themeID int64, darkThemeID *int64, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([]byte, error) {
-	outputPath = layerOutputPath(outputPath, diagram)
+	if diagram.Name != "" {
+		ext := filepath.Ext(outputPath)
+		outputPath = strings.TrimSuffix(outputPath, ext)
+		outputPath = filepath.Join(outputPath, diagram.Name)
+		outputPath += ext
+	}
+
+	boardOutputPath := outputPath
+	if len(diagram.Layers) > 0 || len(diagram.Scenarios) > 0 || len(diagram.Steps) > 0 {
+		// Boards with subboards must be self-contained folders.
+		ext := filepath.Ext(boardOutputPath)
+		boardOutputPath = strings.TrimSuffix(boardOutputPath, ext)
+		os.RemoveAll(boardOutputPath)
+		boardOutputPath = filepath.Join(boardOutputPath, "index")
+		boardOutputPath += ext
+	}
+
+	layersOutputPath := outputPath
+	if len(diagram.Scenarios) > 0 || len(diagram.Steps) > 0 {
+		ext := filepath.Ext(layersOutputPath)
+		layersOutputPath = strings.TrimSuffix(layersOutputPath, ext)
+		layersOutputPath = filepath.Join(layersOutputPath, "layers")
+		layersOutputPath += ext
+	}
+	scenariosOutputPath := outputPath
+	if len(diagram.Layers) > 0 || len(diagram.Steps) > 0 {
+		ext := filepath.Ext(scenariosOutputPath)
+		scenariosOutputPath = strings.TrimSuffix(scenariosOutputPath, ext)
+		scenariosOutputPath = filepath.Join(scenariosOutputPath, "scenarios")
+		scenariosOutputPath += ext
+	}
+	stepsOutputPath := outputPath
+	if len(diagram.Layers) > 0 || len(diagram.Scenarios) > 0 {
+		ext := filepath.Ext(stepsOutputPath)
+		stepsOutputPath = strings.TrimSuffix(stepsOutputPath, ext)
+		stepsOutputPath = filepath.Join(stepsOutputPath, "steps")
+		stepsOutputPath += ext
+	}
+
 	for _, dl := range diagram.Layers {
-		_, err := render(ctx, ms, compileDur, plugin, sketch, pad, themeID, darkThemeID, inputPath, outputPath, bundle, forceAppendix, page, ruler, dl)
+		_, err := render(ctx, ms, compileDur, plugin, sketch, pad, themeID, darkThemeID, inputPath, layersOutputPath, bundle, forceAppendix, page, ruler, dl)
 		if err != nil {
 			return nil, err
 		}
 	}
 	for _, dl := range diagram.Scenarios {
-		_, err := render(ctx, ms, compileDur, plugin, sketch, pad, themeID, darkThemeID, inputPath, outputPath, bundle, forceAppendix, page, ruler, dl)
+		_, err := render(ctx, ms, compileDur, plugin, sketch, pad, themeID, darkThemeID, inputPath, scenariosOutputPath, bundle, forceAppendix, page, ruler, dl)
 		if err != nil {
 			return nil, err
 		}
 	}
 	for _, dl := range diagram.Steps {
-		_, err := render(ctx, ms, compileDur, plugin, sketch, pad, themeID, darkThemeID, inputPath, outputPath, bundle, forceAppendix, page, ruler, dl)
+		_, err := render(ctx, ms, compileDur, plugin, sketch, pad, themeID, darkThemeID, inputPath, stepsOutputPath, bundle, forceAppendix, page, ruler, dl)
 		if err != nil {
 			return nil, err
 		}
 	}
-	start := time.Now()
-	svg, err := _render(ctx, ms, plugin, sketch, pad, themeID, darkThemeID, outputPath, bundle, forceAppendix, page, ruler, diagram)
-	if err != nil {
-		return svg, err
+
+	if !diagram.BoardContainer {
+		start := time.Now()
+		svg, err := _render(ctx, ms, plugin, sketch, pad, themeID, darkThemeID, boardOutputPath, bundle, forceAppendix, page, ruler, diagram)
+		if err != nil {
+			return svg, err
+		}
+		dur := compileDur + time.Since(start)
+		ms.Log.Success.Printf("successfully compiled %s to %s in %s", inputPath, boardOutputPath, dur)
+		return svg, nil
 	}
-	dur := compileDur + time.Since(start)
-	ms.Log.Success.Printf("successfully compiled %s to %s in %s", inputPath, outputPath, dur)
-	return svg, nil
+
+	return nil, nil
 }
 
 func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketch bool, pad int64, themeID int64, darkThemeID *int64, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([]byte, error) {
@@ -474,17 +517,6 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, ske
 	return svg, nil
 }
 
-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 .
 func renameExt(fp string, newExt string) string {
 	ext := filepath.Ext(fp)
diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json
index d4588e787..e7356cadc 100644
--- a/testdata/d2compiler/TestCompile/basic_icon.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,0:0:0-3:0:77",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
index 74535d9b3..d79f837e6 100644
--- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,0:0:0-3:0:33",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json
index a519d65a1..49192d955 100644
--- a/testdata/d2compiler/TestCompile/basic_shape.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,0:0:0-4:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json
index fb33638ba..fa4b00564 100644
--- a/testdata/d2compiler/TestCompile/basic_style.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_style.d2,0:0:0-4:0:28",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json
index 68fb7cf19..0682ec0ad 100644
--- a/testdata/d2compiler/TestCompile/class_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/class_paren.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,0:0:0-6:1:81",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json
index 1d39a3212..33de15dcc 100644
--- a/testdata/d2compiler/TestCompile/class_style.exp.json
+++ b/testdata/d2compiler/TestCompile/class_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,0:0:0-5:0:82",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json
index 5e917a018..5cd7500f6 100644
--- a/testdata/d2compiler/TestCompile/constraint_label.exp.json
+++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-3:1:38",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json
index 072ac22af..92b8d034e 100644
--- a/testdata/d2compiler/TestCompile/default_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/default_direction.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/default_direction.d2,0:0:0-0:1:1",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
index 9f346789d..d1f492915 100644
--- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
+++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimension_with_style.d2,0:0:0-4:0:43",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
index a5b45a2b1..f026f7e68 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,0:0:0-45:0:505",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
index 27d605bfa..2e7a9e8d8 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,0:0:0-5:0:54",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json
index 636b4fb3d..3fe67a387 100644
--- a/testdata/d2compiler/TestCompile/edge.exp.json
+++ b/testdata/d2compiler/TestCompile/edge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
index 02147eba1..1e1fd6fe5 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-9:0:168",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json
index 124bbc7f0..5323499de 100644
--- a/testdata/d2compiler/TestCompile/edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,0:0:0-2:0:57",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
index dd7ea9f90..25ee071f8 100644
--- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,0:0:0-4:0:107",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
index 22fb0bf42..b06c26dae 100644
--- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-13:0:123",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
index 252668201..9304cb2c1 100644
--- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,0:0:0-4:0:35",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
index d84e0455d..8e4f81b14 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-2:0:51",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
index 83b5d7183..2cba683b3 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-4:0:53",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json
index f768c5588..57bfb4d64 100644
--- a/testdata/d2compiler/TestCompile/edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,0:0:0-3:0:30",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
index 3eff01b38..7c2c91072 100644
--- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,0:0:0-5:0:114",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
index 900dde803..4702debce 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,0:0:0-5:0:39",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
index 63e0279b7..843d261cc 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,0:0:0-5:0:40",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
index 0d1e24e0e..5764f4cb3 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,0:0:0-5:0:50",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
index c5845edcb..40573e8c7 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,0:0:0-5:0:51",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
index 4069495d1..132eac5d4 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,0:0:0-7:0:59",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
index b8e131947..296b45768 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,0:0:0-9:0:69",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
index f70133e23..c741322e9 100644
--- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json
index 0901560aa..89050d0fe 100644
--- a/testdata/d2compiler/TestCompile/edge_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,0:0:0-4:0:102",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
index 7ab789ec0..b72a3c8c7 100644
--- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-5:0:57",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
index ef4b689aa..642fccd00 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,0:0:0-3:0:39",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
index 13da7398c..6af6763a1 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-4:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
index e51525ab6..a8e9bbb55 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,0:0:0-6:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
index a7541c459..fc2beb103 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,0:0:0-4:0:33",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
index bbc7e6603..ae2ea5ab4 100644
--- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-6:0:97",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
index ec7a39906..9add873b6 100644
--- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-1:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
index bd9108533..fb86d1449 100644
--- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-4:0:58",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json
index bdb71deb0..f31d0e805 100644
--- a/testdata/d2compiler/TestCompile/escaped_id.exp.json
+++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/escaped_id.d2,0:0:0-0:4:4",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json
index ffc9aea3f..33cdf6caf 100644
--- a/testdata/d2compiler/TestCompile/image_style.exp.json
+++ b/testdata/d2compiler/TestCompile/image_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,0:0:0-5:0:118",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json
index 7aa383a8d..6bb075ecd 100644
--- a/testdata/d2compiler/TestCompile/near_constant.exp.json
+++ b/testdata/d2compiler/TestCompile/near_constant.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json
index cbd905feb..84b2497b1 100644
--- a/testdata/d2compiler/TestCompile/nested_sql.exp.json
+++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,0:0:0-7:1:84",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
index 00ce55a57..b61e46689 100644
--- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
+++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/nil_scope_obj_regression.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json
index 35d0e55fb..dcf4445ff 100644
--- a/testdata/d2compiler/TestCompile/null.exp.json
+++ b/testdata/d2compiler/TestCompile/null.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/null.d2,0:0:0-1:0:5",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json
index 7c96d68c6..e4668ac25 100644
--- a/testdata/d2compiler/TestCompile/path_link.exp.json
+++ b/testdata/d2compiler/TestCompile/path_link.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,0:0:0-3:0:47",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json
index bde5c7157..6b1db13c4 100644
--- a/testdata/d2compiler/TestCompile/positions.exp.json
+++ b/testdata/d2compiler/TestCompile/positions.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/positions.d2,0:0:0-4:0:30",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
index b5e89869b..6ff5636d0 100644
--- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
+++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,0:0:0-8:0:94",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json
index 7f854e01c..0103ca5f7 100644
--- a/testdata/d2compiler/TestCompile/root_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/root_direction.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/root_direction.d2,0:0:0-0:16:16",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json
index 3b18c9b7f..fd3bcb67e 100644
--- a/testdata/d2compiler/TestCompile/root_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/root_sequence.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json
index e5769bdfb..93e81dd86 100644
--- a/testdata/d2compiler/TestCompile/self-referencing.exp.json
+++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
index c41a4f00b..db830101f 100644
--- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,0:0:0-10:0:137",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json
index a561fc72f..af4916738 100644
--- a/testdata/d2compiler/TestCompile/sequence_container.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,0:0:0-5:0:63",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
index 4674302c5..0f7cd6fa2 100644
--- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,0:0:0-6:0:60",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
index aa5093e97..46d3441ed 100644
--- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:0:0-5:0:54",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
index 02af6b56a..6e1c50fec 100644
--- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-9:0:101",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json
index df116fbee..400a5a3a9 100644
--- a/testdata/d2compiler/TestCompile/set_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/set_direction.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,0:0:0-2:1:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
index bf216c1c2..112ba1f9c 100644
--- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
+++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,0:0:0-4:0:40",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json
index 09e889fee..3dabfb8ae 100644
--- a/testdata/d2compiler/TestCompile/sql-regression.exp.json
+++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,0:0:0-10:0:87",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json
index c61a984fa..0a89b826e 100644
--- a/testdata/d2compiler/TestCompile/sql_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,0:0:0-5:1:73",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json
index 6479ada26..588652660 100644
--- a/testdata/d2compiler/TestCompile/stroke-width.exp.json
+++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-3:0:32",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
index 8ec78e2da..ef078622e 100644
--- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
+++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,0:0:0-11:0:99",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json
index a7447912c..558e99d92 100644
--- a/testdata/d2compiler/TestCompile/table_style.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,0:0:0-5:0:81",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json
index a81f2575d..088ceee97 100644
--- a/testdata/d2compiler/TestCompile/table_style_map.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,0:0:0-8:0:113",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
index cdcd84009..b1bd22042 100644
--- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
index a44664b67..404ec3861 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,0:0:0-4:0:21",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
index 0f25d4819..b9f6c4d55 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,0:0:0-4:0:28",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
index fbb09bf26..b635b5225 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,0:0:0-5:0:167",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
index b12d10cbd..a3b2844d8 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,0:0:0-5:0:172",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
index 43eb5dd75..efe266d34 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,0:0:0-6:0:32",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
index cddc450bb..5c10e6e75 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_create.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
index d4bd78e02..257d2d511 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,0:0:0-6:0:27",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
index 8f7a7bf84..7e7b026b5 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,0:0:0-5:0:174",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
index d7bb50733..c755b4d94 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,0:0:0-5:0:174",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
index aa3ea871a..c2d58fff4 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,0:0:0-6:0:29",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
index 6c2c9ac2d..4fcf25a58 100644
--- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_unresolved_obj.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
index 280044b62..1658df443 100644
--- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
+++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json
index eca980a30..0d195d036 100644
--- a/testdata/d2compiler/TestCompile/url_link.exp.json
+++ b/testdata/d2compiler/TestCompile/url_link.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,0:0:0-3:0:34",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
index 3bae4743f..59fff378f 100644
--- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,0:0:0-17:53:406",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile2/boards/boardContainer.exp.json b/testdata/d2compiler/TestCompile2/boards/boardContainer.exp.json
new file mode 100644
index 000000000..2477f86e7
--- /dev/null
+++ b/testdata/d2compiler/TestCompile2/boards/boardContainer.exp.json
@@ -0,0 +1,1688 @@
+{
+  "graph": {
+    "name": "",
+    "boardContainer": true,
+    "ast": {
+      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,0:0:0-18:0:165",
+      "nodes": [
+        {
+          "map_key": {
+            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-17:1:164",
+            "key": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                    "value": [
+                      {
+                        "string": "layers",
+                        "raw_string": "layers"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "primary": {},
+            "value": {
+              "map": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:8:9-17:0:163",
+                "nodes": [
+                  {
+                    "map_key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-4:3:33",
+                      "key": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                        "path": [
+                          {
+                            "unquoted_string": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                              "value": [
+                                {
+                                  "string": "one",
+                                  "raw_string": "one"
+                                }
+                              ]
+                            }
+                          }
+                        ]
+                      },
+                      "primary": {},
+                      "value": {
+                        "map": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:7:18-4:2:32",
+                          "nodes": [
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                        "value": [
+                                          {
+                                            "string": "santa",
+                                            "raw_string": "santa"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {}
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "map_key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-16:3:162",
+                      "key": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                        "path": [
+                          {
+                            "unquoted_string": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                              "value": [
+                                {
+                                  "string": "two",
+                                  "raw_string": "two"
+                                }
+                              ]
+                            }
+                          }
+                        ]
+                      },
+                      "primary": {},
+                      "value": {
+                        "map": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:7:41-16:2:161",
+                          "nodes": [
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                        "value": [
+                                          {
+                                            "string": "clause",
+                                            "raw_string": "clause"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {}
+                              }
+                            },
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-15:3:158",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                        "value": [
+                                          {
+                                            "string": "scenarios",
+                                            "raw_string": "scenarios"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {
+                                  "map": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:13:67-15:2:157",
+                                    "nodes": [
+                                      {
+                                        "map_key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-9:4:88",
+                                          "key": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                            "path": [
+                                              {
+                                                "unquoted_string": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                  "value": [
+                                                    {
+                                                      "string": "seinfeld",
+                                                      "raw_string": "seinfeld"
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            ]
+                                          },
+                                          "primary": {},
+                                          "value": {
+                                            "map": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:13:82-9:3:87",
+                                              "nodes": null
+                                            }
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "map_key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-14:4:154",
+                                          "key": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                            "path": [
+                                              {
+                                                "unquoted_string": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                  "value": [
+                                                    {
+                                                      "string": "missoula",
+                                                      "raw_string": "missoula"
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            ]
+                                          },
+                                          "primary": {},
+                                          "value": {
+                                            "map": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:13:102-14:3:153",
+                                              "nodes": [
+                                                {
+                                                  "map_key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-13:5:149",
+                                                    "key": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                      "path": [
+                                                        {
+                                                          "unquoted_string": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                            "value": [
+                                                              {
+                                                                "string": "steps",
+                                                                "raw_string": "steps"
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      ]
+                                                    },
+                                                    "primary": {},
+                                                    "value": {
+                                                      "map": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:11:115-13:4:148",
+                                                        "nodes": [
+                                                          {
+                                                            "map_key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:26:143",
+                                                              "key": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                "path": [
+                                                                  {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "missus",
+                                                                          "raw_string": "missus"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              },
+                                                              "primary": {},
+                                                              "value": {
+                                                                "unquoted_string": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:13:130-12:26:143",
+                                                                  "value": [
+                                                                    {
+                                                                      "string": "one two three",
+                                                                      "raw_string": "one two three"
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              }
+                                                            }
+                                                          }
+                                                        ]
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              ]
+                                            }
+                                          }
+                                        }
+                                      }
+                                    ]
+                                  }
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      ]
+    },
+    "root": {
+      "id": "",
+      "id_val": "",
+      "label_dimensions": {
+        "width": 0,
+        "height": 0
+      },
+      "attributes": {
+        "label": {
+          "value": ""
+        },
+        "style": {},
+        "near_key": null,
+        "shape": {
+          "value": ""
+        },
+        "direction": {
+          "value": ""
+        },
+        "constraint": {
+          "value": ""
+        }
+      },
+      "zIndex": 0
+    },
+    "edges": null,
+    "objects": null,
+    "layers": [
+      {
+        "name": "one",
+        "boardContainer": false,
+        "ast": {
+          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,0:0:0-18:0:165",
+          "nodes": [
+            {
+              "map_key": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-17:1:164",
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                        "value": [
+                          {
+                            "string": "layers",
+                            "raw_string": "layers"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "primary": {},
+                "value": {
+                  "map": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:8:9-17:0:163",
+                    "nodes": [
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-4:3:33",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                                  "value": [
+                                    {
+                                      "string": "one",
+                                      "raw_string": "one"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:7:18-4:2:32",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                            "value": [
+                                              {
+                                                "string": "santa",
+                                                "raw_string": "santa"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-16:3:162",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                                  "value": [
+                                    {
+                                      "string": "two",
+                                      "raw_string": "two"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:7:41-16:2:161",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                            "value": [
+                                              {
+                                                "string": "clause",
+                                                "raw_string": "clause"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                },
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-15:3:158",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                            "value": [
+                                              {
+                                                "string": "scenarios",
+                                                "raw_string": "scenarios"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {
+                                      "map": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:13:67-15:2:157",
+                                        "nodes": [
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-9:4:88",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                      "value": [
+                                                        {
+                                                          "string": "seinfeld",
+                                                          "raw_string": "seinfeld"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:13:82-9:3:87",
+                                                  "nodes": null
+                                                }
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-14:4:154",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                      "value": [
+                                                        {
+                                                          "string": "missoula",
+                                                          "raw_string": "missoula"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:13:102-14:3:153",
+                                                  "nodes": [
+                                                    {
+                                                      "map_key": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-13:5:149",
+                                                        "key": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                          "path": [
+                                                            {
+                                                              "unquoted_string": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                                "value": [
+                                                                  {
+                                                                    "string": "steps",
+                                                                    "raw_string": "steps"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          ]
+                                                        },
+                                                        "primary": {},
+                                                        "value": {
+                                                          "map": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:11:115-13:4:148",
+                                                            "nodes": [
+                                                              {
+                                                                "map_key": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:26:143",
+                                                                  "key": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                    "path": [
+                                                                      {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "missus",
+                                                                              "raw_string": "missus"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  },
+                                                                  "primary": {},
+                                                                  "value": {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:13:130-12:26:143",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "one two three",
+                                                                          "raw_string": "one two three"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "root": {
+          "id": "",
+          "id_val": "",
+          "label_dimensions": {
+            "width": 0,
+            "height": 0
+          },
+          "attributes": {
+            "label": {
+              "value": ""
+            },
+            "style": {},
+            "near_key": null,
+            "shape": {
+              "value": ""
+            },
+            "direction": {
+              "value": ""
+            },
+            "constraint": {
+              "value": ""
+            }
+          },
+          "zIndex": 0
+        },
+        "edges": null,
+        "objects": [
+          {
+            "id": "santa",
+            "id_val": "santa",
+            "label_dimensions": {
+              "width": 0,
+              "height": 0
+            },
+            "references": [
+              {
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                        "value": [
+                          {
+                            "string": "santa",
+                            "raw_string": "santa"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "key_path_index": 0,
+                "map_key_edge_index": -1
+              }
+            ],
+            "attributes": {
+              "label": {
+                "value": "santa"
+              },
+              "style": {},
+              "near_key": null,
+              "shape": {
+                "value": "rectangle"
+              },
+              "direction": {
+                "value": ""
+              },
+              "constraint": {
+                "value": ""
+              }
+            },
+            "zIndex": 0
+          }
+        ]
+      },
+      {
+        "name": "two",
+        "boardContainer": false,
+        "ast": {
+          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,0:0:0-18:0:165",
+          "nodes": [
+            {
+              "map_key": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-17:1:164",
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                        "value": [
+                          {
+                            "string": "layers",
+                            "raw_string": "layers"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "primary": {},
+                "value": {
+                  "map": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:8:9-17:0:163",
+                    "nodes": [
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-4:3:33",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                                  "value": [
+                                    {
+                                      "string": "one",
+                                      "raw_string": "one"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:7:18-4:2:32",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                            "value": [
+                                              {
+                                                "string": "santa",
+                                                "raw_string": "santa"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-16:3:162",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                                  "value": [
+                                    {
+                                      "string": "two",
+                                      "raw_string": "two"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:7:41-16:2:161",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                            "value": [
+                                              {
+                                                "string": "clause",
+                                                "raw_string": "clause"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                },
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-15:3:158",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                            "value": [
+                                              {
+                                                "string": "scenarios",
+                                                "raw_string": "scenarios"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {
+                                      "map": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:13:67-15:2:157",
+                                        "nodes": [
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-9:4:88",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                      "value": [
+                                                        {
+                                                          "string": "seinfeld",
+                                                          "raw_string": "seinfeld"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:13:82-9:3:87",
+                                                  "nodes": null
+                                                }
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-14:4:154",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                      "value": [
+                                                        {
+                                                          "string": "missoula",
+                                                          "raw_string": "missoula"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:13:102-14:3:153",
+                                                  "nodes": [
+                                                    {
+                                                      "map_key": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-13:5:149",
+                                                        "key": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                          "path": [
+                                                            {
+                                                              "unquoted_string": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                                "value": [
+                                                                  {
+                                                                    "string": "steps",
+                                                                    "raw_string": "steps"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          ]
+                                                        },
+                                                        "primary": {},
+                                                        "value": {
+                                                          "map": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:11:115-13:4:148",
+                                                            "nodes": [
+                                                              {
+                                                                "map_key": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:26:143",
+                                                                  "key": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                    "path": [
+                                                                      {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "missus",
+                                                                              "raw_string": "missus"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  },
+                                                                  "primary": {},
+                                                                  "value": {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:13:130-12:26:143",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "one two three",
+                                                                          "raw_string": "one two three"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "root": {
+          "id": "",
+          "id_val": "",
+          "label_dimensions": {
+            "width": 0,
+            "height": 0
+          },
+          "attributes": {
+            "label": {
+              "value": ""
+            },
+            "style": {},
+            "near_key": null,
+            "shape": {
+              "value": ""
+            },
+            "direction": {
+              "value": ""
+            },
+            "constraint": {
+              "value": ""
+            }
+          },
+          "zIndex": 0
+        },
+        "edges": null,
+        "objects": [
+          {
+            "id": "clause",
+            "id_val": "clause",
+            "label_dimensions": {
+              "width": 0,
+              "height": 0
+            },
+            "references": [
+              {
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                        "value": [
+                          {
+                            "string": "clause",
+                            "raw_string": "clause"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "key_path_index": 0,
+                "map_key_edge_index": -1
+              }
+            ],
+            "attributes": {
+              "label": {
+                "value": "clause"
+              },
+              "style": {},
+              "near_key": null,
+              "shape": {
+                "value": "rectangle"
+              },
+              "direction": {
+                "value": ""
+              },
+              "constraint": {
+                "value": ""
+              }
+            },
+            "zIndex": 0
+          }
+        ],
+        "scenarios": [
+          {
+            "name": "seinfeld",
+            "boardContainer": false,
+            "ast": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,0:0:0-18:0:165",
+              "nodes": [
+                {
+                  "map_key": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-17:1:164",
+                    "key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                      "path": [
+                        {
+                          "unquoted_string": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                            "value": [
+                              {
+                                "string": "layers",
+                                "raw_string": "layers"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    "primary": {},
+                    "value": {
+                      "map": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:8:9-17:0:163",
+                        "nodes": [
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-4:3:33",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                                      "value": [
+                                        {
+                                          "string": "one",
+                                          "raw_string": "one"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:7:18-4:2:32",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                                "value": [
+                                                  {
+                                                    "string": "santa",
+                                                    "raw_string": "santa"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-16:3:162",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                                      "value": [
+                                        {
+                                          "string": "two",
+                                          "raw_string": "two"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:7:41-16:2:161",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                                "value": [
+                                                  {
+                                                    "string": "clause",
+                                                    "raw_string": "clause"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    },
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-15:3:158",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                                "value": [
+                                                  {
+                                                    "string": "scenarios",
+                                                    "raw_string": "scenarios"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {
+                                          "map": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:13:67-15:2:157",
+                                            "nodes": [
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-9:4:88",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                          "value": [
+                                                            {
+                                                              "string": "seinfeld",
+                                                              "raw_string": "seinfeld"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:13:82-9:3:87",
+                                                      "nodes": null
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-14:4:154",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                          "value": [
+                                                            {
+                                                              "string": "missoula",
+                                                              "raw_string": "missoula"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:13:102-14:3:153",
+                                                      "nodes": [
+                                                        {
+                                                          "map_key": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-13:5:149",
+                                                            "key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                              "path": [
+                                                                {
+                                                                  "unquoted_string": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                                    "value": [
+                                                                      {
+                                                                        "string": "steps",
+                                                                        "raw_string": "steps"
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              ]
+                                                            },
+                                                            "primary": {},
+                                                            "value": {
+                                                              "map": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:11:115-13:4:148",
+                                                                "nodes": [
+                                                                  {
+                                                                    "map_key": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:26:143",
+                                                                      "key": {
+                                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                        "path": [
+                                                                          {
+                                                                            "unquoted_string": {
+                                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                              "value": [
+                                                                                {
+                                                                                  "string": "missus",
+                                                                                  "raw_string": "missus"
+                                                                                }
+                                                                              ]
+                                                                            }
+                                                                          }
+                                                                        ]
+                                                                      },
+                                                                      "primary": {},
+                                                                      "value": {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:13:130-12:26:143",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "one two three",
+                                                                              "raw_string": "one two three"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          }
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "root": {
+              "id": "",
+              "id_val": "",
+              "label_dimensions": {
+                "width": 0,
+                "height": 0
+              },
+              "attributes": {
+                "label": {
+                  "value": ""
+                },
+                "style": {},
+                "near_key": null,
+                "shape": {
+                  "value": ""
+                },
+                "direction": {
+                  "value": ""
+                },
+                "constraint": {
+                  "value": ""
+                }
+              },
+              "zIndex": 0
+            },
+            "edges": null,
+            "objects": null
+          },
+          {
+            "name": "missoula",
+            "boardContainer": false,
+            "ast": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,0:0:0-18:0:165",
+              "nodes": [
+                {
+                  "map_key": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-17:1:164",
+                    "key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                      "path": [
+                        {
+                          "unquoted_string": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:0:1-1:6:7",
+                            "value": [
+                              {
+                                "string": "layers",
+                                "raw_string": "layers"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    "primary": {},
+                    "value": {
+                      "map": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,1:8:9-17:0:163",
+                        "nodes": [
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-4:3:33",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:2:13-2:5:16",
+                                      "value": [
+                                        {
+                                          "string": "one",
+                                          "raw_string": "one"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,2:7:18-4:2:32",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,3:4:24-3:9:29",
+                                                "value": [
+                                                  {
+                                                    "string": "santa",
+                                                    "raw_string": "santa"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-16:3:162",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:2:36-5:5:39",
+                                      "value": [
+                                        {
+                                          "string": "two",
+                                          "raw_string": "two"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,5:7:41-16:2:161",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,6:4:47-6:10:53",
+                                                "value": [
+                                                  {
+                                                    "string": "clause",
+                                                    "raw_string": "clause"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    },
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-15:3:158",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:2:56-7:11:65",
+                                                "value": [
+                                                  {
+                                                    "string": "scenarios",
+                                                    "raw_string": "scenarios"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {
+                                          "map": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,7:13:67-15:2:157",
+                                            "nodes": [
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-9:4:88",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:3:72-8:11:80",
+                                                          "value": [
+                                                            {
+                                                              "string": "seinfeld",
+                                                              "raw_string": "seinfeld"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,8:13:82-9:3:87",
+                                                      "nodes": null
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-14:4:154",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:3:92-10:11:100",
+                                                          "value": [
+                                                            {
+                                                              "string": "missoula",
+                                                              "raw_string": "missoula"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,10:13:102-14:3:153",
+                                                      "nodes": [
+                                                        {
+                                                          "map_key": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-13:5:149",
+                                                            "key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                              "path": [
+                                                                {
+                                                                  "unquoted_string": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:4:108-11:9:113",
+                                                                    "value": [
+                                                                      {
+                                                                        "string": "steps",
+                                                                        "raw_string": "steps"
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              ]
+                                                            },
+                                                            "primary": {},
+                                                            "value": {
+                                                              "map": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,11:11:115-13:4:148",
+                                                                "nodes": [
+                                                                  {
+                                                                    "map_key": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:26:143",
+                                                                      "key": {
+                                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                        "path": [
+                                                                          {
+                                                                            "unquoted_string": {
+                                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:5:122-12:11:128",
+                                                                              "value": [
+                                                                                {
+                                                                                  "string": "missus",
+                                                                                  "raw_string": "missus"
+                                                                                }
+                                                                              ]
+                                                                            }
+                                                                          }
+                                                                        ]
+                                                                      },
+                                                                      "primary": {},
+                                                                      "value": {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/boardContainer.d2,12:13:130-12:26:143",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "one two three",
+                                                                              "raw_string": "one two three"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          }
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "root": {
+              "id": "",
+              "id_val": "",
+              "label_dimensions": {
+                "width": 0,
+                "height": 0
+              },
+              "attributes": {
+                "label": {
+                  "value": ""
+                },
+                "style": {},
+                "near_key": null,
+                "shape": {
+                  "value": ""
+                },
+                "direction": {
+                  "value": ""
+                },
+                "constraint": {
+                  "value": ""
+                }
+              },
+              "zIndex": 0
+            },
+            "edges": null,
+            "objects": null
+          }
+        ]
+      }
+    ]
+  },
+  "err": null
+}
diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
index 4496b0752..26b40ebc4 100644
--- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
       "nodes": [
@@ -373,6 +374,7 @@
     "layers": [
       {
         "name": "one",
+        "boardContainer": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
           "nodes": [
@@ -745,6 +747,7 @@
       },
       {
         "name": "two",
+        "boardContainer": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
           "nodes": [
@@ -1117,6 +1120,7 @@
         "steps": [
           {
             "name": "seinfeld",
+            "boardContainer": false,
             "ast": {
               "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
               "nodes": [
@@ -1489,6 +1493,7 @@
           },
           {
             "name": "missoula",
+            "boardContainer": false,
             "ast": {
               "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
               "nodes": [
diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json
index 7efd58eac..0cde5472a 100644
--- a/testdata/d2compiler/TestCompile2/boards/root.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
       "nodes": [
@@ -240,6 +241,7 @@
     "layers": [
       {
         "name": "one",
+        "boardContainer": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
           "nodes": [
@@ -479,6 +481,7 @@
       },
       {
         "name": "two",
+        "boardContainer": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
           "nodes": [
diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
index bcb6578e1..f57c040d8 100644
--- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
+++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json
index c3a73c250..76c94fd8a 100644
--- a/testdata/d2exporter/TestExport/connection/basic.exp.json
+++ b/testdata/d2exporter/TestExport/connection/basic.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
index bd7d592b7..bbf08a54a 100644
--- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
+++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
index e61f591c6..105ab2d04 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json
index f5e1adf88..c51558d50 100644
--- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json
+++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
index de93011a6..39313ede2 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
index 514507049..cf299ad8d 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json
index d7b1416f8..9d42b24d2 100644
--- a/testdata/d2exporter/TestExport/shape/basic.exp.json
+++ b/testdata/d2exporter/TestExport/shape/basic.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json
index 7fa756e9a..106b98988 100644
--- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json
+++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
index ef0c6423e..0d4034e3b 100644
--- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
+++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
index 333ef9d1b..cba840552 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json
index 2731c8828..9020cf14a 100644
--- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json
+++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json
index 1cfab40b1..6175b8a1e 100644
--- a/testdata/d2exporter/TestExport/shape/text_color.exp.json
+++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json
@@ -1,5 +1,6 @@
 {
   "name": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
index b3f4e132b..c51b77257 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
index bcd8419db..6eb2bb34f 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
index cbcfe8233..c8b16eed6 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
index fc6906a77..fef17876f 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
index b11d826fd..173e6d257 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": "",
+  "boardContainer": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json
index 996a7c994..78751d6e5 100644
--- a/testdata/d2oracle/TestCreate/base.exp.json
+++ b/testdata/d2oracle/TestCreate/base.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/base.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json
index 1a87d6d38..018c08d4a 100644
--- a/testdata/d2oracle/TestCreate/container.exp.json
+++ b/testdata/d2oracle/TestCreate/container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json
index 12ef49624..bf00c913f 100644
--- a/testdata/d2oracle/TestCreate/container_edge.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
index 482c30883..b45bf1af5 100644
--- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,0:0:0-3:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json
index 9667c122a..d1d9dc70b 100644
--- a/testdata/d2oracle/TestCreate/edge.exp.json
+++ b/testdata/d2oracle/TestCreate/edge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json
index 870d3a601..23b03dc76 100644
--- a/testdata/d2oracle/TestCreate/edge_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json
index cda1c03a6..b5446e794 100644
--- a/testdata/d2oracle/TestCreate/edge_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
index acba172e8..fb00c8ef4 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
index 62d3c0e7b..d64009920 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json
index bd24e02df..19c70051c 100644
--- a/testdata/d2oracle/TestCreate/edge_unique.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-4:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json
index c2b722f1c..0c019766c 100644
--- a/testdata/d2oracle/TestCreate/gen_key.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key.d2,0:0:0-1:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json
index f7b16843b..352975c35 100644
--- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_n.d2,0:0:0-13:0:132",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
index d0554e316..f11fad941 100644
--- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_nested.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
index 925596db4..fbba4f466 100644
--- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_scope.d2,0:0:0-4:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
index 91484dee5..8410e8875 100644
--- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_suffix.d2,0:0:0-2:0:10",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
index 82bbc2052..8e2c0414e 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,0:0:0-4:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
index e41155eaa..5293a0f51 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,0:0:0-6:0:48",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
index 442432aa7..bf6edf494 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,0:0:0-8:0:50",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json
index 643e62ffe..64fc28222 100644
--- a/testdata/d2oracle/TestCreate/nested.exp.json
+++ b/testdata/d2oracle/TestCreate/nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/nested.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json
index fd309beff..e6eb0354b 100644
--- a/testdata/d2oracle/TestCreate/scope.exp.json
+++ b/testdata/d2oracle/TestCreate/scope.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/scope.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json
index eb4cd6ebb..676850972 100644
--- a/testdata/d2oracle/TestDelete/arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
index 30ff73b25..0fcf35fdc 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-3:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
index 9fab0d94b..6cfcd1575 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
index 6ad6f3824..5727914be 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
index 15a36bad0..e7cf0ecb2 100644
--- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/breakup_arrowhead.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json
index 8c4a7ec9f..e03409a76 100644
--- a/testdata/d2oracle/TestDelete/chaos_1.exp.json
+++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:0:0-8:0:94",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json
index bbe45f5de..b9d9282e3 100644
--- a/testdata/d2oracle/TestDelete/children.exp.json
+++ b/testdata/d2oracle/TestDelete/children.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children.d2,0:0:0-2:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json
index b948b2c81..41fd2b690 100644
--- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_conflicts.d2,0:0:0-3:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
index 64ba9b515..d8db9f86b 100644
--- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-5:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
index 9ad7f6dc2..2cecde0dc 100644
--- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-6:0:41",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
index bcd4d45b9..463a4794e 100644
--- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_flat_conflicts.d2,0:0:0-4:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
index ff02a6970..ddc318287 100644
--- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-8:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
index 5325c9501..57d5c796b 100644
--- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_nested_conflicts.d2,0:0:0-5:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
index 52e1f8cb1..25061efa1 100644
--- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,0:0:0-6:0:33",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
index 452712e66..dd1f4c3eb 100644
--- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_no_self_conflict.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json
index 6c3104b9b..4f4fb28b1 100644
--- a/testdata/d2oracle/TestDelete/children_order.exp.json
+++ b/testdata/d2oracle/TestDelete/children_order.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_order.d2,0:0:0-7:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
index f4248dfb2..6a05c66f5 100644
--- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_referenced_conflicts.d2,0:0:0-5:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json
index 1d87e7168..3cc0fb48b 100644
--- a/testdata/d2oracle/TestDelete/children_scope.exp.json
+++ b/testdata/d2oracle/TestDelete/children_scope.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,0:0:0-4:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json
index 2da2da37f..7dd501b28 100644
--- a/testdata/d2oracle/TestDelete/container_near.exp.json
+++ b/testdata/d2oracle/TestDelete/container_near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,0:0:0-7:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
index 9dcbd5845..b3449d69a 100644
--- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,0:0:0-10:0:255",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json
index 66fcdfb72..ad7316e90 100644
--- a/testdata/d2oracle/TestDelete/delete_icon.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,0:0:0-3:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json
index 4fc895c7c..b282309c0 100644
--- a/testdata/d2oracle/TestDelete/delete_link.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_link.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_link.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json
index 77810228e..825fda7d2 100644
--- a/testdata/d2oracle/TestDelete/delete_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_near.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
index 80e21b12b..286925c5c 100644
--- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_needed_flat_near.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
index 17650db85..27238624b 100644
--- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_redundant_flat_near.d2,0:0:0-3:0:5",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
index d2cd0ee73..2b5fe8b2c 100644
--- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_tooltip.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
index 50846ea3b..047b5cb06 100644
--- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
index b10cd9d5f..33de5fab3 100644
--- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-1:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json
index 1e5e01fd3..77413c3ab 100644
--- a/testdata/d2oracle/TestDelete/edge_common.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
index fe55153e0..5b23e12ee 100644
--- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json
index a044a6d9c..4b96d3a96 100644
--- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_3.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json
index c04064cc8..ee9ad90d6 100644
--- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_4.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
index 69e5772aa..a7c242145 100644
--- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-2:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
index 4ab45fd6f..246f3b939 100644
--- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-10:0:102",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json
index 34e6fa07f..3988d6666 100644
--- a/testdata/d2oracle/TestDelete/edge_first.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_first.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
index 7910d6c66..08d649bad 100644
--- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
index 1e5afaf19..958a7058e 100644
--- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-1:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
index dbf182d48..6239e242d 100644
--- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json
index 5c5b92a1a..186c1a527 100644
--- a/testdata/d2oracle/TestDelete/edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_last.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
index e66a56e1a..1a670f8e2 100644
--- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json
index fa20d2ca4..16556d724 100644
--- a/testdata/d2oracle/TestDelete/edge_middle.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json
index 48a037b44..331ef9097 100644
--- a/testdata/d2oracle/TestDelete/empty_map.exp.json
+++ b/testdata/d2oracle/TestDelete/empty_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/empty_map.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json
index efd57ca61..8a66c38ba 100644
--- a/testdata/d2oracle/TestDelete/flat.exp.json
+++ b/testdata/d2oracle/TestDelete/flat.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/flat.d2,0:0:0-0:0:0",
       "nodes": null
diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
index b1933c4d0..7da09b6c7 100644
--- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json
index 21e5def64..b600b2fa7 100644
--- a/testdata/d2oracle/TestDelete/hoist_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/hoist_children.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
index c3703e0b0..15bef0922 100644
--- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json
index e7052b733..bb38c6f85 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges.d2,0:0:0-2:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
index 7895330b3..0709fa287 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_2.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
index 40833f8be..1f584d13a 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_3.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
index 81dfb3765..d710d5939 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_4.d2,0:0:0-2:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json
index 0be52a3ad..d58acf629 100644
--- a/testdata/d2oracle/TestDelete/left.exp.json
+++ b/testdata/d2oracle/TestDelete/left.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/left.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json
index ee3e75b94..90ce2349b 100644
--- a/testdata/d2oracle/TestDelete/multi_near.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,0:0:0-9:0:57",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
index ad7b50c02..72830543f 100644
--- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,0:0:0-6:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
index 911987500..8b707726e 100644
--- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.d2,0:0:0-5:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
index 07ec7b0f9..e12dcca12 100644
--- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_flat_middle_container.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
index ded66bfc1..3461face3 100644
--- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_flat_style.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
index f65f40986..6e446d065 100644
--- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,0:0:0-5:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json
index bc5952b25..134dfb547 100644
--- a/testdata/d2oracle/TestDelete/near.exp.json
+++ b/testdata/d2oracle/TestDelete/near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/near.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json
index 8cf70d4ac..0a822f970 100644
--- a/testdata/d2oracle/TestDelete/nested.exp.json
+++ b/testdata/d2oracle/TestDelete/nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json
index c0fcd695f..949fbaa99 100644
--- a/testdata/d2oracle/TestDelete/nested_2.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_2.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
index 5ec5bf573..fb1f195b9 100644
--- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
index f1e33ea61..cccef6a1e 100644
--- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json
index c7c746eb2..6ddee2d85 100644
--- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_reserved.d2,0:0:0-2:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
index 0600e7be2..c48eae332 100644
--- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_underscore_update.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
index dcb1a70ab..47f9dc294 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-5:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
index 655ce329f..31fb0fdfc 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-4:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
index 483e50180..aeccd4c5b 100644
--- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
+++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only-underscore-nested.d2,0:0:0-4:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json
index ce90b0614..d6ca8edea 100644
--- a/testdata/d2oracle/TestDelete/only-underscore.exp.json
+++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only-underscore.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
index 2b45a4726..b2cb71b09 100644
--- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
index 244083c88..565c3951e 100644
--- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json
index 281b408ec..44f7565bc 100644
--- a/testdata/d2oracle/TestDelete/order_1.exp.json
+++ b/testdata/d2oracle/TestDelete/order_1.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json
index 0e91a5f4f..158fdd600 100644
--- a/testdata/d2oracle/TestDelete/order_2.exp.json
+++ b/testdata/d2oracle/TestDelete/order_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_2.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json
index a10acc982..bba567f43 100644
--- a/testdata/d2oracle/TestDelete/order_3.exp.json
+++ b/testdata/d2oracle/TestDelete/order_3.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_3.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json
index b894c5e49..059ef248c 100644
--- a/testdata/d2oracle/TestDelete/order_4.exp.json
+++ b/testdata/d2oracle/TestDelete/order_4.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_4.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json
index e7e51144d..4ba164160 100644
--- a/testdata/d2oracle/TestDelete/order_5.exp.json
+++ b/testdata/d2oracle/TestDelete/order_5.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,0:0:0-4:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json
index b35e3f7b0..194e8481a 100644
--- a/testdata/d2oracle/TestDelete/order_6.exp.json
+++ b/testdata/d2oracle/TestDelete/order_6.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_6.d2,0:0:0-4:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json
index f0f8a237d..119b9d428 100644
--- a/testdata/d2oracle/TestDelete/order_7.exp.json
+++ b/testdata/d2oracle/TestDelete/order_7.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_7.d2,0:0:0-4:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json
index 4d596cf76..6469684e3 100644
--- a/testdata/d2oracle/TestDelete/order_8.exp.json
+++ b/testdata/d2oracle/TestDelete/order_8.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_8.d2,0:0:0-7:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json
index 0db68a357..d4b21d957 100644
--- a/testdata/d2oracle/TestDelete/shape_class.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_class.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/shape_class.d2,0:0:0-2:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
index 2343b6250..8c7ce9edb 100644
--- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,0:0:0-10:0:128",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
index 66257d2b8..74b2064d1 100644
--- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/singular_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json
index a0f9bc160..1e7b6b63b 100644
--- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/singular_map_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
index f7bb55dc2..8c8372987 100644
--- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/underscore_no_conflict.d2,0:0:0-5:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
index 4681f41bc..2bd4ac6b7 100644
--- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json
index c1c010bcb..6be79cb36 100644
--- a/testdata/d2oracle/TestDelete/width.exp.json
+++ b/testdata/d2oracle/TestDelete/width.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/width.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
index 932165164..12b904edd 100644
--- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
+++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,0:0:0-12:0:104",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json
index 06e880d9a..0015b69df 100644
--- a/testdata/d2oracle/TestMove/basic.exp.json
+++ b/testdata/d2oracle/TestMove/basic.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json
index b35f7ceba..a3cc64aab 100644
--- a/testdata/d2oracle/TestMove/basic_nested.exp.json
+++ b/testdata/d2oracle/TestMove/basic_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic_nested.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
index 9bcfc0c5a..c8cd1cadb 100644
--- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic_out_of_container.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json
index f2941d00d..f4715fe63 100644
--- a/testdata/d2oracle/TestMove/between_containers.exp.json
+++ b/testdata/d2oracle/TestMove/between_containers.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/between_containers.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
index dc49a1953..cb6b5a086 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-2:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
index 2dcce1517..22de06c80 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-1:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json
index c36689ff3..3bd4bdc70 100644
--- a/testdata/d2oracle/TestMove/connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/connected_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
index ef29483a3..eddd16106 100644
--- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
+++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json
index fe29c811f..9d4e0866a 100644
--- a/testdata/d2oracle/TestMove/container_near.exp.json
+++ b/testdata/d2oracle/TestMove/container_near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/container_near.d2,0:0:0-9:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
index 9f99c2555..002bbe71f 100644
--- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json
+++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,0:0:0-4:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json
index 2a60da94e..dcbb54dc6 100644
--- a/testdata/d2oracle/TestMove/edge_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_basic.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
index c6d658897..062589e4f 100644
--- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-1:0:12",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
index 6679b4125..c1e4355f2 100644
--- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
index f09c25792..3673cb950 100644
--- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-2:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
index 6bcae60e4..b4c7d31f2 100644
--- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,0:0:0-3:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json
index 1e9d65f2a..e3409c297 100644
--- a/testdata/d2oracle/TestMove/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json
index 6f2f17d66..0b1f61e63 100644
--- a/testdata/d2oracle/TestMove/edge_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,0:0:0-4:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
index b94d41178..11cc7ea61 100644
--- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
index 3ebabb074..2d478d6f7 100644
--- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json
index 0fa8abbe9..dcc483d29 100644
--- a/testdata/d2oracle/TestMove/extend_map.exp.json
+++ b/testdata/d2oracle/TestMove/extend_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,0:0:0-8:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
index 4fa0e17c8..5df47e11d 100644
--- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
+++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json
index c90e16cd4..996c0e451 100644
--- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json
+++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_between_containers.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json
index 5e629af74..3f894caea 100644
--- a/testdata/d2oracle/TestMove/flat_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_merge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,0:0:0-5:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json
index 88ec4f470..eae90e96e 100644
--- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json
+++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_middle_container.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
index 1d9fe533b..40f733d4c 100644
--- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge.d2,0:0:0-5:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
index 3fc5de772..6fc426350 100644
--- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
+++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,0:0:0-10:0:54",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
index 28f4a4d88..4f4b4f4c8 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
index 729fc1fba..2dab965e1 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,0:0:0-8:0:72",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
index 4c86d8222..8de1ed2d9 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_value.d2,0:0:0-2:0:10",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json
index 5895f7640..ec9826a4c 100644
--- a/testdata/d2oracle/TestMove/flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/flat_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,0:0:0-4:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
index 7930f259f..da741d272 100644
--- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,0:0:0-6:0:33",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json
index e8f944e88..1cfebe5bd 100644
--- a/testdata/d2oracle/TestMove/full_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_slice.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/full_slice.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json
index 4e2f91a5b..52fceafe1 100644
--- a/testdata/d2oracle/TestMove/gnarly_1.exp.json
+++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-9:0:64",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json
index f7281f450..fa88ef150 100644
--- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json
+++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/hoist_container_children.d2,0:0:0-6:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
index 24c90bda3..ec25408e0 100644
--- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_existing_map.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
index 97a8c0842..67d60315c 100644
--- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_nonexisting_map.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
index 37ed09c5a..dde1c77e9 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,0:0:0-7:0:95",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
index 9b1be928b..7de33c453 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_style.d2,0:0:0-4:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json
index 7cfe89507..31d1eec69 100644
--- a/testdata/d2oracle/TestMove/map_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/map_transplant.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,0:0:0-13:0:79",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json
index 9be066a03..7b277495a 100644
--- a/testdata/d2oracle/TestMove/map_with_label.exp.json
+++ b/testdata/d2oracle/TestMove/map_with_label.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,0:0:0-5:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
index 3a9a60e26..480a59ef0 100644
--- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
+++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,0:0:0-11:0:67",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json
index 5b1266847..5b984730f 100644
--- a/testdata/d2oracle/TestMove/merge_reserved.exp.json
+++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,0:0:0-9:0:70",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json
index 2290d2ecd..44d7bbc64 100644
--- a/testdata/d2oracle/TestMove/middle_container.exp.json
+++ b/testdata/d2oracle/TestMove/middle_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/middle_container.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json
index 0fc5e2d5c..744a058df 100644
--- a/testdata/d2oracle/TestMove/move_container_children.exp.json
+++ b/testdata/d2oracle/TestMove/move_container_children.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_container_children.d2,0:0:0-7:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
index 54d04a271..354d0928f 100644
--- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
+++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_container_conflict_children.d2,0:0:0-7:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
index 3ed4a639d..cf4dd2e18 100644
--- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_into_key_with_value.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
index d59c9e251..2aa013cf6 100644
--- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-2:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
index 512eef888..9d2e33cc4 100644
--- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
index b4748aa22..97fc1ff36 100644
--- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
+++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,0:0:0-11:0:71",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json
index 1bb25dbb0..ee79ef333 100644
--- a/testdata/d2oracle/TestMove/near.exp.json
+++ b/testdata/d2oracle/TestMove/near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
index 79df7f9c5..fe850dee0 100644
--- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
+++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nested-underscore-move-out.d2,0:0:0-4:0:27",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json
index 09b3f6a31..cbc441bdd 100644
--- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,0:0:0-6:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
index 91b09c986..c88a48388 100644
--- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,0:0:0-7:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
index 53bcddb77..0baa03700 100644
--- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
+++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/out_of_newline_container.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json
index b2580ed86..e6ddf5c1f 100644
--- a/testdata/d2oracle/TestMove/parentheses.exp.json
+++ b/testdata/d2oracle/TestMove/parentheses.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-2:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
index 29fbde7e7..9592e1c8a 100644
--- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json
index 0161c622d..1b278aff6 100644
--- a/testdata/d2oracle/TestMove/partial_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_slice.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/partial_slice.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json
index e9b014af4..ab485cdc2 100644
--- a/testdata/d2oracle/TestMove/rename_2.exp.json
+++ b/testdata/d2oracle/TestMove/rename_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/rename_2.d2,0:0:0-7:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json
index 7998a8359..3a2d12f25 100644
--- a/testdata/d2oracle/TestMove/reuse_map.exp.json
+++ b/testdata/d2oracle/TestMove/reuse_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,0:0:0-7:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json
index a679114f2..6a3760d4f 100644
--- a/testdata/d2oracle/TestMove/slice_style.exp.json
+++ b/testdata/d2oracle/TestMove/slice_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/slice_style.d2,0:0:0-3:0:68",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json
index 46568d214..5a3b38326 100644
--- a/testdata/d2oracle/TestMove/underscore-connection.exp.json
+++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,0:0:0-8:0:40",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json
index b6c8caa7e..c85227420 100644
--- a/testdata/d2oracle/TestMove/underscore_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_children.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_children.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
index 464d2c192..fed0087ed 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,0:0:0-4:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
index 90b7fa65e..8a6bc447b 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
index f323b850c..c1d72817f 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
index 1f9caaf4c..89eabdf6d 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
index 6f099e02c..1b3df4c90 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
index 6312973f9..a1aaba647 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,0:0:0-3:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
index 28b326089..b16c6da65 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,0:0:0-6:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json
index 34d2cab06..545036948 100644
--- a/testdata/d2oracle/TestMove/underscore_merge.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,0:0:0-6:0:32",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json
index 497f43451..098abe757 100644
--- a/testdata/d2oracle/TestMove/underscore_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_split.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,0:0:0-6:0:28",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json
index 1f114ae4a..64f660789 100644
--- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,0:0:0-10:0:60",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json
index 58f9589e4..b85a89f0d 100644
--- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_transplant.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json
index 6d3a8542d..9a53a0d37 100644
--- a/testdata/d2oracle/TestMove/unique_name.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/unique_name.d2,0:0:0-6:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
index 2543b2824..e95ac2258 100644
--- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json
index e41966b64..a7dd13abb 100644
--- a/testdata/d2oracle/TestRename/arrows.exp.json
+++ b/testdata/d2oracle/TestRename/arrows.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json
index f39e8e331..af72f4a35 100644
--- a/testdata/d2oracle/TestRename/arrows_chain.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-1:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json
index ceaeb1939..24621f6b5 100644
--- a/testdata/d2oracle/TestRename/arrows_complex.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
index a8b23a0e9..9df2c2078 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-1:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
index 10857e4ec..7c4aa9d97 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-1:0:27",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
index 3da52bb89..b90cface2 100644
--- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-1:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
index 86105711f..0f5b83b06 100644
--- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json
index a09bd8615..3cac1cbc1 100644
--- a/testdata/d2oracle/TestRename/conflict.exp.json
+++ b/testdata/d2oracle/TestRename/conflict.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json
index 087cd96a7..5cac9c791 100644
--- a/testdata/d2oracle/TestRename/conflict_2.exp.json
+++ b/testdata/d2oracle/TestRename/conflict_2.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict_2.d2,0:0:0-4:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
index 79e6458c0..b0a1657f7 100644
--- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
+++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict_with_dots.d2,0:0:0-2:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json
index ebcfb5eaa..1ad3150a2 100644
--- a/testdata/d2oracle/TestRename/container.exp.json
+++ b/testdata/d2oracle/TestRename/container.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-12:0:235",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json
index 206fb1380..39a243507 100644
--- a/testdata/d2oracle/TestRename/edges.exp.json
+++ b/testdata/d2oracle/TestRename/edges.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-5:0:74",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json
index 45509c8ea..3f40c1e3c 100644
--- a/testdata/d2oracle/TestRename/flat.exp.json
+++ b/testdata/d2oracle/TestRename/flat.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/flat.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json
index f2e7999e4..5381ff45f 100644
--- a/testdata/d2oracle/TestRename/generated.exp.json
+++ b/testdata/d2oracle/TestRename/generated.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/generated.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json
index 18b232744..c49ba0867 100644
--- a/testdata/d2oracle/TestRename/near.exp.json
+++ b/testdata/d2oracle/TestRename/near.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/near.d2,0:0:0-4:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json
index a1fbc9dc1..c31eca90b 100644
--- a/testdata/d2oracle/TestRename/nested.exp.json
+++ b/testdata/d2oracle/TestRename/nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/nested.d2,0:0:0-4:0:61",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json
index 937c0c25e..696145673 100644
--- a/testdata/d2oracle/TestSet/base.exp.json
+++ b/testdata/d2oracle/TestSet/base.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/base.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json
index 9ef7f779c..a0c385bf3 100644
--- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json
+++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/block_string_multiline.d2,0:0:0-5:0:146",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json
index e34f67274..d5cc295a9 100644
--- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json
+++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/block_string_oneline.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json
index 7dd362d35..960d8bffd 100644
--- a/testdata/d2oracle/TestSet/edge.exp.json
+++ b/testdata/d2oracle/TestSet/edge.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-1:0:12",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json
index df73c9e8c..52516f8b8 100644
--- a/testdata/d2oracle/TestSet/edge_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json
index 38a955f54..71b4f1bc7 100644
--- a/testdata/d2oracle/TestSet/edge_chain.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,0:0:0-4:0:93",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
index 352c03065..b699b9b18 100644
--- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-2:0:45",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
index 4da734c2f..36c3157c1 100644
--- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-3:0:76",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
index ec5796b6a..3e44edb4a 100644
--- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,0:0:0-4:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
index 36c828de4..1e4798cf4 100644
--- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-2:0:55",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json
index 658fde41f..9146317da 100644
--- a/testdata/d2oracle/TestSet/edge_index_case.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,0:0:0-6:0:54",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
index d8dcf3782..b03b33e94 100644
--- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-2:0:43",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
index 3c4f39bc9..8afe4a808 100644
--- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
index de50d761d..be48faf2d 100644
--- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
+++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,0:0:0-2:0:37",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json
index f723ae78e..579666a58 100644
--- a/testdata/d2oracle/TestSet/edge_label.exp.json
+++ b/testdata/d2oracle/TestSet/edge_label.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-1:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
index 5ab8b6250..1f684f9d6 100644
--- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-6:0:70",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
index 005921a4e..5fe582934 100644
--- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-6:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
index 4cb7db16e..2f9e953a0 100644
--- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,0:0:0-3:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
index e1940b0cb..136f4a2a5 100644
--- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,0:0:0-3:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
index 2099babb4..daf32c444 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
index 17bc34333..ae249573a 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-2:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
index 0c3855cc9..1eae1a22b 100644
--- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json
index 313881f23..8e002af39 100644
--- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json
+++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,0:0:0-5:0:44",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json
index 512580e72..2359bf53c 100644
--- a/testdata/d2oracle/TestSet/icon.exp.json
+++ b/testdata/d2oracle/TestSet/icon.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:0:0-1:0:68",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json
index 5bf597a34..5b8f52381 100644
--- a/testdata/d2oracle/TestSet/inline_style.exp.json
+++ b/testdata/d2oracle/TestSet/inline_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,0:0:0-4:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json
index 1f5153d22..9c19b1853 100644
--- a/testdata/d2oracle/TestSet/label.exp.json
+++ b/testdata/d2oracle/TestSet/label.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label.d2,0:0:0-1:0:88",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json
index 39dc2bf45..88abb7d0f 100644
--- a/testdata/d2oracle/TestSet/label_primary.exp.json
+++ b/testdata/d2oracle/TestSet/label_primary.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,0:0:0-3:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json
index 52c0452b2..22338d647 100644
--- a/testdata/d2oracle/TestSet/label_replace.exp.json
+++ b/testdata/d2oracle/TestSet/label_replace.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_replace.d2,0:0:0-1:0:88",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json
index 9a9cbe0d6..2878bd3e1 100644
--- a/testdata/d2oracle/TestSet/label_unset.exp.json
+++ b/testdata/d2oracle/TestSet/label_unset.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_unset.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json
index 86d7f6a1a..801f646b8 100644
--- a/testdata/d2oracle/TestSet/map_key_missing.exp.json
+++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-1:0:83",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json
index 8b3ed2f81..693ec3fa0 100644
--- a/testdata/d2oracle/TestSet/nested_alex.exp.json
+++ b/testdata/d2oracle/TestSet/nested_alex.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,0:0:0-5:0:202",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json
index acb2cadba..119eac8ef 100644
--- a/testdata/d2oracle/TestSet/new_style.exp.json
+++ b/testdata/d2oracle/TestSet/new_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/new_style.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
index dcc2c7bdc..3ca0ca736 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-3:0:45",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
index dcabb24e7..06a5767a7 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-5:0:56",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json
index cfb65d1c3..bf2ff2283 100644
--- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json
+++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_dimensions.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
index 0b015d938..be349970a 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-4:0:59",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
index 5bacdac19..57302a7ff 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-5:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json
index a6ad42efe..aa022e6d1 100644
--- a/testdata/d2oracle/TestSet/replace_link.exp.json
+++ b/testdata/d2oracle/TestSet/replace_link.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json
index 8a0cfec54..f6d88af71 100644
--- a/testdata/d2oracle/TestSet/replace_position.exp.json
+++ b/testdata/d2oracle/TestSet/replace_position.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_position.d2,0:0:0-5:0:47",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json
index 76ff7277d..58c715d2c 100644
--- a/testdata/d2oracle/TestSet/replace_shape.exp.json
+++ b/testdata/d2oracle/TestSet/replace_shape.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_shape.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json
index 5c1ca8d60..fb7915942 100644
--- a/testdata/d2oracle/TestSet/replace_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_style.d2,0:0:0-1:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
index 0b4762d81..9ce6bc852 100644
--- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_style_edgecase.d2,0:0:0-2:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
index 7aab2f7e2..110192330 100644
--- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json
index 073461ca1..a2bd8c05c 100644
--- a/testdata/d2oracle/TestSet/set_dimensions.exp.json
+++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_dimensions.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json
index 321da083b..28dc27b2f 100644
--- a/testdata/d2oracle/TestSet/set_position.exp.json
+++ b/testdata/d2oracle/TestSet/set_position.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_position.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json
index 15cd02ebd..9d2fa571a 100644
--- a/testdata/d2oracle/TestSet/set_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json
index 52c35106f..feaca3032 100644
--- a/testdata/d2oracle/TestSet/shape.exp.json
+++ b/testdata/d2oracle/TestSet/shape.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
index d4db3fa52..a29aa1bd0 100644
--- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
@@ -1,6 +1,7 @@
 {
   "graph": {
     "name": "",
+    "boardContainer": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/shape_nested_style_set.d2,0:0:0-1:0:24",
       "nodes": [

From 65437b954dafad321c7edb2580d83937cd9fc3ab Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Mon, 27 Feb 2023 13:41:00 -0800
Subject: [PATCH 2/5] main: Don't render board containers in renderPDF

cc @berniexie
---
 .gitignore |  1 +
 main.go    | 52 +++++++++++++++++++++++++++-------------------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index e9e020ff5..23917e35e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 e2e_report.html
 bin
 out
+d2
diff --git a/main.go b/main.go
index de0a0a4e9..e5c343ecf 100644
--- a/main.go
+++ b/main.go
@@ -457,35 +457,37 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, ske
 		currBoardPath = append(boardPath, diagram.Name)
 	}
 
-	svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{
-		Pad:    int(pad),
-		Sketch: sketch,
-	})
-	if err != nil {
-		return nil, err
-	}
+	if !diagram.BoardContainer {
+		svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{
+			Pad:    int(pad),
+			Sketch: sketch,
+		})
+		if err != nil {
+			return nil, err
+		}
 
-	svg, err = plugin.PostProcess(ctx, svg)
-	if err != nil {
-		return svg, err
-	}
+		svg, err = plugin.PostProcess(ctx, svg)
+		if err != nil {
+			return svg, err
+		}
 
-	svg, bundleErr := imgbundler.BundleLocal(ctx, ms, svg)
-	svg, bundleErr2 := imgbundler.BundleRemote(ctx, ms, svg)
-	bundleErr = multierr.Combine(bundleErr, bundleErr2)
-	if bundleErr != nil {
-		return svg, bundleErr
-	}
-	svg = appendix.Append(diagram, ruler, svg)
+		svg, bundleErr := imgbundler.BundleLocal(ctx, ms, svg)
+		svg, bundleErr2 := imgbundler.BundleRemote(ctx, ms, svg)
+		bundleErr = multierr.Combine(bundleErr, bundleErr2)
+		if bundleErr != nil {
+			return svg, bundleErr
+		}
+		svg = appendix.Append(diagram, ruler, svg)
 
-	pngImg, err := png.ConvertSVG(ms, page, svg)
-	if err != nil {
-		return svg, err
-	}
+		pngImg, err := png.ConvertSVG(ms, page, svg)
+		if err != nil {
+			return svg, err
+		}
 
-	err = pdf.AddPDFPage(pngImg, currBoardPath)
-	if err != nil {
-		return svg, err
+		err = pdf.AddPDFPage(pngImg, currBoardPath)
+		if err != nil {
+			return svg, err
+		}
 	}
 
 	for _, dl := range diagram.Layers {

From 89394421f8ab580c72df2e7745876aad6810da99 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Mon, 27 Feb 2023 13:43:41 -0800
Subject: [PATCH 3/5] changelog: Update

---
 ci/release/changelogs/next.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
index e6f26b305..0bcc4fe59 100644
--- a/ci/release/changelogs/next.md
+++ b/ci/release/changelogs/next.md
@@ -11,6 +11,7 @@
 - `class` and `sql_table` shape respect `font-color` styling as header font color. [#899](https://github.com/terrastruct/d2/issues/899)
 - SVG fits to screen by default in both watch mode and as a standalone SVG (this time with just CSS, no JS). [#725](https://github.com/terrastruct/d2/issues/725)
 - Only chromium is installed when rendering png diagrams instead of also installing webkit and firefox. [#835](https://github.com/terrastruct/d2/issues/835)
+- Multiboard output is now self-contained and less confusing. See [#923](https://github.com/terrastruct/d2/pull/923)
 
 #### Bugfixes ⛑️
 

From 78b09f5007fe1058ea0fb58577ea7b7d73f27b5f Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Mon, 27 Feb 2023 14:25:37 -0800
Subject: [PATCH 4/5] BoardContainer -> IsContainerOnly

As discussed on slack.
---
 d2compiler/compile.go                         |    2 +-
 d2compiler/compile_test.go                    |    8 +-
 d2exporter/export.go                          |    2 +-
 d2graph/d2graph.go                            |   11 +-
 .../d2sketch/testdata/animated/sketch.exp.svg |    2 +-
 .../testdata/animated_dark/sketch.exp.svg     |    2 +-
 d2target/d2target.go                          |    6 +-
 .../measured/empty-class/dagre/board.exp.json |    2 +-
 .../measured/empty-shape/dagre/board.exp.json |    2 +-
 .../empty-sql_table/dagre/board.exp.json      |    2 +-
 .../ampersand-escape/dagre/board.exp.json     |    2 +-
 .../ampersand-escape/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre-disconnect/dagre/board.exp.json     |    2 +-
 .../dagre-disconnect/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../dagre_broken_arrowhead/elk/board.exp.json |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre_special_ids/dagre/board.exp.json    |    2 +-
 .../dagre_special_ids/elk/board.exp.json      |    2 +-
 .../elk_alignment/dagre/board.exp.json        |    2 +-
 .../elk_alignment/elk/board.exp.json          |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../elk_loop_panic/dagre/board.exp.json       |    2 +-
 .../elk_loop_panic/elk/board.exp.json         |    2 +-
 .../regression/elk_order/dagre/board.exp.json |    2 +-
 .../regression/elk_order/elk/board.exp.json   |    2 +-
 .../empty_class_height/dagre/board.exp.json   |    2 +-
 .../empty_class_height/elk/board.exp.json     |    2 +-
 .../empty_sequence/dagre/board.exp.json       |    2 +-
 .../empty_sequence/elk/board.exp.json         |    2 +-
 .../regression/hex-fill/dagre/board.exp.json  |    2 +-
 .../regression/hex-fill/elk/board.exp.json    |    2 +-
 .../just-width/dagre/board.exp.json           |    2 +-
 .../regression/just-width/elk/board.exp.json  |    2 +-
 .../md_h1_li_li/dagre/board.exp.json          |    2 +-
 .../regression/md_h1_li_li/elk/board.exp.json |    2 +-
 .../nested_steps/dagre/board.exp.json         |    2 +-
 .../nested_steps/elk/board.exp.json           |    2 +-
 .../regression/no-lexer/dagre/board.exp.json  |    2 +-
 .../regression/no-lexer/elk/board.exp.json    |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../opacity-on-label/dagre/board.exp.json     |    2 +-
 .../opacity-on-label/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../overlapping-edge-label/elk/board.exp.json |    2 +-
 .../query_param_escape/dagre/board.exp.json   |    2 +-
 .../query_param_escape/elk/board.exp.json     |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../sql_table_overflow/dagre/board.exp.json   |    2 +-
 .../sql_table_overflow/elk/board.exp.json     |    2 +-
 .../unconnected/dagre/board.exp.json          |    2 +-
 .../regression/unconnected/elk/board.exp.json |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../root/border-radius/dagre/board.exp.json   |    2 +-
 .../root/border-radius/elk/board.exp.json     |    2 +-
 .../root/double-border/dagre/board.exp.json   |    2 +-
 .../root/double-border/elk/board.exp.json     |    2 +-
 .../even-stroke-width/dagre/board.exp.json    |    2 +-
 .../root/even-stroke-width/elk/board.exp.json |    2 +-
 .../testdata/root/fill/dagre/board.exp.json   |    2 +-
 .../testdata/root/fill/elk/board.exp.json     |    2 +-
 .../root/stroke-dash/dagre/board.exp.json     |    2 +-
 .../root/stroke-dash/elk/board.exp.json       |    2 +-
 .../root/stroke-no-width/dagre/board.exp.json |    2 +-
 .../root/stroke-no-width/elk/board.exp.json   |    2 +-
 .../root/stroke-width/dagre/board.exp.json    |    2 +-
 .../root/stroke-width/elk/board.exp.json      |    2 +-
 .../sanity/1_to_2/dagre/board.exp.json        |    2 +-
 .../testdata/sanity/1_to_2/elk/board.exp.json |    2 +-
 .../sanity/basic/dagre/board.exp.json         |    2 +-
 .../testdata/sanity/basic/elk/board.exp.json  |    2 +-
 .../child_to_child/dagre/board.exp.json       |    2 +-
 .../sanity/child_to_child/elk/board.exp.json  |    2 +-
 .../connection_label/dagre/board.exp.json     |    2 +-
 .../connection_label/elk/board.exp.json       |    2 +-
 .../sanity/empty/dagre/board.exp.json         |    2 +-
 .../testdata/sanity/empty/elk/board.exp.json  |    2 +-
 .../3d_fill_and_stroke/dagre/board.exp.json   |    2 +-
 .../3d_fill_and_stroke/elk/board.exp.json     |    2 +-
 .../stable/all_shapes/dagre/board.exp.json    |    2 +-
 .../stable/all_shapes/elk/board.exp.json      |    2 +-
 .../all_shapes_multiple/dagre/board.exp.json  |    2 +-
 .../all_shapes_multiple/elk/board.exp.json    |    2 +-
 .../all_shapes_shadow/dagre/board.exp.json    |    2 +-
 .../all_shapes_shadow/elk/board.exp.json      |    2 +-
 .../stable/animated/dagre/board.exp.json      |    2 +-
 .../stable/animated/elk/board.exp.json        |    2 +-
 .../arrowhead_adjustment/dagre/board.exp.json |    2 +-
 .../arrowhead_adjustment/elk/board.exp.json   |    2 +-
 .../arrowhead_labels/dagre/board.exp.json     |    2 +-
 .../arrowhead_labels/elk/board.exp.json       |    2 +-
 .../stable/binary_tree/dagre/board.exp.json   |    2 +-
 .../stable/binary_tree/elk/board.exp.json     |    2 +-
 .../stable/border-radius/dagre/board.exp.json |    2 +-
 .../stable/border-radius/elk/board.exp.json   |    2 +-
 .../stable/chaos2/dagre/board.exp.json        |    2 +-
 .../testdata/stable/chaos2/elk/board.exp.json |    2 +-
 .../circle_arrowhead/dagre/board.exp.json     |    2 +-
 .../circle_arrowhead/elk/board.exp.json       |    2 +-
 .../circular_dependency/dagre/board.exp.json  |    2 +-
 .../circular_dependency/elk/board.exp.json    |    2 +-
 .../stable/class/dagre/board.exp.json         |    2 +-
 .../testdata/stable/class/elk/board.exp.json  |    2 +-
 .../stable/code_snippet/dagre/board.exp.json  |    2 +-
 .../stable/code_snippet/elk/board.exp.json    |    2 +-
 .../complex-layers/dagre/board.exp.json       |   20 +-
 .../stable/complex-layers/elk/board.exp.json  |   20 +-
 .../connected_container/dagre/board.exp.json  |    2 +-
 .../connected_container/elk/board.exp.json    |    2 +-
 .../constant_near_stress/dagre/board.exp.json |    2 +-
 .../constant_near_stress/elk/board.exp.json   |    2 +-
 .../constant_near_title/dagre/board.exp.json  |    2 +-
 .../constant_near_title/elk/board.exp.json    |    2 +-
 .../container_edges/dagre/board.exp.json      |    2 +-
 .../stable/container_edges/elk/board.exp.json |    2 +-
 .../crow_foot_arrowhead/dagre/board.exp.json  |    2 +-
 .../crow_foot_arrowhead/elk/board.exp.json    |    2 +-
 .../stable/dense/dagre/board.exp.json         |    2 +-
 .../testdata/stable/dense/elk/board.exp.json  |    2 +-
 .../different_subgraphs/dagre/board.exp.json  |    2 +-
 .../different_subgraphs/elk/board.exp.json    |    2 +-
 .../stable/direction/dagre/board.exp.json     |    2 +-
 .../stable/direction/elk/board.exp.json       |    2 +-
 .../stable/font_colors/dagre/board.exp.json   |    2 +-
 .../stable/font_colors/elk/board.exp.json     |    2 +-
 .../stable/font_sizes/dagre/board.exp.json    |    2 +-
 .../stable/font_sizes/elk/board.exp.json      |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../giant_markdown_test/dagre/board.exp.json  |    2 +-
 .../giant_markdown_test/elk/board.exp.json    |    2 +-
 .../stable/hexagon_3d/dagre/board.exp.json    |    2 +-
 .../stable/hexagon_3d/elk/board.exp.json      |    2 +-
 .../testdata/stable/hr/dagre/board.exp.json   |    2 +-
 .../testdata/stable/hr/elk/board.exp.json     |    2 +-
 .../icon-containers/dagre/board.exp.json      |    2 +-
 .../stable/icon-containers/elk/board.exp.json |    2 +-
 .../stable/icon-label/dagre/board.exp.json    |    2 +-
 .../stable/icon-label/elk/board.exp.json      |    2 +-
 .../stable/images/dagre/board.exp.json        |    2 +-
 .../testdata/stable/images/elk/board.exp.json |    2 +-
 .../stable/investigate/dagre/board.exp.json   |    2 +-
 .../stable/investigate/elk/board.exp.json     |    2 +-
 .../stable/large_arch/dagre/board.exp.json    |    2 +-
 .../stable/large_arch/elk/board.exp.json      |    2 +-
 .../stable/latex/dagre/board.exp.json         |    2 +-
 .../testdata/stable/latex/elk/board.exp.json  |    2 +-
 .../testdata/stable/li1/dagre/board.exp.json  |    2 +-
 .../testdata/stable/li1/elk/board.exp.json    |    2 +-
 .../testdata/stable/li2/dagre/board.exp.json  |    2 +-
 .../testdata/stable/li2/elk/board.exp.json    |    2 +-
 .../testdata/stable/li3/dagre/board.exp.json  |    2 +-
 .../testdata/stable/li3/elk/board.exp.json    |    2 +-
 .../testdata/stable/li4/dagre/board.exp.json  |    2 +-
 .../testdata/stable/li4/elk/board.exp.json    |    2 +-
 .../stable/links/dagre/board.exp.json         |    2 +-
 .../testdata/stable/links/elk/board.exp.json  |    2 +-
 .../stable/lone_h1/dagre/board.exp.json       |    2 +-
 .../stable/lone_h1/elk/board.exp.json         |    2 +-
 .../stable/markdown/dagre/board.exp.json      |    2 +-
 .../stable/markdown/elk/board.exp.json        |    2 +-
 .../markdown_stroke_fill/dagre/board.exp.json |    2 +-
 .../markdown_stroke_fill/elk/board.exp.json   |    2 +-
 .../md_2space_newline/dagre/board.exp.json    |    2 +-
 .../md_2space_newline/elk/board.exp.json      |    2 +-
 .../md_backslash_newline/dagre/board.exp.json |    2 +-
 .../md_backslash_newline/elk/board.exp.json   |    2 +-
 .../md_code_block_fenced/dagre/board.exp.json |    2 +-
 .../md_code_block_fenced/elk/board.exp.json   |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../md_code_block_indented/elk/board.exp.json |    2 +-
 .../md_code_inline/dagre/board.exp.json       |    2 +-
 .../stable/md_code_inline/elk/board.exp.json  |    2 +-
 .../multiline_text/dagre/board.exp.json       |    2 +-
 .../stable/multiline_text/elk/board.exp.json  |    2 +-
 .../multiple_trees/dagre/board.exp.json       |    2 +-
 .../stable/multiple_trees/elk/board.exp.json  |    2 +-
 .../stable/n22_e32/dagre/board.exp.json       |    2 +-
 .../stable/n22_e32/elk/board.exp.json         |    2 +-
 .../stable/near-alone/dagre/board.exp.json    |    2 +-
 .../stable/near-alone/elk/board.exp.json      |    2 +-
 .../number_connections/dagre/board.exp.json   |    2 +-
 .../number_connections/elk/board.exp.json     |    2 +-
 .../one_container_loop/dagre/board.exp.json   |    2 +-
 .../one_container_loop/elk/board.exp.json     |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../stable/ovals/dagre/board.exp.json         |    2 +-
 .../testdata/stable/ovals/elk/board.exp.json  |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../testdata/stable/p/dagre/board.exp.json    |    2 +-
 e2etests/testdata/stable/p/elk/board.exp.json |    2 +-
 .../stable/people/dagre/board.exp.json        |    2 +-
 .../testdata/stable/people/elk/board.exp.json |    2 +-
 .../testdata/stable/pre/dagre/board.exp.json  |    2 +-
 .../testdata/stable/pre/elk/board.exp.json    |    2 +-
 .../self-referencing/dagre/board.exp.json     |    2 +-
 .../self-referencing/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../sequence_diagram_note/elk/board.exp.json  |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../sequence_diagram_real/elk/board.exp.json  |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../sequence_diagram_span/elk/board.exp.json  |    2 +-
 .../sequence_diagrams/dagre/board.exp.json    |    2 +-
 .../sequence_diagrams/elk/board.exp.json      |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../stable/sql_tables/dagre/board.exp.json    |    2 +-
 .../stable/sql_tables/elk/board.exp.json      |    2 +-
 .../stable/square_3d/dagre/board.exp.json     |    2 +-
 .../stable/square_3d/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../stable/stylish/dagre/board.exp.json       |    2 +-
 .../stable/stylish/elk/board.exp.json         |    2 +-
 .../text_font_sizes/dagre/board.exp.json      |    2 +-
 .../stable/text_font_sizes/elk/board.exp.json |    2 +-
 .../stable/tooltips/dagre/board.exp.json      |    2 +-
 .../stable/tooltips/elk/board.exp.json        |    2 +-
 .../transparent_3d/dagre/board.exp.json       |    2 +-
 .../stable/transparent_3d/elk/board.exp.json  |    2 +-
 .../unnamed_only_height/dagre/board.exp.json  |    2 +-
 .../unnamed_only_height/elk/board.exp.json    |    2 +-
 .../unnamed_only_width/dagre/board.exp.json   |    2 +-
 .../unnamed_only_width/elk/board.exp.json     |    2 +-
 .../stable/us_map/dagre/board.exp.json        |    2 +-
 .../testdata/stable/us_map/elk/board.exp.json |    2 +-
 .../container_icon_label/dagre/board.exp.json |    2 +-
 .../container_icon_label/elk/board.exp.json   |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../shape_set_width_height/elk/board.exp.json |    2 +-
 .../unicode/chinese/dagre/board.exp.json      |    2 +-
 .../unicode/chinese/elk/board.exp.json        |    2 +-
 .../unicode/emojis/dagre/board.exp.json       |    2 +-
 .../unicode/emojis/elk/board.exp.json         |    2 +-
 .../japanese-basic/dagre/board.exp.json       |    2 +-
 .../unicode/japanese-basic/elk/board.exp.json |    2 +-
 .../japanese-full/dagre/board.exp.json        |    2 +-
 .../unicode/japanese-full/elk/board.exp.json  |    2 +-
 .../japanese-mixed/dagre/board.exp.json       |    2 +-
 .../unicode/japanese-mixed/elk/board.exp.json |    2 +-
 .../unicode/korean/dagre/board.exp.json       |    2 +-
 .../unicode/korean/elk/board.exp.json         |    2 +-
 .../mixed-language-2/dagre/board.exp.json     |    2 +-
 .../mixed-language-2/elk/board.exp.json       |    2 +-
 .../mixed-language/dagre/board.exp.json       |    2 +-
 .../unicode/mixed-language/elk/board.exp.json |    2 +-
 .../unicode/with-style/dagre/board.exp.json   |    2 +-
 .../unicode/with-style/elk/board.exp.json     |    2 +-
 main.go                                       |    4 +-
 .../TestCompile/basic_icon.exp.json           |    2 +-
 .../TestCompile/basic_sequence.exp.json       |    2 +-
 .../TestCompile/basic_shape.exp.json          |    2 +-
 .../TestCompile/basic_style.exp.json          |    2 +-
 .../TestCompile/class_paren.exp.json          |    2 +-
 .../TestCompile/class_style.exp.json          |    2 +-
 .../TestCompile/constraint_label.exp.json     |    2 +-
 .../TestCompile/default_direction.exp.json    |    2 +-
 .../TestCompile/dimension_with_style.exp.json |    2 +-
 .../dimensions_on_containers.exp.json         |    2 +-
 .../dimensions_on_nonimage.exp.json           |    2 +-
 testdata/d2compiler/TestCompile/edge.exp.json |    2 +-
 .../edge_arrowhead_fields.exp.json            |    2 +-
 .../TestCompile/edge_chain.exp.json           |    2 +-
 .../TestCompile/edge_chain_map.exp.json       |    2 +-
 .../TestCompile/edge_column_index.exp.json    |    2 +-
 .../TestCompile/edge_exclusive_style.exp.json |    2 +-
 .../TestCompile/edge_flat_arrowhead.exp.json  |    2 +-
 .../edge_flat_label_arrowhead.exp.json        |    2 +-
 .../TestCompile/edge_index.exp.json           |    2 +-
 .../TestCompile/edge_index_map.exp.json       |    2 +-
 .../TestCompile/edge_index_nested.exp.json    |    2 +-
 .../edge_index_nested_cross_scope.exp.json    |    2 +-
 .../edge_key_group_flat_nested.exp.json       |    2 +-
 ..._key_group_flat_nested_underscore.exp.json |    2 +-
 ..._group_map_flat_nested_underscore.exp.json |    2 +-
 ...e_key_group_map_nested_underscore.exp.json |    2 +-
 .../TestCompile/edge_label_map.exp.json       |    2 +-
 .../d2compiler/TestCompile/edge_map.exp.json  |    2 +-
 .../TestCompile/edge_map_arrowhead.exp.json   |    2 +-
 .../TestCompile/edge_map_group_flat.exp.json  |    2 +-
 .../edge_map_group_semiflat.exp.json          |    2 +-
 .../TestCompile/edge_map_nested.exp.json      |    2 +-
 .../TestCompile/edge_map_nested_flat.exp.json |    2 +-
 .../TestCompile/edge_mixed_arrowhead.exp.json |    2 +-
 .../edge_non_shape_arrowhead.exp.json         |    2 +-
 .../edge_semiflat_arrowhead.exp.json          |    2 +-
 .../TestCompile/escaped_id.exp.json           |    2 +-
 .../TestCompile/image_style.exp.json          |    2 +-
 .../TestCompile/near_constant.exp.json        |    2 +-
 .../TestCompile/nested_sql.exp.json           |    2 +-
 .../nil_scope_obj_regression.exp.json         |    2 +-
 testdata/d2compiler/TestCompile/null.exp.json |    2 +-
 .../d2compiler/TestCompile/path_link.exp.json |    2 +-
 .../d2compiler/TestCompile/positions.exp.json |    2 +-
 .../reserved_icon_near_style.exp.json         |    2 +-
 .../TestCompile/root_direction.exp.json       |    2 +-
 .../TestCompile/root_sequence.exp.json        |    2 +-
 .../TestCompile/self-referencing.exp.json     |    2 +-
 .../TestCompile/sequence-timestamp.exp.json   |    2 +-
 .../TestCompile/sequence_container.exp.json   |    2 +-
 .../TestCompile/sequence_container_2.exp.json |    2 +-
 .../sequence_grouped_note.exp.json            |    2 +-
 .../TestCompile/sequence_scoping.exp.json     |    2 +-
 .../TestCompile/set_direction.exp.json        |    2 +-
 .../single_dimension_on_circle.exp.json       |    2 +-
 .../TestCompile/sql-regression.exp.json       |    2 +-
 .../d2compiler/TestCompile/sql_paren.exp.json |    2 +-
 .../TestCompile/stroke-width.exp.json         |    2 +-
 .../table_connection_attr.exp.json            |    2 +-
 .../TestCompile/table_style.exp.json          |    2 +-
 .../TestCompile/table_style_map.exp.json      |    2 +-
 .../underscore_connection.exp.json            |    2 +-
 .../TestCompile/underscore_edge.exp.json      |    2 +-
 .../underscore_edge_chain.exp.json            |    2 +-
 .../underscore_edge_existing.exp.json         |    2 +-
 .../underscore_edge_index.exp.json            |    2 +-
 .../underscore_edge_nested.exp.json           |    2 +-
 .../underscore_parent_create.exp.json         |    2 +-
 .../underscore_parent_not_root.exp.json       |    2 +-
 .../underscore_parent_preference_1.exp.json   |    2 +-
 .../underscore_parent_preference_2.exp.json   |    2 +-
 .../underscore_parent_squared.exp.json        |    2 +-
 .../underscore_unresolved_obj.exp.json        |    2 +-
 .../TestCompile/unescaped_id_cr.exp.json      |    2 +-
 .../d2compiler/TestCompile/url_link.exp.json  |    2 +-
 .../TestCompile/wrong_column_index.exp.json   |    2 +-
 .../boards/isContainerOnly.exp.json           | 1688 +++++++++++++++++
 .../TestCompile2/boards/recursive.exp.json    |   10 +-
 .../TestCompile2/boards/root.exp.json         |    6 +-
 .../TestExport/connection/arrowhead.exp.json  |    2 +-
 .../TestExport/connection/basic.exp.json      |    2 +-
 .../connection/stroke-dash.exp.json           |    2 +-
 .../connection/theme_stroke-dash.exp.json     |    2 +-
 .../TestExport/label/basic_shape.exp.json     |    2 +-
 .../label/connection_font_color.exp.json      |    2 +-
 .../label/shape_font_color.exp.json           |    2 +-
 .../TestExport/shape/basic.exp.json           |    2 +-
 .../TestExport/shape/border-radius.exp.json   |    2 +-
 .../shape/image_dimensions.exp.json           |    2 +-
 .../shape/sequence_group_position.exp.json    |    2 +-
 .../TestExport/shape/synonyms.exp.json        |    2 +-
 .../TestExport/shape/text_color.exp.json      |    2 +-
 .../theme/connection_with_bold.exp.json       |    2 +-
 .../theme/connection_with_italic.exp.json     |    2 +-
 .../theme/connection_without_italic.exp.json  |    2 +-
 .../theme/shape_with_italic.exp.json          |    2 +-
 .../theme/shape_without_bold.exp.json         |    2 +-
 testdata/d2oracle/TestCreate/base.exp.json    |    2 +-
 .../d2oracle/TestCreate/container.exp.json    |    2 +-
 .../TestCreate/container_edge.exp.json        |    2 +-
 .../TestCreate/container_edge_label.exp.json  |    2 +-
 testdata/d2oracle/TestCreate/edge.exp.json    |    2 +-
 .../d2oracle/TestCreate/edge_nested.exp.json  |    2 +-
 .../d2oracle/TestCreate/edge_scope.exp.json   |    2 +-
 .../TestCreate/edge_scope_flat.exp.json       |    2 +-
 .../TestCreate/edge_scope_nested.exp.json     |    2 +-
 .../d2oracle/TestCreate/edge_unique.exp.json  |    2 +-
 testdata/d2oracle/TestCreate/gen_key.exp.json |    2 +-
 .../d2oracle/TestCreate/gen_key_n.exp.json    |    2 +-
 .../TestCreate/gen_key_nested.exp.json        |    2 +-
 .../TestCreate/gen_key_scope.exp.json         |    2 +-
 .../TestCreate/gen_key_suffix.exp.json        |    2 +-
 .../TestCreate/make_scope_multiline.exp.json  |    2 +-
 .../make_scope_multiline_spacing_1.exp.json   |    2 +-
 .../make_scope_multiline_spacing_2.exp.json   |    2 +-
 testdata/d2oracle/TestCreate/nested.exp.json  |    2 +-
 testdata/d2oracle/TestCreate/scope.exp.json   |    2 +-
 .../d2oracle/TestDelete/arrowhead.exp.json    |    2 +-
 .../TestDelete/arrowhead_label.exp.json       |    2 +-
 .../TestDelete/arrowhead_map.exp.json         |    2 +-
 .../TestDelete/arrowhead_shape.exp.json       |    2 +-
 .../TestDelete/breakup_arrowhead.exp.json     |    2 +-
 testdata/d2oracle/TestDelete/chaos_1.exp.json |    2 +-
 .../d2oracle/TestDelete/children.exp.json     |    2 +-
 .../TestDelete/children_conflicts.exp.json    |    2 +-
 .../children_edge_conflicts.exp.json          |    2 +-
 .../children_edges_flat_conflicts.exp.json    |    2 +-
 .../children_flat_conflicts.exp.json          |    2 +-
 .../children_multiple_conflicts.exp.json      |    2 +-
 .../children_nested_conflicts.exp.json        |    2 +-
 ...ldren_nested_referenced_conflicts.exp.json |    2 +-
 .../children_no_self_conflict.exp.json        |    2 +-
 .../TestDelete/children_order.exp.json        |    2 +-
 .../children_referenced_conflicts.exp.json    |    2 +-
 .../TestDelete/children_scope.exp.json        |    2 +-
 .../TestDelete/container_near.exp.json        |    2 +-
 .../delete_container_of_near.exp.json         |    2 +-
 .../d2oracle/TestDelete/delete_icon.exp.json  |    2 +-
 .../d2oracle/TestDelete/delete_link.exp.json  |    2 +-
 .../d2oracle/TestDelete/delete_near.exp.json  |    2 +-
 .../delete_needed_flat_near.exp.json          |    2 +-
 .../delete_redundant_flat_near.exp.json       |    2 +-
 .../TestDelete/delete_tooltip.exp.json        |    2 +-
 .../TestDelete/edge-only-style.exp.json       |    2 +-
 .../edge_both_identical_childs.exp.json       |    2 +-
 .../d2oracle/TestDelete/edge_common.exp.json  |    2 +-
 .../TestDelete/edge_common_2.exp.json         |    2 +-
 .../TestDelete/edge_common_3.exp.json         |    2 +-
 .../TestDelete/edge_common_4.exp.json         |    2 +-
 .../TestDelete/edge_conflict.exp.json         |    2 +-
 .../TestDelete/edge_decrement.exp.json        |    2 +-
 .../d2oracle/TestDelete/edge_first.exp.json   |    2 +-
 .../TestDelete/edge_flat_style.exp.json       |    2 +-
 .../TestDelete/edge_identical_child.exp.json  |    2 +-
 .../TestDelete/edge_key_style.exp.json        |    2 +-
 .../d2oracle/TestDelete/edge_last.exp.json    |    2 +-
 .../TestDelete/edge_map_style.exp.json        |    2 +-
 .../d2oracle/TestDelete/edge_middle.exp.json  |    2 +-
 .../d2oracle/TestDelete/empty_map.exp.json    |    2 +-
 testdata/d2oracle/TestDelete/flat.exp.json    |    2 +-
 .../TestDelete/flat_reserved.exp.json         |    2 +-
 .../TestDelete/hoist_children.exp.json        |    2 +-
 .../TestDelete/hoist_edge_children.exp.json   |    2 +-
 .../TestDelete/key_with_edges.exp.json        |    2 +-
 .../TestDelete/key_with_edges_2.exp.json      |    2 +-
 .../TestDelete/key_with_edges_3.exp.json      |    2 +-
 .../TestDelete/key_with_edges_4.exp.json      |    2 +-
 testdata/d2oracle/TestDelete/left.exp.json    |    2 +-
 .../d2oracle/TestDelete/multi_near.exp.json   |    2 +-
 .../multi_path_map_conflict.exp.json          |    2 +-
 .../multi_path_map_no_conflict.exp.json       |    2 +-
 .../multiple_flat_middle_container.exp.json   |    2 +-
 .../TestDelete/multiple_flat_style.exp.json   |    2 +-
 .../TestDelete/multiple_map_styles.exp.json   |    2 +-
 testdata/d2oracle/TestDelete/near.exp.json    |    2 +-
 testdata/d2oracle/TestDelete/nested.exp.json  |    2 +-
 .../d2oracle/TestDelete/nested_2.exp.json     |    2 +-
 .../TestDelete/nested_edge_key_style.exp.json |    2 +-
 .../TestDelete/nested_flat_style.exp.json     |    2 +-
 .../TestDelete/nested_reserved.exp.json       |    2 +-
 .../nested_underscore_update.exp.json         |    2 +-
 .../d2oracle/TestDelete/node_in_edge.exp.json |    2 +-
 .../TestDelete/node_in_edge_last.exp.json     |    2 +-
 .../only-underscore-nested.exp.json           |    2 +-
 .../TestDelete/only-underscore.exp.json       |    2 +-
 .../only_delete_edge_reserved.exp.json        |    2 +-
 .../only_delete_obj_reserved.exp.json         |    2 +-
 testdata/d2oracle/TestDelete/order_1.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_2.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_3.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_4.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_5.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_6.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_7.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_8.exp.json |    2 +-
 .../d2oracle/TestDelete/shape_class.exp.json  |    2 +-
 .../TestDelete/shape_sql_table.exp.json       |    2 +-
 .../TestDelete/singular_flat_style.exp.json   |    2 +-
 .../TestDelete/singular_map_style.exp.json    |    2 +-
 .../underscore_no_conflict.exp.json           |    2 +-
 .../TestDelete/underscore_remove.exp.json     |    2 +-
 testdata/d2oracle/TestDelete/width.exp.json   |    2 +-
 .../TestMove/append_multiple_styles.exp.json  |    2 +-
 testdata/d2oracle/TestMove/basic.exp.json     |    2 +-
 .../d2oracle/TestMove/basic_nested.exp.json   |    2 +-
 .../TestMove/basic_out_of_container.exp.json  |    2 +-
 .../TestMove/between_containers.exp.json      |    2 +-
 .../TestMove/chain_connected_nested.exp.json  |    2 +-
 ..._connected_nested_no_extra_create.exp.json |    2 +-
 .../TestMove/connected_nested.exp.json        |    2 +-
 ...ner_multiple_refs_with_underscore.exp.json |    2 +-
 .../d2oracle/TestMove/container_near.exp.json |    2 +-
 .../TestMove/edge_across_containers.exp.json  |    2 +-
 .../d2oracle/TestMove/edge_basic.exp.json     |    2 +-
 .../TestMove/edge_chain_basic.exp.json        |    2 +-
 .../TestMove/edge_chain_circular.exp.json     |    2 +-
 .../edge_chain_into_container.exp.json        |    2 +-
 .../edge_chain_out_container.exp.json         |    2 +-
 .../d2oracle/TestMove/edge_conflict.exp.json  |    2 +-
 .../TestMove/edge_into_container.exp.json     |    2 +-
 .../TestMove/edge_nested_basic.exp.json       |    2 +-
 .../TestMove/edge_out_of_container.exp.json   |    2 +-
 .../d2oracle/TestMove/extend_map.exp.json     |    2 +-
 .../TestMove/extend_stationary_path.exp.json  |    2 +-
 .../TestMove/flat_between_containers.exp.json |    2 +-
 .../d2oracle/TestMove/flat_merge.exp.json     |    2 +-
 .../TestMove/flat_middle_container.exp.json   |    2 +-
 .../TestMove/flat_nested_merge.exp.json       |    2 +-
 .../flat_nested_merge_multiple_refs.exp.json  |    2 +-
 .../flat_reparent_with_map_value.exp.json     |    2 +-
 ...lat_reparent_with_mixed_map_value.exp.json |    2 +-
 .../flat_reparent_with_value.exp.json         |    2 +-
 .../d2oracle/TestMove/flat_style.exp.json     |    2 +-
 .../TestMove/full_edge_slice.exp.json         |    2 +-
 .../d2oracle/TestMove/full_slice.exp.json     |    2 +-
 testdata/d2oracle/TestMove/gnarly_1.exp.json  |    2 +-
 .../hoist_container_children.exp.json         |    2 +-
 .../into_container_existing_map.exp.json      |    2 +-
 .../into_container_nonexisting_map.exp.json   |    2 +-
 .../into_container_with_flat_keys.exp.json    |    2 +-
 .../into_container_with_flat_style.exp.json   |    2 +-
 .../d2oracle/TestMove/map_transplant.exp.json |    2 +-
 .../d2oracle/TestMove/map_with_label.exp.json |    2 +-
 .../TestMove/merge_nested_maps.exp.json       |    2 +-
 .../d2oracle/TestMove/merge_reserved.exp.json |    2 +-
 .../TestMove/middle_container.exp.json        |    2 +-
 .../TestMove/move_container_children.exp.json |    2 +-
 .../move_container_conflict_children.exp.json |    2 +-
 .../move_into_key_with_value.exp.json         |    2 +-
 .../TestMove/move_out_of_edge.exp.json        |    2 +-
 .../TestMove/move_out_of_nested_edge.exp.json |    2 +-
 .../TestMove/multiple_nesting_levels.exp.json |    2 +-
 testdata/d2oracle/TestMove/near.exp.json      |    2 +-
 .../nested-underscore-move-out.exp.json       |    2 +-
 .../d2oracle/TestMove/nhooyr_one.exp.json     |    2 +-
 .../d2oracle/TestMove/nhooyr_two.exp.json     |    2 +-
 .../out_of_newline_container.exp.json         |    2 +-
 .../d2oracle/TestMove/parentheses.exp.json    |    2 +-
 .../TestMove/partial_edge_slice.exp.json      |    2 +-
 .../d2oracle/TestMove/partial_slice.exp.json  |    2 +-
 testdata/d2oracle/TestMove/rename_2.exp.json  |    2 +-
 testdata/d2oracle/TestMove/reuse_map.exp.json |    2 +-
 .../d2oracle/TestMove/slice_style.exp.json    |    2 +-
 .../TestMove/underscore-connection.exp.json   |    2 +-
 .../TestMove/underscore_children.exp.json     |    2 +-
 .../underscore_edge_children.exp.json         |    2 +-
 .../underscore_edge_container_1.exp.json      |    2 +-
 .../underscore_edge_container_2.exp.json      |    2 +-
 .../underscore_edge_container_3.exp.json      |    2 +-
 .../underscore_edge_container_4.exp.json      |    2 +-
 .../underscore_edge_container_5.exp.json      |    2 +-
 .../TestMove/underscore_edge_split.exp.json   |    2 +-
 .../TestMove/underscore_merge.exp.json        |    2 +-
 .../TestMove/underscore_split.exp.json        |    2 +-
 .../TestMove/underscore_split_out.exp.json    |    2 +-
 .../TestMove/underscore_transplant.exp.json   |    2 +-
 .../d2oracle/TestMove/unique_name.exp.json    |    2 +-
 .../unique_name_with_references.exp.json      |    2 +-
 testdata/d2oracle/TestRename/arrows.exp.json  |    2 +-
 .../d2oracle/TestRename/arrows_chain.exp.json |    2 +-
 .../TestRename/arrows_complex.exp.json        |    2 +-
 .../TestRename/arrows_trim_common.exp.json    |    2 +-
 .../TestRename/arrows_trim_common_2.exp.json  |    2 +-
 .../TestRename/complex_edge_1.exp.json        |    2 +-
 .../TestRename/complex_edge_2.exp.json        |    2 +-
 .../d2oracle/TestRename/conflict.exp.json     |    2 +-
 .../d2oracle/TestRename/conflict_2.exp.json   |    2 +-
 .../TestRename/conflict_with_dots.exp.json    |    2 +-
 .../d2oracle/TestRename/container.exp.json    |    2 +-
 testdata/d2oracle/TestRename/edges.exp.json   |    2 +-
 testdata/d2oracle/TestRename/flat.exp.json    |    2 +-
 .../d2oracle/TestRename/generated.exp.json    |    2 +-
 testdata/d2oracle/TestRename/near.exp.json    |    2 +-
 testdata/d2oracle/TestRename/nested.exp.json  |    2 +-
 testdata/d2oracle/TestSet/base.exp.json       |    2 +-
 .../TestSet/block_string_multiline.exp.json   |    2 +-
 .../TestSet/block_string_oneline.exp.json     |    2 +-
 testdata/d2oracle/TestSet/edge.exp.json       |    2 +-
 .../TestSet/edge_append_style.exp.json        |    2 +-
 testdata/d2oracle/TestSet/edge_chain.exp.json |    2 +-
 .../TestSet/edge_chain_append_style.exp.json  |    2 +-
 .../edge_chain_existing_style.exp.json        |    2 +-
 .../TestSet/edge_chain_nested_set.exp.json    |    2 +-
 .../edge_flat_merge_arrowhead.exp.json        |    2 +-
 .../d2oracle/TestSet/edge_index_case.exp.json |    2 +-
 .../TestSet/edge_index_merge_style.exp.json   |    2 +-
 .../TestSet/edge_index_nested.exp.json        |    2 +-
 .../TestSet/edge_key_and_key.exp.json         |    2 +-
 testdata/d2oracle/TestSet/edge_label.exp.json |    2 +-
 .../TestSet/edge_merge_arrowhead.exp.json     |    2 +-
 .../TestSet/edge_merge_style.exp.json         |    2 +-
 .../TestSet/edge_nested_label_set.exp.json    |    2 +-
 .../TestSet/edge_nested_style_set.exp.json    |    2 +-
 .../TestSet/edge_replace_arrowhead.exp.json   |    2 +-
 .../edge_replace_arrowhead_indexed.exp.json   |    2 +-
 .../TestSet/edge_set_arrowhead.exp.json       |    2 +-
 .../TestSet/expanded_map_style.exp.json       |    2 +-
 testdata/d2oracle/TestSet/icon.exp.json       |    2 +-
 .../d2oracle/TestSet/inline_style.exp.json    |    2 +-
 testdata/d2oracle/TestSet/label.exp.json      |    2 +-
 .../d2oracle/TestSet/label_primary.exp.json   |    2 +-
 .../d2oracle/TestSet/label_replace.exp.json   |    2 +-
 .../d2oracle/TestSet/label_unset.exp.json     |    2 +-
 .../d2oracle/TestSet/map_key_missing.exp.json |    2 +-
 .../d2oracle/TestSet/nested_alex.exp.json     |    2 +-
 testdata/d2oracle/TestSet/new_style.exp.json  |    2 +-
 .../TestSet/replace_arrowhead.exp.json        |    2 +-
 .../TestSet/replace_arrowhead_map.exp.json    |    2 +-
 .../TestSet/replace_dimensions.exp.json       |    2 +-
 .../TestSet/replace_edge_style.exp.json       |    2 +-
 .../TestSet/replace_edge_style_map.exp.json   |    2 +-
 .../d2oracle/TestSet/replace_link.exp.json    |    2 +-
 .../TestSet/replace_position.exp.json         |    2 +-
 .../d2oracle/TestSet/replace_shape.exp.json   |    2 +-
 .../d2oracle/TestSet/replace_style.exp.json   |    2 +-
 .../TestSet/replace_style_edgecase.exp.json   |    2 +-
 .../d2oracle/TestSet/replace_tooltip.exp.json |    2 +-
 .../d2oracle/TestSet/set_dimensions.exp.json  |    2 +-
 .../d2oracle/TestSet/set_position.exp.json    |    2 +-
 .../d2oracle/TestSet/set_tooltip.exp.json     |    2 +-
 testdata/d2oracle/TestSet/shape.exp.json      |    2 +-
 .../TestSet/shape_nested_style_set.exp.json   |    2 +-
 642 files changed, 2363 insertions(+), 676 deletions(-)
 create mode 100644 testdata/d2compiler/TestCompile2/boards/isContainerOnly.exp.json

diff --git a/d2compiler/compile.go b/d2compiler/compile.go
index 35118331a..173d00cd7 100644
--- a/d2compiler/compile.go
+++ b/d2compiler/compile.go
@@ -73,7 +73,7 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph {
 	c.compileBoardsField(g, ir, "steps")
 	if d2ir.ParentMap(ir).CopyBase(nil).Equal(ir.CopyBase(nil)) {
 		if len(g.Layers) > 0 || len(g.Scenarios) > 0 || len(g.Steps) > 0 {
-			g.BoardContainer = true
+			g.IsContainerOnly = true
 		}
 	}
 	return g
diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
index a7a5c24fd..4b3ecd99a 100644
--- a/d2compiler/compile_test.go
+++ b/d2compiler/compile_test.go
@@ -2133,7 +2133,7 @@ layers: {
 			},
 		},
 		{
-			name: "boardContainer",
+			name: "isContainerOnly",
 			run: func(t *testing.T) {
 				g := assertCompile(t, `
 layers: {
@@ -2154,13 +2154,13 @@ layers: {
   }
 }
 `, "")
-				assert.True(t, g.BoardContainer)
+				assert.True(t, g.IsContainerOnly)
 				assert.Equal(t, 2, len(g.Layers))
 				assert.Equal(t, "one", g.Layers[0].Name)
 				assert.Equal(t, "two", g.Layers[1].Name)
 				assert.Equal(t, 2, len(g.Layers[1].Scenarios))
-				assert.False(t, g.Layers[1].Scenarios[0].BoardContainer)
-				assert.False(t, g.Layers[1].Scenarios[1].BoardContainer)
+				assert.False(t, g.Layers[1].Scenarios[0].IsContainerOnly)
+				assert.False(t, g.Layers[1].Scenarios[1].IsContainerOnly)
 			},
 		},
 		{
diff --git a/d2exporter/export.go b/d2exporter/export.go
index c238ba746..a7ce23fce 100644
--- a/d2exporter/export.go
+++ b/d2exporter/export.go
@@ -16,7 +16,7 @@ func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamil
 	diagram := d2target.NewDiagram()
 	applyStyles(&diagram.Root, g.Root)
 	diagram.Name = g.Name
-	diagram.BoardContainer = g.BoardContainer
+	diagram.IsContainerOnly = g.IsContainerOnly
 	if fontFamily == nil {
 		fontFamily = go2.Pointer(d2fonts.SourceSansPro)
 	}
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
index 2d26954b7..52c421b7b 100644
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@@ -29,12 +29,11 @@ const MIN_SHAPE_SIZE = 5
 
 type Graph struct {
 	Name string `json:"name"`
-	// A BoardContainer is a board or scenario itself contains nothing
-	// but its base and more boards, scenarios or steps.
-	// boardContainers do not have a render and are used purely for organizing the board
-	// tree.
-	BoardContainer bool       `json:"boardContainer"`
-	AST            *d2ast.Map `json:"ast"`
+	// IsContainerOnly indicates a board or scenario itself makes no modifications from its
+	// base. Container only boards do not have a render and are used purely for organizing
+	// the board tree.
+	IsContainerOnly bool       `json:"isContainerOnly"`
+	AST             *d2ast.Map `json:"ast"`
 
 	Root    *Object   `json:"root"`
 	Edges   []*Edge   `json:"edges"`
diff --git a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg
index 4f34dadef..b5c982c3f 100644
--- a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg
@@ -30,7 +30,7 @@
   mix-blend-mode: multiply;
   opacity: 0.5;
 }
-.fill-N1{fill:#0A0F25;}.fill-N2{fill:#676C7E;}.fill-N3{fill:#9499AB;}.fill-N4{fill:#CFD2DD;}.fill-N5{fill:#DEE1EB;}.fill-N6{fill:#EEF1F8;}.fill-N7{fill:#FFFFFF;}.fill-B1{fill:#0D32B2;}.fill-B2{fill:#0D32B2;}.fill-B3{fill:#E3E9FD;}.fill-B4{fill:#E3E9FD;}.fill-B5{fill:#EDF0FD;}.fill-B6{fill:#F7F8FE;}.fill-AA2{fill:#4A6FF3;}.fill-AA4{fill:#EDF0FD;}.fill-AA5{fill:#F7F8FE;}.fill-AB4{fill:#EDF0FD;}.fill-AB5{fill:#F7F8FE;}.stroke-N1{stroke:#0A0F25;}.stroke-N2{stroke:#676C7E;}.stroke-N3{stroke:#9499AB;}.stroke-N4{stroke:#CFD2DD;}.stroke-N5{stroke:#DEE1EB;}.stroke-N6{stroke:#EEF1F8;}.stroke-N7{stroke:#FFFFFF;}.stroke-B1{stroke:#0D32B2;}.stroke-B2{stroke:#0D32B2;}.stroke-B3{stroke:#E3E9FD;}.stroke-B4{stroke:#E3E9FD;}.stroke-B5{stroke:#EDF0FD;}.stroke-B6{stroke:#F7F8FE;}.stroke-AA2{stroke:#4A6FF3;}.stroke-AA4{stroke:#EDF0FD;}.stroke-AA5{stroke:#F7F8FE;}.stroke-AB4{stroke:#EDF0FD;}.stroke-AB5{stroke:#F7F8FE;}.background-color-N1{background-color:#0A0F25;}.background-color-N2{background-color:#676C7E;}.background-color-N3{background-color:#9499AB;}.background-color-N4{background-color:#CFD2DD;}.background-color-N5{background-color:#DEE1EB;}.background-color-N6{background-color:#EEF1F8;}.background-color-N7{background-color:#FFFFFF;}.background-color-B1{background-color:#0D32B2;}.background-color-B2{background-color:#0D32B2;}.background-color-B3{background-color:#E3E9FD;}.background-color-B4{background-color:#E3E9FD;}.background-color-B5{background-color:#EDF0FD;}.background-color-B6{background-color:#F7F8FE;}.background-color-AA2{background-color:#4A6FF3;}.background-color-AA4{background-color:#EDF0FD;}.background-color-AA5{background-color:#F7F8FE;}.background-color-AB4{background-color:#EDF0FD;}.background-color-AB5{background-color:#F7F8FE;}.color-N1{color:#0A0F25;}.color-N2{color:#676C7E;}.color-N3{color:#9499AB;}.color-N4{color:#CFD2DD;}.color-N5{color:#DEE1EB;}.color-N6{color:#EEF1F8;}.color-N7{color:#FFFFFF;}.color-B1{color:#0D32B2;}.color-B2{color:#0D32B2;}.color-B3{color:#E3E9FD;}.color-B4{color:#E3E9FD;}.color-B5{color:#EDF0FD;}.color-B6{color:#F7F8FE;}.color-AA2{color:#4A6FF3;}.color-AA4{color:#EDF0FD;}.color-AA5{color:#F7F8FE;}.color-AB4{color:#EDF0FD;}.color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}]]></style><g id="winter"><g class="shape" ><path d="M-1.600310 -0.578379 L212.045551 1.811030 L211.253697 120.234072 L0.925556 123.532483" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.755797 0.849798 C41.919041 0.271510, 83.908070 -2.279368, 210.300335 0.345898 M-0.571888 0.233280 C47.092687 -0.888816, 93.486665 -1.391062, 210.488319 0.663711 M212.536704 -1.749433 C210.972303 27.765539, 211.663839 51.429772, 212.390547 121.130645 M211.297677 -0.799274 C212.010129 31.884164, 211.033660 65.515876, 211.406876 122.352243 M211.928191 121.811822 C166.401573 125.510374, 118.501892 125.031181, 1.619092 121.644237 M210.168238 121.873280 C131.604972 122.658440, 53.066606 122.419106, 0.827814 122.036891 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="211.000000" height="122.000000" transform="translate(16.000000 44.000000)" class=" sketch-overlay-B4" /></g><text x="121.500000" y="28.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><path d="M-1.600310 -0.578379 L156.045551 1.811030 L155.253697 120.234072 L0.925556 123.532483" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.857263 0.963884 C30.680942 0.534936, 61.441269 -2.358399, 154.206405 0.392335 M-0.648665 0.264598 C34.748995 -0.524619, 68.705478 -1.094292, 154.419625 0.752815 M156.536704 -1.749433 C154.972303 27.765539, 155.663839 51.429772, 156.390547 121.130645 M155.297677 -0.799274 C156.010129 31.884164, 155.033660 65.515876, 155.406876 122.352243 M156.052801 121.786559 C122.601194 124.873674, 86.457938 124.330149, 1.836456 121.596476 M154.056573 121.856267 C96.645676 122.618642, 39.263022 122.347177, 0.938949 122.041844 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="155.000000" height="122.000000" transform="translate(0.000000 310.000000)" class=" sketch-overlay-B4" /></g><text x="77.500000" y="294.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="trees"><g class="shape" ><path d="M-1.600310 -0.578379 L86.045551 1.811030 L85.253697 64.234072 L0.925556 67.532483" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><path d="M0.857263 0.963884 C16.680628 0.818655, 33.440640 -2.074680, 84.206405 0.392335 M-0.648665 0.264598 C19.254363 0.079782, 37.716213 -0.489889, 84.419625 0.752815 M86.536704 -1.749433 C85.489431 15.585410, 86.180967 27.069513, 86.390547 65.130645 M85.297677 -0.799274 C85.657560 16.854002, 84.681091 35.455552, 85.406876 66.352243 M86.052801 65.786559 C67.698267 67.488711, 46.652085 66.945187, 1.836456 65.596476 M84.056573 65.856267 C52.959557 66.458399, 21.890783 66.186934, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><rect width="85.000000" height="66.000000" transform="translate(84.000000 532.000000)" class=" sketch-overlay-B6" /></g><text x="126.500000" y="570.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">trees</text></g><g id="winter.snow"><g class="shape" ><path d="M-1.600310 -0.578379 L89.045551 1.811030 L88.253697 64.234072 L0.925556 67.532483" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C17.280641 0.806495, 34.640667 -2.086840, 87.206405 0.392335 M-0.648665 0.264598 C19.918419 0.053879, 39.044325 -0.515792, 87.419625 0.752815 M89.536704 -1.749433 C88.489431 15.585410, 89.180967 27.069513, 89.390547 65.130645 M88.297677 -0.799274 C88.657560 16.854002, 87.681091 35.455552, 88.406876 66.352243 M89.052801 65.786559 C70.051250 67.548067, 48.358050 67.004542, 1.836456 65.596476 M87.056573 65.856267 C54.831819 66.465266, 22.635308 66.193802, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="88.000000" height="66.000000" transform="translate(82.000000 72.000000)" class=" sketch-overlay-B5" /></g><text x="126.000000" y="110.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><path d="M-1.600310 -0.578379 L76.045551 1.811030 L75.253697 64.234072 L0.925556 67.532483" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C14.680583 0.859186, 29.440550 -2.034149, 74.206405 0.392335 M-0.648665 0.264598 C17.040844 0.166125, 33.289176 -0.403546, 74.419625 0.752815 M76.536704 -1.749433 C75.489431 15.585410, 76.180967 27.069513, 76.390547 65.130645 M75.297677 -0.799274 C75.657560 16.854002, 74.681091 35.455552, 75.406876 66.352243 M76.052801 65.786559 C59.854992 67.290860, 40.965535 66.747335, 1.836456 65.596476 M74.056573 65.856267 C46.718682 66.435507, 19.409035 66.164043, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="75.000000" height="66.000000" transform="translate(40.000000 338.000000)" class=" sketch-overlay-B5" /></g><text x="77.500000" y="376.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M103.420046 137.720240 M103.420046 137.720240 C84.337378 160.080246, 78.663171 175.439876, 77.905312 191.857263 M101.689881 136.926646 C82.802780 161.479289, 75.878336 176.661496, 77.990419 189.033797 M77.990419 189.033797 C77.672784 206.488053, 76.339251 281.905631, 78.378905 335.627398 M76.340465 188.110353 C75.313208 207.373630, 79.037822 282.638050, 78.070257 335.920880" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(77.500000 334.000000) rotate(90)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(77.500000 334.000000) rotate(90)" /></g><g id="(summer.sun -&gt; trees)[0]"><path d="M75.500089 404.340129 M75.500089 404.340129 C78.463884 426.080246, 84.463171 491.439876, 104.898440 529.397138 M73.769924 403.546535 C76.929286 427.479289, 81.678336 492.661496, 104.983547 526.573672" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(104.493128 528.539875) rotate(59.88626684901755)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(104.493128 528.539875) rotate(59.88626684901755)" /></g><g id="(trees -&gt; winter.snow)[0]"><path d="M144.645524 528.615593 M144.645524 528.615593 C170.090390 491.680246, 176.163171 471.439876, 175.405312 457.857263 M142.915359 527.821999 C168.555792 493.079289, 173.378336 472.661496, 175.490419 455.033797 M175.490419 455.033797 C175.172784 442.488053, 173.839251 416.905631, 175.878905 392.127398 M173.840465 454.110353 C172.813208 443.373630, 176.537822 417.638050, 175.570257 392.420880 M175.570257 392.420880 C174.130645 364.967915, 175.629587 331.218184, 173.359209 308.890547 M176.165613 390.822332 C173.163909 365.668281, 176.017192 333.280609, 175.605080 305.349706 M175.605080 305.349706 C176.978518 283.652801, 174.786559 257.030428, 173.313449 241.522259 M175.412052 303.666112 C174.495595 284.497814, 174.407310 256.286147, 174.079308 243.295570 M174.079308 243.295570 C174.824253 226.527637, 170.791845 160.384708, 146.990752 140.490913 M175.957207 243.379259 C174.843469 225.099244, 168.848165 161.975958, 148.547838 142.592714" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /></g><mask id="1960707820" maskUnits="userSpaceOnUse" x="-101" y="-100" width="429" height="799">
+.fill-N1{fill:#0A0F25;}.fill-N2{fill:#676C7E;}.fill-N3{fill:#9499AB;}.fill-N4{fill:#CFD2DD;}.fill-N5{fill:#DEE1EB;}.fill-N6{fill:#EEF1F8;}.fill-N7{fill:#FFFFFF;}.fill-B1{fill:#0D32B2;}.fill-B2{fill:#0D32B2;}.fill-B3{fill:#E3E9FD;}.fill-B4{fill:#E3E9FD;}.fill-B5{fill:#EDF0FD;}.fill-B6{fill:#F7F8FE;}.fill-AA2{fill:#4A6FF3;}.fill-AA4{fill:#EDF0FD;}.fill-AA5{fill:#F7F8FE;}.fill-AB4{fill:#EDF0FD;}.fill-AB5{fill:#F7F8FE;}.stroke-N1{stroke:#0A0F25;}.stroke-N2{stroke:#676C7E;}.stroke-N3{stroke:#9499AB;}.stroke-N4{stroke:#CFD2DD;}.stroke-N5{stroke:#DEE1EB;}.stroke-N6{stroke:#EEF1F8;}.stroke-N7{stroke:#FFFFFF;}.stroke-B1{stroke:#0D32B2;}.stroke-B2{stroke:#0D32B2;}.stroke-B3{stroke:#E3E9FD;}.stroke-B4{stroke:#E3E9FD;}.stroke-B5{stroke:#EDF0FD;}.stroke-B6{stroke:#F7F8FE;}.stroke-AA2{stroke:#4A6FF3;}.stroke-AA4{stroke:#EDF0FD;}.stroke-AA5{stroke:#F7F8FE;}.stroke-AB4{stroke:#EDF0FD;}.stroke-AB5{stroke:#F7F8FE;}.background-color-N1{background-color:#0A0F25;}.background-color-N2{background-color:#676C7E;}.background-color-N3{background-color:#9499AB;}.background-color-N4{background-color:#CFD2DD;}.background-color-N5{background-color:#DEE1EB;}.background-color-N6{background-color:#EEF1F8;}.background-color-N7{background-color:#FFFFFF;}.background-color-B1{background-color:#0D32B2;}.background-color-B2{background-color:#0D32B2;}.background-color-B3{background-color:#E3E9FD;}.background-color-B4{background-color:#E3E9FD;}.background-color-B5{background-color:#EDF0FD;}.background-color-B6{background-color:#F7F8FE;}.background-color-AA2{background-color:#4A6FF3;}.background-color-AA4{background-color:#EDF0FD;}.background-color-AA5{background-color:#F7F8FE;}.background-color-AB4{background-color:#EDF0FD;}.background-color-AB5{background-color:#F7F8FE;}.color-N1{color:#0A0F25;}.color-N2{color:#676C7E;}.color-N3{color:#9499AB;}.color-N4{color:#CFD2DD;}.color-N5{color:#DEE1EB;}.color-N6{color:#EEF1F8;}.color-N7{color:#FFFFFF;}.color-B1{color:#0D32B2;}.color-B2{color:#0D32B2;}.color-B3{color:#E3E9FD;}.color-B4{color:#E3E9FD;}.color-B5{color:#EDF0FD;}.color-B6{color:#F7F8FE;}.color-AA2{color:#4A6FF3;}.color-AA4{color:#EDF0FD;}.color-AA5{color:#F7F8FE;}.color-AB4{color:#EDF0FD;}.color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}]]></style><g id="winter"><g class="shape" ><path d="M-1.600310 -0.578379 L212.045551 1.811030 L211.253697 120.234072 L0.925556 123.532483" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.755797 0.849798 C41.919041 0.271510, 83.908070 -2.279368, 210.300335 0.345898 M-0.571888 0.233280 C47.092687 -0.888816, 93.486665 -1.391062, 210.488319 0.663711 M212.536704 -1.749433 C210.972303 27.765539, 211.663839 51.429772, 212.390547 121.130645 M211.297677 -0.799274 C212.010129 31.884164, 211.033660 65.515876, 211.406876 122.352243 M211.928191 121.811822 C166.401573 125.510374, 118.501892 125.031181, 1.619092 121.644237 M210.168238 121.873280 C131.604972 122.658440, 53.066606 122.419106, 0.827814 122.036891 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="211.000000" height="122.000000" transform="translate(16.000000 44.000000)" class=" sketch-overlay-B4" /></g><text x="121.500000" y="28.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><path d="M-1.600310 -0.578379 L156.045551 1.811030 L155.253697 120.234072 L0.925556 123.532483" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.857263 0.963884 C30.680942 0.534936, 61.441269 -2.358399, 154.206405 0.392335 M-0.648665 0.264598 C34.748995 -0.524619, 68.705478 -1.094292, 154.419625 0.752815 M156.536704 -1.749433 C154.972303 27.765539, 155.663839 51.429772, 156.390547 121.130645 M155.297677 -0.799274 C156.010129 31.884164, 155.033660 65.515876, 155.406876 122.352243 M156.052801 121.786559 C122.601194 124.873674, 86.457938 124.330149, 1.836456 121.596476 M154.056573 121.856267 C96.645676 122.618642, 39.263022 122.347177, 0.938949 122.041844 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="155.000000" height="122.000000" transform="translate(0.000000 310.000000)" class=" sketch-overlay-B4" /></g><text x="77.500000" y="294.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="trees"><g class="shape" ><path d="M-1.600310 -0.578379 L86.045551 1.811030 L85.253697 64.234072 L0.925556 67.532483" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><path d="M0.857263 0.963884 C16.680628 0.818655, 33.440640 -2.074680, 84.206405 0.392335 M-0.648665 0.264598 C19.254363 0.079782, 37.716213 -0.489889, 84.419625 0.752815 M86.536704 -1.749433 C85.489431 15.585410, 86.180967 27.069513, 86.390547 65.130645 M85.297677 -0.799274 C85.657560 16.854002, 84.681091 35.455552, 85.406876 66.352243 M86.052801 65.786559 C67.698267 67.488711, 46.652085 66.945187, 1.836456 65.596476 M84.056573 65.856267 C52.959557 66.458399, 21.890783 66.186934, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><rect width="85.000000" height="66.000000" transform="translate(84.000000 532.000000)" class=" sketch-overlay-B6" /></g><text x="126.500000" y="570.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">trees</text></g><g id="winter.snow"><g class="shape" ><path d="M-1.600310 -0.578379 L89.045551 1.811030 L88.253697 64.234072 L0.925556 67.532483" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C17.280641 0.806495, 34.640667 -2.086840, 87.206405 0.392335 M-0.648665 0.264598 C19.918419 0.053879, 39.044325 -0.515792, 87.419625 0.752815 M89.536704 -1.749433 C88.489431 15.585410, 89.180967 27.069513, 89.390547 65.130645 M88.297677 -0.799274 C88.657560 16.854002, 87.681091 35.455552, 88.406876 66.352243 M89.052801 65.786559 C70.051250 67.548067, 48.358050 67.004542, 1.836456 65.596476 M87.056573 65.856267 C54.831819 66.465266, 22.635308 66.193802, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="88.000000" height="66.000000" transform="translate(82.000000 72.000000)" class=" sketch-overlay-B5" /></g><text x="126.000000" y="110.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><path d="M-1.600310 -0.578379 L76.045551 1.811030 L75.253697 64.234072 L0.925556 67.532483" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C14.680583 0.859186, 29.440550 -2.034149, 74.206405 0.392335 M-0.648665 0.264598 C17.040844 0.166125, 33.289176 -0.403546, 74.419625 0.752815 M76.536704 -1.749433 C75.489431 15.585410, 76.180967 27.069513, 76.390547 65.130645 M75.297677 -0.799274 C75.657560 16.854002, 74.681091 35.455552, 75.406876 66.352243 M76.052801 65.786559 C59.854992 67.290860, 40.965535 66.747335, 1.836456 65.596476 M74.056573 65.856267 C46.718682 66.435507, 19.409035 66.164043, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="75.000000" height="66.000000" transform="translate(40.000000 338.000000)" class=" sketch-overlay-B5" /></g><text x="77.500000" y="376.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M103.420046 137.720240 M103.420046 137.720240 C84.337378 160.080246, 78.663171 175.439876, 77.905312 191.857263 M101.689881 136.926646 C82.802780 161.479289, 75.878336 176.661496, 77.990419 189.033797 M77.990419 189.033797 C77.672784 206.488053, 76.339251 281.905631, 78.378905 335.627398 M76.340465 188.110353 C75.313208 207.373630, 79.037822 282.638050, 78.070257 335.920880" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(77.500000 334.000000) rotate(90)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(77.500000 334.000000) rotate(90)" /></g><g id="(summer.sun -&gt; trees)[0]"><path d="M75.500089 404.340129 M75.500089 404.340129 C78.463884 426.080246, 84.463171 491.439876, 104.898440 529.397138 M73.769924 403.546535 C76.929286 427.479289, 81.678336 492.661496, 104.983547 526.573672" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(104.493128 528.539875) rotate(59.886266849017574)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(104.493128 528.539875) rotate(59.886266849017574)" /></g><g id="(trees -&gt; winter.snow)[0]"><path d="M144.645524 528.615593 M144.645524 528.615593 C170.090390 491.680246, 176.163171 471.439876, 175.405312 457.857263 M142.915359 527.821999 C168.555792 493.079289, 173.378336 472.661496, 175.490419 455.033797 M175.490419 455.033797 C175.172784 442.488053, 173.839251 416.905631, 175.878905 392.127398 M173.840465 454.110353 C172.813208 443.373630, 176.537822 417.638050, 175.570257 392.420880 M175.570257 392.420880 C174.130645 364.967915, 175.629587 331.218184, 173.359209 308.890547 M176.165613 390.822332 C173.163909 365.668281, 176.017192 333.280609, 175.605080 305.349706 M175.605080 305.349706 C176.978518 283.652801, 174.786559 257.030428, 173.313449 241.522259 M175.412052 303.666112 C174.495595 284.497814, 174.407310 256.286147, 174.079308 243.295570 M174.079308 243.295570 C174.824253 226.527637, 170.791845 160.384708, 146.990752 140.490913 M175.957207 243.379259 C174.843469 225.099244, 168.848165 161.975958, 148.547838 142.592714" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /></g><mask id="1960707820" maskUnits="userSpaceOnUse" x="-101" y="-100" width="429" height="799">
 <rect x="-101" y="-100" width="429" height="799" fill="white"></rect>
 
 </mask></svg></svg>
\ No newline at end of file
diff --git a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg
index 87ddf699b..d5dbfaf35 100644
--- a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg
@@ -30,7 +30,7 @@
   mix-blend-mode: multiply;
   opacity: 0.5;
 }
-.fill-N1{fill:#CDD6F4;}.fill-N2{fill:#BAC2DE;}.fill-N3{fill:#A6ADC8;}.fill-N4{fill:#585B70;}.fill-N5{fill:#45475A;}.fill-N6{fill:#313244;}.fill-N7{fill:#1E1E2E;}.fill-B1{fill:#CBA6f7;}.fill-B2{fill:#CBA6f7;}.fill-B3{fill:#6C7086;}.fill-B4{fill:#585B70;}.fill-B5{fill:#45475A;}.fill-B6{fill:#313244;}.fill-AA2{fill:#f38BA8;}.fill-AA4{fill:#45475A;}.fill-AA5{fill:#313244;}.fill-AB4{fill:#45475A;}.fill-AB5{fill:#313244;}.stroke-N1{stroke:#CDD6F4;}.stroke-N2{stroke:#BAC2DE;}.stroke-N3{stroke:#A6ADC8;}.stroke-N4{stroke:#585B70;}.stroke-N5{stroke:#45475A;}.stroke-N6{stroke:#313244;}.stroke-N7{stroke:#1E1E2E;}.stroke-B1{stroke:#CBA6f7;}.stroke-B2{stroke:#CBA6f7;}.stroke-B3{stroke:#6C7086;}.stroke-B4{stroke:#585B70;}.stroke-B5{stroke:#45475A;}.stroke-B6{stroke:#313244;}.stroke-AA2{stroke:#f38BA8;}.stroke-AA4{stroke:#45475A;}.stroke-AA5{stroke:#313244;}.stroke-AB4{stroke:#45475A;}.stroke-AB5{stroke:#313244;}.background-color-N1{background-color:#CDD6F4;}.background-color-N2{background-color:#BAC2DE;}.background-color-N3{background-color:#A6ADC8;}.background-color-N4{background-color:#585B70;}.background-color-N5{background-color:#45475A;}.background-color-N6{background-color:#313244;}.background-color-N7{background-color:#1E1E2E;}.background-color-B1{background-color:#CBA6f7;}.background-color-B2{background-color:#CBA6f7;}.background-color-B3{background-color:#6C7086;}.background-color-B4{background-color:#585B70;}.background-color-B5{background-color:#45475A;}.background-color-B6{background-color:#313244;}.background-color-AA2{background-color:#f38BA8;}.background-color-AA4{background-color:#45475A;}.background-color-AA5{background-color:#313244;}.background-color-AB4{background-color:#45475A;}.background-color-AB5{background-color:#313244;}.color-N1{color:#CDD6F4;}.color-N2{color:#BAC2DE;}.color-N3{color:#A6ADC8;}.color-N4{color:#585B70;}.color-N5{color:#45475A;}.color-N6{color:#313244;}.color-N7{color:#1E1E2E;}.color-B1{color:#CBA6f7;}.color-B2{color:#CBA6f7;}.color-B3{color:#6C7086;}.color-B4{color:#585B70;}.color-B5{color:#45475A;}.color-B6{color:#313244;}.color-AA2{color:#f38BA8;}.color-AA4{color:#45475A;}.color-AA5{color:#313244;}.color-AB4{color:#45475A;}.color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}]]></style><g id="winter"><g class="shape" ><path d="M-1.600310 -0.578379 L212.045551 1.811030 L211.253697 120.234072 L0.925556 123.532483" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.755797 0.849798 C41.919041 0.271510, 83.908070 -2.279368, 210.300335 0.345898 M-0.571888 0.233280 C47.092687 -0.888816, 93.486665 -1.391062, 210.488319 0.663711 M212.536704 -1.749433 C210.972303 27.765539, 211.663839 51.429772, 212.390547 121.130645 M211.297677 -0.799274 C212.010129 31.884164, 211.033660 65.515876, 211.406876 122.352243 M211.928191 121.811822 C166.401573 125.510374, 118.501892 125.031181, 1.619092 121.644237 M210.168238 121.873280 C131.604972 122.658440, 53.066606 122.419106, 0.827814 122.036891 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="211.000000" height="122.000000" transform="translate(16.000000 44.000000)" class=" sketch-overlay-B4" /></g><text x="121.500000" y="28.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><path d="M-1.600310 -0.578379 L156.045551 1.811030 L155.253697 120.234072 L0.925556 123.532483" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.857263 0.963884 C30.680942 0.534936, 61.441269 -2.358399, 154.206405 0.392335 M-0.648665 0.264598 C34.748995 -0.524619, 68.705478 -1.094292, 154.419625 0.752815 M156.536704 -1.749433 C154.972303 27.765539, 155.663839 51.429772, 156.390547 121.130645 M155.297677 -0.799274 C156.010129 31.884164, 155.033660 65.515876, 155.406876 122.352243 M156.052801 121.786559 C122.601194 124.873674, 86.457938 124.330149, 1.836456 121.596476 M154.056573 121.856267 C96.645676 122.618642, 39.263022 122.347177, 0.938949 122.041844 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="155.000000" height="122.000000" transform="translate(0.000000 310.000000)" class=" sketch-overlay-B4" /></g><text x="77.500000" y="294.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="trees"><g class="shape" ><path d="M-1.600310 -0.578379 L86.045551 1.811030 L85.253697 64.234072 L0.925556 67.532483" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><path d="M0.857263 0.963884 C16.680628 0.818655, 33.440640 -2.074680, 84.206405 0.392335 M-0.648665 0.264598 C19.254363 0.079782, 37.716213 -0.489889, 84.419625 0.752815 M86.536704 -1.749433 C85.489431 15.585410, 86.180967 27.069513, 86.390547 65.130645 M85.297677 -0.799274 C85.657560 16.854002, 84.681091 35.455552, 85.406876 66.352243 M86.052801 65.786559 C67.698267 67.488711, 46.652085 66.945187, 1.836456 65.596476 M84.056573 65.856267 C52.959557 66.458399, 21.890783 66.186934, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><rect width="85.000000" height="66.000000" transform="translate(84.000000 532.000000)" class=" sketch-overlay-B6" /></g><text x="126.500000" y="570.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">trees</text></g><g id="winter.snow"><g class="shape" ><path d="M-1.600310 -0.578379 L89.045551 1.811030 L88.253697 64.234072 L0.925556 67.532483" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C17.280641 0.806495, 34.640667 -2.086840, 87.206405 0.392335 M-0.648665 0.264598 C19.918419 0.053879, 39.044325 -0.515792, 87.419625 0.752815 M89.536704 -1.749433 C88.489431 15.585410, 89.180967 27.069513, 89.390547 65.130645 M88.297677 -0.799274 C88.657560 16.854002, 87.681091 35.455552, 88.406876 66.352243 M89.052801 65.786559 C70.051250 67.548067, 48.358050 67.004542, 1.836456 65.596476 M87.056573 65.856267 C54.831819 66.465266, 22.635308 66.193802, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="88.000000" height="66.000000" transform="translate(82.000000 72.000000)" class=" sketch-overlay-B5" /></g><text x="126.000000" y="110.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><path d="M-1.600310 -0.578379 L76.045551 1.811030 L75.253697 64.234072 L0.925556 67.532483" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C14.680583 0.859186, 29.440550 -2.034149, 74.206405 0.392335 M-0.648665 0.264598 C17.040844 0.166125, 33.289176 -0.403546, 74.419625 0.752815 M76.536704 -1.749433 C75.489431 15.585410, 76.180967 27.069513, 76.390547 65.130645 M75.297677 -0.799274 C75.657560 16.854002, 74.681091 35.455552, 75.406876 66.352243 M76.052801 65.786559 C59.854992 67.290860, 40.965535 66.747335, 1.836456 65.596476 M74.056573 65.856267 C46.718682 66.435507, 19.409035 66.164043, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="75.000000" height="66.000000" transform="translate(40.000000 338.000000)" class=" sketch-overlay-B5" /></g><text x="77.500000" y="376.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M103.420046 137.720240 M103.420046 137.720240 C84.337378 160.080246, 78.663171 175.439876, 77.905312 191.857263 M101.689881 136.926646 C82.802780 161.479289, 75.878336 176.661496, 77.990419 189.033797 M77.990419 189.033797 C77.672784 206.488053, 76.339251 281.905631, 78.378905 335.627398 M76.340465 188.110353 C75.313208 207.373630, 79.037822 282.638050, 78.070257 335.920880" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(77.500000 334.000000) rotate(90)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(77.500000 334.000000) rotate(90)" /></g><g id="(summer.sun -&gt; trees)[0]"><path d="M75.500089 404.340129 M75.500089 404.340129 C78.463884 426.080246, 84.463171 491.439876, 104.898440 529.397138 M73.769924 403.546535 C76.929286 427.479289, 81.678336 492.661496, 104.983547 526.573672" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(104.493128 528.539875) rotate(59.88626684901755)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(104.493128 528.539875) rotate(59.88626684901755)" /></g><g id="(trees -&gt; winter.snow)[0]"><path d="M144.645524 528.615593 M144.645524 528.615593 C170.090390 491.680246, 176.163171 471.439876, 175.405312 457.857263 M142.915359 527.821999 C168.555792 493.079289, 173.378336 472.661496, 175.490419 455.033797 M175.490419 455.033797 C175.172784 442.488053, 173.839251 416.905631, 175.878905 392.127398 M173.840465 454.110353 C172.813208 443.373630, 176.537822 417.638050, 175.570257 392.420880 M175.570257 392.420880 C174.130645 364.967915, 175.629587 331.218184, 173.359209 308.890547 M176.165613 390.822332 C173.163909 365.668281, 176.017192 333.280609, 175.605080 305.349706 M175.605080 305.349706 C176.978518 283.652801, 174.786559 257.030428, 173.313449 241.522259 M175.412052 303.666112 C174.495595 284.497814, 174.407310 256.286147, 174.079308 243.295570 M174.079308 243.295570 C174.824253 226.527637, 170.791845 160.384708, 146.990752 140.490913 M175.957207 243.379259 C174.843469 225.099244, 168.848165 161.975958, 148.547838 142.592714" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /></g><mask id="1960707820" maskUnits="userSpaceOnUse" x="-101" y="-100" width="429" height="799">
+.fill-N1{fill:#CDD6F4;}.fill-N2{fill:#BAC2DE;}.fill-N3{fill:#A6ADC8;}.fill-N4{fill:#585B70;}.fill-N5{fill:#45475A;}.fill-N6{fill:#313244;}.fill-N7{fill:#1E1E2E;}.fill-B1{fill:#CBA6f7;}.fill-B2{fill:#CBA6f7;}.fill-B3{fill:#6C7086;}.fill-B4{fill:#585B70;}.fill-B5{fill:#45475A;}.fill-B6{fill:#313244;}.fill-AA2{fill:#f38BA8;}.fill-AA4{fill:#45475A;}.fill-AA5{fill:#313244;}.fill-AB4{fill:#45475A;}.fill-AB5{fill:#313244;}.stroke-N1{stroke:#CDD6F4;}.stroke-N2{stroke:#BAC2DE;}.stroke-N3{stroke:#A6ADC8;}.stroke-N4{stroke:#585B70;}.stroke-N5{stroke:#45475A;}.stroke-N6{stroke:#313244;}.stroke-N7{stroke:#1E1E2E;}.stroke-B1{stroke:#CBA6f7;}.stroke-B2{stroke:#CBA6f7;}.stroke-B3{stroke:#6C7086;}.stroke-B4{stroke:#585B70;}.stroke-B5{stroke:#45475A;}.stroke-B6{stroke:#313244;}.stroke-AA2{stroke:#f38BA8;}.stroke-AA4{stroke:#45475A;}.stroke-AA5{stroke:#313244;}.stroke-AB4{stroke:#45475A;}.stroke-AB5{stroke:#313244;}.background-color-N1{background-color:#CDD6F4;}.background-color-N2{background-color:#BAC2DE;}.background-color-N3{background-color:#A6ADC8;}.background-color-N4{background-color:#585B70;}.background-color-N5{background-color:#45475A;}.background-color-N6{background-color:#313244;}.background-color-N7{background-color:#1E1E2E;}.background-color-B1{background-color:#CBA6f7;}.background-color-B2{background-color:#CBA6f7;}.background-color-B3{background-color:#6C7086;}.background-color-B4{background-color:#585B70;}.background-color-B5{background-color:#45475A;}.background-color-B6{background-color:#313244;}.background-color-AA2{background-color:#f38BA8;}.background-color-AA4{background-color:#45475A;}.background-color-AA5{background-color:#313244;}.background-color-AB4{background-color:#45475A;}.background-color-AB5{background-color:#313244;}.color-N1{color:#CDD6F4;}.color-N2{color:#BAC2DE;}.color-N3{color:#A6ADC8;}.color-N4{color:#585B70;}.color-N5{color:#45475A;}.color-N6{color:#313244;}.color-N7{color:#1E1E2E;}.color-B1{color:#CBA6f7;}.color-B2{color:#CBA6f7;}.color-B3{color:#6C7086;}.color-B4{color:#585B70;}.color-B5{color:#45475A;}.color-B6{color:#313244;}.color-AA2{color:#f38BA8;}.color-AA4{color:#45475A;}.color-AA5{color:#313244;}.color-AB4{color:#45475A;}.color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}]]></style><g id="winter"><g class="shape" ><path d="M-1.600310 -0.578379 L212.045551 1.811030 L211.253697 120.234072 L0.925556 123.532483" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.755797 0.849798 C41.919041 0.271510, 83.908070 -2.279368, 210.300335 0.345898 M-0.571888 0.233280 C47.092687 -0.888816, 93.486665 -1.391062, 210.488319 0.663711 M212.536704 -1.749433 C210.972303 27.765539, 211.663839 51.429772, 212.390547 121.130645 M211.297677 -0.799274 C212.010129 31.884164, 211.033660 65.515876, 211.406876 122.352243 M211.928191 121.811822 C166.401573 125.510374, 118.501892 125.031181, 1.619092 121.644237 M210.168238 121.873280 C131.604972 122.658440, 53.066606 122.419106, 0.827814 122.036891 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(16.000000 44.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="211.000000" height="122.000000" transform="translate(16.000000 44.000000)" class=" sketch-overlay-B4" /></g><text x="121.500000" y="28.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">winter</text></g><g id="summer"><g class="shape" ><path d="M-1.600310 -0.578379 L156.045551 1.811030 L155.253697 120.234072 L0.925556 123.532483" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><path d="M0.857263 0.963884 C30.680942 0.534936, 61.441269 -2.358399, 154.206405 0.392335 M-0.648665 0.264598 C34.748995 -0.524619, 68.705478 -1.094292, 154.419625 0.752815 M156.536704 -1.749433 C154.972303 27.765539, 155.663839 51.429772, 156.390547 121.130645 M155.297677 -0.799274 C156.010129 31.884164, 155.033660 65.515876, 155.406876 122.352243 M156.052801 121.786559 C122.601194 124.873674, 86.457938 124.330149, 1.836456 121.596476 M154.056573 121.856267 C96.645676 122.618642, 39.263022 122.347177, 0.938949 122.041844 M-0.720604 121.718532 C-0.510025 85.480882, -2.242459 52.198522, 0.591800 -1.206080 M0.217956 122.998223 C-2.276897 76.966576, -1.770843 32.340540, 0.440740 0.988030" transform="translate(0.000000 310.000000)" class="shape stroke-B1 fill-B4" style="stroke-width:2;" /><rect width="155.000000" height="122.000000" transform="translate(0.000000 310.000000)" class=" sketch-overlay-B4" /></g><text x="77.500000" y="294.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">summer</text></g><g id="trees"><g class="shape" ><path d="M-1.600310 -0.578379 L86.045551 1.811030 L85.253697 64.234072 L0.925556 67.532483" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><path d="M0.857263 0.963884 C16.680628 0.818655, 33.440640 -2.074680, 84.206405 0.392335 M-0.648665 0.264598 C19.254363 0.079782, 37.716213 -0.489889, 84.419625 0.752815 M86.536704 -1.749433 C85.489431 15.585410, 86.180967 27.069513, 86.390547 65.130645 M85.297677 -0.799274 C85.657560 16.854002, 84.681091 35.455552, 85.406876 66.352243 M86.052801 65.786559 C67.698267 67.488711, 46.652085 66.945187, 1.836456 65.596476 M84.056573 65.856267 C52.959557 66.458399, 21.890783 66.186934, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(84.000000 532.000000)" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /><rect width="85.000000" height="66.000000" transform="translate(84.000000 532.000000)" class=" sketch-overlay-B6" /></g><text x="126.500000" y="570.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">trees</text></g><g id="winter.snow"><g class="shape" ><path d="M-1.600310 -0.578379 L89.045551 1.811030 L88.253697 64.234072 L0.925556 67.532483" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C17.280641 0.806495, 34.640667 -2.086840, 87.206405 0.392335 M-0.648665 0.264598 C19.918419 0.053879, 39.044325 -0.515792, 87.419625 0.752815 M89.536704 -1.749433 C88.489431 15.585410, 89.180967 27.069513, 89.390547 65.130645 M88.297677 -0.799274 C88.657560 16.854002, 87.681091 35.455552, 88.406876 66.352243 M89.052801 65.786559 C70.051250 67.548067, 48.358050 67.004542, 1.836456 65.596476 M87.056573 65.856267 C54.831819 66.465266, 22.635308 66.193802, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(82.000000 72.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="88.000000" height="66.000000" transform="translate(82.000000 72.000000)" class=" sketch-overlay-B5" /></g><text x="126.000000" y="110.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">snow</text></g><g id="summer.sun"><g class="shape" ><path d="M-1.600310 -0.578379 L76.045551 1.811030 L75.253697 64.234072 L0.925556 67.532483" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><path d="M0.857263 0.963884 C14.680583 0.859186, 29.440550 -2.034149, 74.206405 0.392335 M-0.648665 0.264598 C17.040844 0.166125, 33.289176 -0.403546, 74.419625 0.752815 M76.536704 -1.749433 C75.489431 15.585410, 76.180967 27.069513, 76.390547 65.130645 M75.297677 -0.799274 C75.657560 16.854002, 74.681091 35.455552, 75.406876 66.352243 M76.052801 65.786559 C59.854992 67.290860, 40.965535 66.747335, 1.836456 65.596476 M74.056573 65.856267 C46.718682 66.435507, 19.409035 66.164043, 0.938949 66.041844 M-0.720604 65.718532 C0.302797 45.542204, -1.429636 28.321166, 0.591800 -1.206080 M0.217956 66.998223 C-1.587850 41.337487, -1.081795 17.082362, 0.440740 0.988030" transform="translate(40.000000 338.000000)" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /><rect width="75.000000" height="66.000000" transform="translate(40.000000 338.000000)" class=" sketch-overlay-B5" /></g><text x="77.500000" y="376.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">sun</text></g><g id="(winter.snow -&gt; summer.sun)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M103.420046 137.720240 M103.420046 137.720240 C84.337378 160.080246, 78.663171 175.439876, 77.905312 191.857263 M101.689881 136.926646 C82.802780 161.479289, 75.878336 176.661496, 77.990419 189.033797 M77.990419 189.033797 C77.672784 206.488053, 76.339251 281.905631, 78.378905 335.627398 M76.340465 188.110353 C75.313208 207.373630, 79.037822 282.638050, 78.070257 335.920880" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(77.500000 334.000000) rotate(90)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(77.500000 334.000000) rotate(90)" /></g><g id="(summer.sun -&gt; trees)[0]"><path d="M75.500089 404.340129 M75.500089 404.340129 C78.463884 426.080246, 84.463171 491.439876, 104.898440 529.397138 M73.769924 403.546535 C76.929286 427.479289, 81.678336 492.661496, 104.983547 526.573672" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(104.493128 528.539875) rotate(59.886266849017574)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(104.493128 528.539875) rotate(59.886266849017574)" /></g><g id="(trees -&gt; winter.snow)[0]"><path d="M144.645524 528.615593 M144.645524 528.615593 C170.090390 491.680246, 176.163171 471.439876, 175.405312 457.857263 M142.915359 527.821999 C168.555792 493.079289, 173.378336 472.661496, 175.490419 455.033797 M175.490419 455.033797 C175.172784 442.488053, 173.839251 416.905631, 175.878905 392.127398 M173.840465 454.110353 C172.813208 443.373630, 176.537822 417.638050, 175.570257 392.420880 M175.570257 392.420880 C174.130645 364.967915, 175.629587 331.218184, 173.359209 308.890547 M176.165613 390.822332 C173.163909 365.668281, 176.017192 333.280609, 175.605080 305.349706 M175.605080 305.349706 C176.978518 283.652801, 174.786559 257.030428, 173.313449 241.522259 M175.412052 303.666112 C174.495595 284.497814, 174.407310 256.286147, 174.079308 243.295570 M174.079308 243.295570 C174.824253 226.527637, 170.791845 160.384708, 146.990752 140.490913 M175.957207 243.379259 C174.843469 225.099244, 168.848165 161.975958, 148.547838 142.592714" fill="none" class="connection animated-connection stroke-B1" style="stroke-width:2;stroke-dasharray:10.000000,9.865639;stroke-dashoffset:-198.656393;animation: dashdraw 4.932820s linear infinite;" mask="url(#1960707820)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(148.877606 140.778378) rotate(-136.00508600525419)" /></g><mask id="1960707820" maskUnits="userSpaceOnUse" x="-101" y="-100" width="429" height="799">
 <rect x="-101" y="-100" width="429" height="799" fill="white"></rect>
 
 </mask></svg></svg>
\ No newline at end of file
diff --git a/d2target/d2target.go b/d2target/d2target.go
index 390d0ecce..6eba661f0 100644
--- a/d2target/d2target.go
+++ b/d2target/d2target.go
@@ -36,9 +36,9 @@ var BorderOffset = geo.NewVector(5, 5)
 type Diagram struct {
 	Name string `json:"name"`
 	// See docs on the same field in d2graph to understand what it means.
-	BoardContainer bool                `json:"boardContainer"`
-	Description    string              `json:"description,omitempty"`
-	FontFamily     *d2fonts.FontFamily `json:"fontFamily,omitempty"`
+	IsContainerOnly bool                `json:"isContainerOnly"`
+	Description     string              `json:"description,omitempty"`
+	FontFamily      *d2fonts.FontFamily `json:"fontFamily,omitempty"`
 
 	Shapes      []Shape      `json:"shapes"`
 	Connections []Connection `json:"connections"`
diff --git a/e2etests/testdata/measured/empty-class/dagre/board.exp.json b/e2etests/testdata/measured/empty-class/dagre/board.exp.json
index 6231b1bb2..cb2781305 100644
--- a/e2etests/testdata/measured/empty-class/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-class/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
index 952ca74f2..5c8c34350 100644
--- a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 36d689a78..f512ef98f 100644
--- a/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
index 01954fa35..b47ff1d08 100644
--- a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
+++ b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
index a26383b03..c143e5ffd 100644
--- a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
+++ b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json b/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
index a51931b4c..f8d4cccfc 100644
--- a/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
+++ b/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json b/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
index a51931b4c..f8d4cccfc 100644
--- a/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
+++ b/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 94b0967b4..d00ea4070 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ead40ad85..b137b1e09 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
index 0772e95da..a0f386314 100644
--- a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
index 330651cc0..714fbb3eb 100644
--- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c1dd11f38..a289cfe9e 100644
--- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 899dc4c98..ec7e09e12 100644
--- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3b42ffcf7..d3dea45b9 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c32145e28..54c2a971e 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ddeecaaa8..185991a74 100644
--- a/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c32fcfc3b..50316bc1b 100644
--- a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
index 13df18f0e..8d0b61205 100644
--- a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
index ac78a0014..f383b25dc 100644
--- a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d28c5574f..24a1c9c8a 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 96337fcd5..46ee6e7b9 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 60f8c02eb..292a5655e 100644
--- a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 24a2f7a2a..92f067c11 100644
--- a/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_order/dagre/board.exp.json b/e2etests/testdata/regression/elk_order/dagre/board.exp.json
index a6290e2f0..5fa79d666 100644
--- a/e2etests/testdata/regression/elk_order/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_order/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_order/elk/board.exp.json b/e2etests/testdata/regression/elk_order/elk/board.exp.json
index a70155b9f..42bdc6ca8 100644
--- a/e2etests/testdata/regression/elk_order/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_order/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
index 67064b7db..0d1a65a20 100644
--- a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
+++ b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
index 106ec1f0f..fdb9ac7f7 100644
--- a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
+++ b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
index a82697ebf..c20232f14 100644
--- a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
+++ b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
index 392451abd..fa989de68 100644
--- a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
+++ b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/hex-fill/dagre/board.exp.json b/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
index c52a3dbac..99c7059ff 100644
--- a/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
+++ b/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/hex-fill/elk/board.exp.json b/e2etests/testdata/regression/hex-fill/elk/board.exp.json
index d6c06e77d..7c6111115 100644
--- a/e2etests/testdata/regression/hex-fill/elk/board.exp.json
+++ b/e2etests/testdata/regression/hex-fill/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/just-width/dagre/board.exp.json b/e2etests/testdata/regression/just-width/dagre/board.exp.json
index 533bfb17e..9f073c283 100644
--- a/e2etests/testdata/regression/just-width/dagre/board.exp.json
+++ b/e2etests/testdata/regression/just-width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/just-width/elk/board.exp.json b/e2etests/testdata/regression/just-width/elk/board.exp.json
index 0c82f6815..2bfaf491f 100644
--- a/e2etests/testdata/regression/just-width/elk/board.exp.json
+++ b/e2etests/testdata/regression/just-width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c0f9e6a87..2aa4ab6a6 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 810b4bc6b..9ddf78606 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
index 7f48836c0..7fc22cdf1 100644
--- a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
+++ b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/nested_steps/elk/board.exp.json b/e2etests/testdata/regression/nested_steps/elk/board.exp.json
index baf8897ca..554126bc5 100644
--- a/e2etests/testdata/regression/nested_steps/elk/board.exp.json
+++ b/e2etests/testdata/regression/nested_steps/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
index 1f3bfeba8..d81c14a2b 100644
--- a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
+++ b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/no-lexer/elk/board.exp.json b/e2etests/testdata/regression/no-lexer/elk/board.exp.json
index a6a6366b2..80233747d 100644
--- a/e2etests/testdata/regression/no-lexer/elk/board.exp.json
+++ b/e2etests/testdata/regression/no-lexer/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 202d7c773..725580288 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e063f7685..4a370f615 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2021d2f45..f736ed1bc 100644
--- a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json
+++ b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3b33e68ed..4804c1e28 100644
--- a/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json
+++ b/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 bd945ee1e..cc8324c07 100644
--- a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
+++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 38f416855..8abf29e1d 100644
--- a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json
+++ b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9ecc80f17..f90f924fe 100644
--- a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
+++ b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 53dacf9a9..eef642d86 100644
--- a/e2etests/testdata/regression/query_param_escape/elk/board.exp.json
+++ b/e2etests/testdata/regression/query_param_escape/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json b/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
index f2f3d8dcb..5391890d1 100644
--- a/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json b/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
index f2f3d8dcb..5391890d1 100644
--- a/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a906a104b..46638cfe8 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c93a79135..eb2f20539 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 de36f0fbd..970d8f7c7 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 de36f0fbd..970d8f7c7 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
index 05a42f07b..e39227c07 100644
--- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
index 05a42f07b..e39227c07 100644
--- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cd08783a8..c184900a0 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cd08783a8..c184900a0 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 5d15ab6dc..9e7056764 100644
--- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 8d83a9dd5..d2df0ec30 100644
--- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
+++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json
index f381804d8..a74e5dff7 100644
--- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json
+++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json
index 2cffc639b..652fca077 100644
--- a/e2etests/testdata/regression/unconnected/elk/board.exp.json
+++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b42f3c4c8..7cc295125 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3145187d7..d933e697d 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/border-radius/dagre/board.exp.json b/e2etests/testdata/root/border-radius/dagre/board.exp.json
index ca4629c76..19ab2e5a3 100644
--- a/e2etests/testdata/root/border-radius/dagre/board.exp.json
+++ b/e2etests/testdata/root/border-radius/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/border-radius/elk/board.exp.json b/e2etests/testdata/root/border-radius/elk/board.exp.json
index 12a643863..6e101c4dd 100644
--- a/e2etests/testdata/root/border-radius/elk/board.exp.json
+++ b/e2etests/testdata/root/border-radius/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/double-border/dagre/board.exp.json b/e2etests/testdata/root/double-border/dagre/board.exp.json
index 536ef6ec8..22ee9c689 100644
--- a/e2etests/testdata/root/double-border/dagre/board.exp.json
+++ b/e2etests/testdata/root/double-border/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/double-border/elk/board.exp.json b/e2etests/testdata/root/double-border/elk/board.exp.json
index c14094633..3054a6d31 100644
--- a/e2etests/testdata/root/double-border/elk/board.exp.json
+++ b/e2etests/testdata/root/double-border/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json b/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
index 30c416d4a..ca7abbe04 100644
--- a/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/even-stroke-width/elk/board.exp.json b/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
index 95eb93e8a..048a0c4e4 100644
--- a/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
+++ b/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/fill/dagre/board.exp.json b/e2etests/testdata/root/fill/dagre/board.exp.json
index e53ba605f..23b22678b 100644
--- a/e2etests/testdata/root/fill/dagre/board.exp.json
+++ b/e2etests/testdata/root/fill/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/fill/elk/board.exp.json b/e2etests/testdata/root/fill/elk/board.exp.json
index 710acbd9b..dde80fb0e 100644
--- a/e2etests/testdata/root/fill/elk/board.exp.json
+++ b/e2etests/testdata/root/fill/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-dash/dagre/board.exp.json b/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
index 958c309f4..e264fc4ea 100644
--- a/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-dash/elk/board.exp.json b/e2etests/testdata/root/stroke-dash/elk/board.exp.json
index 21830ad7d..6788ce9ca 100644
--- a/e2etests/testdata/root/stroke-dash/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-dash/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json b/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
index 9eabe67d3..ce1001ec5 100644
--- a/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-no-width/elk/board.exp.json b/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
index cfa88c214..8ebb89389 100644
--- a/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-width/dagre/board.exp.json b/e2etests/testdata/root/stroke-width/dagre/board.exp.json
index 3be01ea19..fe28a3b7e 100644
--- a/e2etests/testdata/root/stroke-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-width/elk/board.exp.json b/e2etests/testdata/root/stroke-width/elk/board.exp.json
index 4470f2722..6a1008563 100644
--- a/e2etests/testdata/root/stroke-width/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 aa843643c..011b7fea0 100644
--- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3b9baf1d2..dd67da689 100644
--- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json
+++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/basic/dagre/board.exp.json b/e2etests/testdata/sanity/basic/dagre/board.exp.json
index 4b6ba7d06..1b188fefd 100644
--- a/e2etests/testdata/sanity/basic/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/basic/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/basic/elk/board.exp.json b/e2etests/testdata/sanity/basic/elk/board.exp.json
index 7b5172c33..52119de7f 100644
--- a/e2etests/testdata/sanity/basic/elk/board.exp.json
+++ b/e2etests/testdata/sanity/basic/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 6dbcb3ca3..b59b01a40 100644
--- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ff5e8c00c..d67b52d0e 100644
--- a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json
+++ b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
index 70110085f..35b780827 100644
--- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json
index e80f114f4..c64cfb0b6 100644
--- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json
+++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/empty/dagre/board.exp.json b/e2etests/testdata/sanity/empty/dagre/board.exp.json
index fb8672f6b..caf899c0c 100644
--- a/e2etests/testdata/sanity/empty/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/empty/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [],
   "connections": [],
diff --git a/e2etests/testdata/sanity/empty/elk/board.exp.json b/e2etests/testdata/sanity/empty/elk/board.exp.json
index fb8672f6b..caf899c0c 100644
--- a/e2etests/testdata/sanity/empty/elk/board.exp.json
+++ b/e2etests/testdata/sanity/empty/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [],
   "connections": [],
diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
index c81c344ab..0388fd0e5 100644
--- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
+++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
index e1a5484d4..f70edb6ed 100644
--- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
+++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
index 7182353a4..2a1ca64a3 100644
--- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json
index 1322655ba..7424a2c36 100644
--- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 5b470e291..7c2cc3a59 100644
--- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 45f7f64e4..9a59a5058 100644
--- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 45b34f835..af36b3cda 100644
--- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9ae6f8e51..891f92ee6 100644
--- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/animated/dagre/board.exp.json b/e2etests/testdata/stable/animated/dagre/board.exp.json
index fe344cd5f..38519d78a 100644
--- a/e2etests/testdata/stable/animated/dagre/board.exp.json
+++ b/e2etests/testdata/stable/animated/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/animated/elk/board.exp.json b/e2etests/testdata/stable/animated/elk/board.exp.json
index e1bebebb9..55a137df3 100644
--- a/e2etests/testdata/stable/animated/elk/board.exp.json
+++ b/e2etests/testdata/stable/animated/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
index 4b0a3492a..94318c05c 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
index 74d42e754..522e32421 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
index 5c453af9b..dad6870a8 100644
--- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
index 33553369a..d026b1e97 100644
--- a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
index 0837fe23d..858b97d4c 100644
--- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
+++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json
index 0a20df0d7..10777e4b8 100644
--- a/e2etests/testdata/stable/binary_tree/elk/board.exp.json
+++ b/e2etests/testdata/stable/binary_tree/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/border-radius/dagre/board.exp.json b/e2etests/testdata/stable/border-radius/dagre/board.exp.json
index a7a95516c..7ac374f8c 100644
--- a/e2etests/testdata/stable/border-radius/dagre/board.exp.json
+++ b/e2etests/testdata/stable/border-radius/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/border-radius/elk/board.exp.json b/e2etests/testdata/stable/border-radius/elk/board.exp.json
index 7bf28caa0..b2faaa582 100644
--- a/e2etests/testdata/stable/border-radius/elk/board.exp.json
+++ b/e2etests/testdata/stable/border-radius/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
index 790c6cab9..54d3c6b89 100644
--- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json
index f3374690e..3b4d64f23 100644
--- a/e2etests/testdata/stable/chaos2/elk/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
index e40e60c03..0b531e6a7 100644
--- a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
index 6a9d70baa..ceee45ec9 100644
--- a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
index 6db120ab8..81dc40b4a 100644
--- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
+++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
index 737d77c51..97f34f1ef 100644
--- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
+++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/class/dagre/board.exp.json b/e2etests/testdata/stable/class/dagre/board.exp.json
index a4642c01d..782a635e6 100644
--- a/e2etests/testdata/stable/class/dagre/board.exp.json
+++ b/e2etests/testdata/stable/class/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json
index 3b9393e55..0c778c913 100644
--- a/e2etests/testdata/stable/class/elk/board.exp.json
+++ b/e2etests/testdata/stable/class/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
index 6a958bd4a..bbf491464 100644
--- a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
+++ b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json
index 9725399e1..0cee2c6d5 100644
--- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json
+++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
index f81f29157..71256ab41 100644
--- a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
+++ b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -171,7 +171,7 @@
   "layers": [
     {
       "name": "window",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -301,7 +301,7 @@
     },
     {
       "name": "roof",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -472,7 +472,7 @@
     },
     {
       "name": "garage",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -602,7 +602,7 @@
     },
     {
       "name": "repair",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [],
       "connections": [],
@@ -649,7 +649,7 @@
       "steps": [
         {
           "name": "1",
-          "boardContainer": false,
+          "isContainerOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -820,7 +820,7 @@
         },
         {
           "name": "2",
-          "boardContainer": false,
+          "isContainerOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -999,7 +999,7 @@
         },
         {
           "name": "3",
-          "boardContainer": false,
+          "isContainerOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1178,7 +1178,7 @@
         },
         {
           "name": "4",
-          "boardContainer": false,
+          "isContainerOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1361,7 +1361,7 @@
   "scenarios": [
     {
       "name": "storm",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
diff --git a/e2etests/testdata/stable/complex-layers/elk/board.exp.json b/e2etests/testdata/stable/complex-layers/elk/board.exp.json
index 1758f3797..ba3804755 100644
--- a/e2etests/testdata/stable/complex-layers/elk/board.exp.json
+++ b/e2etests/testdata/stable/complex-layers/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -171,7 +171,7 @@
   "layers": [
     {
       "name": "window",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -301,7 +301,7 @@
     },
     {
       "name": "roof",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -472,7 +472,7 @@
     },
     {
       "name": "garage",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -602,7 +602,7 @@
     },
     {
       "name": "repair",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [],
       "connections": [],
@@ -649,7 +649,7 @@
       "steps": [
         {
           "name": "1",
-          "boardContainer": false,
+          "isContainerOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -820,7 +820,7 @@
         },
         {
           "name": "2",
-          "boardContainer": false,
+          "isContainerOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -990,7 +990,7 @@
         },
         {
           "name": "3",
-          "boardContainer": false,
+          "isContainerOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1160,7 +1160,7 @@
         },
         {
           "name": "4",
-          "boardContainer": false,
+          "isContainerOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1334,7 +1334,7 @@
   "scenarios": [
     {
       "name": "storm",
-      "boardContainer": false,
+      "isContainerOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json
index 7a93813b7..0f4d37be2 100644
--- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json
+++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json
index 919165744..4436d9626 100644
--- a/e2etests/testdata/stable/connected_container/elk/board.exp.json
+++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 119cad4c8..8fcd066b9 100644
--- a/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 bd09f24e8..2983796c9 100644
--- a/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d46129be2..ac0a8f1a3 100644
--- a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 198eb8525..7c10f48bb 100644
--- a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json
index 0b4a8e2d6..d1ccaafe3 100644
--- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json
+++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json
index 993929023..04d3c2911 100644
--- a/e2etests/testdata/stable/container_edges/elk/board.exp.json
+++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 01843fda6..0aeaccf18 100644
--- a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 650639a6e..419ca4880 100644
--- a/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json
index cd7945594..b252c7bbf 100644
--- a/e2etests/testdata/stable/dense/dagre/board.exp.json
+++ b/e2etests/testdata/stable/dense/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json
index 2cd12cfda..b864b2b41 100644
--- a/e2etests/testdata/stable/dense/elk/board.exp.json
+++ b/e2etests/testdata/stable/dense/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
index 34f8e812c..27a82d454 100644
--- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
+++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
index 45e7f4aaa..98a76029e 100644
--- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
+++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json
index 1e06050f8..9f9ebb213 100644
--- a/e2etests/testdata/stable/direction/dagre/board.exp.json
+++ b/e2etests/testdata/stable/direction/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/direction/elk/board.exp.json b/e2etests/testdata/stable/direction/elk/board.exp.json
index f0cdbeadc..a65cd9ee7 100644
--- a/e2etests/testdata/stable/direction/elk/board.exp.json
+++ b/e2etests/testdata/stable/direction/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json
index a407d3b9c..f2ddc59dd 100644
--- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json
index b5eb06395..7d71b0f00 100644
--- a/e2etests/testdata/stable/font_colors/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_colors/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
index 3e0e925d0..26973ed9a 100644
--- a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json
index 06f0bea63..074b8797b 100644
--- a/e2etests/testdata/stable/font_sizes/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
index 5d58e92b6..0df7462fb 100644
--- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
index 93c0e1d69..e3659d2b6 100644
--- a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 14396fe00..28b794f41 100644
--- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json
+++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 99c53a54b..bd40f0d73 100644
--- a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json
+++ b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
index 9f0db2a38..a81740662 100644
--- a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json b/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
index 5c53236da..83eee01ff 100644
--- a/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hr/dagre/board.exp.json b/e2etests/testdata/stable/hr/dagre/board.exp.json
index f3b845588..c361d781d 100644
--- a/e2etests/testdata/stable/hr/dagre/board.exp.json
+++ b/e2etests/testdata/stable/hr/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json
index 21804cee6..ace715776 100644
--- a/e2etests/testdata/stable/hr/elk/board.exp.json
+++ b/e2etests/testdata/stable/hr/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
index 54b8b2c3a..e1576c041 100644
--- a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
+++ b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-containers/elk/board.exp.json b/e2etests/testdata/stable/icon-containers/elk/board.exp.json
index 1c4511741..90bf71f03 100644
--- a/e2etests/testdata/stable/icon-containers/elk/board.exp.json
+++ b/e2etests/testdata/stable/icon-containers/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-label/dagre/board.exp.json b/e2etests/testdata/stable/icon-label/dagre/board.exp.json
index 4ab131247..15c123dd6 100644
--- a/e2etests/testdata/stable/icon-label/dagre/board.exp.json
+++ b/e2etests/testdata/stable/icon-label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-label/elk/board.exp.json b/e2etests/testdata/stable/icon-label/elk/board.exp.json
index fd319a7b7..76f431ae2 100644
--- a/e2etests/testdata/stable/icon-label/elk/board.exp.json
+++ b/e2etests/testdata/stable/icon-label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json
index f20a98616..3e79966ae 100644
--- a/e2etests/testdata/stable/images/dagre/board.exp.json
+++ b/e2etests/testdata/stable/images/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/images/elk/board.exp.json b/e2etests/testdata/stable/images/elk/board.exp.json
index 975aeb591..04a6a05a7 100644
--- a/e2etests/testdata/stable/images/elk/board.exp.json
+++ b/e2etests/testdata/stable/images/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json
index 05ba5a1ce..33d0f4cb2 100644
--- a/e2etests/testdata/stable/investigate/dagre/board.exp.json
+++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json
index c4963c6ae..f71b4bd37 100644
--- a/e2etests/testdata/stable/investigate/elk/board.exp.json
+++ b/e2etests/testdata/stable/investigate/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json
index f8b1ea204..e98fc7282 100644
--- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json
+++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json
index a0a6290d3..80236abd4 100644
--- a/e2etests/testdata/stable/large_arch/elk/board.exp.json
+++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json
index 463ab2df1..8204f8ba0 100644
--- a/e2etests/testdata/stable/latex/dagre/board.exp.json
+++ b/e2etests/testdata/stable/latex/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json
index 375a315e3..d5c87a5e4 100644
--- a/e2etests/testdata/stable/latex/elk/board.exp.json
+++ b/e2etests/testdata/stable/latex/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li1/dagre/board.exp.json b/e2etests/testdata/stable/li1/dagre/board.exp.json
index d64df2dfe..3d8e214cb 100644
--- a/e2etests/testdata/stable/li1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li1/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li1/elk/board.exp.json b/e2etests/testdata/stable/li1/elk/board.exp.json
index 485e8f7ad..fff471f52 100644
--- a/e2etests/testdata/stable/li1/elk/board.exp.json
+++ b/e2etests/testdata/stable/li1/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li2/dagre/board.exp.json b/e2etests/testdata/stable/li2/dagre/board.exp.json
index 26ad64521..878993d29 100644
--- a/e2etests/testdata/stable/li2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li2/elk/board.exp.json b/e2etests/testdata/stable/li2/elk/board.exp.json
index ab3071df0..36a423d46 100644
--- a/e2etests/testdata/stable/li2/elk/board.exp.json
+++ b/e2etests/testdata/stable/li2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li3/dagre/board.exp.json b/e2etests/testdata/stable/li3/dagre/board.exp.json
index c57e40df9..c186b53ab 100644
--- a/e2etests/testdata/stable/li3/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li3/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li3/elk/board.exp.json b/e2etests/testdata/stable/li3/elk/board.exp.json
index 070ee20d6..edb396a34 100644
--- a/e2etests/testdata/stable/li3/elk/board.exp.json
+++ b/e2etests/testdata/stable/li3/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li4/dagre/board.exp.json b/e2etests/testdata/stable/li4/dagre/board.exp.json
index 2313060cb..bd1f685f0 100644
--- a/e2etests/testdata/stable/li4/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li4/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li4/elk/board.exp.json b/e2etests/testdata/stable/li4/elk/board.exp.json
index 9d5a5ad46..cc54d0dfb 100644
--- a/e2etests/testdata/stable/li4/elk/board.exp.json
+++ b/e2etests/testdata/stable/li4/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/links/dagre/board.exp.json b/e2etests/testdata/stable/links/dagre/board.exp.json
index fba2b69ba..81d02a094 100644
--- a/e2etests/testdata/stable/links/dagre/board.exp.json
+++ b/e2etests/testdata/stable/links/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/links/elk/board.exp.json b/e2etests/testdata/stable/links/elk/board.exp.json
index 5b0689d08..9e42cda4e 100644
--- a/e2etests/testdata/stable/links/elk/board.exp.json
+++ b/e2etests/testdata/stable/links/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
index 5046f309c..438529dc2 100644
--- a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/lone_h1/elk/board.exp.json b/e2etests/testdata/stable/lone_h1/elk/board.exp.json
index 16ee84b9a..edf87b100 100644
--- a/e2etests/testdata/stable/lone_h1/elk/board.exp.json
+++ b/e2etests/testdata/stable/lone_h1/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/markdown/dagre/board.exp.json b/e2etests/testdata/stable/markdown/dagre/board.exp.json
index 3ca56e341..ddca5b91b 100644
--- a/e2etests/testdata/stable/markdown/dagre/board.exp.json
+++ b/e2etests/testdata/stable/markdown/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/markdown/elk/board.exp.json b/e2etests/testdata/stable/markdown/elk/board.exp.json
index 827783b59..0e88cbd89 100644
--- a/e2etests/testdata/stable/markdown/elk/board.exp.json
+++ b/e2etests/testdata/stable/markdown/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f0cbc7d62..f1a2eea08 100644
--- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json
+++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7cd367a8e..09acda39a 100644
--- a/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json
+++ b/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 70e155cc4..356eaf7e7 100644
--- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 01b1bf9bc..2548c289a 100644
--- a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 6ed78f708..dd4af4a99 100644
--- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 09fe4c5a9..6f70da0e4 100644
--- a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 11eb0cd3c..479237bd1 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a0646cd76..478043cfa 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 76107a787..c3f0cc5a0 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ab50aa02f..60019cbfe 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ac4f11922..ed7189530 100644
--- a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b5a097af0..1dd213fba 100644
--- a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
index 6cae4e1fb..acd4e1dfb 100644
--- a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
+++ b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiline_text/elk/board.exp.json b/e2etests/testdata/stable/multiline_text/elk/board.exp.json
index 5dd8c3ee4..304d52d16 100644
--- a/e2etests/testdata/stable/multiline_text/elk/board.exp.json
+++ b/e2etests/testdata/stable/multiline_text/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
index 6bfd0338e..ef02f5058 100644
--- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
+++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
index ba69368bd..f62c640ec 100644
--- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
+++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
index f610a31dd..a89e7f954 100644
--- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
+++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json
index 60a9842c9..4795cae29 100644
--- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json
+++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/near-alone/dagre/board.exp.json b/e2etests/testdata/stable/near-alone/dagre/board.exp.json
index 68a75843b..aaa2005f0 100644
--- a/e2etests/testdata/stable/near-alone/dagre/board.exp.json
+++ b/e2etests/testdata/stable/near-alone/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/near-alone/elk/board.exp.json b/e2etests/testdata/stable/near-alone/elk/board.exp.json
index 68a75843b..aaa2005f0 100644
--- a/e2etests/testdata/stable/near-alone/elk/board.exp.json
+++ b/e2etests/testdata/stable/near-alone/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/number_connections/dagre/board.exp.json b/e2etests/testdata/stable/number_connections/dagre/board.exp.json
index fb86cb480..ac5fd54b7 100644
--- a/e2etests/testdata/stable/number_connections/dagre/board.exp.json
+++ b/e2etests/testdata/stable/number_connections/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/number_connections/elk/board.exp.json b/e2etests/testdata/stable/number_connections/elk/board.exp.json
index 71d3eae76..718a0daf3 100644
--- a/e2etests/testdata/stable/number_connections/elk/board.exp.json
+++ b/e2etests/testdata/stable/number_connections/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f5925a7fd..bfa025695 100644
--- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json
+++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 8b56a4f21..7ae6943ed 100644
--- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json
+++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 106747a0a..af665709f 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e6ef206b0..30fb15a57 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/ovals/dagre/board.exp.json b/e2etests/testdata/stable/ovals/dagre/board.exp.json
index 72b9a89a7..b9e585bc4 100644
--- a/e2etests/testdata/stable/ovals/dagre/board.exp.json
+++ b/e2etests/testdata/stable/ovals/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/ovals/elk/board.exp.json b/e2etests/testdata/stable/ovals/elk/board.exp.json
index 306644b2f..1540ac8d2 100644
--- a/e2etests/testdata/stable/ovals/elk/board.exp.json
+++ b/e2etests/testdata/stable/ovals/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ac4676501..017b68b15 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3f68b451b..50d055551 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/p/dagre/board.exp.json b/e2etests/testdata/stable/p/dagre/board.exp.json
index 1c942f945..d5f461d2b 100644
--- a/e2etests/testdata/stable/p/dagre/board.exp.json
+++ b/e2etests/testdata/stable/p/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/p/elk/board.exp.json b/e2etests/testdata/stable/p/elk/board.exp.json
index c678af1b3..df39732d1 100644
--- a/e2etests/testdata/stable/p/elk/board.exp.json
+++ b/e2etests/testdata/stable/p/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/people/dagre/board.exp.json b/e2etests/testdata/stable/people/dagre/board.exp.json
index 44961c7db..308ccf610 100644
--- a/e2etests/testdata/stable/people/dagre/board.exp.json
+++ b/e2etests/testdata/stable/people/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/people/elk/board.exp.json b/e2etests/testdata/stable/people/elk/board.exp.json
index d872830ec..89839fdf6 100644
--- a/e2etests/testdata/stable/people/elk/board.exp.json
+++ b/e2etests/testdata/stable/people/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/pre/dagre/board.exp.json b/e2etests/testdata/stable/pre/dagre/board.exp.json
index e21d1e5b0..c79c11c95 100644
--- a/e2etests/testdata/stable/pre/dagre/board.exp.json
+++ b/e2etests/testdata/stable/pre/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json
index c34ba54ce..2679868a7 100644
--- a/e2etests/testdata/stable/pre/elk/board.exp.json
+++ b/e2etests/testdata/stable/pre/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
index bfd578f08..7aa820d77 100644
--- a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
+++ b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/self-referencing/elk/board.exp.json b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
index a5f367899..359b4bcd4 100644
--- a/e2etests/testdata/stable/self-referencing/elk/board.exp.json
+++ b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 017e9012a..b1bc4cbbe 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 017e9012a..b1bc4cbbe 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1c68d7344..2e805a649 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1c68d7344..2e805a649 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 50728400d..ac6f88cc8 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 50728400d..ac6f88cc8 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 872698fa4..746975661 100644
--- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 872698fa4..746975661 100644
--- a/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ccdd5e0e7..b3ff87f04 100644
--- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ccdd5e0e7..b3ff87f04 100644
--- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 18cc4d71d..637df2a62 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 18cc4d71d..637df2a62 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2f55aa1f8..5be534d6a 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2f55aa1f8..5be534d6a 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9ba1dd3e7..213df6457 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9ba1dd3e7..213df6457 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e34c26bc4..f64ac54a0 100644
--- a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e34c26bc4..f64ac54a0 100644
--- a/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d4efaa1e0..e4b6cea6a 100644
--- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 fab9599d9..d0b8d63e7 100644
--- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a2170b053..1f5ae567d 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a2170b053..1f5ae567d 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 6a314506b..c96318f07 100644
--- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 6a314506b..c96318f07 100644
--- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e1247de23..a7f2a319e 100644
--- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e1247de23..a7f2a319e 100644
--- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
index eba38ab7e..6d66a0847 100644
--- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
index 09e9f9875..7db60a45a 100644
--- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
index fadd77f24..fa66eff48 100644
--- a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
index da6bae686..e79aef156 100644
--- a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
+++ b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 852c6d887..a83ba6a4d 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d514baf01..342209c86 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
index ddb9b58b0..2cb57306e 100644
--- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json
index a63bc0c9c..037704e5c 100644
--- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json
+++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json
index f03ee32c2..cab663320 100644
--- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json
index f2ece7f23..07115faed 100644
--- a/e2etests/testdata/stable/square_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2e2252cc7..902248d13 100644
--- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json
+++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 77b8d06d2..81a51ed61 100644
--- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json
+++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json
index 15914d519..9571c41bb 100644
--- a/e2etests/testdata/stable/stylish/dagre/board.exp.json
+++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json
index b9d707aae..732df792b 100644
--- a/e2etests/testdata/stable/stylish/elk/board.exp.json
+++ b/e2etests/testdata/stable/stylish/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e2cd3ef08..c490a0e27 100644
--- a/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d2effa063..bb3d4974c 100644
--- a/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json
+++ b/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/tooltips/dagre/board.exp.json b/e2etests/testdata/stable/tooltips/dagre/board.exp.json
index e64c8389d..f3147dbf2 100644
--- a/e2etests/testdata/stable/tooltips/dagre/board.exp.json
+++ b/e2etests/testdata/stable/tooltips/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/tooltips/elk/board.exp.json b/e2etests/testdata/stable/tooltips/elk/board.exp.json
index c2d28b3d2..b53b63b8c 100644
--- a/e2etests/testdata/stable/tooltips/elk/board.exp.json
+++ b/e2etests/testdata/stable/tooltips/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
index 681a68515..6fbb03bae 100644
--- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
index a2811af3f..a6331963b 100644
--- a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a64b7c5f2..00c6e73d4 100644
--- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 61bd31f20..0edc1f86e 100644
--- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9c89f62e1..45dd9e585 100644
--- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cd7b0c25b..6fe96c7f4 100644
--- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json
index c735c7506..4f25a8070 100644
--- a/e2etests/testdata/stable/us_map/dagre/board.exp.json
+++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json
index 7cfe72081..449417219 100644
--- a/e2etests/testdata/stable/us_map/elk/board.exp.json
+++ b/e2etests/testdata/stable/us_map/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json b/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
index d65907f94..1c67f6fc3 100644
--- a/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_icon_label/elk/board.exp.json b/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
index 758b7efb2..f9f99f549 100644
--- a/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
index 7b892f5e4..316f9b584 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
index 7727264e2..cf0cdb489 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
index 211709f94..2be19c03d 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
index 2c0529d02..c66193dec 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cf70b6ad7..4da9d2331 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cf70b6ad7..4da9d2331 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
index 78cbf6abd..a63acf378 100644
--- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
+++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
index 158406d1c..52cab802c 100644
--- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
+++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 3a2030839..4cb8cb041 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 0eaed615e..64c3498af 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,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/chinese/dagre/board.exp.json b/e2etests/testdata/unicode/chinese/dagre/board.exp.json
index b1f6b1813..69edf8962 100644
--- a/e2etests/testdata/unicode/chinese/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/chinese/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/chinese/elk/board.exp.json b/e2etests/testdata/unicode/chinese/elk/board.exp.json
index 274dddcd8..4dd6a41d1 100644
--- a/e2etests/testdata/unicode/chinese/elk/board.exp.json
+++ b/e2etests/testdata/unicode/chinese/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/emojis/dagre/board.exp.json b/e2etests/testdata/unicode/emojis/dagre/board.exp.json
index fb6b4908d..73f07b98d 100644
--- a/e2etests/testdata/unicode/emojis/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/emojis/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/emojis/elk/board.exp.json b/e2etests/testdata/unicode/emojis/elk/board.exp.json
index a82419203..1d11494b6 100644
--- a/e2etests/testdata/unicode/emojis/elk/board.exp.json
+++ b/e2etests/testdata/unicode/emojis/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
index 84e505290..80271beb8 100644
--- a/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json b/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
index a0413515c..745df2dee 100644
--- a/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
index bb165da1b..1911496c4 100644
--- a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-full/elk/board.exp.json b/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
index ee7531a40..cbec465dd 100644
--- a/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
index 2d83ce493..669c1dfc1 100644
--- a/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json b/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
index 9dafa63d5..a1ead4e0b 100644
--- a/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/korean/dagre/board.exp.json b/e2etests/testdata/unicode/korean/dagre/board.exp.json
index a04b66131..78647c7bc 100644
--- a/e2etests/testdata/unicode/korean/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/korean/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/korean/elk/board.exp.json b/e2etests/testdata/unicode/korean/elk/board.exp.json
index aac2016f0..63bcae17a 100644
--- a/e2etests/testdata/unicode/korean/elk/board.exp.json
+++ b/e2etests/testdata/unicode/korean/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
index 5aa64d0a4..2ecd63d07 100644
--- a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
index 5303af0c2..ffea1ae82 100644
--- a/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
index 4a6fb24c2..dc54eea40 100644
--- a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
index 3ab37d0ea..4362b74ef 100644
--- a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/with-style/dagre/board.exp.json b/e2etests/testdata/unicode/with-style/dagre/board.exp.json
index edb70cab7..4822750c7 100644
--- a/e2etests/testdata/unicode/with-style/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/with-style/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/with-style/elk/board.exp.json b/e2etests/testdata/unicode/with-style/elk/board.exp.json
index 5e3c9f318..2587c7e6e 100644
--- a/e2etests/testdata/unicode/with-style/elk/board.exp.json
+++ b/e2etests/testdata/unicode/with-style/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/main.go b/main.go
index e5c343ecf..1c3203b95 100644
--- a/main.go
+++ b/main.go
@@ -364,7 +364,7 @@ func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plug
 		}
 	}
 
-	if !diagram.BoardContainer {
+	if !diagram.IsContainerOnly {
 		start := time.Now()
 		svg, err := _render(ctx, ms, plugin, sketch, pad, themeID, darkThemeID, boardOutputPath, bundle, forceAppendix, page, ruler, diagram)
 		if err != nil {
@@ -457,7 +457,7 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, ske
 		currBoardPath = append(boardPath, diagram.Name)
 	}
 
-	if !diagram.BoardContainer {
+	if !diagram.IsContainerOnly {
 		svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{
 			Pad:    int(pad),
 			Sketch: sketch,
diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json
index e7356cadc..5b4fed437 100644
--- a/testdata/d2compiler/TestCompile/basic_icon.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,0:0:0-3:0:77",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
index d79f837e6..caf78f230 100644
--- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,0:0:0-3:0:33",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json
index 49192d955..3b7350a3f 100644
--- a/testdata/d2compiler/TestCompile/basic_shape.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,0:0:0-4:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json
index fa4b00564..9eaeed18e 100644
--- a/testdata/d2compiler/TestCompile/basic_style.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_style.d2,0:0:0-4:0:28",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json
index 0682ec0ad..7ce46b9a1 100644
--- a/testdata/d2compiler/TestCompile/class_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/class_paren.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,0:0:0-6:1:81",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json
index 33de15dcc..7a3bbd5d3 100644
--- a/testdata/d2compiler/TestCompile/class_style.exp.json
+++ b/testdata/d2compiler/TestCompile/class_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,0:0:0-5:0:82",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json
index 5cd7500f6..fd591706b 100644
--- a/testdata/d2compiler/TestCompile/constraint_label.exp.json
+++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-3:1:38",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json
index 92b8d034e..c8d30aa7f 100644
--- a/testdata/d2compiler/TestCompile/default_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/default_direction.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/default_direction.d2,0:0:0-0:1:1",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
index d1f492915..63f41f9cf 100644
--- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
+++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimension_with_style.d2,0:0:0-4:0:43",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
index f026f7e68..5e2c58b68 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,0:0:0-45:0:505",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
index 2e7a9e8d8..49cd15515 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,0:0:0-5:0:54",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json
index 3fe67a387..f9a00392f 100644
--- a/testdata/d2compiler/TestCompile/edge.exp.json
+++ b/testdata/d2compiler/TestCompile/edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
index 1e1fd6fe5..4b420c357 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-9:0:168",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json
index 5323499de..f4a480774 100644
--- a/testdata/d2compiler/TestCompile/edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,0:0:0-2:0:57",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
index 25ee071f8..bfc0c00e4 100644
--- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,0:0:0-4:0:107",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
index b06c26dae..9f84dea45 100644
--- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-13:0:123",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
index 9304cb2c1..fec8e7d36 100644
--- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,0:0:0-4:0:35",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
index 8e4f81b14..a315c5116 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-2:0:51",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
index 2cba683b3..8769d9e94 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-4:0:53",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json
index 57bfb4d64..cb272059d 100644
--- a/testdata/d2compiler/TestCompile/edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,0:0:0-3:0:30",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
index 7c2c91072..24761e539 100644
--- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,0:0:0-5:0:114",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
index 4702debce..294547dad 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,0:0:0-5:0:39",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
index 843d261cc..74f62ba4a 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,0:0:0-5:0:40",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
index 5764f4cb3..baba07576 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,0:0:0-5:0:50",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
index 40573e8c7..df59a2e60 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,0:0:0-5:0:51",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
index 132eac5d4..7507638ad 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,0:0:0-7:0:59",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
index 296b45768..120c1378a 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,0:0:0-9:0:69",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
index c741322e9..11f5fe980 100644
--- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json
index 89050d0fe..35059bfe1 100644
--- a/testdata/d2compiler/TestCompile/edge_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,0:0:0-4:0:102",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
index b72a3c8c7..df30d0fd6 100644
--- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-5:0:57",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
index 642fccd00..1eaab8de8 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,0:0:0-3:0:39",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
index 6af6763a1..9491f4a88 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-4:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
index a8e9bbb55..bfcad1b19 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,0:0:0-6:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
index fc2beb103..04d4c6c3d 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,0:0:0-4:0:33",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
index ae2ea5ab4..38504ca59 100644
--- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-6:0:97",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
index 9add873b6..4c7d728a4 100644
--- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-1:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
index fb86d1449..d2265d844 100644
--- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-4:0:58",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json
index f31d0e805..210b3db08 100644
--- a/testdata/d2compiler/TestCompile/escaped_id.exp.json
+++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/escaped_id.d2,0:0:0-0:4:4",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json
index 33cdf6caf..a10218c0f 100644
--- a/testdata/d2compiler/TestCompile/image_style.exp.json
+++ b/testdata/d2compiler/TestCompile/image_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,0:0:0-5:0:118",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json
index 6bb075ecd..725d2c9ef 100644
--- a/testdata/d2compiler/TestCompile/near_constant.exp.json
+++ b/testdata/d2compiler/TestCompile/near_constant.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json
index 84b2497b1..5e9cbf9f0 100644
--- a/testdata/d2compiler/TestCompile/nested_sql.exp.json
+++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,0:0:0-7:1:84",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
index b61e46689..8ca4d9d9f 100644
--- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
+++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/nil_scope_obj_regression.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json
index dcf4445ff..12d02391f 100644
--- a/testdata/d2compiler/TestCompile/null.exp.json
+++ b/testdata/d2compiler/TestCompile/null.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/null.d2,0:0:0-1:0:5",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json
index e4668ac25..56bab622d 100644
--- a/testdata/d2compiler/TestCompile/path_link.exp.json
+++ b/testdata/d2compiler/TestCompile/path_link.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,0:0:0-3:0:47",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json
index 6b1db13c4..51cea9960 100644
--- a/testdata/d2compiler/TestCompile/positions.exp.json
+++ b/testdata/d2compiler/TestCompile/positions.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/positions.d2,0:0:0-4:0:30",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
index 6ff5636d0..145110040 100644
--- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
+++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,0:0:0-8:0:94",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json
index 0103ca5f7..4eec7c364 100644
--- a/testdata/d2compiler/TestCompile/root_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/root_direction.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/root_direction.d2,0:0:0-0:16:16",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json
index fd3bcb67e..dc54f7907 100644
--- a/testdata/d2compiler/TestCompile/root_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/root_sequence.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json
index 93e81dd86..04715445f 100644
--- a/testdata/d2compiler/TestCompile/self-referencing.exp.json
+++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
index db830101f..9aa88bfab 100644
--- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,0:0:0-10:0:137",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json
index af4916738..70f3c144e 100644
--- a/testdata/d2compiler/TestCompile/sequence_container.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,0:0:0-5:0:63",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
index 0f7cd6fa2..20858b17e 100644
--- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,0:0:0-6:0:60",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
index 46d3441ed..0d735e0e5 100644
--- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:0:0-5:0:54",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
index 6e1c50fec..1ff4f2f46 100644
--- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-9:0:101",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json
index 400a5a3a9..670b4c552 100644
--- a/testdata/d2compiler/TestCompile/set_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/set_direction.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,0:0:0-2:1:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
index 112ba1f9c..f16c5bcb4 100644
--- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
+++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,0:0:0-4:0:40",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json
index 3dabfb8ae..47ab47057 100644
--- a/testdata/d2compiler/TestCompile/sql-regression.exp.json
+++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,0:0:0-10:0:87",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json
index 0a89b826e..5d2a9f784 100644
--- a/testdata/d2compiler/TestCompile/sql_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,0:0:0-5:1:73",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json
index 588652660..0f39d7682 100644
--- a/testdata/d2compiler/TestCompile/stroke-width.exp.json
+++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-3:0:32",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
index ef078622e..613c47ab1 100644
--- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
+++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,0:0:0-11:0:99",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json
index 558e99d92..779feb9b0 100644
--- a/testdata/d2compiler/TestCompile/table_style.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,0:0:0-5:0:81",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json
index 088ceee97..322f087df 100644
--- a/testdata/d2compiler/TestCompile/table_style_map.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,0:0:0-8:0:113",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
index b1bd22042..c087c181c 100644
--- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
index 404ec3861..7d961e5b9 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,0:0:0-4:0:21",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
index b9f6c4d55..d8ab9b2bc 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,0:0:0-4:0:28",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
index b635b5225..c1db8dfcf 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,0:0:0-5:0:167",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
index a3b2844d8..1165d7485 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,0:0:0-5:0:172",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
index efe266d34..ba4191779 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,0:0:0-6:0:32",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
index 5c10e6e75..9b8649ecc 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_create.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
index 257d2d511..674dd6d6f 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,0:0:0-6:0:27",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
index 7e7b026b5..3f32357e9 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,0:0:0-5:0:174",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
index c755b4d94..2820c2b15 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,0:0:0-5:0:174",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
index c2d58fff4..727b29ecb 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,0:0:0-6:0:29",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
index 4fcf25a58..4a3fde905 100644
--- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_unresolved_obj.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
index 1658df443..540ae3448 100644
--- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
+++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json
index 0d195d036..2c05dc886 100644
--- a/testdata/d2compiler/TestCompile/url_link.exp.json
+++ b/testdata/d2compiler/TestCompile/url_link.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,0:0:0-3:0:34",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
index 59fff378f..deb4b81b7 100644
--- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,0:0:0-17:53:406",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile2/boards/isContainerOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isContainerOnly.exp.json
new file mode 100644
index 000000000..73db9ac11
--- /dev/null
+++ b/testdata/d2compiler/TestCompile2/boards/isContainerOnly.exp.json
@@ -0,0 +1,1688 @@
+{
+  "graph": {
+    "name": "",
+    "isContainerOnly": true,
+    "ast": {
+      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,0:0:0-18:0:165",
+      "nodes": [
+        {
+          "map_key": {
+            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-17:1:164",
+            "key": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                    "value": [
+                      {
+                        "string": "layers",
+                        "raw_string": "layers"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "primary": {},
+            "value": {
+              "map": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:8:9-17:0:163",
+                "nodes": [
+                  {
+                    "map_key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-4:3:33",
+                      "key": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                        "path": [
+                          {
+                            "unquoted_string": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                              "value": [
+                                {
+                                  "string": "one",
+                                  "raw_string": "one"
+                                }
+                              ]
+                            }
+                          }
+                        ]
+                      },
+                      "primary": {},
+                      "value": {
+                        "map": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:7:18-4:2:32",
+                          "nodes": [
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                        "value": [
+                                          {
+                                            "string": "santa",
+                                            "raw_string": "santa"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {}
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "map_key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-16:3:162",
+                      "key": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                        "path": [
+                          {
+                            "unquoted_string": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                              "value": [
+                                {
+                                  "string": "two",
+                                  "raw_string": "two"
+                                }
+                              ]
+                            }
+                          }
+                        ]
+                      },
+                      "primary": {},
+                      "value": {
+                        "map": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:7:41-16:2:161",
+                          "nodes": [
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                        "value": [
+                                          {
+                                            "string": "clause",
+                                            "raw_string": "clause"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {}
+                              }
+                            },
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-15:3:158",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                        "value": [
+                                          {
+                                            "string": "scenarios",
+                                            "raw_string": "scenarios"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {
+                                  "map": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:13:67-15:2:157",
+                                    "nodes": [
+                                      {
+                                        "map_key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-9:4:88",
+                                          "key": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                            "path": [
+                                              {
+                                                "unquoted_string": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                  "value": [
+                                                    {
+                                                      "string": "seinfeld",
+                                                      "raw_string": "seinfeld"
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            ]
+                                          },
+                                          "primary": {},
+                                          "value": {
+                                            "map": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:13:82-9:3:87",
+                                              "nodes": null
+                                            }
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "map_key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-14:4:154",
+                                          "key": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                            "path": [
+                                              {
+                                                "unquoted_string": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                  "value": [
+                                                    {
+                                                      "string": "missoula",
+                                                      "raw_string": "missoula"
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            ]
+                                          },
+                                          "primary": {},
+                                          "value": {
+                                            "map": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:13:102-14:3:153",
+                                              "nodes": [
+                                                {
+                                                  "map_key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-13:5:149",
+                                                    "key": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                      "path": [
+                                                        {
+                                                          "unquoted_string": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                            "value": [
+                                                              {
+                                                                "string": "steps",
+                                                                "raw_string": "steps"
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      ]
+                                                    },
+                                                    "primary": {},
+                                                    "value": {
+                                                      "map": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:11:115-13:4:148",
+                                                        "nodes": [
+                                                          {
+                                                            "map_key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:26:143",
+                                                              "key": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                "path": [
+                                                                  {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "missus",
+                                                                          "raw_string": "missus"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              },
+                                                              "primary": {},
+                                                              "value": {
+                                                                "unquoted_string": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:13:130-12:26:143",
+                                                                  "value": [
+                                                                    {
+                                                                      "string": "one two three",
+                                                                      "raw_string": "one two three"
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              }
+                                                            }
+                                                          }
+                                                        ]
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              ]
+                                            }
+                                          }
+                                        }
+                                      }
+                                    ]
+                                  }
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      ]
+    },
+    "root": {
+      "id": "",
+      "id_val": "",
+      "label_dimensions": {
+        "width": 0,
+        "height": 0
+      },
+      "attributes": {
+        "label": {
+          "value": ""
+        },
+        "style": {},
+        "near_key": null,
+        "shape": {
+          "value": ""
+        },
+        "direction": {
+          "value": ""
+        },
+        "constraint": {
+          "value": ""
+        }
+      },
+      "zIndex": 0
+    },
+    "edges": null,
+    "objects": null,
+    "layers": [
+      {
+        "name": "one",
+        "isContainerOnly": false,
+        "ast": {
+          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,0:0:0-18:0:165",
+          "nodes": [
+            {
+              "map_key": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-17:1:164",
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                        "value": [
+                          {
+                            "string": "layers",
+                            "raw_string": "layers"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "primary": {},
+                "value": {
+                  "map": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:8:9-17:0:163",
+                    "nodes": [
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-4:3:33",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                                  "value": [
+                                    {
+                                      "string": "one",
+                                      "raw_string": "one"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:7:18-4:2:32",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                            "value": [
+                                              {
+                                                "string": "santa",
+                                                "raw_string": "santa"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-16:3:162",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                                  "value": [
+                                    {
+                                      "string": "two",
+                                      "raw_string": "two"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:7:41-16:2:161",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                            "value": [
+                                              {
+                                                "string": "clause",
+                                                "raw_string": "clause"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                },
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-15:3:158",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                            "value": [
+                                              {
+                                                "string": "scenarios",
+                                                "raw_string": "scenarios"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {
+                                      "map": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:13:67-15:2:157",
+                                        "nodes": [
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-9:4:88",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                      "value": [
+                                                        {
+                                                          "string": "seinfeld",
+                                                          "raw_string": "seinfeld"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:13:82-9:3:87",
+                                                  "nodes": null
+                                                }
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-14:4:154",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                      "value": [
+                                                        {
+                                                          "string": "missoula",
+                                                          "raw_string": "missoula"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:13:102-14:3:153",
+                                                  "nodes": [
+                                                    {
+                                                      "map_key": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-13:5:149",
+                                                        "key": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                          "path": [
+                                                            {
+                                                              "unquoted_string": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                                "value": [
+                                                                  {
+                                                                    "string": "steps",
+                                                                    "raw_string": "steps"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          ]
+                                                        },
+                                                        "primary": {},
+                                                        "value": {
+                                                          "map": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:11:115-13:4:148",
+                                                            "nodes": [
+                                                              {
+                                                                "map_key": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:26:143",
+                                                                  "key": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                    "path": [
+                                                                      {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "missus",
+                                                                              "raw_string": "missus"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  },
+                                                                  "primary": {},
+                                                                  "value": {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:13:130-12:26:143",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "one two three",
+                                                                          "raw_string": "one two three"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "root": {
+          "id": "",
+          "id_val": "",
+          "label_dimensions": {
+            "width": 0,
+            "height": 0
+          },
+          "attributes": {
+            "label": {
+              "value": ""
+            },
+            "style": {},
+            "near_key": null,
+            "shape": {
+              "value": ""
+            },
+            "direction": {
+              "value": ""
+            },
+            "constraint": {
+              "value": ""
+            }
+          },
+          "zIndex": 0
+        },
+        "edges": null,
+        "objects": [
+          {
+            "id": "santa",
+            "id_val": "santa",
+            "label_dimensions": {
+              "width": 0,
+              "height": 0
+            },
+            "references": [
+              {
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                        "value": [
+                          {
+                            "string": "santa",
+                            "raw_string": "santa"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "key_path_index": 0,
+                "map_key_edge_index": -1
+              }
+            ],
+            "attributes": {
+              "label": {
+                "value": "santa"
+              },
+              "style": {},
+              "near_key": null,
+              "shape": {
+                "value": "rectangle"
+              },
+              "direction": {
+                "value": ""
+              },
+              "constraint": {
+                "value": ""
+              }
+            },
+            "zIndex": 0
+          }
+        ]
+      },
+      {
+        "name": "two",
+        "isContainerOnly": false,
+        "ast": {
+          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,0:0:0-18:0:165",
+          "nodes": [
+            {
+              "map_key": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-17:1:164",
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                        "value": [
+                          {
+                            "string": "layers",
+                            "raw_string": "layers"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "primary": {},
+                "value": {
+                  "map": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:8:9-17:0:163",
+                    "nodes": [
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-4:3:33",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                                  "value": [
+                                    {
+                                      "string": "one",
+                                      "raw_string": "one"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:7:18-4:2:32",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                            "value": [
+                                              {
+                                                "string": "santa",
+                                                "raw_string": "santa"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-16:3:162",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                                  "value": [
+                                    {
+                                      "string": "two",
+                                      "raw_string": "two"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:7:41-16:2:161",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                            "value": [
+                                              {
+                                                "string": "clause",
+                                                "raw_string": "clause"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                },
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-15:3:158",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                            "value": [
+                                              {
+                                                "string": "scenarios",
+                                                "raw_string": "scenarios"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {
+                                      "map": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:13:67-15:2:157",
+                                        "nodes": [
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-9:4:88",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                      "value": [
+                                                        {
+                                                          "string": "seinfeld",
+                                                          "raw_string": "seinfeld"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:13:82-9:3:87",
+                                                  "nodes": null
+                                                }
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-14:4:154",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                      "value": [
+                                                        {
+                                                          "string": "missoula",
+                                                          "raw_string": "missoula"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:13:102-14:3:153",
+                                                  "nodes": [
+                                                    {
+                                                      "map_key": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-13:5:149",
+                                                        "key": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                          "path": [
+                                                            {
+                                                              "unquoted_string": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                                "value": [
+                                                                  {
+                                                                    "string": "steps",
+                                                                    "raw_string": "steps"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          ]
+                                                        },
+                                                        "primary": {},
+                                                        "value": {
+                                                          "map": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:11:115-13:4:148",
+                                                            "nodes": [
+                                                              {
+                                                                "map_key": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:26:143",
+                                                                  "key": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                    "path": [
+                                                                      {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "missus",
+                                                                              "raw_string": "missus"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  },
+                                                                  "primary": {},
+                                                                  "value": {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:13:130-12:26:143",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "one two three",
+                                                                          "raw_string": "one two three"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "root": {
+          "id": "",
+          "id_val": "",
+          "label_dimensions": {
+            "width": 0,
+            "height": 0
+          },
+          "attributes": {
+            "label": {
+              "value": ""
+            },
+            "style": {},
+            "near_key": null,
+            "shape": {
+              "value": ""
+            },
+            "direction": {
+              "value": ""
+            },
+            "constraint": {
+              "value": ""
+            }
+          },
+          "zIndex": 0
+        },
+        "edges": null,
+        "objects": [
+          {
+            "id": "clause",
+            "id_val": "clause",
+            "label_dimensions": {
+              "width": 0,
+              "height": 0
+            },
+            "references": [
+              {
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                        "value": [
+                          {
+                            "string": "clause",
+                            "raw_string": "clause"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "key_path_index": 0,
+                "map_key_edge_index": -1
+              }
+            ],
+            "attributes": {
+              "label": {
+                "value": "clause"
+              },
+              "style": {},
+              "near_key": null,
+              "shape": {
+                "value": "rectangle"
+              },
+              "direction": {
+                "value": ""
+              },
+              "constraint": {
+                "value": ""
+              }
+            },
+            "zIndex": 0
+          }
+        ],
+        "scenarios": [
+          {
+            "name": "seinfeld",
+            "isContainerOnly": false,
+            "ast": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,0:0:0-18:0:165",
+              "nodes": [
+                {
+                  "map_key": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-17:1:164",
+                    "key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                      "path": [
+                        {
+                          "unquoted_string": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                            "value": [
+                              {
+                                "string": "layers",
+                                "raw_string": "layers"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    "primary": {},
+                    "value": {
+                      "map": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:8:9-17:0:163",
+                        "nodes": [
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-4:3:33",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                                      "value": [
+                                        {
+                                          "string": "one",
+                                          "raw_string": "one"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:7:18-4:2:32",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                                "value": [
+                                                  {
+                                                    "string": "santa",
+                                                    "raw_string": "santa"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-16:3:162",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                                      "value": [
+                                        {
+                                          "string": "two",
+                                          "raw_string": "two"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:7:41-16:2:161",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                                "value": [
+                                                  {
+                                                    "string": "clause",
+                                                    "raw_string": "clause"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    },
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-15:3:158",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                                "value": [
+                                                  {
+                                                    "string": "scenarios",
+                                                    "raw_string": "scenarios"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {
+                                          "map": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:13:67-15:2:157",
+                                            "nodes": [
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-9:4:88",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                          "value": [
+                                                            {
+                                                              "string": "seinfeld",
+                                                              "raw_string": "seinfeld"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:13:82-9:3:87",
+                                                      "nodes": null
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-14:4:154",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                          "value": [
+                                                            {
+                                                              "string": "missoula",
+                                                              "raw_string": "missoula"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:13:102-14:3:153",
+                                                      "nodes": [
+                                                        {
+                                                          "map_key": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-13:5:149",
+                                                            "key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                              "path": [
+                                                                {
+                                                                  "unquoted_string": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                                    "value": [
+                                                                      {
+                                                                        "string": "steps",
+                                                                        "raw_string": "steps"
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              ]
+                                                            },
+                                                            "primary": {},
+                                                            "value": {
+                                                              "map": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:11:115-13:4:148",
+                                                                "nodes": [
+                                                                  {
+                                                                    "map_key": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:26:143",
+                                                                      "key": {
+                                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                        "path": [
+                                                                          {
+                                                                            "unquoted_string": {
+                                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                              "value": [
+                                                                                {
+                                                                                  "string": "missus",
+                                                                                  "raw_string": "missus"
+                                                                                }
+                                                                              ]
+                                                                            }
+                                                                          }
+                                                                        ]
+                                                                      },
+                                                                      "primary": {},
+                                                                      "value": {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:13:130-12:26:143",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "one two three",
+                                                                              "raw_string": "one two three"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          }
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "root": {
+              "id": "",
+              "id_val": "",
+              "label_dimensions": {
+                "width": 0,
+                "height": 0
+              },
+              "attributes": {
+                "label": {
+                  "value": ""
+                },
+                "style": {},
+                "near_key": null,
+                "shape": {
+                  "value": ""
+                },
+                "direction": {
+                  "value": ""
+                },
+                "constraint": {
+                  "value": ""
+                }
+              },
+              "zIndex": 0
+            },
+            "edges": null,
+            "objects": null
+          },
+          {
+            "name": "missoula",
+            "isContainerOnly": false,
+            "ast": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,0:0:0-18:0:165",
+              "nodes": [
+                {
+                  "map_key": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-17:1:164",
+                    "key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                      "path": [
+                        {
+                          "unquoted_string": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:0:1-1:6:7",
+                            "value": [
+                              {
+                                "string": "layers",
+                                "raw_string": "layers"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    "primary": {},
+                    "value": {
+                      "map": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,1:8:9-17:0:163",
+                        "nodes": [
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-4:3:33",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:2:13-2:5:16",
+                                      "value": [
+                                        {
+                                          "string": "one",
+                                          "raw_string": "one"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,2:7:18-4:2:32",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,3:4:24-3:9:29",
+                                                "value": [
+                                                  {
+                                                    "string": "santa",
+                                                    "raw_string": "santa"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-16:3:162",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:2:36-5:5:39",
+                                      "value": [
+                                        {
+                                          "string": "two",
+                                          "raw_string": "two"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,5:7:41-16:2:161",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,6:4:47-6:10:53",
+                                                "value": [
+                                                  {
+                                                    "string": "clause",
+                                                    "raw_string": "clause"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    },
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-15:3:158",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:2:56-7:11:65",
+                                                "value": [
+                                                  {
+                                                    "string": "scenarios",
+                                                    "raw_string": "scenarios"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {
+                                          "map": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,7:13:67-15:2:157",
+                                            "nodes": [
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-9:4:88",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:3:72-8:11:80",
+                                                          "value": [
+                                                            {
+                                                              "string": "seinfeld",
+                                                              "raw_string": "seinfeld"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,8:13:82-9:3:87",
+                                                      "nodes": null
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-14:4:154",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:3:92-10:11:100",
+                                                          "value": [
+                                                            {
+                                                              "string": "missoula",
+                                                              "raw_string": "missoula"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,10:13:102-14:3:153",
+                                                      "nodes": [
+                                                        {
+                                                          "map_key": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-13:5:149",
+                                                            "key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                              "path": [
+                                                                {
+                                                                  "unquoted_string": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:4:108-11:9:113",
+                                                                    "value": [
+                                                                      {
+                                                                        "string": "steps",
+                                                                        "raw_string": "steps"
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              ]
+                                                            },
+                                                            "primary": {},
+                                                            "value": {
+                                                              "map": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,11:11:115-13:4:148",
+                                                                "nodes": [
+                                                                  {
+                                                                    "map_key": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:26:143",
+                                                                      "key": {
+                                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                        "path": [
+                                                                          {
+                                                                            "unquoted_string": {
+                                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:5:122-12:11:128",
+                                                                              "value": [
+                                                                                {
+                                                                                  "string": "missus",
+                                                                                  "raw_string": "missus"
+                                                                                }
+                                                                              ]
+                                                                            }
+                                                                          }
+                                                                        ]
+                                                                      },
+                                                                      "primary": {},
+                                                                      "value": {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isContainerOnly.d2,12:13:130-12:26:143",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "one two three",
+                                                                              "raw_string": "one two three"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          }
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "root": {
+              "id": "",
+              "id_val": "",
+              "label_dimensions": {
+                "width": 0,
+                "height": 0
+              },
+              "attributes": {
+                "label": {
+                  "value": ""
+                },
+                "style": {},
+                "near_key": null,
+                "shape": {
+                  "value": ""
+                },
+                "direction": {
+                  "value": ""
+                },
+                "constraint": {
+                  "value": ""
+                }
+              },
+              "zIndex": 0
+            },
+            "edges": null,
+            "objects": null
+          }
+        ]
+      }
+    ]
+  },
+  "err": null
+}
diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
index 26b40ebc4..995d197ef 100644
--- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
       "nodes": [
@@ -374,7 +374,7 @@
     "layers": [
       {
         "name": "one",
-        "boardContainer": false,
+        "isContainerOnly": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
           "nodes": [
@@ -747,7 +747,7 @@
       },
       {
         "name": "two",
-        "boardContainer": false,
+        "isContainerOnly": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
           "nodes": [
@@ -1120,7 +1120,7 @@
         "steps": [
           {
             "name": "seinfeld",
-            "boardContainer": false,
+            "isContainerOnly": false,
             "ast": {
               "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
               "nodes": [
@@ -1493,7 +1493,7 @@
           },
           {
             "name": "missoula",
-            "boardContainer": false,
+            "isContainerOnly": false,
             "ast": {
               "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
               "nodes": [
diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json
index 0cde5472a..6883ca8c1 100644
--- a/testdata/d2compiler/TestCompile2/boards/root.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
       "nodes": [
@@ -241,7 +241,7 @@
     "layers": [
       {
         "name": "one",
-        "boardContainer": false,
+        "isContainerOnly": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
           "nodes": [
@@ -481,7 +481,7 @@
       },
       {
         "name": "two",
-        "boardContainer": false,
+        "isContainerOnly": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
           "nodes": [
diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
index f57c040d8..1e8c7f546 100644
--- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
+++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json
index 76c94fd8a..eb8fb3497 100644
--- a/testdata/d2exporter/TestExport/connection/basic.exp.json
+++ b/testdata/d2exporter/TestExport/connection/basic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
index bbf08a54a..3bd442e2d 100644
--- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
+++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
index 105ab2d04..cb529e10c 100644
--- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
+++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json
index c51558d50..145dc2bdd 100644
--- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json
+++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
index 39313ede2..7e45740f2 100644
--- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
+++ b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
index cf299ad8d..1ec046b2a 100644
--- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
+++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json
index 9d42b24d2..f27875598 100644
--- a/testdata/d2exporter/TestExport/shape/basic.exp.json
+++ b/testdata/d2exporter/TestExport/shape/basic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json
index 106b98988..14f7226e4 100644
--- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json
+++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
index 0d4034e3b..e9c536235 100644
--- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
+++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
index cba840552..2d0a3987f 100644
--- a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
+++ b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json
index 9020cf14a..a12f49247 100644
--- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json
+++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json
index 6175b8a1e..08e64fad3 100644
--- a/testdata/d2exporter/TestExport/shape/text_color.exp.json
+++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
index c51b77257..46ee19cc3 100644
--- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
index 6eb2bb34f..3281dbfba 100644
--- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
index c8b16eed6..e00534c91 100644
--- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
index fef17876f..240b17a17 100644
--- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
index 173e6d257..2944df9ba 100644
--- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
+++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "boardContainer": false,
+  "isContainerOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json
index 78751d6e5..2e646f05c 100644
--- a/testdata/d2oracle/TestCreate/base.exp.json
+++ b/testdata/d2oracle/TestCreate/base.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/base.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json
index 018c08d4a..cf1936c65 100644
--- a/testdata/d2oracle/TestCreate/container.exp.json
+++ b/testdata/d2oracle/TestCreate/container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json
index bf00c913f..99b312cba 100644
--- a/testdata/d2oracle/TestCreate/container_edge.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
index b45bf1af5..1cefe3a01 100644
--- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,0:0:0-3:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json
index d1d9dc70b..dbf5f05d5 100644
--- a/testdata/d2oracle/TestCreate/edge.exp.json
+++ b/testdata/d2oracle/TestCreate/edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json
index 23b03dc76..01ebc9f75 100644
--- a/testdata/d2oracle/TestCreate/edge_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json
index b5446e794..c8ac4a71f 100644
--- a/testdata/d2oracle/TestCreate/edge_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
index fb00c8ef4..4ac4ea53b 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
index d64009920..d4aade1bd 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json
index 19c70051c..31f997395 100644
--- a/testdata/d2oracle/TestCreate/edge_unique.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-4:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json
index 0c019766c..bf3db2413 100644
--- a/testdata/d2oracle/TestCreate/gen_key.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key.d2,0:0:0-1:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json
index 352975c35..d48624699 100644
--- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_n.d2,0:0:0-13:0:132",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
index f11fad941..2c5770752 100644
--- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_nested.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
index fbba4f466..d25e682ae 100644
--- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_scope.d2,0:0:0-4:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
index 8410e8875..d4e9342c8 100644
--- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_suffix.d2,0:0:0-2:0:10",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
index 8e2c0414e..929ae47ca 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,0:0:0-4:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
index 5293a0f51..cfa07d36c 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,0:0:0-6:0:48",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
index bf6edf494..23d535c1c 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,0:0:0-8:0:50",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json
index 64fc28222..badeef6f3 100644
--- a/testdata/d2oracle/TestCreate/nested.exp.json
+++ b/testdata/d2oracle/TestCreate/nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/nested.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json
index e6eb0354b..3d2ade9f8 100644
--- a/testdata/d2oracle/TestCreate/scope.exp.json
+++ b/testdata/d2oracle/TestCreate/scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/scope.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json
index 676850972..ce323149a 100644
--- a/testdata/d2oracle/TestDelete/arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
index 0fcf35fdc..9db8cb3b3 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-3:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
index 6cfcd1575..9abb7d091 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
index 5727914be..f89e562c1 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
index e7cf0ecb2..59dfdd3a7 100644
--- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/breakup_arrowhead.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json
index e03409a76..33ca2dbb1 100644
--- a/testdata/d2oracle/TestDelete/chaos_1.exp.json
+++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:0:0-8:0:94",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json
index b9d9282e3..ffdae1633 100644
--- a/testdata/d2oracle/TestDelete/children.exp.json
+++ b/testdata/d2oracle/TestDelete/children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children.d2,0:0:0-2:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json
index 41fd2b690..55c19b96a 100644
--- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_conflicts.d2,0:0:0-3:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
index d8db9f86b..54abce2f2 100644
--- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-5:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
index 2cecde0dc..17ebaef68 100644
--- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-6:0:41",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
index 463a4794e..4ab8571f1 100644
--- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_flat_conflicts.d2,0:0:0-4:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
index ddc318287..e672647a1 100644
--- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-8:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
index 57d5c796b..256176838 100644
--- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_nested_conflicts.d2,0:0:0-5:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
index 25061efa1..de9d0cb7d 100644
--- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,0:0:0-6:0:33",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
index dd1f4c3eb..acb9d83ec 100644
--- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_no_self_conflict.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json
index 4f4fb28b1..dd3a0a3db 100644
--- a/testdata/d2oracle/TestDelete/children_order.exp.json
+++ b/testdata/d2oracle/TestDelete/children_order.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_order.d2,0:0:0-7:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
index 6a05c66f5..16d89893d 100644
--- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_referenced_conflicts.d2,0:0:0-5:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json
index 3cc0fb48b..f3ede85c8 100644
--- a/testdata/d2oracle/TestDelete/children_scope.exp.json
+++ b/testdata/d2oracle/TestDelete/children_scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,0:0:0-4:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json
index 7dd501b28..9af898bf4 100644
--- a/testdata/d2oracle/TestDelete/container_near.exp.json
+++ b/testdata/d2oracle/TestDelete/container_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,0:0:0-7:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
index b3449d69a..65e90de6a 100644
--- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,0:0:0-10:0:255",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json
index ad7316e90..963c5dbad 100644
--- a/testdata/d2oracle/TestDelete/delete_icon.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,0:0:0-3:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json
index b282309c0..3a846ac5b 100644
--- a/testdata/d2oracle/TestDelete/delete_link.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_link.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_link.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json
index 825fda7d2..d10a4309b 100644
--- a/testdata/d2oracle/TestDelete/delete_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_near.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
index 286925c5c..4a0d2213a 100644
--- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_needed_flat_near.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
index 27238624b..93a5f838c 100644
--- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_redundant_flat_near.d2,0:0:0-3:0:5",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
index 2b5fe8b2c..58a25c550 100644
--- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_tooltip.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
index 047b5cb06..4606739c8 100644
--- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
index 33de5fab3..8a3817dbc 100644
--- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-1:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json
index 77413c3ab..6c6532a01 100644
--- a/testdata/d2oracle/TestDelete/edge_common.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
index 5b23e12ee..0074f2140 100644
--- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json
index 4b96d3a96..a84d6cdfd 100644
--- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_3.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json
index ee9ad90d6..41dfcd3e6 100644
--- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_4.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
index a7c242145..279512768 100644
--- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-2:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
index 246f3b939..f0cb76557 100644
--- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-10:0:102",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json
index 3988d6666..c6213b785 100644
--- a/testdata/d2oracle/TestDelete/edge_first.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_first.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
index 08d649bad..204e09ba0 100644
--- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
index 958a7058e..b3f850c2a 100644
--- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-1:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
index 6239e242d..99703c68f 100644
--- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json
index 186c1a527..2b6d6cd69 100644
--- a/testdata/d2oracle/TestDelete/edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_last.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
index 1a670f8e2..2139671ea 100644
--- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json
index 16556d724..60acf64a9 100644
--- a/testdata/d2oracle/TestDelete/edge_middle.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json
index 331ef9097..c4e4a918c 100644
--- a/testdata/d2oracle/TestDelete/empty_map.exp.json
+++ b/testdata/d2oracle/TestDelete/empty_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/empty_map.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json
index 8a66c38ba..b78be5ccd 100644
--- a/testdata/d2oracle/TestDelete/flat.exp.json
+++ b/testdata/d2oracle/TestDelete/flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/flat.d2,0:0:0-0:0:0",
       "nodes": null
diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
index 7da09b6c7..9794daeaf 100644
--- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json
index b600b2fa7..f1312d590 100644
--- a/testdata/d2oracle/TestDelete/hoist_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/hoist_children.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
index 15bef0922..96a4e6cb2 100644
--- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json
index bb38c6f85..ec8b09ace 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges.d2,0:0:0-2:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
index 0709fa287..68541a6a5 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_2.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
index 1f584d13a..c5263d40d 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_3.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
index d710d5939..77d00c552 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_4.d2,0:0:0-2:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json
index d58acf629..710b47f1b 100644
--- a/testdata/d2oracle/TestDelete/left.exp.json
+++ b/testdata/d2oracle/TestDelete/left.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/left.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json
index 90ce2349b..9a2e1b0ae 100644
--- a/testdata/d2oracle/TestDelete/multi_near.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,0:0:0-9:0:57",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
index 72830543f..670199d7d 100644
--- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,0:0:0-6:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
index 8b707726e..78f9e04c7 100644
--- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.d2,0:0:0-5:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
index e12dcca12..eb9a928c4 100644
--- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_flat_middle_container.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
index 3461face3..bec69d205 100644
--- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_flat_style.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
index 6e446d065..c2a4e1c74 100644
--- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,0:0:0-5:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json
index 134dfb547..f58bf0bbb 100644
--- a/testdata/d2oracle/TestDelete/near.exp.json
+++ b/testdata/d2oracle/TestDelete/near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/near.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json
index 0a822f970..81ec134ab 100644
--- a/testdata/d2oracle/TestDelete/nested.exp.json
+++ b/testdata/d2oracle/TestDelete/nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json
index 949fbaa99..18281aaa4 100644
--- a/testdata/d2oracle/TestDelete/nested_2.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_2.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
index fb1f195b9..5b71fe5b4 100644
--- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
index cccef6a1e..925314753 100644
--- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json
index 6ddee2d85..7dc2f6dc7 100644
--- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_reserved.d2,0:0:0-2:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
index c48eae332..d16605b46 100644
--- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_underscore_update.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
index 47f9dc294..94734c593 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-5:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
index 31fb0fdfc..b7e51ad19 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-4:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
index aeccd4c5b..4c40bb213 100644
--- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
+++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only-underscore-nested.d2,0:0:0-4:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json
index d6ca8edea..5658c3a5c 100644
--- a/testdata/d2oracle/TestDelete/only-underscore.exp.json
+++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only-underscore.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
index b2cb71b09..fa8c0f3a7 100644
--- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
index 565c3951e..49e23529e 100644
--- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json
index 44f7565bc..aeacb84aa 100644
--- a/testdata/d2oracle/TestDelete/order_1.exp.json
+++ b/testdata/d2oracle/TestDelete/order_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json
index 158fdd600..f81f2a413 100644
--- a/testdata/d2oracle/TestDelete/order_2.exp.json
+++ b/testdata/d2oracle/TestDelete/order_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_2.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json
index bba567f43..d9a539b53 100644
--- a/testdata/d2oracle/TestDelete/order_3.exp.json
+++ b/testdata/d2oracle/TestDelete/order_3.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_3.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json
index 059ef248c..ba1dc2363 100644
--- a/testdata/d2oracle/TestDelete/order_4.exp.json
+++ b/testdata/d2oracle/TestDelete/order_4.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_4.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json
index 4ba164160..8886cfbb3 100644
--- a/testdata/d2oracle/TestDelete/order_5.exp.json
+++ b/testdata/d2oracle/TestDelete/order_5.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,0:0:0-4:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json
index 194e8481a..1d869e424 100644
--- a/testdata/d2oracle/TestDelete/order_6.exp.json
+++ b/testdata/d2oracle/TestDelete/order_6.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_6.d2,0:0:0-4:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json
index 119b9d428..c4fb7ac50 100644
--- a/testdata/d2oracle/TestDelete/order_7.exp.json
+++ b/testdata/d2oracle/TestDelete/order_7.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_7.d2,0:0:0-4:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json
index 6469684e3..4245f163e 100644
--- a/testdata/d2oracle/TestDelete/order_8.exp.json
+++ b/testdata/d2oracle/TestDelete/order_8.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_8.d2,0:0:0-7:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json
index d4b21d957..bea90c397 100644
--- a/testdata/d2oracle/TestDelete/shape_class.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_class.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/shape_class.d2,0:0:0-2:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
index 8c7ce9edb..f01b13ca1 100644
--- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,0:0:0-10:0:128",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
index 74b2064d1..758e84185 100644
--- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/singular_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json
index 1e7b6b63b..40905f013 100644
--- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/singular_map_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
index 8c8372987..0f4a46a31 100644
--- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/underscore_no_conflict.d2,0:0:0-5:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
index 2bd4ac6b7..71822b8ea 100644
--- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json
index 6be79cb36..c13b72504 100644
--- a/testdata/d2oracle/TestDelete/width.exp.json
+++ b/testdata/d2oracle/TestDelete/width.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/width.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
index 12b904edd..16b6b3eb8 100644
--- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
+++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,0:0:0-12:0:104",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json
index 0015b69df..9c5c3bea6 100644
--- a/testdata/d2oracle/TestMove/basic.exp.json
+++ b/testdata/d2oracle/TestMove/basic.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json
index a3cc64aab..361a38b9a 100644
--- a/testdata/d2oracle/TestMove/basic_nested.exp.json
+++ b/testdata/d2oracle/TestMove/basic_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic_nested.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
index c8cd1cadb..404eadd10 100644
--- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic_out_of_container.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json
index f4715fe63..805cd1c9a 100644
--- a/testdata/d2oracle/TestMove/between_containers.exp.json
+++ b/testdata/d2oracle/TestMove/between_containers.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/between_containers.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
index cb6b5a086..6b055298d 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-2:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
index 22de06c80..937ab3b8a 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-1:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json
index 3bd4bdc70..4cc72b05a 100644
--- a/testdata/d2oracle/TestMove/connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/connected_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
index eddd16106..6dc23b56a 100644
--- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
+++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json
index 9d4e0866a..43cc5bf7d 100644
--- a/testdata/d2oracle/TestMove/container_near.exp.json
+++ b/testdata/d2oracle/TestMove/container_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/container_near.d2,0:0:0-9:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
index 002bbe71f..476ca4340 100644
--- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json
+++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,0:0:0-4:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json
index dcbb54dc6..28ac2143b 100644
--- a/testdata/d2oracle/TestMove/edge_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_basic.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
index 062589e4f..96bea725b 100644
--- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-1:0:12",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
index c1e4355f2..05a3c891d 100644
--- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
index 3673cb950..e6f0af929 100644
--- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-2:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
index b4c7d31f2..6f348c219 100644
--- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,0:0:0-3:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json
index e3409c297..165508577 100644
--- a/testdata/d2oracle/TestMove/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json
index 0b1f61e63..b12b2462a 100644
--- a/testdata/d2oracle/TestMove/edge_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,0:0:0-4:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
index 11cc7ea61..a026d86ed 100644
--- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
index 2d478d6f7..372e7b9de 100644
--- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json
index dcc483d29..af273e829 100644
--- a/testdata/d2oracle/TestMove/extend_map.exp.json
+++ b/testdata/d2oracle/TestMove/extend_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,0:0:0-8:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
index 5df47e11d..bca33e543 100644
--- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
+++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json
index 996c0e451..b4dbb323e 100644
--- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json
+++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_between_containers.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json
index 3f894caea..d163557a6 100644
--- a/testdata/d2oracle/TestMove/flat_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_merge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,0:0:0-5:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json
index eae90e96e..93ff95b6d 100644
--- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json
+++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_middle_container.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
index 40f733d4c..2f373a2be 100644
--- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge.d2,0:0:0-5:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
index 6fc426350..106996a84 100644
--- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
+++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,0:0:0-10:0:54",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
index 4f4b4f4c8..10b6b0afb 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
index 2dab965e1..d9fb1d5f7 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,0:0:0-8:0:72",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
index 8de1ed2d9..d613b240a 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_value.d2,0:0:0-2:0:10",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json
index ec9826a4c..5a62bbe70 100644
--- a/testdata/d2oracle/TestMove/flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,0:0:0-4:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
index da741d272..bb5268230 100644
--- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,0:0:0-6:0:33",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json
index 1cfebe5bd..c43093588 100644
--- a/testdata/d2oracle/TestMove/full_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_slice.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/full_slice.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json
index 52fceafe1..c469f6b0c 100644
--- a/testdata/d2oracle/TestMove/gnarly_1.exp.json
+++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-9:0:64",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json
index fa88ef150..9d0c61756 100644
--- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json
+++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/hoist_container_children.d2,0:0:0-6:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
index ec25408e0..3d0056464 100644
--- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_existing_map.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
index 67d60315c..df7cccb67 100644
--- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_nonexisting_map.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
index dde1c77e9..0eb6e8507 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,0:0:0-7:0:95",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
index 7de33c453..371467098 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_style.d2,0:0:0-4:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json
index 31d1eec69..b41db5921 100644
--- a/testdata/d2oracle/TestMove/map_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/map_transplant.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,0:0:0-13:0:79",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json
index 7b277495a..1b5c15e48 100644
--- a/testdata/d2oracle/TestMove/map_with_label.exp.json
+++ b/testdata/d2oracle/TestMove/map_with_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,0:0:0-5:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
index 480a59ef0..fee959ebe 100644
--- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
+++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,0:0:0-11:0:67",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json
index 5b984730f..b97791c1c 100644
--- a/testdata/d2oracle/TestMove/merge_reserved.exp.json
+++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,0:0:0-9:0:70",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json
index 44d7bbc64..c7fafe388 100644
--- a/testdata/d2oracle/TestMove/middle_container.exp.json
+++ b/testdata/d2oracle/TestMove/middle_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/middle_container.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json
index 744a058df..231891e55 100644
--- a/testdata/d2oracle/TestMove/move_container_children.exp.json
+++ b/testdata/d2oracle/TestMove/move_container_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_container_children.d2,0:0:0-7:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
index 354d0928f..50c4488c0 100644
--- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
+++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_container_conflict_children.d2,0:0:0-7:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
index cf4dd2e18..a0c5bcb0d 100644
--- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_into_key_with_value.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
index 2aa013cf6..22eb7c7a4 100644
--- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-2:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
index 9d2e33cc4..5716835fa 100644
--- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
index 97fc1ff36..640e40261 100644
--- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
+++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,0:0:0-11:0:71",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json
index ee79ef333..372ceedc9 100644
--- a/testdata/d2oracle/TestMove/near.exp.json
+++ b/testdata/d2oracle/TestMove/near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
index fe850dee0..9fd267b67 100644
--- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
+++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nested-underscore-move-out.d2,0:0:0-4:0:27",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json
index cbc441bdd..1a22ae6b0 100644
--- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,0:0:0-6:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
index c88a48388..b195cddb9 100644
--- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,0:0:0-7:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
index 0baa03700..1df21604b 100644
--- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
+++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/out_of_newline_container.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json
index e6ddf5c1f..398e9000e 100644
--- a/testdata/d2oracle/TestMove/parentheses.exp.json
+++ b/testdata/d2oracle/TestMove/parentheses.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-2:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
index 9592e1c8a..7e2a5b47f 100644
--- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json
index 1b278aff6..e1e915a1b 100644
--- a/testdata/d2oracle/TestMove/partial_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_slice.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/partial_slice.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json
index ab485cdc2..51fa56150 100644
--- a/testdata/d2oracle/TestMove/rename_2.exp.json
+++ b/testdata/d2oracle/TestMove/rename_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/rename_2.d2,0:0:0-7:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json
index 3a2d12f25..749a68e62 100644
--- a/testdata/d2oracle/TestMove/reuse_map.exp.json
+++ b/testdata/d2oracle/TestMove/reuse_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,0:0:0-7:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json
index 6a3760d4f..a6edd6c13 100644
--- a/testdata/d2oracle/TestMove/slice_style.exp.json
+++ b/testdata/d2oracle/TestMove/slice_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/slice_style.d2,0:0:0-3:0:68",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json
index 5a3b38326..64204de97 100644
--- a/testdata/d2oracle/TestMove/underscore-connection.exp.json
+++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,0:0:0-8:0:40",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json
index c85227420..454c75884 100644
--- a/testdata/d2oracle/TestMove/underscore_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_children.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
index fed0087ed..db278b6d1 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,0:0:0-4:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
index 8a6bc447b..08f12dec5 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
index c1d72817f..495710ccf 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
index 89eabdf6d..e62b59d9e 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
index 1b3df4c90..3c4654dc5 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
index a1aaba647..d6205dcea 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,0:0:0-3:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
index b16c6da65..e8f841dff 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,0:0:0-6:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json
index 545036948..4b6f6e921 100644
--- a/testdata/d2oracle/TestMove/underscore_merge.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,0:0:0-6:0:32",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json
index 098abe757..07ec2a84c 100644
--- a/testdata/d2oracle/TestMove/underscore_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_split.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,0:0:0-6:0:28",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json
index 64f660789..71fcca045 100644
--- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,0:0:0-10:0:60",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json
index b85a89f0d..2a4494c87 100644
--- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_transplant.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json
index 9a53a0d37..b966ff44c 100644
--- a/testdata/d2oracle/TestMove/unique_name.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/unique_name.d2,0:0:0-6:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
index e95ac2258..db46f90e8 100644
--- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json
index a7dd13abb..4c8b13746 100644
--- a/testdata/d2oracle/TestRename/arrows.exp.json
+++ b/testdata/d2oracle/TestRename/arrows.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json
index af72f4a35..94955f81f 100644
--- a/testdata/d2oracle/TestRename/arrows_chain.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-1:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json
index 24621f6b5..85ec88306 100644
--- a/testdata/d2oracle/TestRename/arrows_complex.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
index 9df2c2078..97df297a2 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-1:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
index 7c4aa9d97..137248a31 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-1:0:27",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
index b90cface2..54f62bf36 100644
--- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-1:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
index 0f5b83b06..e56bd3cc4 100644
--- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json
index 3cac1cbc1..8b5064507 100644
--- a/testdata/d2oracle/TestRename/conflict.exp.json
+++ b/testdata/d2oracle/TestRename/conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json
index 5cac9c791..0581c359c 100644
--- a/testdata/d2oracle/TestRename/conflict_2.exp.json
+++ b/testdata/d2oracle/TestRename/conflict_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict_2.d2,0:0:0-4:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
index b0a1657f7..2e7d0c105 100644
--- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
+++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict_with_dots.d2,0:0:0-2:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json
index 1ad3150a2..39bea84cc 100644
--- a/testdata/d2oracle/TestRename/container.exp.json
+++ b/testdata/d2oracle/TestRename/container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-12:0:235",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json
index 39a243507..c1b512c54 100644
--- a/testdata/d2oracle/TestRename/edges.exp.json
+++ b/testdata/d2oracle/TestRename/edges.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-5:0:74",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json
index 3f40c1e3c..75c17b946 100644
--- a/testdata/d2oracle/TestRename/flat.exp.json
+++ b/testdata/d2oracle/TestRename/flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/flat.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json
index 5381ff45f..7ca08a2c6 100644
--- a/testdata/d2oracle/TestRename/generated.exp.json
+++ b/testdata/d2oracle/TestRename/generated.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/generated.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json
index c49ba0867..f8cd15608 100644
--- a/testdata/d2oracle/TestRename/near.exp.json
+++ b/testdata/d2oracle/TestRename/near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/near.d2,0:0:0-4:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json
index c31eca90b..44fa19cca 100644
--- a/testdata/d2oracle/TestRename/nested.exp.json
+++ b/testdata/d2oracle/TestRename/nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/nested.d2,0:0:0-4:0:61",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json
index 696145673..bae39df74 100644
--- a/testdata/d2oracle/TestSet/base.exp.json
+++ b/testdata/d2oracle/TestSet/base.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/base.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json
index a0c385bf3..7b9839e81 100644
--- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json
+++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/block_string_multiline.d2,0:0:0-5:0:146",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json
index d5cc295a9..f05040176 100644
--- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json
+++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/block_string_oneline.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json
index 960d8bffd..d51130ed2 100644
--- a/testdata/d2oracle/TestSet/edge.exp.json
+++ b/testdata/d2oracle/TestSet/edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-1:0:12",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json
index 52516f8b8..eaeb88ec9 100644
--- a/testdata/d2oracle/TestSet/edge_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json
index 71b4f1bc7..a4e7dfb19 100644
--- a/testdata/d2oracle/TestSet/edge_chain.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,0:0:0-4:0:93",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
index b699b9b18..86ceaf09c 100644
--- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-2:0:45",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
index 36c3157c1..decdfa4a1 100644
--- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-3:0:76",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
index 3e44edb4a..b7c7d8679 100644
--- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,0:0:0-4:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
index 1e4798cf4..c9e29fd6d 100644
--- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-2:0:55",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json
index 9146317da..cdbc7eb76 100644
--- a/testdata/d2oracle/TestSet/edge_index_case.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,0:0:0-6:0:54",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
index b03b33e94..507d164bc 100644
--- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-2:0:43",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
index 8afe4a808..35b831403 100644
--- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
index be48faf2d..1b3eb34b0 100644
--- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
+++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,0:0:0-2:0:37",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json
index 579666a58..67fffa7be 100644
--- a/testdata/d2oracle/TestSet/edge_label.exp.json
+++ b/testdata/d2oracle/TestSet/edge_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-1:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
index 1f684f9d6..63d242e7a 100644
--- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-6:0:70",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
index 5fe582934..f53edc1d9 100644
--- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-6:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
index 2f9e953a0..41be08edc 100644
--- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,0:0:0-3:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
index 136f4a2a5..734b681db 100644
--- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,0:0:0-3:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
index daf32c444..a4206713f 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
index ae249573a..c47c70beb 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-2:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
index 1eae1a22b..5573b5348 100644
--- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json
index 8e002af39..5fc455ba3 100644
--- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json
+++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,0:0:0-5:0:44",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json
index 2359bf53c..b44444a5e 100644
--- a/testdata/d2oracle/TestSet/icon.exp.json
+++ b/testdata/d2oracle/TestSet/icon.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:0:0-1:0:68",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json
index 5b8f52381..366380214 100644
--- a/testdata/d2oracle/TestSet/inline_style.exp.json
+++ b/testdata/d2oracle/TestSet/inline_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,0:0:0-4:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json
index 9c19b1853..9c502d199 100644
--- a/testdata/d2oracle/TestSet/label.exp.json
+++ b/testdata/d2oracle/TestSet/label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label.d2,0:0:0-1:0:88",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json
index 88abb7d0f..dcd401091 100644
--- a/testdata/d2oracle/TestSet/label_primary.exp.json
+++ b/testdata/d2oracle/TestSet/label_primary.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,0:0:0-3:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json
index 22338d647..8c6b7be98 100644
--- a/testdata/d2oracle/TestSet/label_replace.exp.json
+++ b/testdata/d2oracle/TestSet/label_replace.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_replace.d2,0:0:0-1:0:88",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json
index 2878bd3e1..5b8f1b505 100644
--- a/testdata/d2oracle/TestSet/label_unset.exp.json
+++ b/testdata/d2oracle/TestSet/label_unset.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_unset.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json
index 801f646b8..b68d29e52 100644
--- a/testdata/d2oracle/TestSet/map_key_missing.exp.json
+++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-1:0:83",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json
index 693ec3fa0..c9505a86d 100644
--- a/testdata/d2oracle/TestSet/nested_alex.exp.json
+++ b/testdata/d2oracle/TestSet/nested_alex.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,0:0:0-5:0:202",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json
index 119eac8ef..de49469cf 100644
--- a/testdata/d2oracle/TestSet/new_style.exp.json
+++ b/testdata/d2oracle/TestSet/new_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/new_style.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
index 3ca0ca736..f3a071b8b 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-3:0:45",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
index 06a5767a7..6f61e5ccf 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-5:0:56",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json
index bf2ff2283..6f180fe4a 100644
--- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json
+++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_dimensions.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
index be349970a..5a0c8b2cf 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-4:0:59",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
index 57302a7ff..5380b903a 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-5:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json
index aa022e6d1..e523a41f8 100644
--- a/testdata/d2oracle/TestSet/replace_link.exp.json
+++ b/testdata/d2oracle/TestSet/replace_link.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json
index f6d88af71..e4b2192ba 100644
--- a/testdata/d2oracle/TestSet/replace_position.exp.json
+++ b/testdata/d2oracle/TestSet/replace_position.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_position.d2,0:0:0-5:0:47",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json
index 58c715d2c..1455ae8cb 100644
--- a/testdata/d2oracle/TestSet/replace_shape.exp.json
+++ b/testdata/d2oracle/TestSet/replace_shape.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_shape.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json
index fb7915942..e04fb53c1 100644
--- a/testdata/d2oracle/TestSet/replace_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_style.d2,0:0:0-1:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
index 9ce6bc852..49fc47df6 100644
--- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_style_edgecase.d2,0:0:0-2:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
index 110192330..91d3d5797 100644
--- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json
index a2bd8c05c..776fc20bc 100644
--- a/testdata/d2oracle/TestSet/set_dimensions.exp.json
+++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_dimensions.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json
index 28dc27b2f..c08666648 100644
--- a/testdata/d2oracle/TestSet/set_position.exp.json
+++ b/testdata/d2oracle/TestSet/set_position.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_position.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json
index 9d2fa571a..7b9668576 100644
--- a/testdata/d2oracle/TestSet/set_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json
index feaca3032..f8ed5b5f5 100644
--- a/testdata/d2oracle/TestSet/shape.exp.json
+++ b/testdata/d2oracle/TestSet/shape.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
index a29aa1bd0..8b4d3ce16 100644
--- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "boardContainer": false,
+    "isContainerOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/shape_nested_style_set.d2,0:0:0-1:0:24",
       "nodes": [

From f64b5c010da068f4708e64be67f6b216180e8eef Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Mon, 27 Feb 2023 14:33:33 -0800
Subject: [PATCH 5/5] IsContainerOnly -> IsFolderOnly

---
 ci/sub                                        |    2 +-
 d2compiler/compile.go                         |    2 +-
 d2compiler/compile_test.go                    |    8 +-
 d2exporter/export.go                          |    2 +-
 d2graph/d2graph.go                            |    8 +-
 d2target/d2target.go                          |    6 +-
 .../measured/empty-class/dagre/board.exp.json |    2 +-
 .../measured/empty-shape/dagre/board.exp.json |    2 +-
 .../empty-sql_table/dagre/board.exp.json      |    2 +-
 .../ampersand-escape/dagre/board.exp.json     |    2 +-
 .../ampersand-escape/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre-disconnect/dagre/board.exp.json     |    2 +-
 .../dagre-disconnect/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../dagre_broken_arrowhead/elk/board.exp.json |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre_special_ids/dagre/board.exp.json    |    2 +-
 .../dagre_special_ids/elk/board.exp.json      |    2 +-
 .../elk_alignment/dagre/board.exp.json        |    2 +-
 .../elk_alignment/elk/board.exp.json          |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../elk_loop_panic/dagre/board.exp.json       |    2 +-
 .../elk_loop_panic/elk/board.exp.json         |    2 +-
 .../regression/elk_order/dagre/board.exp.json |    2 +-
 .../regression/elk_order/elk/board.exp.json   |    2 +-
 .../empty_class_height/dagre/board.exp.json   |    2 +-
 .../empty_class_height/elk/board.exp.json     |    2 +-
 .../empty_sequence/dagre/board.exp.json       |    2 +-
 .../empty_sequence/elk/board.exp.json         |    2 +-
 .../regression/hex-fill/dagre/board.exp.json  |    2 +-
 .../regression/hex-fill/elk/board.exp.json    |    2 +-
 .../just-width/dagre/board.exp.json           |    2 +-
 .../regression/just-width/elk/board.exp.json  |    2 +-
 .../md_h1_li_li/dagre/board.exp.json          |    2 +-
 .../regression/md_h1_li_li/elk/board.exp.json |    2 +-
 .../nested_steps/dagre/board.exp.json         |    2 +-
 .../nested_steps/elk/board.exp.json           |    2 +-
 .../regression/no-lexer/dagre/board.exp.json  |    2 +-
 .../regression/no-lexer/elk/board.exp.json    |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../opacity-on-label/dagre/board.exp.json     |    2 +-
 .../opacity-on-label/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../overlapping-edge-label/elk/board.exp.json |    2 +-
 .../query_param_escape/dagre/board.exp.json   |    2 +-
 .../query_param_escape/elk/board.exp.json     |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../sql_table_overflow/dagre/board.exp.json   |    2 +-
 .../sql_table_overflow/elk/board.exp.json     |    2 +-
 .../unconnected/dagre/board.exp.json          |    2 +-
 .../regression/unconnected/elk/board.exp.json |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../root/border-radius/dagre/board.exp.json   |    2 +-
 .../root/border-radius/elk/board.exp.json     |    2 +-
 .../root/double-border/dagre/board.exp.json   |    2 +-
 .../root/double-border/elk/board.exp.json     |    2 +-
 .../even-stroke-width/dagre/board.exp.json    |    2 +-
 .../root/even-stroke-width/elk/board.exp.json |    2 +-
 .../testdata/root/fill/dagre/board.exp.json   |    2 +-
 .../testdata/root/fill/elk/board.exp.json     |    2 +-
 .../root/stroke-dash/dagre/board.exp.json     |    2 +-
 .../root/stroke-dash/elk/board.exp.json       |    2 +-
 .../root/stroke-no-width/dagre/board.exp.json |    2 +-
 .../root/stroke-no-width/elk/board.exp.json   |    2 +-
 .../root/stroke-width/dagre/board.exp.json    |    2 +-
 .../root/stroke-width/elk/board.exp.json      |    2 +-
 .../sanity/1_to_2/dagre/board.exp.json        |    2 +-
 .../testdata/sanity/1_to_2/elk/board.exp.json |    2 +-
 .../sanity/basic/dagre/board.exp.json         |    2 +-
 .../testdata/sanity/basic/elk/board.exp.json  |    2 +-
 .../child_to_child/dagre/board.exp.json       |    2 +-
 .../sanity/child_to_child/elk/board.exp.json  |    2 +-
 .../connection_label/dagre/board.exp.json     |    2 +-
 .../connection_label/elk/board.exp.json       |    2 +-
 .../sanity/empty/dagre/board.exp.json         |    2 +-
 .../testdata/sanity/empty/elk/board.exp.json  |    2 +-
 .../3d_fill_and_stroke/dagre/board.exp.json   |    2 +-
 .../3d_fill_and_stroke/elk/board.exp.json     |    2 +-
 .../stable/all_shapes/dagre/board.exp.json    |    2 +-
 .../stable/all_shapes/elk/board.exp.json      |    2 +-
 .../all_shapes_multiple/dagre/board.exp.json  |    2 +-
 .../all_shapes_multiple/elk/board.exp.json    |    2 +-
 .../all_shapes_shadow/dagre/board.exp.json    |    2 +-
 .../all_shapes_shadow/elk/board.exp.json      |    2 +-
 .../stable/animated/dagre/board.exp.json      |    2 +-
 .../stable/animated/elk/board.exp.json        |    2 +-
 .../arrowhead_adjustment/dagre/board.exp.json |    2 +-
 .../arrowhead_adjustment/elk/board.exp.json   |    2 +-
 .../arrowhead_labels/dagre/board.exp.json     |    2 +-
 .../arrowhead_labels/elk/board.exp.json       |    2 +-
 .../stable/binary_tree/dagre/board.exp.json   |    2 +-
 .../stable/binary_tree/elk/board.exp.json     |    2 +-
 .../stable/border-radius/dagre/board.exp.json |    2 +-
 .../stable/border-radius/elk/board.exp.json   |    2 +-
 .../stable/chaos2/dagre/board.exp.json        |    2 +-
 .../testdata/stable/chaos2/elk/board.exp.json |    2 +-
 .../circle_arrowhead/dagre/board.exp.json     |    2 +-
 .../circle_arrowhead/elk/board.exp.json       |    2 +-
 .../circular_dependency/dagre/board.exp.json  |    2 +-
 .../circular_dependency/elk/board.exp.json    |    2 +-
 .../stable/class/dagre/board.exp.json         |    2 +-
 .../testdata/stable/class/elk/board.exp.json  |    2 +-
 .../stable/code_snippet/dagre/board.exp.json  |    2 +-
 .../stable/code_snippet/elk/board.exp.json    |    2 +-
 .../complex-layers/dagre/board.exp.json       |   20 +-
 .../stable/complex-layers/elk/board.exp.json  |   20 +-
 .../connected_container/dagre/board.exp.json  |    2 +-
 .../connected_container/elk/board.exp.json    |    2 +-
 .../constant_near_stress/dagre/board.exp.json |    2 +-
 .../constant_near_stress/elk/board.exp.json   |    2 +-
 .../constant_near_title/dagre/board.exp.json  |    2 +-
 .../constant_near_title/elk/board.exp.json    |    2 +-
 .../container_edges/dagre/board.exp.json      |    2 +-
 .../stable/container_edges/elk/board.exp.json |    2 +-
 .../crow_foot_arrowhead/dagre/board.exp.json  |    2 +-
 .../crow_foot_arrowhead/elk/board.exp.json    |    2 +-
 .../stable/dense/dagre/board.exp.json         |    2 +-
 .../testdata/stable/dense/elk/board.exp.json  |    2 +-
 .../different_subgraphs/dagre/board.exp.json  |    2 +-
 .../different_subgraphs/elk/board.exp.json    |    2 +-
 .../stable/direction/dagre/board.exp.json     |    2 +-
 .../stable/direction/elk/board.exp.json       |    2 +-
 .../stable/font_colors/dagre/board.exp.json   |    2 +-
 .../stable/font_colors/elk/board.exp.json     |    2 +-
 .../stable/font_sizes/dagre/board.exp.json    |    2 +-
 .../stable/font_sizes/elk/board.exp.json      |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../giant_markdown_test/dagre/board.exp.json  |    2 +-
 .../giant_markdown_test/elk/board.exp.json    |    2 +-
 .../stable/hexagon_3d/dagre/board.exp.json    |    2 +-
 .../stable/hexagon_3d/elk/board.exp.json      |    2 +-
 .../testdata/stable/hr/dagre/board.exp.json   |    2 +-
 .../testdata/stable/hr/elk/board.exp.json     |    2 +-
 .../icon-containers/dagre/board.exp.json      |    2 +-
 .../stable/icon-containers/elk/board.exp.json |    2 +-
 .../stable/icon-label/dagre/board.exp.json    |    2 +-
 .../stable/icon-label/elk/board.exp.json      |    2 +-
 .../stable/images/dagre/board.exp.json        |    2 +-
 .../testdata/stable/images/elk/board.exp.json |    2 +-
 .../stable/investigate/dagre/board.exp.json   |    2 +-
 .../stable/investigate/elk/board.exp.json     |    2 +-
 .../stable/large_arch/dagre/board.exp.json    |    2 +-
 .../stable/large_arch/elk/board.exp.json      |    2 +-
 .../stable/latex/dagre/board.exp.json         |    2 +-
 .../testdata/stable/latex/elk/board.exp.json  |    2 +-
 .../testdata/stable/li1/dagre/board.exp.json  |    2 +-
 .../testdata/stable/li1/elk/board.exp.json    |    2 +-
 .../testdata/stable/li2/dagre/board.exp.json  |    2 +-
 .../testdata/stable/li2/elk/board.exp.json    |    2 +-
 .../testdata/stable/li3/dagre/board.exp.json  |    2 +-
 .../testdata/stable/li3/elk/board.exp.json    |    2 +-
 .../testdata/stable/li4/dagre/board.exp.json  |    2 +-
 .../testdata/stable/li4/elk/board.exp.json    |    2 +-
 .../stable/links/dagre/board.exp.json         |    2 +-
 .../testdata/stable/links/elk/board.exp.json  |    2 +-
 .../stable/lone_h1/dagre/board.exp.json       |    2 +-
 .../stable/lone_h1/elk/board.exp.json         |    2 +-
 .../stable/markdown/dagre/board.exp.json      |    2 +-
 .../stable/markdown/elk/board.exp.json        |    2 +-
 .../markdown_stroke_fill/dagre/board.exp.json |    2 +-
 .../markdown_stroke_fill/elk/board.exp.json   |    2 +-
 .../md_2space_newline/dagre/board.exp.json    |    2 +-
 .../md_2space_newline/elk/board.exp.json      |    2 +-
 .../md_backslash_newline/dagre/board.exp.json |    2 +-
 .../md_backslash_newline/elk/board.exp.json   |    2 +-
 .../md_code_block_fenced/dagre/board.exp.json |    2 +-
 .../md_code_block_fenced/elk/board.exp.json   |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../md_code_block_indented/elk/board.exp.json |    2 +-
 .../md_code_inline/dagre/board.exp.json       |    2 +-
 .../stable/md_code_inline/elk/board.exp.json  |    2 +-
 .../multiline_text/dagre/board.exp.json       |    2 +-
 .../stable/multiline_text/elk/board.exp.json  |    2 +-
 .../multiple_trees/dagre/board.exp.json       |    2 +-
 .../stable/multiple_trees/elk/board.exp.json  |    2 +-
 .../stable/n22_e32/dagre/board.exp.json       |    2 +-
 .../stable/n22_e32/elk/board.exp.json         |    2 +-
 .../stable/near-alone/dagre/board.exp.json    |    2 +-
 .../stable/near-alone/elk/board.exp.json      |    2 +-
 .../number_connections/dagre/board.exp.json   |    2 +-
 .../number_connections/elk/board.exp.json     |    2 +-
 .../one_container_loop/dagre/board.exp.json   |    2 +-
 .../one_container_loop/elk/board.exp.json     |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../stable/ovals/dagre/board.exp.json         |    2 +-
 .../testdata/stable/ovals/elk/board.exp.json  |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../testdata/stable/p/dagre/board.exp.json    |    2 +-
 e2etests/testdata/stable/p/elk/board.exp.json |    2 +-
 .../stable/people/dagre/board.exp.json        |    2 +-
 .../testdata/stable/people/elk/board.exp.json |    2 +-
 .../testdata/stable/pre/dagre/board.exp.json  |    2 +-
 .../testdata/stable/pre/elk/board.exp.json    |    2 +-
 .../self-referencing/dagre/board.exp.json     |    2 +-
 .../self-referencing/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../sequence_diagram_note/elk/board.exp.json  |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../sequence_diagram_real/elk/board.exp.json  |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../sequence_diagram_span/elk/board.exp.json  |    2 +-
 .../sequence_diagrams/dagre/board.exp.json    |    2 +-
 .../sequence_diagrams/elk/board.exp.json      |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../stable/sql_tables/dagre/board.exp.json    |    2 +-
 .../stable/sql_tables/elk/board.exp.json      |    2 +-
 .../stable/square_3d/dagre/board.exp.json     |    2 +-
 .../stable/square_3d/elk/board.exp.json       |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../stable/stylish/dagre/board.exp.json       |    2 +-
 .../stable/stylish/elk/board.exp.json         |    2 +-
 .../text_font_sizes/dagre/board.exp.json      |    2 +-
 .../stable/text_font_sizes/elk/board.exp.json |    2 +-
 .../stable/tooltips/dagre/board.exp.json      |    2 +-
 .../stable/tooltips/elk/board.exp.json        |    2 +-
 .../transparent_3d/dagre/board.exp.json       |    2 +-
 .../stable/transparent_3d/elk/board.exp.json  |    2 +-
 .../unnamed_only_height/dagre/board.exp.json  |    2 +-
 .../unnamed_only_height/elk/board.exp.json    |    2 +-
 .../unnamed_only_width/dagre/board.exp.json   |    2 +-
 .../unnamed_only_width/elk/board.exp.json     |    2 +-
 .../stable/us_map/dagre/board.exp.json        |    2 +-
 .../testdata/stable/us_map/elk/board.exp.json |    2 +-
 .../container_icon_label/dagre/board.exp.json |    2 +-
 .../container_icon_label/elk/board.exp.json   |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../elk/board.exp.json                        |    2 +-
 .../dagre/board.exp.json                      |    2 +-
 .../shape_set_width_height/elk/board.exp.json |    2 +-
 .../unicode/chinese/dagre/board.exp.json      |    2 +-
 .../unicode/chinese/elk/board.exp.json        |    2 +-
 .../unicode/emojis/dagre/board.exp.json       |    2 +-
 .../unicode/emojis/elk/board.exp.json         |    2 +-
 .../japanese-basic/dagre/board.exp.json       |    2 +-
 .../unicode/japanese-basic/elk/board.exp.json |    2 +-
 .../japanese-full/dagre/board.exp.json        |    2 +-
 .../unicode/japanese-full/elk/board.exp.json  |    2 +-
 .../japanese-mixed/dagre/board.exp.json       |    2 +-
 .../unicode/japanese-mixed/elk/board.exp.json |    2 +-
 .../unicode/korean/dagre/board.exp.json       |    2 +-
 .../unicode/korean/elk/board.exp.json         |    2 +-
 .../mixed-language-2/dagre/board.exp.json     |    2 +-
 .../mixed-language-2/elk/board.exp.json       |    2 +-
 .../mixed-language/dagre/board.exp.json       |    2 +-
 .../unicode/mixed-language/elk/board.exp.json |    2 +-
 .../unicode/with-style/dagre/board.exp.json   |    2 +-
 .../unicode/with-style/elk/board.exp.json     |    2 +-
 main.go                                       |    4 +-
 .../TestCompile/basic_icon.exp.json           |    2 +-
 .../TestCompile/basic_sequence.exp.json       |    2 +-
 .../TestCompile/basic_shape.exp.json          |    2 +-
 .../TestCompile/basic_style.exp.json          |    2 +-
 .../TestCompile/class_paren.exp.json          |    2 +-
 .../TestCompile/class_style.exp.json          |    2 +-
 .../TestCompile/constraint_label.exp.json     |    2 +-
 .../TestCompile/default_direction.exp.json    |    2 +-
 .../TestCompile/dimension_with_style.exp.json |    2 +-
 .../dimensions_on_containers.exp.json         |    2 +-
 .../dimensions_on_nonimage.exp.json           |    2 +-
 testdata/d2compiler/TestCompile/edge.exp.json |    2 +-
 .../edge_arrowhead_fields.exp.json            |    2 +-
 .../TestCompile/edge_chain.exp.json           |    2 +-
 .../TestCompile/edge_chain_map.exp.json       |    2 +-
 .../TestCompile/edge_column_index.exp.json    |    2 +-
 .../TestCompile/edge_exclusive_style.exp.json |    2 +-
 .../TestCompile/edge_flat_arrowhead.exp.json  |    2 +-
 .../edge_flat_label_arrowhead.exp.json        |    2 +-
 .../TestCompile/edge_index.exp.json           |    2 +-
 .../TestCompile/edge_index_map.exp.json       |    2 +-
 .../TestCompile/edge_index_nested.exp.json    |    2 +-
 .../edge_index_nested_cross_scope.exp.json    |    2 +-
 .../edge_key_group_flat_nested.exp.json       |    2 +-
 ..._key_group_flat_nested_underscore.exp.json |    2 +-
 ..._group_map_flat_nested_underscore.exp.json |    2 +-
 ...e_key_group_map_nested_underscore.exp.json |    2 +-
 .../TestCompile/edge_label_map.exp.json       |    2 +-
 .../d2compiler/TestCompile/edge_map.exp.json  |    2 +-
 .../TestCompile/edge_map_arrowhead.exp.json   |    2 +-
 .../TestCompile/edge_map_group_flat.exp.json  |    2 +-
 .../edge_map_group_semiflat.exp.json          |    2 +-
 .../TestCompile/edge_map_nested.exp.json      |    2 +-
 .../TestCompile/edge_map_nested_flat.exp.json |    2 +-
 .../TestCompile/edge_mixed_arrowhead.exp.json |    2 +-
 .../edge_non_shape_arrowhead.exp.json         |    2 +-
 .../edge_semiflat_arrowhead.exp.json          |    2 +-
 .../TestCompile/escaped_id.exp.json           |    2 +-
 .../TestCompile/image_style.exp.json          |    2 +-
 .../TestCompile/near_constant.exp.json        |    2 +-
 .../TestCompile/nested_sql.exp.json           |    2 +-
 .../nil_scope_obj_regression.exp.json         |    2 +-
 testdata/d2compiler/TestCompile/null.exp.json |    2 +-
 .../d2compiler/TestCompile/path_link.exp.json |    2 +-
 .../d2compiler/TestCompile/positions.exp.json |    2 +-
 .../reserved_icon_near_style.exp.json         |    2 +-
 .../TestCompile/root_direction.exp.json       |    2 +-
 .../TestCompile/root_sequence.exp.json        |    2 +-
 .../TestCompile/self-referencing.exp.json     |    2 +-
 .../TestCompile/sequence-timestamp.exp.json   |    2 +-
 .../TestCompile/sequence_container.exp.json   |    2 +-
 .../TestCompile/sequence_container_2.exp.json |    2 +-
 .../sequence_grouped_note.exp.json            |    2 +-
 .../TestCompile/sequence_scoping.exp.json     |    2 +-
 .../TestCompile/set_direction.exp.json        |    2 +-
 .../single_dimension_on_circle.exp.json       |    2 +-
 .../TestCompile/sql-regression.exp.json       |    2 +-
 .../d2compiler/TestCompile/sql_paren.exp.json |    2 +-
 .../TestCompile/stroke-width.exp.json         |    2 +-
 .../table_connection_attr.exp.json            |    2 +-
 .../TestCompile/table_style.exp.json          |    2 +-
 .../TestCompile/table_style_map.exp.json      |    2 +-
 .../underscore_connection.exp.json            |    2 +-
 .../TestCompile/underscore_edge.exp.json      |    2 +-
 .../underscore_edge_chain.exp.json            |    2 +-
 .../underscore_edge_existing.exp.json         |    2 +-
 .../underscore_edge_index.exp.json            |    2 +-
 .../underscore_edge_nested.exp.json           |    2 +-
 .../underscore_parent_create.exp.json         |    2 +-
 .../underscore_parent_not_root.exp.json       |    2 +-
 .../underscore_parent_preference_1.exp.json   |    2 +-
 .../underscore_parent_preference_2.exp.json   |    2 +-
 .../underscore_parent_squared.exp.json        |    2 +-
 .../underscore_unresolved_obj.exp.json        |    2 +-
 .../TestCompile/unescaped_id_cr.exp.json      |    2 +-
 .../d2compiler/TestCompile/url_link.exp.json  |    2 +-
 .../TestCompile/wrong_column_index.exp.json   |    2 +-
 .../TestCompile2/boards/isFolderOnly.exp.json | 1688 +++++++++++++++++
 .../TestCompile2/boards/recursive.exp.json    |   10 +-
 .../TestCompile2/boards/root.exp.json         |    6 +-
 .../TestExport/connection/arrowhead.exp.json  |    2 +-
 .../TestExport/connection/basic.exp.json      |    2 +-
 .../connection/stroke-dash.exp.json           |    2 +-
 .../connection/theme_stroke-dash.exp.json     |    2 +-
 .../TestExport/label/basic_shape.exp.json     |    2 +-
 .../label/connection_font_color.exp.json      |    2 +-
 .../label/shape_font_color.exp.json           |    2 +-
 .../TestExport/shape/basic.exp.json           |    2 +-
 .../TestExport/shape/border-radius.exp.json   |    2 +-
 .../shape/image_dimensions.exp.json           |    2 +-
 .../shape/sequence_group_position.exp.json    |    2 +-
 .../TestExport/shape/synonyms.exp.json        |    2 +-
 .../TestExport/shape/text_color.exp.json      |    2 +-
 .../theme/connection_with_bold.exp.json       |    2 +-
 .../theme/connection_with_italic.exp.json     |    2 +-
 .../theme/connection_without_italic.exp.json  |    2 +-
 .../theme/shape_with_italic.exp.json          |    2 +-
 .../theme/shape_without_bold.exp.json         |    2 +-
 testdata/d2oracle/TestCreate/base.exp.json    |    2 +-
 .../d2oracle/TestCreate/container.exp.json    |    2 +-
 .../TestCreate/container_edge.exp.json        |    2 +-
 .../TestCreate/container_edge_label.exp.json  |    2 +-
 testdata/d2oracle/TestCreate/edge.exp.json    |    2 +-
 .../d2oracle/TestCreate/edge_nested.exp.json  |    2 +-
 .../d2oracle/TestCreate/edge_scope.exp.json   |    2 +-
 .../TestCreate/edge_scope_flat.exp.json       |    2 +-
 .../TestCreate/edge_scope_nested.exp.json     |    2 +-
 .../d2oracle/TestCreate/edge_unique.exp.json  |    2 +-
 testdata/d2oracle/TestCreate/gen_key.exp.json |    2 +-
 .../d2oracle/TestCreate/gen_key_n.exp.json    |    2 +-
 .../TestCreate/gen_key_nested.exp.json        |    2 +-
 .../TestCreate/gen_key_scope.exp.json         |    2 +-
 .../TestCreate/gen_key_suffix.exp.json        |    2 +-
 .../TestCreate/make_scope_multiline.exp.json  |    2 +-
 .../make_scope_multiline_spacing_1.exp.json   |    2 +-
 .../make_scope_multiline_spacing_2.exp.json   |    2 +-
 testdata/d2oracle/TestCreate/nested.exp.json  |    2 +-
 testdata/d2oracle/TestCreate/scope.exp.json   |    2 +-
 .../d2oracle/TestDelete/arrowhead.exp.json    |    2 +-
 .../TestDelete/arrowhead_label.exp.json       |    2 +-
 .../TestDelete/arrowhead_map.exp.json         |    2 +-
 .../TestDelete/arrowhead_shape.exp.json       |    2 +-
 .../TestDelete/breakup_arrowhead.exp.json     |    2 +-
 testdata/d2oracle/TestDelete/chaos_1.exp.json |    2 +-
 .../d2oracle/TestDelete/children.exp.json     |    2 +-
 .../TestDelete/children_conflicts.exp.json    |    2 +-
 .../children_edge_conflicts.exp.json          |    2 +-
 .../children_edges_flat_conflicts.exp.json    |    2 +-
 .../children_flat_conflicts.exp.json          |    2 +-
 .../children_multiple_conflicts.exp.json      |    2 +-
 .../children_nested_conflicts.exp.json        |    2 +-
 ...ldren_nested_referenced_conflicts.exp.json |    2 +-
 .../children_no_self_conflict.exp.json        |    2 +-
 .../TestDelete/children_order.exp.json        |    2 +-
 .../children_referenced_conflicts.exp.json    |    2 +-
 .../TestDelete/children_scope.exp.json        |    2 +-
 .../TestDelete/container_near.exp.json        |    2 +-
 .../delete_container_of_near.exp.json         |    2 +-
 .../d2oracle/TestDelete/delete_icon.exp.json  |    2 +-
 .../d2oracle/TestDelete/delete_link.exp.json  |    2 +-
 .../d2oracle/TestDelete/delete_near.exp.json  |    2 +-
 .../delete_needed_flat_near.exp.json          |    2 +-
 .../delete_redundant_flat_near.exp.json       |    2 +-
 .../TestDelete/delete_tooltip.exp.json        |    2 +-
 .../TestDelete/edge-only-style.exp.json       |    2 +-
 .../edge_both_identical_childs.exp.json       |    2 +-
 .../d2oracle/TestDelete/edge_common.exp.json  |    2 +-
 .../TestDelete/edge_common_2.exp.json         |    2 +-
 .../TestDelete/edge_common_3.exp.json         |    2 +-
 .../TestDelete/edge_common_4.exp.json         |    2 +-
 .../TestDelete/edge_conflict.exp.json         |    2 +-
 .../TestDelete/edge_decrement.exp.json        |    2 +-
 .../d2oracle/TestDelete/edge_first.exp.json   |    2 +-
 .../TestDelete/edge_flat_style.exp.json       |    2 +-
 .../TestDelete/edge_identical_child.exp.json  |    2 +-
 .../TestDelete/edge_key_style.exp.json        |    2 +-
 .../d2oracle/TestDelete/edge_last.exp.json    |    2 +-
 .../TestDelete/edge_map_style.exp.json        |    2 +-
 .../d2oracle/TestDelete/edge_middle.exp.json  |    2 +-
 .../d2oracle/TestDelete/empty_map.exp.json    |    2 +-
 testdata/d2oracle/TestDelete/flat.exp.json    |    2 +-
 .../TestDelete/flat_reserved.exp.json         |    2 +-
 .../TestDelete/hoist_children.exp.json        |    2 +-
 .../TestDelete/hoist_edge_children.exp.json   |    2 +-
 .../TestDelete/key_with_edges.exp.json        |    2 +-
 .../TestDelete/key_with_edges_2.exp.json      |    2 +-
 .../TestDelete/key_with_edges_3.exp.json      |    2 +-
 .../TestDelete/key_with_edges_4.exp.json      |    2 +-
 testdata/d2oracle/TestDelete/left.exp.json    |    2 +-
 .../d2oracle/TestDelete/multi_near.exp.json   |    2 +-
 .../multi_path_map_conflict.exp.json          |    2 +-
 .../multi_path_map_no_conflict.exp.json       |    2 +-
 .../multiple_flat_middle_container.exp.json   |    2 +-
 .../TestDelete/multiple_flat_style.exp.json   |    2 +-
 .../TestDelete/multiple_map_styles.exp.json   |    2 +-
 testdata/d2oracle/TestDelete/near.exp.json    |    2 +-
 testdata/d2oracle/TestDelete/nested.exp.json  |    2 +-
 .../d2oracle/TestDelete/nested_2.exp.json     |    2 +-
 .../TestDelete/nested_edge_key_style.exp.json |    2 +-
 .../TestDelete/nested_flat_style.exp.json     |    2 +-
 .../TestDelete/nested_reserved.exp.json       |    2 +-
 .../nested_underscore_update.exp.json         |    2 +-
 .../d2oracle/TestDelete/node_in_edge.exp.json |    2 +-
 .../TestDelete/node_in_edge_last.exp.json     |    2 +-
 .../only-underscore-nested.exp.json           |    2 +-
 .../TestDelete/only-underscore.exp.json       |    2 +-
 .../only_delete_edge_reserved.exp.json        |    2 +-
 .../only_delete_obj_reserved.exp.json         |    2 +-
 testdata/d2oracle/TestDelete/order_1.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_2.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_3.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_4.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_5.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_6.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_7.exp.json |    2 +-
 testdata/d2oracle/TestDelete/order_8.exp.json |    2 +-
 .../d2oracle/TestDelete/shape_class.exp.json  |    2 +-
 .../TestDelete/shape_sql_table.exp.json       |    2 +-
 .../TestDelete/singular_flat_style.exp.json   |    2 +-
 .../TestDelete/singular_map_style.exp.json    |    2 +-
 .../underscore_no_conflict.exp.json           |    2 +-
 .../TestDelete/underscore_remove.exp.json     |    2 +-
 testdata/d2oracle/TestDelete/width.exp.json   |    2 +-
 .../TestMove/append_multiple_styles.exp.json  |    2 +-
 testdata/d2oracle/TestMove/basic.exp.json     |    2 +-
 .../d2oracle/TestMove/basic_nested.exp.json   |    2 +-
 .../TestMove/basic_out_of_container.exp.json  |    2 +-
 .../TestMove/between_containers.exp.json      |    2 +-
 .../TestMove/chain_connected_nested.exp.json  |    2 +-
 ..._connected_nested_no_extra_create.exp.json |    2 +-
 .../TestMove/connected_nested.exp.json        |    2 +-
 ...ner_multiple_refs_with_underscore.exp.json |    2 +-
 .../d2oracle/TestMove/container_near.exp.json |    2 +-
 .../TestMove/edge_across_containers.exp.json  |    2 +-
 .../d2oracle/TestMove/edge_basic.exp.json     |    2 +-
 .../TestMove/edge_chain_basic.exp.json        |    2 +-
 .../TestMove/edge_chain_circular.exp.json     |    2 +-
 .../edge_chain_into_container.exp.json        |    2 +-
 .../edge_chain_out_container.exp.json         |    2 +-
 .../d2oracle/TestMove/edge_conflict.exp.json  |    2 +-
 .../TestMove/edge_into_container.exp.json     |    2 +-
 .../TestMove/edge_nested_basic.exp.json       |    2 +-
 .../TestMove/edge_out_of_container.exp.json   |    2 +-
 .../d2oracle/TestMove/extend_map.exp.json     |    2 +-
 .../TestMove/extend_stationary_path.exp.json  |    2 +-
 .../TestMove/flat_between_containers.exp.json |    2 +-
 .../d2oracle/TestMove/flat_merge.exp.json     |    2 +-
 .../TestMove/flat_middle_container.exp.json   |    2 +-
 .../TestMove/flat_nested_merge.exp.json       |    2 +-
 .../flat_nested_merge_multiple_refs.exp.json  |    2 +-
 .../flat_reparent_with_map_value.exp.json     |    2 +-
 ...lat_reparent_with_mixed_map_value.exp.json |    2 +-
 .../flat_reparent_with_value.exp.json         |    2 +-
 .../d2oracle/TestMove/flat_style.exp.json     |    2 +-
 .../TestMove/full_edge_slice.exp.json         |    2 +-
 .../d2oracle/TestMove/full_slice.exp.json     |    2 +-
 testdata/d2oracle/TestMove/gnarly_1.exp.json  |    2 +-
 .../hoist_container_children.exp.json         |    2 +-
 .../into_container_existing_map.exp.json      |    2 +-
 .../into_container_nonexisting_map.exp.json   |    2 +-
 .../into_container_with_flat_keys.exp.json    |    2 +-
 .../into_container_with_flat_style.exp.json   |    2 +-
 .../d2oracle/TestMove/map_transplant.exp.json |    2 +-
 .../d2oracle/TestMove/map_with_label.exp.json |    2 +-
 .../TestMove/merge_nested_maps.exp.json       |    2 +-
 .../d2oracle/TestMove/merge_reserved.exp.json |    2 +-
 .../TestMove/middle_container.exp.json        |    2 +-
 .../TestMove/move_container_children.exp.json |    2 +-
 .../move_container_conflict_children.exp.json |    2 +-
 .../move_into_key_with_value.exp.json         |    2 +-
 .../TestMove/move_out_of_edge.exp.json        |    2 +-
 .../TestMove/move_out_of_nested_edge.exp.json |    2 +-
 .../TestMove/multiple_nesting_levels.exp.json |    2 +-
 testdata/d2oracle/TestMove/near.exp.json      |    2 +-
 .../nested-underscore-move-out.exp.json       |    2 +-
 .../d2oracle/TestMove/nhooyr_one.exp.json     |    2 +-
 .../d2oracle/TestMove/nhooyr_two.exp.json     |    2 +-
 .../out_of_newline_container.exp.json         |    2 +-
 .../d2oracle/TestMove/parentheses.exp.json    |    2 +-
 .../TestMove/partial_edge_slice.exp.json      |    2 +-
 .../d2oracle/TestMove/partial_slice.exp.json  |    2 +-
 testdata/d2oracle/TestMove/rename_2.exp.json  |    2 +-
 testdata/d2oracle/TestMove/reuse_map.exp.json |    2 +-
 .../d2oracle/TestMove/slice_style.exp.json    |    2 +-
 .../TestMove/underscore-connection.exp.json   |    2 +-
 .../TestMove/underscore_children.exp.json     |    2 +-
 .../underscore_edge_children.exp.json         |    2 +-
 .../underscore_edge_container_1.exp.json      |    2 +-
 .../underscore_edge_container_2.exp.json      |    2 +-
 .../underscore_edge_container_3.exp.json      |    2 +-
 .../underscore_edge_container_4.exp.json      |    2 +-
 .../underscore_edge_container_5.exp.json      |    2 +-
 .../TestMove/underscore_edge_split.exp.json   |    2 +-
 .../TestMove/underscore_merge.exp.json        |    2 +-
 .../TestMove/underscore_split.exp.json        |    2 +-
 .../TestMove/underscore_split_out.exp.json    |    2 +-
 .../TestMove/underscore_transplant.exp.json   |    2 +-
 .../d2oracle/TestMove/unique_name.exp.json    |    2 +-
 .../unique_name_with_references.exp.json      |    2 +-
 testdata/d2oracle/TestRename/arrows.exp.json  |    2 +-
 .../d2oracle/TestRename/arrows_chain.exp.json |    2 +-
 .../TestRename/arrows_complex.exp.json        |    2 +-
 .../TestRename/arrows_trim_common.exp.json    |    2 +-
 .../TestRename/arrows_trim_common_2.exp.json  |    2 +-
 .../TestRename/complex_edge_1.exp.json        |    2 +-
 .../TestRename/complex_edge_2.exp.json        |    2 +-
 .../d2oracle/TestRename/conflict.exp.json     |    2 +-
 .../d2oracle/TestRename/conflict_2.exp.json   |    2 +-
 .../TestRename/conflict_with_dots.exp.json    |    2 +-
 .../d2oracle/TestRename/container.exp.json    |    2 +-
 testdata/d2oracle/TestRename/edges.exp.json   |    2 +-
 testdata/d2oracle/TestRename/flat.exp.json    |    2 +-
 .../d2oracle/TestRename/generated.exp.json    |    2 +-
 testdata/d2oracle/TestRename/near.exp.json    |    2 +-
 testdata/d2oracle/TestRename/nested.exp.json  |    2 +-
 testdata/d2oracle/TestSet/base.exp.json       |    2 +-
 .../TestSet/block_string_multiline.exp.json   |    2 +-
 .../TestSet/block_string_oneline.exp.json     |    2 +-
 testdata/d2oracle/TestSet/edge.exp.json       |    2 +-
 .../TestSet/edge_append_style.exp.json        |    2 +-
 testdata/d2oracle/TestSet/edge_chain.exp.json |    2 +-
 .../TestSet/edge_chain_append_style.exp.json  |    2 +-
 .../edge_chain_existing_style.exp.json        |    2 +-
 .../TestSet/edge_chain_nested_set.exp.json    |    2 +-
 .../edge_flat_merge_arrowhead.exp.json        |    2 +-
 .../d2oracle/TestSet/edge_index_case.exp.json |    2 +-
 .../TestSet/edge_index_merge_style.exp.json   |    2 +-
 .../TestSet/edge_index_nested.exp.json        |    2 +-
 .../TestSet/edge_key_and_key.exp.json         |    2 +-
 testdata/d2oracle/TestSet/edge_label.exp.json |    2 +-
 .../TestSet/edge_merge_arrowhead.exp.json     |    2 +-
 .../TestSet/edge_merge_style.exp.json         |    2 +-
 .../TestSet/edge_nested_label_set.exp.json    |    2 +-
 .../TestSet/edge_nested_style_set.exp.json    |    2 +-
 .../TestSet/edge_replace_arrowhead.exp.json   |    2 +-
 .../edge_replace_arrowhead_indexed.exp.json   |    2 +-
 .../TestSet/edge_set_arrowhead.exp.json       |    2 +-
 .../TestSet/expanded_map_style.exp.json       |    2 +-
 testdata/d2oracle/TestSet/icon.exp.json       |    2 +-
 .../d2oracle/TestSet/inline_style.exp.json    |    2 +-
 testdata/d2oracle/TestSet/label.exp.json      |    2 +-
 .../d2oracle/TestSet/label_primary.exp.json   |    2 +-
 .../d2oracle/TestSet/label_replace.exp.json   |    2 +-
 .../d2oracle/TestSet/label_unset.exp.json     |    2 +-
 .../d2oracle/TestSet/map_key_missing.exp.json |    2 +-
 .../d2oracle/TestSet/nested_alex.exp.json     |    2 +-
 testdata/d2oracle/TestSet/new_style.exp.json  |    2 +-
 .../TestSet/replace_arrowhead.exp.json        |    2 +-
 .../TestSet/replace_arrowhead_map.exp.json    |    2 +-
 .../TestSet/replace_dimensions.exp.json       |    2 +-
 .../TestSet/replace_edge_style.exp.json       |    2 +-
 .../TestSet/replace_edge_style_map.exp.json   |    2 +-
 .../d2oracle/TestSet/replace_link.exp.json    |    2 +-
 .../TestSet/replace_position.exp.json         |    2 +-
 .../d2oracle/TestSet/replace_shape.exp.json   |    2 +-
 .../d2oracle/TestSet/replace_style.exp.json   |    2 +-
 .../TestSet/replace_style_edgecase.exp.json   |    2 +-
 .../d2oracle/TestSet/replace_tooltip.exp.json |    2 +-
 .../d2oracle/TestSet/set_dimensions.exp.json  |    2 +-
 .../d2oracle/TestSet/set_position.exp.json    |    2 +-
 .../d2oracle/TestSet/set_tooltip.exp.json     |    2 +-
 testdata/d2oracle/TestSet/shape.exp.json      |    2 +-
 .../TestSet/shape_nested_style_set.exp.json   |    2 +-
 641 files changed, 2361 insertions(+), 673 deletions(-)
 create mode 100644 testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json

diff --git a/ci/sub b/ci/sub
index 512bad5a9..cb8a9993d 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit 512bad5a958c5e33ba9b3e89dfac1bfd6002f98c
+Subproject commit cb8a9993d7e1d91815650c5baade7658622189b9
diff --git a/d2compiler/compile.go b/d2compiler/compile.go
index 173d00cd7..327b25e15 100644
--- a/d2compiler/compile.go
+++ b/d2compiler/compile.go
@@ -73,7 +73,7 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph {
 	c.compileBoardsField(g, ir, "steps")
 	if d2ir.ParentMap(ir).CopyBase(nil).Equal(ir.CopyBase(nil)) {
 		if len(g.Layers) > 0 || len(g.Scenarios) > 0 || len(g.Steps) > 0 {
-			g.IsContainerOnly = true
+			g.IsFolderOnly = true
 		}
 	}
 	return g
diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
index 4b3ecd99a..c6219d291 100644
--- a/d2compiler/compile_test.go
+++ b/d2compiler/compile_test.go
@@ -2133,7 +2133,7 @@ layers: {
 			},
 		},
 		{
-			name: "isContainerOnly",
+			name: "isFolderOnly",
 			run: func(t *testing.T) {
 				g := assertCompile(t, `
 layers: {
@@ -2154,13 +2154,13 @@ layers: {
   }
 }
 `, "")
-				assert.True(t, g.IsContainerOnly)
+				assert.True(t, g.IsFolderOnly)
 				assert.Equal(t, 2, len(g.Layers))
 				assert.Equal(t, "one", g.Layers[0].Name)
 				assert.Equal(t, "two", g.Layers[1].Name)
 				assert.Equal(t, 2, len(g.Layers[1].Scenarios))
-				assert.False(t, g.Layers[1].Scenarios[0].IsContainerOnly)
-				assert.False(t, g.Layers[1].Scenarios[1].IsContainerOnly)
+				assert.False(t, g.Layers[1].Scenarios[0].IsFolderOnly)
+				assert.False(t, g.Layers[1].Scenarios[1].IsFolderOnly)
 			},
 		},
 		{
diff --git a/d2exporter/export.go b/d2exporter/export.go
index a7ce23fce..1331becaa 100644
--- a/d2exporter/export.go
+++ b/d2exporter/export.go
@@ -16,7 +16,7 @@ func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamil
 	diagram := d2target.NewDiagram()
 	applyStyles(&diagram.Root, g.Root)
 	diagram.Name = g.Name
-	diagram.IsContainerOnly = g.IsContainerOnly
+	diagram.IsFolderOnly = g.IsFolderOnly
 	if fontFamily == nil {
 		fontFamily = go2.Pointer(d2fonts.SourceSansPro)
 	}
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
index 52c421b7b..265f81c1b 100644
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@@ -29,11 +29,11 @@ const MIN_SHAPE_SIZE = 5
 
 type Graph struct {
 	Name string `json:"name"`
-	// IsContainerOnly indicates a board or scenario itself makes no modifications from its
-	// base. Container only boards do not have a render and are used purely for organizing
+	// IsFolderOnly indicates a board or scenario itself makes no modifications from its
+	// base. Folder only boards do not have a render and are used purely for organizing
 	// the board tree.
-	IsContainerOnly bool       `json:"isContainerOnly"`
-	AST             *d2ast.Map `json:"ast"`
+	IsFolderOnly bool       `json:"isFolderOnly"`
+	AST          *d2ast.Map `json:"ast"`
 
 	Root    *Object   `json:"root"`
 	Edges   []*Edge   `json:"edges"`
diff --git a/d2target/d2target.go b/d2target/d2target.go
index 6eba661f0..c6da41188 100644
--- a/d2target/d2target.go
+++ b/d2target/d2target.go
@@ -36,9 +36,9 @@ var BorderOffset = geo.NewVector(5, 5)
 type Diagram struct {
 	Name string `json:"name"`
 	// See docs on the same field in d2graph to understand what it means.
-	IsContainerOnly bool                `json:"isContainerOnly"`
-	Description     string              `json:"description,omitempty"`
-	FontFamily      *d2fonts.FontFamily `json:"fontFamily,omitempty"`
+	IsFolderOnly bool                `json:"isFolderOnly"`
+	Description  string              `json:"description,omitempty"`
+	FontFamily   *d2fonts.FontFamily `json:"fontFamily,omitempty"`
 
 	Shapes      []Shape      `json:"shapes"`
 	Connections []Connection `json:"connections"`
diff --git a/e2etests/testdata/measured/empty-class/dagre/board.exp.json b/e2etests/testdata/measured/empty-class/dagre/board.exp.json
index cb2781305..67c4dd5ba 100644
--- a/e2etests/testdata/measured/empty-class/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-class/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
index 5c8c34350..48e996553 100644
--- a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f512ef98f..3256c8a67 100644
--- a/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json
+++ b/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
index b47ff1d08..924c38e6b 100644
--- a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
+++ b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
index c143e5ffd..29afa3817 100644
--- a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
+++ b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json b/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
index f8d4cccfc..9b30621d8 100644
--- a/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
+++ b/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json b/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
index f8d4cccfc..9b30621d8 100644
--- a/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
+++ b/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d00ea4070..36e468eb3 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b137b1e09..4bec6de83 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
index a0f386314..2c1b77e75 100644
--- a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
index 714fbb3eb..e7eba3441 100644
--- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a289cfe9e..2e5592c32 100644
--- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ec7e09e12..41d252cb9 100644
--- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d3dea45b9..2b2a1697e 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 54c2a971e..215213dfc 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 185991a74..7cf19c6e1 100644
--- a/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json
+++ b/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 50316bc1b..36792e8dd 100644
--- a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json
+++ b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
index 8d0b61205..925cf901d 100644
--- a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
index f383b25dc..0a2eefdf2 100644
--- a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 24a1c9c8a..2e43d66d2 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 46ee6e7b9..e6f2b5f72 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 292a5655e..06cca3d68 100644
--- a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 92f067c11..595140976 100644
--- a/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_order/dagre/board.exp.json b/e2etests/testdata/regression/elk_order/dagre/board.exp.json
index 5fa79d666..e8974ba03 100644
--- a/e2etests/testdata/regression/elk_order/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_order/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/elk_order/elk/board.exp.json b/e2etests/testdata/regression/elk_order/elk/board.exp.json
index 42bdc6ca8..df15e9048 100644
--- a/e2etests/testdata/regression/elk_order/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_order/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
index 0d1a65a20..d04a989ef 100644
--- a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
+++ b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
index fdb9ac7f7..5ada06396 100644
--- a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
+++ b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
index c20232f14..6db27a5d3 100644
--- a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
+++ b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
index fa989de68..bf5a89c1b 100644
--- a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
+++ b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/hex-fill/dagre/board.exp.json b/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
index 99c7059ff..1fe3a5425 100644
--- a/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
+++ b/e2etests/testdata/regression/hex-fill/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/hex-fill/elk/board.exp.json b/e2etests/testdata/regression/hex-fill/elk/board.exp.json
index 7c6111115..a94ec7569 100644
--- a/e2etests/testdata/regression/hex-fill/elk/board.exp.json
+++ b/e2etests/testdata/regression/hex-fill/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/just-width/dagre/board.exp.json b/e2etests/testdata/regression/just-width/dagre/board.exp.json
index 9f073c283..c1f63d1f6 100644
--- a/e2etests/testdata/regression/just-width/dagre/board.exp.json
+++ b/e2etests/testdata/regression/just-width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/just-width/elk/board.exp.json b/e2etests/testdata/regression/just-width/elk/board.exp.json
index 2bfaf491f..f88d632ff 100644
--- a/e2etests/testdata/regression/just-width/elk/board.exp.json
+++ b/e2etests/testdata/regression/just-width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2aa4ab6a6..74401fd85 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9ddf78606..8877c65b0 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
index 7fc22cdf1..bab45b2b0 100644
--- a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
+++ b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/nested_steps/elk/board.exp.json b/e2etests/testdata/regression/nested_steps/elk/board.exp.json
index 554126bc5..eb5128fce 100644
--- a/e2etests/testdata/regression/nested_steps/elk/board.exp.json
+++ b/e2etests/testdata/regression/nested_steps/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
index d81c14a2b..c03fe0f4a 100644
--- a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
+++ b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/no-lexer/elk/board.exp.json b/e2etests/testdata/regression/no-lexer/elk/board.exp.json
index 80233747d..ac6d3eca9 100644
--- a/e2etests/testdata/regression/no-lexer/elk/board.exp.json
+++ b/e2etests/testdata/regression/no-lexer/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 725580288..9ebf89fe8 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 4a370f615..348867b15 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f736ed1bc..4de6ce7c5 100644
--- a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json
+++ b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 4804c1e28..22f9123b3 100644
--- a/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json
+++ b/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 cc8324c07..9f8dc2406 100644
--- a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
+++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 8abf29e1d..92cb93789 100644
--- a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json
+++ b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f90f924fe..0db2c643d 100644
--- a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
+++ b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 eef642d86..6b51ba38b 100644
--- a/e2etests/testdata/regression/query_param_escape/elk/board.exp.json
+++ b/e2etests/testdata/regression/query_param_escape/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json b/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
index 5391890d1..5bfc2f3c0 100644
--- a/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json b/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
index 5391890d1..5bfc2f3c0 100644
--- a/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 46638cfe8..9615e8257 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 eb2f20539..9d0c9d9e2 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 970d8f7c7..16e61c9be 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 970d8f7c7..16e61c9be 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
index e39227c07..5bfa152c8 100644
--- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
index e39227c07..5bfa152c8 100644
--- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
+++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c184900a0..b29e1bd24 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c184900a0..b29e1bd24 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9e7056764..4433d76ae 100644
--- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d2df0ec30..b68be23ec 100644
--- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
+++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json
index a74e5dff7..51f4bbd31 100644
--- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json
+++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/regression/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json
index 652fca077..57ae7dcff 100644
--- a/e2etests/testdata/regression/unconnected/elk/board.exp.json
+++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7cc295125..4cfa235db 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d933e697d..156f8238b 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/border-radius/dagre/board.exp.json b/e2etests/testdata/root/border-radius/dagre/board.exp.json
index 19ab2e5a3..4bba6b7bc 100644
--- a/e2etests/testdata/root/border-radius/dagre/board.exp.json
+++ b/e2etests/testdata/root/border-radius/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/border-radius/elk/board.exp.json b/e2etests/testdata/root/border-radius/elk/board.exp.json
index 6e101c4dd..2a2fc1682 100644
--- a/e2etests/testdata/root/border-radius/elk/board.exp.json
+++ b/e2etests/testdata/root/border-radius/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/double-border/dagre/board.exp.json b/e2etests/testdata/root/double-border/dagre/board.exp.json
index 22ee9c689..80804eadf 100644
--- a/e2etests/testdata/root/double-border/dagre/board.exp.json
+++ b/e2etests/testdata/root/double-border/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/double-border/elk/board.exp.json b/e2etests/testdata/root/double-border/elk/board.exp.json
index 3054a6d31..08fa999af 100644
--- a/e2etests/testdata/root/double-border/elk/board.exp.json
+++ b/e2etests/testdata/root/double-border/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json b/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
index ca7abbe04..7a7a01118 100644
--- a/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/even-stroke-width/elk/board.exp.json b/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
index 048a0c4e4..583b74f73 100644
--- a/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
+++ b/e2etests/testdata/root/even-stroke-width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/fill/dagre/board.exp.json b/e2etests/testdata/root/fill/dagre/board.exp.json
index 23b22678b..44cd107d1 100644
--- a/e2etests/testdata/root/fill/dagre/board.exp.json
+++ b/e2etests/testdata/root/fill/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/fill/elk/board.exp.json b/e2etests/testdata/root/fill/elk/board.exp.json
index dde80fb0e..48e3ae135 100644
--- a/e2etests/testdata/root/fill/elk/board.exp.json
+++ b/e2etests/testdata/root/fill/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-dash/dagre/board.exp.json b/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
index e264fc4ea..fd07f6936 100644
--- a/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-dash/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-dash/elk/board.exp.json b/e2etests/testdata/root/stroke-dash/elk/board.exp.json
index 6788ce9ca..e6c052fe9 100644
--- a/e2etests/testdata/root/stroke-dash/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-dash/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json b/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
index ce1001ec5..41f071142 100644
--- a/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-no-width/elk/board.exp.json b/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
index 8ebb89389..0c4a9976d 100644
--- a/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-no-width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-width/dagre/board.exp.json b/e2etests/testdata/root/stroke-width/dagre/board.exp.json
index fe28a3b7e..b2c8eb28a 100644
--- a/e2etests/testdata/root/stroke-width/dagre/board.exp.json
+++ b/e2etests/testdata/root/stroke-width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/root/stroke-width/elk/board.exp.json b/e2etests/testdata/root/stroke-width/elk/board.exp.json
index 6a1008563..38bddec05 100644
--- a/e2etests/testdata/root/stroke-width/elk/board.exp.json
+++ b/e2etests/testdata/root/stroke-width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 011b7fea0..f08fa3e95 100644
--- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 dd67da689..0b49683b9 100644
--- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json
+++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/basic/dagre/board.exp.json b/e2etests/testdata/sanity/basic/dagre/board.exp.json
index 1b188fefd..a1299ac07 100644
--- a/e2etests/testdata/sanity/basic/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/basic/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/basic/elk/board.exp.json b/e2etests/testdata/sanity/basic/elk/board.exp.json
index 52119de7f..482bd4139 100644
--- a/e2etests/testdata/sanity/basic/elk/board.exp.json
+++ b/e2etests/testdata/sanity/basic/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b59b01a40..b86725323 100644
--- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d67b52d0e..f31484ee5 100644
--- a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json
+++ b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
index 35b780827..b4d90a3d0 100644
--- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json
index c64cfb0b6..0cf4d4fe2 100644
--- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json
+++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/sanity/empty/dagre/board.exp.json b/e2etests/testdata/sanity/empty/dagre/board.exp.json
index caf899c0c..193d4edf8 100644
--- a/e2etests/testdata/sanity/empty/dagre/board.exp.json
+++ b/e2etests/testdata/sanity/empty/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [],
   "connections": [],
diff --git a/e2etests/testdata/sanity/empty/elk/board.exp.json b/e2etests/testdata/sanity/empty/elk/board.exp.json
index caf899c0c..193d4edf8 100644
--- a/e2etests/testdata/sanity/empty/elk/board.exp.json
+++ b/e2etests/testdata/sanity/empty/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [],
   "connections": [],
diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
index 0388fd0e5..7270e231b 100644
--- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
+++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
index f70edb6ed..3ae4f1604 100644
--- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
+++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
index 2a1ca64a3..51b303a98 100644
--- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json
index 7424a2c36..9df2c0769 100644
--- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7c2cc3a59..669ccf455 100644
--- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 9a59a5058..90a00f558 100644
--- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 af36b3cda..3bb1ceff6 100644
--- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 891f92ee6..0270faad5 100644
--- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/animated/dagre/board.exp.json b/e2etests/testdata/stable/animated/dagre/board.exp.json
index 38519d78a..d2cd2eefd 100644
--- a/e2etests/testdata/stable/animated/dagre/board.exp.json
+++ b/e2etests/testdata/stable/animated/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/animated/elk/board.exp.json b/e2etests/testdata/stable/animated/elk/board.exp.json
index 55a137df3..88406331f 100644
--- a/e2etests/testdata/stable/animated/elk/board.exp.json
+++ b/e2etests/testdata/stable/animated/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
index 94318c05c..50cd654ad 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
index 522e32421..4c8a33584 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
index dad6870a8..b9a1994f4 100644
--- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
index d026b1e97..79b8d43d6 100644
--- a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
index 858b97d4c..920ca1a59 100644
--- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
+++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json
index 10777e4b8..c1978039c 100644
--- a/e2etests/testdata/stable/binary_tree/elk/board.exp.json
+++ b/e2etests/testdata/stable/binary_tree/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/border-radius/dagre/board.exp.json b/e2etests/testdata/stable/border-radius/dagre/board.exp.json
index 7ac374f8c..f7c5e20e4 100644
--- a/e2etests/testdata/stable/border-radius/dagre/board.exp.json
+++ b/e2etests/testdata/stable/border-radius/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/border-radius/elk/board.exp.json b/e2etests/testdata/stable/border-radius/elk/board.exp.json
index b2faaa582..df86d116d 100644
--- a/e2etests/testdata/stable/border-radius/elk/board.exp.json
+++ b/e2etests/testdata/stable/border-radius/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
index 54d3c6b89..3e844a2de 100644
--- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json
index 3b4d64f23..b72e6c020 100644
--- a/e2etests/testdata/stable/chaos2/elk/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
index 0b531e6a7..33aff78c9 100644
--- a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
index ceee45ec9..08e5fe2d4 100644
--- a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
index 81dc40b4a..e2dfa0277 100644
--- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
+++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
index 97f34f1ef..702e5e4c4 100644
--- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
+++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/class/dagre/board.exp.json b/e2etests/testdata/stable/class/dagre/board.exp.json
index 782a635e6..4d73de526 100644
--- a/e2etests/testdata/stable/class/dagre/board.exp.json
+++ b/e2etests/testdata/stable/class/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json
index 0c778c913..89bf9f16d 100644
--- a/e2etests/testdata/stable/class/elk/board.exp.json
+++ b/e2etests/testdata/stable/class/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
index bbf491464..c8cd6bfeb 100644
--- a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
+++ b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json
index 0cee2c6d5..79bf134b3 100644
--- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json
+++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
index 71256ab41..57ee81f3c 100644
--- a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
+++ b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -171,7 +171,7 @@
   "layers": [
     {
       "name": "window",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -301,7 +301,7 @@
     },
     {
       "name": "roof",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -472,7 +472,7 @@
     },
     {
       "name": "garage",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -602,7 +602,7 @@
     },
     {
       "name": "repair",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [],
       "connections": [],
@@ -649,7 +649,7 @@
       "steps": [
         {
           "name": "1",
-          "isContainerOnly": false,
+          "isFolderOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -820,7 +820,7 @@
         },
         {
           "name": "2",
-          "isContainerOnly": false,
+          "isFolderOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -999,7 +999,7 @@
         },
         {
           "name": "3",
-          "isContainerOnly": false,
+          "isFolderOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1178,7 +1178,7 @@
         },
         {
           "name": "4",
-          "isContainerOnly": false,
+          "isFolderOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1361,7 +1361,7 @@
   "scenarios": [
     {
       "name": "storm",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
diff --git a/e2etests/testdata/stable/complex-layers/elk/board.exp.json b/e2etests/testdata/stable/complex-layers/elk/board.exp.json
index ba3804755..8a4ec64fa 100644
--- a/e2etests/testdata/stable/complex-layers/elk/board.exp.json
+++ b/e2etests/testdata/stable/complex-layers/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -171,7 +171,7 @@
   "layers": [
     {
       "name": "window",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -301,7 +301,7 @@
     },
     {
       "name": "roof",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -472,7 +472,7 @@
     },
     {
       "name": "garage",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
@@ -602,7 +602,7 @@
     },
     {
       "name": "repair",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [],
       "connections": [],
@@ -649,7 +649,7 @@
       "steps": [
         {
           "name": "1",
-          "isContainerOnly": false,
+          "isFolderOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -820,7 +820,7 @@
         },
         {
           "name": "2",
-          "isContainerOnly": false,
+          "isFolderOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -990,7 +990,7 @@
         },
         {
           "name": "3",
-          "isContainerOnly": false,
+          "isFolderOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1160,7 +1160,7 @@
         },
         {
           "name": "4",
-          "isContainerOnly": false,
+          "isFolderOnly": false,
           "fontFamily": "SourceSansPro",
           "shapes": [
             {
@@ -1334,7 +1334,7 @@
   "scenarios": [
     {
       "name": "storm",
-      "isContainerOnly": false,
+      "isFolderOnly": false,
       "fontFamily": "SourceSansPro",
       "shapes": [
         {
diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json
index 0f4d37be2..9ccef1f15 100644
--- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json
+++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json
index 4436d9626..4c6ff4306 100644
--- a/e2etests/testdata/stable/connected_container/elk/board.exp.json
+++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 8fcd066b9..792fffecd 100644
--- a/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2983796c9..072d00ebd 100644
--- a/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ac0a8f1a3..62f6e321b 100644
--- a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7c10f48bb..025b5c864 100644
--- a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json
+++ b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json
index d1ccaafe3..1b6f09eb7 100644
--- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json
+++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json
index 04d3c2911..571d8379d 100644
--- a/e2etests/testdata/stable/container_edges/elk/board.exp.json
+++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 0aeaccf18..edbf00697 100644
--- a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json
+++ b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 419ca4880..2e192dddf 100644
--- a/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json
+++ b/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json
index b252c7bbf..9788489df 100644
--- a/e2etests/testdata/stable/dense/dagre/board.exp.json
+++ b/e2etests/testdata/stable/dense/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json
index b864b2b41..dbb29fc1a 100644
--- a/e2etests/testdata/stable/dense/elk/board.exp.json
+++ b/e2etests/testdata/stable/dense/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
index 27a82d454..150e9e65a 100644
--- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
+++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
index 98a76029e..690ffc90d 100644
--- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
+++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json
index 9f9ebb213..e146416bc 100644
--- a/e2etests/testdata/stable/direction/dagre/board.exp.json
+++ b/e2etests/testdata/stable/direction/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/direction/elk/board.exp.json b/e2etests/testdata/stable/direction/elk/board.exp.json
index a65cd9ee7..a674c7799 100644
--- a/e2etests/testdata/stable/direction/elk/board.exp.json
+++ b/e2etests/testdata/stable/direction/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json
index f2ddc59dd..05e580e9a 100644
--- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json
index 7d71b0f00..fb7093c3c 100644
--- a/e2etests/testdata/stable/font_colors/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_colors/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
index 26973ed9a..e2e910ff7 100644
--- a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json
index 074b8797b..d6704f0d9 100644
--- a/e2etests/testdata/stable/font_sizes/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
index 0df7462fb..ddc9702b0 100644
--- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
index e3659d2b6..a05e2b636 100644
--- a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
+++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 28b794f41..b5002dcc6 100644
--- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json
+++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 bd40f0d73..bdd18a5bf 100644
--- a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json
+++ b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
index a81740662..2cfd1d39c 100644
--- a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json b/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
index 83eee01ff..65fdd2259 100644
--- a/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hr/dagre/board.exp.json b/e2etests/testdata/stable/hr/dagre/board.exp.json
index c361d781d..7b476daed 100644
--- a/e2etests/testdata/stable/hr/dagre/board.exp.json
+++ b/e2etests/testdata/stable/hr/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json
index ace715776..338711602 100644
--- a/e2etests/testdata/stable/hr/elk/board.exp.json
+++ b/e2etests/testdata/stable/hr/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
index e1576c041..3de2c9eee 100644
--- a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
+++ b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-containers/elk/board.exp.json b/e2etests/testdata/stable/icon-containers/elk/board.exp.json
index 90bf71f03..f4ef06ec5 100644
--- a/e2etests/testdata/stable/icon-containers/elk/board.exp.json
+++ b/e2etests/testdata/stable/icon-containers/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-label/dagre/board.exp.json b/e2etests/testdata/stable/icon-label/dagre/board.exp.json
index 15c123dd6..6ea814e0d 100644
--- a/e2etests/testdata/stable/icon-label/dagre/board.exp.json
+++ b/e2etests/testdata/stable/icon-label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/icon-label/elk/board.exp.json b/e2etests/testdata/stable/icon-label/elk/board.exp.json
index 76f431ae2..8b1e09778 100644
--- a/e2etests/testdata/stable/icon-label/elk/board.exp.json
+++ b/e2etests/testdata/stable/icon-label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json
index 3e79966ae..6dcb23eb0 100644
--- a/e2etests/testdata/stable/images/dagre/board.exp.json
+++ b/e2etests/testdata/stable/images/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/images/elk/board.exp.json b/e2etests/testdata/stable/images/elk/board.exp.json
index 04a6a05a7..e75307d8c 100644
--- a/e2etests/testdata/stable/images/elk/board.exp.json
+++ b/e2etests/testdata/stable/images/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json
index 33d0f4cb2..a83812892 100644
--- a/e2etests/testdata/stable/investigate/dagre/board.exp.json
+++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json
index f71b4bd37..086c60b2b 100644
--- a/e2etests/testdata/stable/investigate/elk/board.exp.json
+++ b/e2etests/testdata/stable/investigate/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json
index e98fc7282..914f7401e 100644
--- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json
+++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json
index 80236abd4..2e53e9ed6 100644
--- a/e2etests/testdata/stable/large_arch/elk/board.exp.json
+++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json
index 8204f8ba0..2f558e93f 100644
--- a/e2etests/testdata/stable/latex/dagre/board.exp.json
+++ b/e2etests/testdata/stable/latex/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json
index d5c87a5e4..909a468a0 100644
--- a/e2etests/testdata/stable/latex/elk/board.exp.json
+++ b/e2etests/testdata/stable/latex/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li1/dagre/board.exp.json b/e2etests/testdata/stable/li1/dagre/board.exp.json
index 3d8e214cb..ab6edb592 100644
--- a/e2etests/testdata/stable/li1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li1/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li1/elk/board.exp.json b/e2etests/testdata/stable/li1/elk/board.exp.json
index fff471f52..ae755184e 100644
--- a/e2etests/testdata/stable/li1/elk/board.exp.json
+++ b/e2etests/testdata/stable/li1/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li2/dagre/board.exp.json b/e2etests/testdata/stable/li2/dagre/board.exp.json
index 878993d29..764b301fa 100644
--- a/e2etests/testdata/stable/li2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li2/elk/board.exp.json b/e2etests/testdata/stable/li2/elk/board.exp.json
index 36a423d46..fbe408026 100644
--- a/e2etests/testdata/stable/li2/elk/board.exp.json
+++ b/e2etests/testdata/stable/li2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li3/dagre/board.exp.json b/e2etests/testdata/stable/li3/dagre/board.exp.json
index c186b53ab..96a377650 100644
--- a/e2etests/testdata/stable/li3/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li3/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li3/elk/board.exp.json b/e2etests/testdata/stable/li3/elk/board.exp.json
index edb396a34..c70ddf187 100644
--- a/e2etests/testdata/stable/li3/elk/board.exp.json
+++ b/e2etests/testdata/stable/li3/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li4/dagre/board.exp.json b/e2etests/testdata/stable/li4/dagre/board.exp.json
index bd1f685f0..92de914d3 100644
--- a/e2etests/testdata/stable/li4/dagre/board.exp.json
+++ b/e2etests/testdata/stable/li4/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/li4/elk/board.exp.json b/e2etests/testdata/stable/li4/elk/board.exp.json
index cc54d0dfb..a28215e57 100644
--- a/e2etests/testdata/stable/li4/elk/board.exp.json
+++ b/e2etests/testdata/stable/li4/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/links/dagre/board.exp.json b/e2etests/testdata/stable/links/dagre/board.exp.json
index 81d02a094..2feeb7e70 100644
--- a/e2etests/testdata/stable/links/dagre/board.exp.json
+++ b/e2etests/testdata/stable/links/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/links/elk/board.exp.json b/e2etests/testdata/stable/links/elk/board.exp.json
index 9e42cda4e..09de704df 100644
--- a/e2etests/testdata/stable/links/elk/board.exp.json
+++ b/e2etests/testdata/stable/links/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
index 438529dc2..8a8205bfe 100644
--- a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/lone_h1/elk/board.exp.json b/e2etests/testdata/stable/lone_h1/elk/board.exp.json
index edf87b100..d70d0bb14 100644
--- a/e2etests/testdata/stable/lone_h1/elk/board.exp.json
+++ b/e2etests/testdata/stable/lone_h1/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/markdown/dagre/board.exp.json b/e2etests/testdata/stable/markdown/dagre/board.exp.json
index ddca5b91b..30387d872 100644
--- a/e2etests/testdata/stable/markdown/dagre/board.exp.json
+++ b/e2etests/testdata/stable/markdown/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/markdown/elk/board.exp.json b/e2etests/testdata/stable/markdown/elk/board.exp.json
index 0e88cbd89..32ccd6058 100644
--- a/e2etests/testdata/stable/markdown/elk/board.exp.json
+++ b/e2etests/testdata/stable/markdown/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f1a2eea08..ba5d9e295 100644
--- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json
+++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 09acda39a..8a603cf79 100644
--- a/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json
+++ b/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 356eaf7e7..3d12b47d6 100644
--- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2548c289a..55717edfc 100644
--- a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 dd4af4a99..05dd96fcf 100644
--- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 6f70da0e4..ecae4e115 100644
--- a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 479237bd1..4440713fc 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 478043cfa..fc84014fc 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c3f0cc5a0..18a14650d 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 60019cbfe..c42224dca 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ed7189530..f7835dbcc 100644
--- a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json
+++ b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1dd213fba..7d37ce22c 100644
--- a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json
+++ b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
index acd4e1dfb..aeea56bc2 100644
--- a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
+++ b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiline_text/elk/board.exp.json b/e2etests/testdata/stable/multiline_text/elk/board.exp.json
index 304d52d16..a10d63b38 100644
--- a/e2etests/testdata/stable/multiline_text/elk/board.exp.json
+++ b/e2etests/testdata/stable/multiline_text/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
index ef02f5058..8effb31b8 100644
--- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
+++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
index f62c640ec..bdc994dc0 100644
--- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
+++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
index a89e7f954..3659b5719 100644
--- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
+++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json
index 4795cae29..f0c7b7a79 100644
--- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json
+++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/near-alone/dagre/board.exp.json b/e2etests/testdata/stable/near-alone/dagre/board.exp.json
index aaa2005f0..52ab93dbc 100644
--- a/e2etests/testdata/stable/near-alone/dagre/board.exp.json
+++ b/e2etests/testdata/stable/near-alone/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/near-alone/elk/board.exp.json b/e2etests/testdata/stable/near-alone/elk/board.exp.json
index aaa2005f0..52ab93dbc 100644
--- a/e2etests/testdata/stable/near-alone/elk/board.exp.json
+++ b/e2etests/testdata/stable/near-alone/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/number_connections/dagre/board.exp.json b/e2etests/testdata/stable/number_connections/dagre/board.exp.json
index ac5fd54b7..5c27bd05e 100644
--- a/e2etests/testdata/stable/number_connections/dagre/board.exp.json
+++ b/e2etests/testdata/stable/number_connections/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/number_connections/elk/board.exp.json b/e2etests/testdata/stable/number_connections/elk/board.exp.json
index 718a0daf3..634075675 100644
--- a/e2etests/testdata/stable/number_connections/elk/board.exp.json
+++ b/e2etests/testdata/stable/number_connections/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 bfa025695..03dcfe50f 100644
--- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json
+++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 7ae6943ed..df8a6baee 100644
--- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json
+++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 af665709f..016442ae6 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 30fb15a57..b61a5bfd8 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/ovals/dagre/board.exp.json b/e2etests/testdata/stable/ovals/dagre/board.exp.json
index b9e585bc4..78811f99c 100644
--- a/e2etests/testdata/stable/ovals/dagre/board.exp.json
+++ b/e2etests/testdata/stable/ovals/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/ovals/elk/board.exp.json b/e2etests/testdata/stable/ovals/elk/board.exp.json
index 1540ac8d2..2c54b17be 100644
--- a/e2etests/testdata/stable/ovals/elk/board.exp.json
+++ b/e2etests/testdata/stable/ovals/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 017b68b15..2410acb8a 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 50d055551..9e5cf485a 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/p/dagre/board.exp.json b/e2etests/testdata/stable/p/dagre/board.exp.json
index d5f461d2b..acfa63faf 100644
--- a/e2etests/testdata/stable/p/dagre/board.exp.json
+++ b/e2etests/testdata/stable/p/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/p/elk/board.exp.json b/e2etests/testdata/stable/p/elk/board.exp.json
index df39732d1..3f278f3e7 100644
--- a/e2etests/testdata/stable/p/elk/board.exp.json
+++ b/e2etests/testdata/stable/p/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/people/dagre/board.exp.json b/e2etests/testdata/stable/people/dagre/board.exp.json
index 308ccf610..e81b912c5 100644
--- a/e2etests/testdata/stable/people/dagre/board.exp.json
+++ b/e2etests/testdata/stable/people/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/people/elk/board.exp.json b/e2etests/testdata/stable/people/elk/board.exp.json
index 89839fdf6..5c8e60c29 100644
--- a/e2etests/testdata/stable/people/elk/board.exp.json
+++ b/e2etests/testdata/stable/people/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/pre/dagre/board.exp.json b/e2etests/testdata/stable/pre/dagre/board.exp.json
index c79c11c95..2c49abfbb 100644
--- a/e2etests/testdata/stable/pre/dagre/board.exp.json
+++ b/e2etests/testdata/stable/pre/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json
index 2679868a7..6241ecf2c 100644
--- a/e2etests/testdata/stable/pre/elk/board.exp.json
+++ b/e2etests/testdata/stable/pre/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
index 7aa820d77..cc029e4c0 100644
--- a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
+++ b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/self-referencing/elk/board.exp.json b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
index 359b4bcd4..efd8d6145 100644
--- a/e2etests/testdata/stable/self-referencing/elk/board.exp.json
+++ b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b1bc4cbbe..7d73eae0f 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b1bc4cbbe..7d73eae0f 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2e805a649..f9f2e20ba 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 2e805a649..f9f2e20ba 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ac6f88cc8..3c3bb45ed 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 ac6f88cc8..3c3bb45ed 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 746975661..ca9ced052 100644
--- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 746975661..ca9ced052 100644
--- a/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b3ff87f04..66cdc7380 100644
--- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 b3ff87f04..66cdc7380 100644
--- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 637df2a62..db4a42039 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 637df2a62..db4a42039 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 5be534d6a..1e5f2a33a 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 5be534d6a..1e5f2a33a 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 213df6457..3cc8a7ea3 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 213df6457..3cc8a7ea3 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f64ac54a0..feb35d626 100644
--- a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 f64ac54a0..feb35d626 100644
--- a/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 e4b6cea6a..a14e19613 100644
--- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 d0b8d63e7..87a28fe30 100644
--- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1f5ae567d..b3c9443f9 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 1f5ae567d..b3c9443f9 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c96318f07..1399a14fd 100644
--- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c96318f07..1399a14fd 100644
--- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a7f2a319e..504cae1ce 100644
--- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a7f2a319e..504cae1ce 100644
--- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
index 6d66a0847..f93af053e 100644
--- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
index 7db60a45a..e69de04eb 100644
--- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
index fa66eff48..55c5ecf20 100644
--- a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
index e79aef156..4819ec11c 100644
--- a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
+++ b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 a83ba6a4d..38161c04e 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 342209c86..1ece9c62e 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
index 2cb57306e..450cc5081 100644
--- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json
index 037704e5c..b7b472cdf 100644
--- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json
+++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json
index cab663320..5279a1e90 100644
--- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json
index 07115faed..f53a06177 100644
--- a/e2etests/testdata/stable/square_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 902248d13..ade991298 100644
--- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json
+++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 81a51ed61..2ed2dc877 100644
--- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json
+++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json
index 9571c41bb..f9c9e6522 100644
--- a/e2etests/testdata/stable/stylish/dagre/board.exp.json
+++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json
index 732df792b..6ead21367 100644
--- a/e2etests/testdata/stable/stylish/elk/board.exp.json
+++ b/e2etests/testdata/stable/stylish/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 c490a0e27..7d9dcc16f 100644
--- a/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 bb3d4974c..70feb3582 100644
--- a/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json
+++ b/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/tooltips/dagre/board.exp.json b/e2etests/testdata/stable/tooltips/dagre/board.exp.json
index f3147dbf2..fb7326616 100644
--- a/e2etests/testdata/stable/tooltips/dagre/board.exp.json
+++ b/e2etests/testdata/stable/tooltips/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/tooltips/elk/board.exp.json b/e2etests/testdata/stable/tooltips/elk/board.exp.json
index b53b63b8c..0717875bd 100644
--- a/e2etests/testdata/stable/tooltips/elk/board.exp.json
+++ b/e2etests/testdata/stable/tooltips/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
index 6fbb03bae..9610888ec 100644
--- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
+++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
index a6331963b..27833da33 100644
--- a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
+++ b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 00c6e73d4..3a4ae673e 100644
--- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 0edc1f86e..e7062a440 100644
--- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 45dd9e585..c05094ff8 100644
--- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 6fe96c7f4..757431819 100644
--- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json
index 4f25a8070..49069c26d 100644
--- a/e2etests/testdata/stable/us_map/dagre/board.exp.json
+++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json
index 449417219..758fc89ea 100644
--- a/e2etests/testdata/stable/us_map/elk/board.exp.json
+++ b/e2etests/testdata/stable/us_map/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json b/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
index 1c67f6fc3..20798dd86 100644
--- a/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_icon_label/elk/board.exp.json b/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
index f9f99f549..1ed059614 100644
--- a/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_icon_label/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
index 316f9b584..49dbef461 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
index cf0cdb489..98891fec8 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
index 2be19c03d..2e48b2197 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
index c66193dec..95266a508 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 4da9d2331..ea4bef6e5 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 4da9d2331..ea4bef6e5 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
index a63acf378..3fdb51224 100644
--- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
+++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
index 52cab802c..cc3694cab 100644
--- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
+++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 4cb8cb041..c1ddaf639 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
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 64c3498af..3f0532f60 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,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/chinese/dagre/board.exp.json b/e2etests/testdata/unicode/chinese/dagre/board.exp.json
index 69edf8962..62950df84 100644
--- a/e2etests/testdata/unicode/chinese/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/chinese/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/chinese/elk/board.exp.json b/e2etests/testdata/unicode/chinese/elk/board.exp.json
index 4dd6a41d1..332696471 100644
--- a/e2etests/testdata/unicode/chinese/elk/board.exp.json
+++ b/e2etests/testdata/unicode/chinese/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/emojis/dagre/board.exp.json b/e2etests/testdata/unicode/emojis/dagre/board.exp.json
index 73f07b98d..a687fc169 100644
--- a/e2etests/testdata/unicode/emojis/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/emojis/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/emojis/elk/board.exp.json b/e2etests/testdata/unicode/emojis/elk/board.exp.json
index 1d11494b6..5d417f783 100644
--- a/e2etests/testdata/unicode/emojis/elk/board.exp.json
+++ b/e2etests/testdata/unicode/emojis/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
index 80271beb8..7b684dbb7 100644
--- a/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json b/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
index 745df2dee..57c3f063d 100644
--- a/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
index 1911496c4..06dffca11 100644
--- a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-full/elk/board.exp.json b/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
index cbec465dd..21d10b772 100644
--- a/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-full/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
index 669c1dfc1..7b2ac388c 100644
--- a/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json b/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
index a1ead4e0b..37d6fa41f 100644
--- a/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
+++ b/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/korean/dagre/board.exp.json b/e2etests/testdata/unicode/korean/dagre/board.exp.json
index 78647c7bc..5917ea9cf 100644
--- a/e2etests/testdata/unicode/korean/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/korean/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/korean/elk/board.exp.json b/e2etests/testdata/unicode/korean/elk/board.exp.json
index 63bcae17a..d64da8678 100644
--- a/e2etests/testdata/unicode/korean/elk/board.exp.json
+++ b/e2etests/testdata/unicode/korean/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
index 2ecd63d07..134292329 100644
--- a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
index ffea1ae82..cf1d86106 100644
--- a/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
index dc54eea40..edd94da26 100644
--- a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
index 4362b74ef..a4cb39229 100644
--- a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
+++ b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/with-style/dagre/board.exp.json b/e2etests/testdata/unicode/with-style/dagre/board.exp.json
index 4822750c7..354bcadea 100644
--- a/e2etests/testdata/unicode/with-style/dagre/board.exp.json
+++ b/e2etests/testdata/unicode/with-style/dagre/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/e2etests/testdata/unicode/with-style/elk/board.exp.json b/e2etests/testdata/unicode/with-style/elk/board.exp.json
index 2587c7e6e..813559b54 100644
--- a/e2etests/testdata/unicode/with-style/elk/board.exp.json
+++ b/e2etests/testdata/unicode/with-style/elk/board.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/main.go b/main.go
index 1c3203b95..15ecc6348 100644
--- a/main.go
+++ b/main.go
@@ -364,7 +364,7 @@ func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plug
 		}
 	}
 
-	if !diagram.IsContainerOnly {
+	if !diagram.IsFolderOnly {
 		start := time.Now()
 		svg, err := _render(ctx, ms, plugin, sketch, pad, themeID, darkThemeID, boardOutputPath, bundle, forceAppendix, page, ruler, diagram)
 		if err != nil {
@@ -457,7 +457,7 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, ske
 		currBoardPath = append(boardPath, diagram.Name)
 	}
 
-	if !diagram.IsContainerOnly {
+	if !diagram.IsFolderOnly {
 		svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{
 			Pad:    int(pad),
 			Sketch: sketch,
diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json
index 5b4fed437..7a8cdb048 100644
--- a/testdata/d2compiler/TestCompile/basic_icon.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,0:0:0-3:0:77",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
index caf78f230..676d6ae9b 100644
--- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,0:0:0-3:0:33",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json
index 3b7350a3f..794e3ba97 100644
--- a/testdata/d2compiler/TestCompile/basic_shape.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,0:0:0-4:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json
index 9eaeed18e..0db1b4c66 100644
--- a/testdata/d2compiler/TestCompile/basic_style.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/basic_style.d2,0:0:0-4:0:28",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json
index 7ce46b9a1..450f61d62 100644
--- a/testdata/d2compiler/TestCompile/class_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/class_paren.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,0:0:0-6:1:81",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json
index 7a3bbd5d3..c8a11220a 100644
--- a/testdata/d2compiler/TestCompile/class_style.exp.json
+++ b/testdata/d2compiler/TestCompile/class_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,0:0:0-5:0:82",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json
index fd591706b..79e7fd283 100644
--- a/testdata/d2compiler/TestCompile/constraint_label.exp.json
+++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-3:1:38",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json
index c8d30aa7f..fa0120ac5 100644
--- a/testdata/d2compiler/TestCompile/default_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/default_direction.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/default_direction.d2,0:0:0-0:1:1",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
index 63f41f9cf..391a94b8b 100644
--- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
+++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimension_with_style.d2,0:0:0-4:0:43",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
index 5e2c58b68..a35e75d92 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,0:0:0-45:0:505",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
index 49cd15515..028a12b83 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,0:0:0-5:0:54",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json
index f9a00392f..87005d17f 100644
--- a/testdata/d2compiler/TestCompile/edge.exp.json
+++ b/testdata/d2compiler/TestCompile/edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
index 4b420c357..b30abffa3 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-9:0:168",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json
index f4a480774..93f38391b 100644
--- a/testdata/d2compiler/TestCompile/edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,0:0:0-2:0:57",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
index bfc0c00e4..d9f3b7648 100644
--- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,0:0:0-4:0:107",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
index 9f84dea45..2af478ac8 100644
--- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-13:0:123",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
index fec8e7d36..829b33077 100644
--- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,0:0:0-4:0:35",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
index a315c5116..72fe99087 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-2:0:51",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
index 8769d9e94..40c0516d0 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-4:0:53",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json
index cb272059d..8f8477966 100644
--- a/testdata/d2compiler/TestCompile/edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,0:0:0-3:0:30",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
index 24761e539..a39b54f40 100644
--- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,0:0:0-5:0:114",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
index 294547dad..ccd156c58 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,0:0:0-5:0:39",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
index 74f62ba4a..906ff7221 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,0:0:0-5:0:40",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
index baba07576..2672b1d9f 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,0:0:0-5:0:50",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
index df59a2e60..b71616dca 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,0:0:0-5:0:51",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
index 7507638ad..0c97a8965 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,0:0:0-7:0:59",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
index 120c1378a..1566cc1cd 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,0:0:0-9:0:69",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
index 11f5fe980..267fcd755 100644
--- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json
index 35059bfe1..38c27848e 100644
--- a/testdata/d2compiler/TestCompile/edge_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,0:0:0-4:0:102",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
index df30d0fd6..dee106300 100644
--- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-5:0:57",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
index 1eaab8de8..3be603501 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,0:0:0-3:0:39",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
index 9491f4a88..c2c30b2ea 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-4:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
index bfcad1b19..866afcedd 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,0:0:0-6:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
index 04d4c6c3d..61d6ac371 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,0:0:0-4:0:33",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
index 38504ca59..98543d75c 100644
--- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-6:0:97",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
index 4c7d728a4..4f81963ec 100644
--- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-1:0:45",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
index d2265d844..537e5cea5 100644
--- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-4:0:58",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json
index 210b3db08..de942475c 100644
--- a/testdata/d2compiler/TestCompile/escaped_id.exp.json
+++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/escaped_id.d2,0:0:0-0:4:4",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json
index a10218c0f..0702d187b 100644
--- a/testdata/d2compiler/TestCompile/image_style.exp.json
+++ b/testdata/d2compiler/TestCompile/image_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,0:0:0-5:0:118",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json
index 725d2c9ef..c19123bcf 100644
--- a/testdata/d2compiler/TestCompile/near_constant.exp.json
+++ b/testdata/d2compiler/TestCompile/near_constant.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json
index 5e9cbf9f0..3e8e30ad2 100644
--- a/testdata/d2compiler/TestCompile/nested_sql.exp.json
+++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,0:0:0-7:1:84",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
index 8ca4d9d9f..a95185760 100644
--- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
+++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/nil_scope_obj_regression.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json
index 12d02391f..bff516303 100644
--- a/testdata/d2compiler/TestCompile/null.exp.json
+++ b/testdata/d2compiler/TestCompile/null.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/null.d2,0:0:0-1:0:5",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json
index 56bab622d..9c08d24ad 100644
--- a/testdata/d2compiler/TestCompile/path_link.exp.json
+++ b/testdata/d2compiler/TestCompile/path_link.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,0:0:0-3:0:47",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json
index 51cea9960..70e3642ce 100644
--- a/testdata/d2compiler/TestCompile/positions.exp.json
+++ b/testdata/d2compiler/TestCompile/positions.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/positions.d2,0:0:0-4:0:30",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
index 145110040..b8e63235a 100644
--- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
+++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,0:0:0-8:0:94",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json
index 4eec7c364..9e491c7cc 100644
--- a/testdata/d2compiler/TestCompile/root_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/root_direction.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/root_direction.d2,0:0:0-0:16:16",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json
index dc54f7907..185ef79ad 100644
--- a/testdata/d2compiler/TestCompile/root_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/root_sequence.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json
index 04715445f..1c38808f2 100644
--- a/testdata/d2compiler/TestCompile/self-referencing.exp.json
+++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
index 9aa88bfab..8822b75a6 100644
--- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,0:0:0-10:0:137",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json
index 70f3c144e..3c70617f7 100644
--- a/testdata/d2compiler/TestCompile/sequence_container.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,0:0:0-5:0:63",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
index 20858b17e..7c673a875 100644
--- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,0:0:0-6:0:60",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
index 0d735e0e5..1efddcb4c 100644
--- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:0:0-5:0:54",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
index 1ff4f2f46..cf90fb88d 100644
--- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:0:0-9:0:101",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json
index 670b4c552..672c6a4b3 100644
--- a/testdata/d2compiler/TestCompile/set_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/set_direction.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,0:0:0-2:1:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
index f16c5bcb4..4d9f5da50 100644
--- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
+++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,0:0:0-4:0:40",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json
index 47ab47057..5bf808844 100644
--- a/testdata/d2compiler/TestCompile/sql-regression.exp.json
+++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,0:0:0-10:0:87",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json
index 5d2a9f784..1fe4cb57d 100644
--- a/testdata/d2compiler/TestCompile/sql_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,0:0:0-5:1:73",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json
index 0f39d7682..d69521ac6 100644
--- a/testdata/d2compiler/TestCompile/stroke-width.exp.json
+++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-3:0:32",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
index 613c47ab1..4e37dbe96 100644
--- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
+++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,0:0:0-11:0:99",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json
index 779feb9b0..c121ac01f 100644
--- a/testdata/d2compiler/TestCompile/table_style.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,0:0:0-5:0:81",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json
index 322f087df..ede7c0ad4 100644
--- a/testdata/d2compiler/TestCompile/table_style_map.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,0:0:0-8:0:113",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
index c087c181c..80150c70f 100644
--- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
index 7d961e5b9..f19ce6a8c 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,0:0:0-4:0:21",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
index d8ab9b2bc..d7ce10dcb 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,0:0:0-4:0:28",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
index c1db8dfcf..ff3b0c66b 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,0:0:0-5:0:167",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
index 1165d7485..27b8f3d1b 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,0:0:0-5:0:172",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
index ba4191779..37ff7be18 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,0:0:0-6:0:32",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
index 9b8649ecc..380951b20 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_create.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
index 674dd6d6f..3972b42e8 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,0:0:0-6:0:27",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
index 3f32357e9..44b01dc8f 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,0:0:0-5:0:174",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
index 2820c2b15..97b34c3e4 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,0:0:0-5:0:174",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
index 727b29ecb..e059d5912 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,0:0:0-6:0:29",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
index 4a3fde905..21964b724 100644
--- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/underscore_unresolved_obj.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
index 540ae3448..40c3c1246 100644
--- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
+++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/unescaped_id_cr.d2,0:0:0-0:4:4",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json
index 2c05dc886..f800be68e 100644
--- a/testdata/d2compiler/TestCompile/url_link.exp.json
+++ b/testdata/d2compiler/TestCompile/url_link.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,0:0:0-3:0:34",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
index deb4b81b7..5b4caf80a 100644
--- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,0:0:0-17:53:406",
       "nodes": [
diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json
new file mode 100644
index 000000000..0f6affc31
--- /dev/null
+++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json
@@ -0,0 +1,1688 @@
+{
+  "graph": {
+    "name": "",
+    "isFolderOnly": true,
+    "ast": {
+      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165",
+      "nodes": [
+        {
+          "map_key": {
+            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164",
+            "key": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                    "value": [
+                      {
+                        "string": "layers",
+                        "raw_string": "layers"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "primary": {},
+            "value": {
+              "map": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163",
+                "nodes": [
+                  {
+                    "map_key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33",
+                      "key": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                        "path": [
+                          {
+                            "unquoted_string": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                              "value": [
+                                {
+                                  "string": "one",
+                                  "raw_string": "one"
+                                }
+                              ]
+                            }
+                          }
+                        ]
+                      },
+                      "primary": {},
+                      "value": {
+                        "map": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32",
+                          "nodes": [
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                        "value": [
+                                          {
+                                            "string": "santa",
+                                            "raw_string": "santa"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {}
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "map_key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162",
+                      "key": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                        "path": [
+                          {
+                            "unquoted_string": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                              "value": [
+                                {
+                                  "string": "two",
+                                  "raw_string": "two"
+                                }
+                              ]
+                            }
+                          }
+                        ]
+                      },
+                      "primary": {},
+                      "value": {
+                        "map": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161",
+                          "nodes": [
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                        "value": [
+                                          {
+                                            "string": "clause",
+                                            "raw_string": "clause"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {}
+                              }
+                            },
+                            {
+                              "map_key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158",
+                                "key": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                  "path": [
+                                    {
+                                      "unquoted_string": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                        "value": [
+                                          {
+                                            "string": "scenarios",
+                                            "raw_string": "scenarios"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  ]
+                                },
+                                "primary": {},
+                                "value": {
+                                  "map": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157",
+                                    "nodes": [
+                                      {
+                                        "map_key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88",
+                                          "key": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                            "path": [
+                                              {
+                                                "unquoted_string": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                  "value": [
+                                                    {
+                                                      "string": "seinfeld",
+                                                      "raw_string": "seinfeld"
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            ]
+                                          },
+                                          "primary": {},
+                                          "value": {
+                                            "map": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87",
+                                              "nodes": null
+                                            }
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "map_key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154",
+                                          "key": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                            "path": [
+                                              {
+                                                "unquoted_string": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                  "value": [
+                                                    {
+                                                      "string": "missoula",
+                                                      "raw_string": "missoula"
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            ]
+                                          },
+                                          "primary": {},
+                                          "value": {
+                                            "map": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153",
+                                              "nodes": [
+                                                {
+                                                  "map_key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149",
+                                                    "key": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                      "path": [
+                                                        {
+                                                          "unquoted_string": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                            "value": [
+                                                              {
+                                                                "string": "steps",
+                                                                "raw_string": "steps"
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      ]
+                                                    },
+                                                    "primary": {},
+                                                    "value": {
+                                                      "map": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148",
+                                                        "nodes": [
+                                                          {
+                                                            "map_key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143",
+                                                              "key": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                "path": [
+                                                                  {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "missus",
+                                                                          "raw_string": "missus"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              },
+                                                              "primary": {},
+                                                              "value": {
+                                                                "unquoted_string": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
+                                                                  "value": [
+                                                                    {
+                                                                      "string": "one two three",
+                                                                      "raw_string": "one two three"
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              }
+                                                            }
+                                                          }
+                                                        ]
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              ]
+                                            }
+                                          }
+                                        }
+                                      }
+                                    ]
+                                  }
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      ]
+    },
+    "root": {
+      "id": "",
+      "id_val": "",
+      "label_dimensions": {
+        "width": 0,
+        "height": 0
+      },
+      "attributes": {
+        "label": {
+          "value": ""
+        },
+        "style": {},
+        "near_key": null,
+        "shape": {
+          "value": ""
+        },
+        "direction": {
+          "value": ""
+        },
+        "constraint": {
+          "value": ""
+        }
+      },
+      "zIndex": 0
+    },
+    "edges": null,
+    "objects": null,
+    "layers": [
+      {
+        "name": "one",
+        "isFolderOnly": false,
+        "ast": {
+          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165",
+          "nodes": [
+            {
+              "map_key": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164",
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                        "value": [
+                          {
+                            "string": "layers",
+                            "raw_string": "layers"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "primary": {},
+                "value": {
+                  "map": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163",
+                    "nodes": [
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                                  "value": [
+                                    {
+                                      "string": "one",
+                                      "raw_string": "one"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                            "value": [
+                                              {
+                                                "string": "santa",
+                                                "raw_string": "santa"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                                  "value": [
+                                    {
+                                      "string": "two",
+                                      "raw_string": "two"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                            "value": [
+                                              {
+                                                "string": "clause",
+                                                "raw_string": "clause"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                },
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                            "value": [
+                                              {
+                                                "string": "scenarios",
+                                                "raw_string": "scenarios"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {
+                                      "map": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157",
+                                        "nodes": [
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                      "value": [
+                                                        {
+                                                          "string": "seinfeld",
+                                                          "raw_string": "seinfeld"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87",
+                                                  "nodes": null
+                                                }
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                      "value": [
+                                                        {
+                                                          "string": "missoula",
+                                                          "raw_string": "missoula"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153",
+                                                  "nodes": [
+                                                    {
+                                                      "map_key": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149",
+                                                        "key": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                          "path": [
+                                                            {
+                                                              "unquoted_string": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                                "value": [
+                                                                  {
+                                                                    "string": "steps",
+                                                                    "raw_string": "steps"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          ]
+                                                        },
+                                                        "primary": {},
+                                                        "value": {
+                                                          "map": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148",
+                                                            "nodes": [
+                                                              {
+                                                                "map_key": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143",
+                                                                  "key": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                    "path": [
+                                                                      {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "missus",
+                                                                              "raw_string": "missus"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  },
+                                                                  "primary": {},
+                                                                  "value": {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "one two three",
+                                                                          "raw_string": "one two three"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "root": {
+          "id": "",
+          "id_val": "",
+          "label_dimensions": {
+            "width": 0,
+            "height": 0
+          },
+          "attributes": {
+            "label": {
+              "value": ""
+            },
+            "style": {},
+            "near_key": null,
+            "shape": {
+              "value": ""
+            },
+            "direction": {
+              "value": ""
+            },
+            "constraint": {
+              "value": ""
+            }
+          },
+          "zIndex": 0
+        },
+        "edges": null,
+        "objects": [
+          {
+            "id": "santa",
+            "id_val": "santa",
+            "label_dimensions": {
+              "width": 0,
+              "height": 0
+            },
+            "references": [
+              {
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                        "value": [
+                          {
+                            "string": "santa",
+                            "raw_string": "santa"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "key_path_index": 0,
+                "map_key_edge_index": -1
+              }
+            ],
+            "attributes": {
+              "label": {
+                "value": "santa"
+              },
+              "style": {},
+              "near_key": null,
+              "shape": {
+                "value": "rectangle"
+              },
+              "direction": {
+                "value": ""
+              },
+              "constraint": {
+                "value": ""
+              }
+            },
+            "zIndex": 0
+          }
+        ]
+      },
+      {
+        "name": "two",
+        "isFolderOnly": false,
+        "ast": {
+          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165",
+          "nodes": [
+            {
+              "map_key": {
+                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164",
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                        "value": [
+                          {
+                            "string": "layers",
+                            "raw_string": "layers"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "primary": {},
+                "value": {
+                  "map": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163",
+                    "nodes": [
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                                  "value": [
+                                    {
+                                      "string": "one",
+                                      "raw_string": "one"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                            "value": [
+                                              {
+                                                "string": "santa",
+                                                "raw_string": "santa"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "map_key": {
+                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162",
+                          "key": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                            "path": [
+                              {
+                                "unquoted_string": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                                  "value": [
+                                    {
+                                      "string": "two",
+                                      "raw_string": "two"
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          "primary": {},
+                          "value": {
+                            "map": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161",
+                              "nodes": [
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                            "value": [
+                                              {
+                                                "string": "clause",
+                                                "raw_string": "clause"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {}
+                                  }
+                                },
+                                {
+                                  "map_key": {
+                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158",
+                                    "key": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                      "path": [
+                                        {
+                                          "unquoted_string": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                            "value": [
+                                              {
+                                                "string": "scenarios",
+                                                "raw_string": "scenarios"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    "primary": {},
+                                    "value": {
+                                      "map": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157",
+                                        "nodes": [
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                      "value": [
+                                                        {
+                                                          "string": "seinfeld",
+                                                          "raw_string": "seinfeld"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87",
+                                                  "nodes": null
+                                                }
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "map_key": {
+                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154",
+                                              "key": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                "path": [
+                                                  {
+                                                    "unquoted_string": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                      "value": [
+                                                        {
+                                                          "string": "missoula",
+                                                          "raw_string": "missoula"
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                ]
+                                              },
+                                              "primary": {},
+                                              "value": {
+                                                "map": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153",
+                                                  "nodes": [
+                                                    {
+                                                      "map_key": {
+                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149",
+                                                        "key": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                          "path": [
+                                                            {
+                                                              "unquoted_string": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                                "value": [
+                                                                  {
+                                                                    "string": "steps",
+                                                                    "raw_string": "steps"
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          ]
+                                                        },
+                                                        "primary": {},
+                                                        "value": {
+                                                          "map": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148",
+                                                            "nodes": [
+                                                              {
+                                                                "map_key": {
+                                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143",
+                                                                  "key": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                    "path": [
+                                                                      {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "missus",
+                                                                              "raw_string": "missus"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  },
+                                                                  "primary": {},
+                                                                  "value": {
+                                                                    "unquoted_string": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
+                                                                      "value": [
+                                                                        {
+                                                                          "string": "one two three",
+                                                                          "raw_string": "one two three"
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "root": {
+          "id": "",
+          "id_val": "",
+          "label_dimensions": {
+            "width": 0,
+            "height": 0
+          },
+          "attributes": {
+            "label": {
+              "value": ""
+            },
+            "style": {},
+            "near_key": null,
+            "shape": {
+              "value": ""
+            },
+            "direction": {
+              "value": ""
+            },
+            "constraint": {
+              "value": ""
+            }
+          },
+          "zIndex": 0
+        },
+        "edges": null,
+        "objects": [
+          {
+            "id": "clause",
+            "id_val": "clause",
+            "label_dimensions": {
+              "width": 0,
+              "height": 0
+            },
+            "references": [
+              {
+                "key": {
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                  "path": [
+                    {
+                      "unquoted_string": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                        "value": [
+                          {
+                            "string": "clause",
+                            "raw_string": "clause"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                "key_path_index": 0,
+                "map_key_edge_index": -1
+              }
+            ],
+            "attributes": {
+              "label": {
+                "value": "clause"
+              },
+              "style": {},
+              "near_key": null,
+              "shape": {
+                "value": "rectangle"
+              },
+              "direction": {
+                "value": ""
+              },
+              "constraint": {
+                "value": ""
+              }
+            },
+            "zIndex": 0
+          }
+        ],
+        "scenarios": [
+          {
+            "name": "seinfeld",
+            "isFolderOnly": false,
+            "ast": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165",
+              "nodes": [
+                {
+                  "map_key": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164",
+                    "key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                      "path": [
+                        {
+                          "unquoted_string": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                            "value": [
+                              {
+                                "string": "layers",
+                                "raw_string": "layers"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    "primary": {},
+                    "value": {
+                      "map": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163",
+                        "nodes": [
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                                      "value": [
+                                        {
+                                          "string": "one",
+                                          "raw_string": "one"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                                "value": [
+                                                  {
+                                                    "string": "santa",
+                                                    "raw_string": "santa"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                                      "value": [
+                                        {
+                                          "string": "two",
+                                          "raw_string": "two"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                                "value": [
+                                                  {
+                                                    "string": "clause",
+                                                    "raw_string": "clause"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    },
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                                "value": [
+                                                  {
+                                                    "string": "scenarios",
+                                                    "raw_string": "scenarios"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {
+                                          "map": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157",
+                                            "nodes": [
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                          "value": [
+                                                            {
+                                                              "string": "seinfeld",
+                                                              "raw_string": "seinfeld"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87",
+                                                      "nodes": null
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                          "value": [
+                                                            {
+                                                              "string": "missoula",
+                                                              "raw_string": "missoula"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153",
+                                                      "nodes": [
+                                                        {
+                                                          "map_key": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149",
+                                                            "key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                              "path": [
+                                                                {
+                                                                  "unquoted_string": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                                    "value": [
+                                                                      {
+                                                                        "string": "steps",
+                                                                        "raw_string": "steps"
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              ]
+                                                            },
+                                                            "primary": {},
+                                                            "value": {
+                                                              "map": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148",
+                                                                "nodes": [
+                                                                  {
+                                                                    "map_key": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143",
+                                                                      "key": {
+                                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                        "path": [
+                                                                          {
+                                                                            "unquoted_string": {
+                                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                              "value": [
+                                                                                {
+                                                                                  "string": "missus",
+                                                                                  "raw_string": "missus"
+                                                                                }
+                                                                              ]
+                                                                            }
+                                                                          }
+                                                                        ]
+                                                                      },
+                                                                      "primary": {},
+                                                                      "value": {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "one two three",
+                                                                              "raw_string": "one two three"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          }
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "root": {
+              "id": "",
+              "id_val": "",
+              "label_dimensions": {
+                "width": 0,
+                "height": 0
+              },
+              "attributes": {
+                "label": {
+                  "value": ""
+                },
+                "style": {},
+                "near_key": null,
+                "shape": {
+                  "value": ""
+                },
+                "direction": {
+                  "value": ""
+                },
+                "constraint": {
+                  "value": ""
+                }
+              },
+              "zIndex": 0
+            },
+            "edges": null,
+            "objects": null
+          },
+          {
+            "name": "missoula",
+            "isFolderOnly": false,
+            "ast": {
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165",
+              "nodes": [
+                {
+                  "map_key": {
+                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164",
+                    "key": {
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                      "path": [
+                        {
+                          "unquoted_string": {
+                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7",
+                            "value": [
+                              {
+                                "string": "layers",
+                                "raw_string": "layers"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    "primary": {},
+                    "value": {
+                      "map": {
+                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163",
+                        "nodes": [
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16",
+                                      "value": [
+                                        {
+                                          "string": "one",
+                                          "raw_string": "one"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29",
+                                                "value": [
+                                                  {
+                                                    "string": "santa",
+                                                    "raw_string": "santa"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "map_key": {
+                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162",
+                              "key": {
+                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                                "path": [
+                                  {
+                                    "unquoted_string": {
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39",
+                                      "value": [
+                                        {
+                                          "string": "two",
+                                          "raw_string": "two"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              },
+                              "primary": {},
+                              "value": {
+                                "map": {
+                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161",
+                                  "nodes": [
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53",
+                                                "value": [
+                                                  {
+                                                    "string": "clause",
+                                                    "raw_string": "clause"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {}
+                                      }
+                                    },
+                                    {
+                                      "map_key": {
+                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158",
+                                        "key": {
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                          "path": [
+                                            {
+                                              "unquoted_string": {
+                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65",
+                                                "value": [
+                                                  {
+                                                    "string": "scenarios",
+                                                    "raw_string": "scenarios"
+                                                  }
+                                                ]
+                                              }
+                                            }
+                                          ]
+                                        },
+                                        "primary": {},
+                                        "value": {
+                                          "map": {
+                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157",
+                                            "nodes": [
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80",
+                                                          "value": [
+                                                            {
+                                                              "string": "seinfeld",
+                                                              "raw_string": "seinfeld"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87",
+                                                      "nodes": null
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              {
+                                                "map_key": {
+                                                  "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154",
+                                                  "key": {
+                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                    "path": [
+                                                      {
+                                                        "unquoted_string": {
+                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100",
+                                                          "value": [
+                                                            {
+                                                              "string": "missoula",
+                                                              "raw_string": "missoula"
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    ]
+                                                  },
+                                                  "primary": {},
+                                                  "value": {
+                                                    "map": {
+                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153",
+                                                      "nodes": [
+                                                        {
+                                                          "map_key": {
+                                                            "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149",
+                                                            "key": {
+                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                              "path": [
+                                                                {
+                                                                  "unquoted_string": {
+                                                                    "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113",
+                                                                    "value": [
+                                                                      {
+                                                                        "string": "steps",
+                                                                        "raw_string": "steps"
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              ]
+                                                            },
+                                                            "primary": {},
+                                                            "value": {
+                                                              "map": {
+                                                                "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148",
+                                                                "nodes": [
+                                                                  {
+                                                                    "map_key": {
+                                                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143",
+                                                                      "key": {
+                                                                        "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                        "path": [
+                                                                          {
+                                                                            "unquoted_string": {
+                                                                              "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128",
+                                                                              "value": [
+                                                                                {
+                                                                                  "string": "missus",
+                                                                                  "raw_string": "missus"
+                                                                                }
+                                                                              ]
+                                                                            }
+                                                                          }
+                                                                        ]
+                                                                      },
+                                                                      "primary": {},
+                                                                      "value": {
+                                                                        "unquoted_string": {
+                                                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
+                                                                          "value": [
+                                                                            {
+                                                                              "string": "one two three",
+                                                                              "raw_string": "one two three"
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                ]
+                                                              }
+                                                            }
+                                                          }
+                                                        }
+                                                      ]
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "root": {
+              "id": "",
+              "id_val": "",
+              "label_dimensions": {
+                "width": 0,
+                "height": 0
+              },
+              "attributes": {
+                "label": {
+                  "value": ""
+                },
+                "style": {},
+                "near_key": null,
+                "shape": {
+                  "value": ""
+                },
+                "direction": {
+                  "value": ""
+                },
+                "constraint": {
+                  "value": ""
+                }
+              },
+              "zIndex": 0
+            },
+            "edges": null,
+            "objects": null
+          }
+        ]
+      }
+    ]
+  },
+  "err": null
+}
diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
index 995d197ef..6d2c25d9e 100644
--- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
       "nodes": [
@@ -374,7 +374,7 @@
     "layers": [
       {
         "name": "one",
-        "isContainerOnly": false,
+        "isFolderOnly": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
           "nodes": [
@@ -747,7 +747,7 @@
       },
       {
         "name": "two",
-        "isContainerOnly": false,
+        "isFolderOnly": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
           "nodes": [
@@ -1120,7 +1120,7 @@
         "steps": [
           {
             "name": "seinfeld",
-            "isContainerOnly": false,
+            "isFolderOnly": false,
             "ast": {
               "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
               "nodes": [
@@ -1493,7 +1493,7 @@
           },
           {
             "name": "missoula",
-            "isContainerOnly": false,
+            "isFolderOnly": false,
             "ast": {
               "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145",
               "nodes": [
diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json
index 6883ca8c1..d5578d6ff 100644
--- a/testdata/d2compiler/TestCompile2/boards/root.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
       "nodes": [
@@ -241,7 +241,7 @@
     "layers": [
       {
         "name": "one",
-        "isContainerOnly": false,
+        "isFolderOnly": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
           "nodes": [
@@ -481,7 +481,7 @@
       },
       {
         "name": "two",
-        "isContainerOnly": false,
+        "isFolderOnly": false,
         "ast": {
           "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65",
           "nodes": [
diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
index 1e8c7f546..caa332fc2 100644
--- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
+++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json
index eb8fb3497..f75ac6af5 100644
--- a/testdata/d2exporter/TestExport/connection/basic.exp.json
+++ b/testdata/d2exporter/TestExport/connection/basic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
index 3bd442e2d..86499c685 100644
--- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
+++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
index cb529e10c..707543c8e 100644
--- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
+++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json
index 145dc2bdd..234023e0c 100644
--- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json
+++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
index 7e45740f2..2ab8c8975 100644
--- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
+++ b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
index 1ec046b2a..d0e68a092 100644
--- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
+++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json
index f27875598..a204974b3 100644
--- a/testdata/d2exporter/TestExport/shape/basic.exp.json
+++ b/testdata/d2exporter/TestExport/shape/basic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json
index 14f7226e4..67f9c5ff7 100644
--- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json
+++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
index e9c536235..5e59d4853 100644
--- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
+++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
index 2d0a3987f..8c7ea254a 100644
--- a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
+++ b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json
index a12f49247..0eb9f4605 100644
--- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json
+++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json
index 08e64fad3..baac9c397 100644
--- a/testdata/d2exporter/TestExport/shape/text_color.exp.json
+++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
index 46ee19cc3..2367b7b9a 100644
--- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
index 3281dbfba..c86b058ac 100644
--- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
index e00534c91..3c3d303b7 100644
--- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
index 240b17a17..72575a3e5 100644
--- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
+++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
index 2944df9ba..ee1636c5f 100644
--- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
+++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json
@@ -1,6 +1,6 @@
 {
   "name": "",
-  "isContainerOnly": false,
+  "isFolderOnly": false,
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json
index 2e646f05c..b1773f3e5 100644
--- a/testdata/d2oracle/TestCreate/base.exp.json
+++ b/testdata/d2oracle/TestCreate/base.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/base.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json
index cf1936c65..45c84a2b9 100644
--- a/testdata/d2oracle/TestCreate/container.exp.json
+++ b/testdata/d2oracle/TestCreate/container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json
index 99b312cba..99fa9987f 100644
--- a/testdata/d2oracle/TestCreate/container_edge.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
index 1cefe3a01..874f701c9 100644
--- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,0:0:0-3:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json
index dbf5f05d5..7c756f94e 100644
--- a/testdata/d2oracle/TestCreate/edge.exp.json
+++ b/testdata/d2oracle/TestCreate/edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json
index 01ebc9f75..ebd1c4a1f 100644
--- a/testdata/d2oracle/TestCreate/edge_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json
index c8ac4a71f..82f59fb8e 100644
--- a/testdata/d2oracle/TestCreate/edge_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
index 4ac4ea53b..0981b56e5 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,0:0:0-3:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
index d4aade1bd..6f03dd3e5 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json
index 31f997395..3feaad7e5 100644
--- a/testdata/d2oracle/TestCreate/edge_unique.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-4:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json
index bf3db2413..6b59db7f6 100644
--- a/testdata/d2oracle/TestCreate/gen_key.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key.d2,0:0:0-1:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json
index d48624699..a6a3ab175 100644
--- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_n.d2,0:0:0-13:0:132",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
index 2c5770752..dd647a29e 100644
--- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_nested.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
index d25e682ae..fdff71529 100644
--- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_scope.d2,0:0:0-4:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
index d4e9342c8..9e45e674f 100644
--- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/gen_key_suffix.d2,0:0:0-2:0:10",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
index 929ae47ca..9e6166137 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,0:0:0-4:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
index cfa07d36c..1a6d18fc7 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,0:0:0-6:0:48",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
index 23d535c1c..5c35c062a 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,0:0:0-8:0:50",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json
index badeef6f3..13a0e5338 100644
--- a/testdata/d2oracle/TestCreate/nested.exp.json
+++ b/testdata/d2oracle/TestCreate/nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/nested.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json
index 3d2ade9f8..9639bbf24 100644
--- a/testdata/d2oracle/TestCreate/scope.exp.json
+++ b/testdata/d2oracle/TestCreate/scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestCreate/scope.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json
index ce323149a..2fc3e31f2 100644
--- a/testdata/d2oracle/TestDelete/arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
index 9db8cb3b3..0d04b4e5c 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-3:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
index 9abb7d091..4ef90b86a 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
index f89e562c1..9cfc5fbb3 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
index 59dfdd3a7..b87f7ada7 100644
--- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/breakup_arrowhead.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json
index 33ca2dbb1..a012ee54a 100644
--- a/testdata/d2oracle/TestDelete/chaos_1.exp.json
+++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:0:0-8:0:94",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json
index ffdae1633..d72aac1bc 100644
--- a/testdata/d2oracle/TestDelete/children.exp.json
+++ b/testdata/d2oracle/TestDelete/children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children.d2,0:0:0-2:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json
index 55c19b96a..aa46010d5 100644
--- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_conflicts.d2,0:0:0-3:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
index 54abce2f2..06b1721b9 100644
--- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-5:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
index 17ebaef68..017b88f80 100644
--- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-6:0:41",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
index 4ab8571f1..72b006c08 100644
--- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_flat_conflicts.d2,0:0:0-4:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
index e672647a1..6dd312311 100644
--- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-8:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
index 256176838..42ec7a673 100644
--- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_nested_conflicts.d2,0:0:0-5:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
index de9d0cb7d..d093f337b 100644
--- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,0:0:0-6:0:33",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
index acb9d83ec..fe35fb0a4 100644
--- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_no_self_conflict.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json
index dd3a0a3db..824bdeaf7 100644
--- a/testdata/d2oracle/TestDelete/children_order.exp.json
+++ b/testdata/d2oracle/TestDelete/children_order.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_order.d2,0:0:0-7:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
index 16d89893d..d3c25dc9f 100644
--- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_referenced_conflicts.d2,0:0:0-5:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json
index f3ede85c8..7ef29ec5d 100644
--- a/testdata/d2oracle/TestDelete/children_scope.exp.json
+++ b/testdata/d2oracle/TestDelete/children_scope.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,0:0:0-4:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json
index 9af898bf4..d687451ab 100644
--- a/testdata/d2oracle/TestDelete/container_near.exp.json
+++ b/testdata/d2oracle/TestDelete/container_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,0:0:0-7:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
index 65e90de6a..73d04d230 100644
--- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,0:0:0-10:0:255",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json
index 963c5dbad..773b7321b 100644
--- a/testdata/d2oracle/TestDelete/delete_icon.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,0:0:0-3:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json
index 3a846ac5b..d875355be 100644
--- a/testdata/d2oracle/TestDelete/delete_link.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_link.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_link.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json
index d10a4309b..db51e96ed 100644
--- a/testdata/d2oracle/TestDelete/delete_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_near.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
index 4a0d2213a..3487837b1 100644
--- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_needed_flat_near.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
index 93a5f838c..1880ac013 100644
--- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_redundant_flat_near.d2,0:0:0-3:0:5",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
index 58a25c550..494ab611e 100644
--- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/delete_tooltip.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
index 4606739c8..509e35081 100644
--- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
index 8a3817dbc..40895df52 100644
--- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-1:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json
index 6c6532a01..953bfb7b1 100644
--- a/testdata/d2oracle/TestDelete/edge_common.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
index 0074f2140..c3c56a3c0 100644
--- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json
index a84d6cdfd..6bca4cd50 100644
--- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_3.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json
index 41dfcd3e6..f085d59f7 100644
--- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_common_4.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
index 279512768..d14b781c5 100644
--- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-2:0:17",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
index f0cb76557..5275b19bd 100644
--- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-10:0:102",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json
index c6213b785..5ba7ba319 100644
--- a/testdata/d2oracle/TestDelete/edge_first.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_first.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
index 204e09ba0..8fe956cea 100644
--- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
index b3f850c2a..ec3514d0e 100644
--- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-1:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
index 99703c68f..a3a9d2cd7 100644
--- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json
index 2b6d6cd69..c49abada8 100644
--- a/testdata/d2oracle/TestDelete/edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_last.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
index 2139671ea..c7bf64faf 100644
--- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json
index 60acf64a9..af0a96fce 100644
--- a/testdata/d2oracle/TestDelete/edge_middle.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json
index c4e4a918c..c32d34aa9 100644
--- a/testdata/d2oracle/TestDelete/empty_map.exp.json
+++ b/testdata/d2oracle/TestDelete/empty_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/empty_map.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json
index b78be5ccd..f116acb97 100644
--- a/testdata/d2oracle/TestDelete/flat.exp.json
+++ b/testdata/d2oracle/TestDelete/flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/flat.d2,0:0:0-0:0:0",
       "nodes": null
diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
index 9794daeaf..563fd9dfc 100644
--- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json
index f1312d590..063460fb9 100644
--- a/testdata/d2oracle/TestDelete/hoist_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/hoist_children.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
index 96a4e6cb2..5e5a55ac1 100644
--- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json
index ec8b09ace..9e0700298 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges.d2,0:0:0-2:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
index 68541a6a5..0cd835b7f 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_2.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
index c5263d40d..d505707b4 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_3.d2,0:0:0-1:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
index 77d00c552..0d1408158 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/key_with_edges_4.d2,0:0:0-2:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json
index 710b47f1b..5270ca29e 100644
--- a/testdata/d2oracle/TestDelete/left.exp.json
+++ b/testdata/d2oracle/TestDelete/left.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/left.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json
index 9a2e1b0ae..e41f9e3ec 100644
--- a/testdata/d2oracle/TestDelete/multi_near.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,0:0:0-9:0:57",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
index 670199d7d..f17fdd862 100644
--- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,0:0:0-6:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
index 78f9e04c7..d507d5227 100644
--- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.d2,0:0:0-5:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
index eb9a928c4..cd609a383 100644
--- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_flat_middle_container.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
index bec69d205..7c3ad54fb 100644
--- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_flat_style.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
index c2a4e1c74..bff7c808d 100644
--- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,0:0:0-5:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json
index f58bf0bbb..dfcbdba6c 100644
--- a/testdata/d2oracle/TestDelete/near.exp.json
+++ b/testdata/d2oracle/TestDelete/near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/near.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json
index 81ec134ab..3b67399a7 100644
--- a/testdata/d2oracle/TestDelete/nested.exp.json
+++ b/testdata/d2oracle/TestDelete/nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json
index 18281aaa4..eb85fd956 100644
--- a/testdata/d2oracle/TestDelete/nested_2.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_2.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
index 5b71fe5b4..56686e462 100644
--- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
index 925314753..8c3c28001 100644
--- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json
index 7dc2f6dc7..629f232ba 100644
--- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_reserved.d2,0:0:0-2:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
index d16605b46..aa3e1c083 100644
--- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/nested_underscore_update.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
index 94734c593..0c55e6543 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-5:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
index b7e51ad19..59fc5db5e 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-4:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
index 4c40bb213..d53723873 100644
--- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
+++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only-underscore-nested.d2,0:0:0-4:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json
index 5658c3a5c..d8e36fd60 100644
--- a/testdata/d2oracle/TestDelete/only-underscore.exp.json
+++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only-underscore.d2,0:0:0-3:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
index fa8c0f3a7..6836d20b7 100644
--- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
index 49e23529e..562a4955f 100644
--- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json
index aeacb84aa..a6b002f3e 100644
--- a/testdata/d2oracle/TestDelete/order_1.exp.json
+++ b/testdata/d2oracle/TestDelete/order_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json
index f81f2a413..31461ae7b 100644
--- a/testdata/d2oracle/TestDelete/order_2.exp.json
+++ b/testdata/d2oracle/TestDelete/order_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_2.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json
index d9a539b53..ed8eae736 100644
--- a/testdata/d2oracle/TestDelete/order_3.exp.json
+++ b/testdata/d2oracle/TestDelete/order_3.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_3.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json
index ba1dc2363..7775c60d5 100644
--- a/testdata/d2oracle/TestDelete/order_4.exp.json
+++ b/testdata/d2oracle/TestDelete/order_4.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_4.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json
index 8886cfbb3..6baa9b67d 100644
--- a/testdata/d2oracle/TestDelete/order_5.exp.json
+++ b/testdata/d2oracle/TestDelete/order_5.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,0:0:0-4:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json
index 1d869e424..8ad11ae8f 100644
--- a/testdata/d2oracle/TestDelete/order_6.exp.json
+++ b/testdata/d2oracle/TestDelete/order_6.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_6.d2,0:0:0-4:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json
index c4fb7ac50..25f840379 100644
--- a/testdata/d2oracle/TestDelete/order_7.exp.json
+++ b/testdata/d2oracle/TestDelete/order_7.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_7.d2,0:0:0-4:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json
index 4245f163e..7b88c05e1 100644
--- a/testdata/d2oracle/TestDelete/order_8.exp.json
+++ b/testdata/d2oracle/TestDelete/order_8.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/order_8.d2,0:0:0-7:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json
index bea90c397..9cffa89e8 100644
--- a/testdata/d2oracle/TestDelete/shape_class.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_class.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/shape_class.d2,0:0:0-2:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
index f01b13ca1..d86497638 100644
--- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,0:0:0-10:0:128",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
index 758e84185..ef7b7af9d 100644
--- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/singular_flat_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json
index 40905f013..66ac50413 100644
--- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/singular_map_style.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
index 0f4a46a31..67c1be91f 100644
--- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/underscore_no_conflict.d2,0:0:0-5:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
index 71822b8ea..df4d7620d 100644
--- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json
index c13b72504..bf73ebf92 100644
--- a/testdata/d2oracle/TestDelete/width.exp.json
+++ b/testdata/d2oracle/TestDelete/width.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestDelete/width.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
index 16b6b3eb8..7a0b72a22 100644
--- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
+++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,0:0:0-12:0:104",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json
index 9c5c3bea6..b15b540e3 100644
--- a/testdata/d2oracle/TestMove/basic.exp.json
+++ b/testdata/d2oracle/TestMove/basic.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic.d2,0:0:0-1:0:2",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json
index 361a38b9a..62e197700 100644
--- a/testdata/d2oracle/TestMove/basic_nested.exp.json
+++ b/testdata/d2oracle/TestMove/basic_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic_nested.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
index 404eadd10..22381d85e 100644
--- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/basic_out_of_container.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json
index 805cd1c9a..65a69a9bf 100644
--- a/testdata/d2oracle/TestMove/between_containers.exp.json
+++ b/testdata/d2oracle/TestMove/between_containers.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/between_containers.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
index 6b055298d..c3a49a0d4 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-2:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
index 937ab3b8a..b769353e0 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-1:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json
index 4cc72b05a..47015323e 100644
--- a/testdata/d2oracle/TestMove/connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/connected_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-2:0:9",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
index 6dc23b56a..2b597f1e1 100644
--- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
+++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json
index 43cc5bf7d..64a272e47 100644
--- a/testdata/d2oracle/TestMove/container_near.exp.json
+++ b/testdata/d2oracle/TestMove/container_near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/container_near.d2,0:0:0-9:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
index 476ca4340..f06a052be 100644
--- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json
+++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,0:0:0-4:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json
index 28ac2143b..80e4b270e 100644
--- a/testdata/d2oracle/TestMove/edge_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_basic.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
index 96bea725b..ebe3e5c99 100644
--- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-1:0:12",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
index 05a3c891d..f2bd3ba19 100644
--- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
index e6f0af929..ec4268b34 100644
--- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-2:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
index 6f348c219..6638f7c31 100644
--- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,0:0:0-3:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json
index 165508577..250ef5dc8 100644
--- a/testdata/d2oracle/TestMove/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json
index b12b2462a..9e0d32d1a 100644
--- a/testdata/d2oracle/TestMove/edge_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,0:0:0-4:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
index a026d86ed..f15452aa2 100644
--- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
index 372e7b9de..753207e8f 100644
--- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json
index af273e829..013d862d0 100644
--- a/testdata/d2oracle/TestMove/extend_map.exp.json
+++ b/testdata/d2oracle/TestMove/extend_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,0:0:0-8:0:35",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
index bca33e543..bb1f992fd 100644
--- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
+++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json
index b4dbb323e..5ffa855d0 100644
--- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json
+++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_between_containers.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json
index d163557a6..6f058bf60 100644
--- a/testdata/d2oracle/TestMove/flat_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_merge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,0:0:0-5:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json
index 93ff95b6d..a02d287e7 100644
--- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json
+++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_middle_container.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
index 2f373a2be..dbbe76c0d 100644
--- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge.d2,0:0:0-5:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
index 106996a84..001c5db56 100644
--- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
+++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,0:0:0-10:0:54",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
index 10b6b0afb..dfca9d602 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
index d9fb1d5f7..ac221c573 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,0:0:0-8:0:72",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
index d613b240a..87493703a 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_value.d2,0:0:0-2:0:10",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json
index 5a62bbe70..0ee95a436 100644
--- a/testdata/d2oracle/TestMove/flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,0:0:0-4:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
index bb5268230..4f326348f 100644
--- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,0:0:0-6:0:33",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json
index c43093588..337f23590 100644
--- a/testdata/d2oracle/TestMove/full_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_slice.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/full_slice.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json
index c469f6b0c..6b23f4c58 100644
--- a/testdata/d2oracle/TestMove/gnarly_1.exp.json
+++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-9:0:64",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json
index 9d0c61756..c99804d09 100644
--- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json
+++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/hoist_container_children.d2,0:0:0-6:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
index 3d0056464..472a2ee02 100644
--- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_existing_map.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
index df7cccb67..0bde25179 100644
--- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_nonexisting_map.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
index 0eb6e8507..53318f42d 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,0:0:0-7:0:95",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
index 371467098..377783a8f 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_style.d2,0:0:0-4:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json
index b41db5921..fdeece592 100644
--- a/testdata/d2oracle/TestMove/map_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/map_transplant.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,0:0:0-13:0:79",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json
index 1b5c15e48..bdd5f2c3d 100644
--- a/testdata/d2oracle/TestMove/map_with_label.exp.json
+++ b/testdata/d2oracle/TestMove/map_with_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,0:0:0-5:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
index fee959ebe..0ebaafa78 100644
--- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
+++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,0:0:0-11:0:67",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json
index b97791c1c..2d2043a01 100644
--- a/testdata/d2oracle/TestMove/merge_reserved.exp.json
+++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,0:0:0-9:0:70",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json
index c7fafe388..ef2e9c413 100644
--- a/testdata/d2oracle/TestMove/middle_container.exp.json
+++ b/testdata/d2oracle/TestMove/middle_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/middle_container.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json
index 231891e55..dc9f8d8dc 100644
--- a/testdata/d2oracle/TestMove/move_container_children.exp.json
+++ b/testdata/d2oracle/TestMove/move_container_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_container_children.d2,0:0:0-7:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
index 50c4488c0..4c4851834 100644
--- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
+++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_container_conflict_children.d2,0:0:0-7:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
index a0c5bcb0d..7c657d924 100644
--- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_into_key_with_value.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
index 22eb7c7a4..99efcb3e8 100644
--- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-2:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
index 5716835fa..ba86c5f1d 100644
--- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-4:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
index 640e40261..45c0f7ac6 100644
--- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
+++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,0:0:0-11:0:71",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json
index 372ceedc9..d1aac8e9b 100644
--- a/testdata/d2oracle/TestMove/near.exp.json
+++ b/testdata/d2oracle/TestMove/near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/near.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
index 9fd267b67..c07f0ee71 100644
--- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
+++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nested-underscore-move-out.d2,0:0:0-4:0:27",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json
index 1a22ae6b0..004758cd5 100644
--- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,0:0:0-6:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
index b195cddb9..1855b26dd 100644
--- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,0:0:0-7:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
index 1df21604b..08cda7e37 100644
--- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
+++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/out_of_newline_container.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json
index 398e9000e..18dd78d44 100644
--- a/testdata/d2oracle/TestMove/parentheses.exp.json
+++ b/testdata/d2oracle/TestMove/parentheses.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-2:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
index 7e2a5b47f..d65ed6f61 100644
--- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,0:0:0-3:0:11",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json
index e1e915a1b..ae724b877 100644
--- a/testdata/d2oracle/TestMove/partial_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_slice.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/partial_slice.d2,0:0:0-2:0:4",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json
index 51fa56150..b8f7bd85a 100644
--- a/testdata/d2oracle/TestMove/rename_2.exp.json
+++ b/testdata/d2oracle/TestMove/rename_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/rename_2.d2,0:0:0-7:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json
index 749a68e62..fc588be56 100644
--- a/testdata/d2oracle/TestMove/reuse_map.exp.json
+++ b/testdata/d2oracle/TestMove/reuse_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,0:0:0-7:0:39",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json
index a6edd6c13..5faba70e0 100644
--- a/testdata/d2oracle/TestMove/slice_style.exp.json
+++ b/testdata/d2oracle/TestMove/slice_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/slice_style.d2,0:0:0-3:0:68",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json
index 64204de97..2024e9463 100644
--- a/testdata/d2oracle/TestMove/underscore-connection.exp.json
+++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,0:0:0-8:0:40",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json
index 454c75884..0fcedfa8b 100644
--- a/testdata/d2oracle/TestMove/underscore_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_children.d2,0:0:0-4:0:15",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
index db278b6d1..1b85cac85 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,0:0:0-4:0:20",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
index 08f12dec5..9acd8d391 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
index 495710ccf..077302a94 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
index e62b59d9e..7c442f9f5 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,0:0:0-3:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
index 3c4654dc5..2732b7cfd 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,0:0:0-3:0:16",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
index d6205dcea..e91b2f8e3 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,0:0:0-3:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
index e8f841dff..712405d97 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,0:0:0-6:0:34",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json
index 4b6f6e921..9dca613fa 100644
--- a/testdata/d2oracle/TestMove/underscore_merge.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,0:0:0-6:0:32",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json
index 07ec2a84c..d612a8983 100644
--- a/testdata/d2oracle/TestMove/underscore_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_split.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,0:0:0-6:0:28",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json
index 71fcca045..0772fd4cf 100644
--- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,0:0:0-10:0:60",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json
index 2a4494c87..5795f4ccf 100644
--- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/underscore_transplant.d2,0:0:0-4:0:13",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json
index b966ff44c..7f3a853d2 100644
--- a/testdata/d2oracle/TestMove/unique_name.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/unique_name.d2,0:0:0-6:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
index db46f90e8..d28c3b420 100644
--- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,0:0:0-6:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json
index 4c8b13746..d24981b23 100644
--- a/testdata/d2oracle/TestRename/arrows.exp.json
+++ b/testdata/d2oracle/TestRename/arrows.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json
index 94955f81f..e4a145958 100644
--- a/testdata/d2oracle/TestRename/arrows_chain.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-1:0:18",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json
index 85ec88306..3a0b0e7fd 100644
--- a/testdata/d2oracle/TestRename/arrows_complex.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
index 97df297a2..82bae106f 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-1:0:22",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
index 137248a31..6db44d5f8 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-1:0:27",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
index 54f62bf36..f0f162256 100644
--- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-1:0:30",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
index e56bd3cc4..b01784f5f 100644
--- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json
index 8b5064507..5252e87c1 100644
--- a/testdata/d2oracle/TestRename/conflict.exp.json
+++ b/testdata/d2oracle/TestRename/conflict.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict.d2,0:0:0-2:0:8",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json
index 0581c359c..9861dedd8 100644
--- a/testdata/d2oracle/TestRename/conflict_2.exp.json
+++ b/testdata/d2oracle/TestRename/conflict_2.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict_2.d2,0:0:0-4:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
index 2e7d0c105..f7aeff695 100644
--- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
+++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/conflict_with_dots.d2,0:0:0-2:0:14",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json
index 39bea84cc..087ca3c1f 100644
--- a/testdata/d2oracle/TestRename/container.exp.json
+++ b/testdata/d2oracle/TestRename/container.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-12:0:235",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json
index c1b512c54..58c135e78 100644
--- a/testdata/d2oracle/TestRename/edges.exp.json
+++ b/testdata/d2oracle/TestRename/edges.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-5:0:74",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json
index 75c17b946..7320fc13c 100644
--- a/testdata/d2oracle/TestRename/flat.exp.json
+++ b/testdata/d2oracle/TestRename/flat.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/flat.d2,0:0:0-1:0:6",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json
index 7ca08a2c6..3c579e170 100644
--- a/testdata/d2oracle/TestRename/generated.exp.json
+++ b/testdata/d2oracle/TestRename/generated.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/generated.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json
index f8cd15608..872d8157d 100644
--- a/testdata/d2oracle/TestRename/near.exp.json
+++ b/testdata/d2oracle/TestRename/near.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/near.d2,0:0:0-4:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json
index 44fa19cca..23130b5ff 100644
--- a/testdata/d2oracle/TestRename/nested.exp.json
+++ b/testdata/d2oracle/TestRename/nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestRename/nested.d2,0:0:0-4:0:61",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json
index bae39df74..40751dbdf 100644
--- a/testdata/d2oracle/TestSet/base.exp.json
+++ b/testdata/d2oracle/TestSet/base.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/base.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json
index 7b9839e81..ca6b20dcc 100644
--- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json
+++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/block_string_multiline.d2,0:0:0-5:0:146",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json
index f05040176..822f69bc4 100644
--- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json
+++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/block_string_oneline.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json
index d51130ed2..1a3dac238 100644
--- a/testdata/d2oracle/TestSet/edge.exp.json
+++ b/testdata/d2oracle/TestSet/edge.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-1:0:12",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json
index eaeb88ec9..5705a640f 100644
--- a/testdata/d2oracle/TestSet/edge_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-1:0:31",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json
index a4e7dfb19..9eeadba7e 100644
--- a/testdata/d2oracle/TestSet/edge_chain.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,0:0:0-4:0:93",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
index 86ceaf09c..f075b2f9e 100644
--- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-2:0:45",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
index decdfa4a1..0b0854fa3 100644
--- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-3:0:76",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
index b7c7d8679..58298d21c 100644
--- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,0:0:0-4:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
index c9e29fd6d..86cc8d45a 100644
--- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-2:0:55",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json
index cdbc7eb76..3149173d3 100644
--- a/testdata/d2oracle/TestSet/edge_index_case.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,0:0:0-6:0:54",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
index 507d164bc..d7aa0245e 100644
--- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-2:0:43",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
index 35b831403..68f7861de 100644
--- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
index 1b3eb34b0..4c7fc0bce 100644
--- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
+++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,0:0:0-2:0:37",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json
index 67fffa7be..b43925f2f 100644
--- a/testdata/d2oracle/TestSet/edge_label.exp.json
+++ b/testdata/d2oracle/TestSet/edge_label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-1:0:36",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
index 63d242e7a..32b8fdf8e 100644
--- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-6:0:70",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
index f53edc1d9..72a0a788e 100644
--- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-6:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
index 41be08edc..f6b9d8b7b 100644
--- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,0:0:0-3:0:23",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
index 734b681db..9bae3fe9e 100644
--- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,0:0:0-3:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
index a4206713f..a2acc09cb 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
index c47c70beb..bafe8d682 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-2:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
index 5573b5348..baaf45fcb 100644
--- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-1:0:42",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json
index 5fc455ba3..4b0dd5e66 100644
--- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json
+++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,0:0:0-5:0:44",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json
index b44444a5e..554bee4a4 100644
--- a/testdata/d2oracle/TestSet/icon.exp.json
+++ b/testdata/d2oracle/TestSet/icon.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:0:0-1:0:68",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json
index 366380214..d35e5f507 100644
--- a/testdata/d2oracle/TestSet/inline_style.exp.json
+++ b/testdata/d2oracle/TestSet/inline_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,0:0:0-4:0:51",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json
index 9c502d199..fa0485116 100644
--- a/testdata/d2oracle/TestSet/label.exp.json
+++ b/testdata/d2oracle/TestSet/label.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label.d2,0:0:0-1:0:88",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json
index dcd401091..aa680310a 100644
--- a/testdata/d2oracle/TestSet/label_primary.exp.json
+++ b/testdata/d2oracle/TestSet/label_primary.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,0:0:0-3:0:63",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json
index 8c6b7be98..c4061c809 100644
--- a/testdata/d2oracle/TestSet/label_replace.exp.json
+++ b/testdata/d2oracle/TestSet/label_replace.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_replace.d2,0:0:0-1:0:88",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json
index 5b8f1b505..b9105e16a 100644
--- a/testdata/d2oracle/TestSet/label_unset.exp.json
+++ b/testdata/d2oracle/TestSet/label_unset.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/label_unset.d2,0:0:0-1:0:7",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json
index b68d29e52..3a1447d10 100644
--- a/testdata/d2oracle/TestSet/map_key_missing.exp.json
+++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-1:0:83",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json
index c9505a86d..ffbbad25c 100644
--- a/testdata/d2oracle/TestSet/nested_alex.exp.json
+++ b/testdata/d2oracle/TestSet/nested_alex.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,0:0:0-5:0:202",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json
index de49469cf..492cc2ff7 100644
--- a/testdata/d2oracle/TestSet/new_style.exp.json
+++ b/testdata/d2oracle/TestSet/new_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/new_style.d2,0:0:0-1:0:29",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
index f3a071b8b..2611bd96f 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-3:0:45",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
index 6f61e5ccf..d4b4a748f 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-5:0:56",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json
index 6f180fe4a..e03a869f4 100644
--- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json
+++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_dimensions.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
index 5a0c8b2cf..5e935e602 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-4:0:59",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
index 5380b903a..b40c829dc 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-5:0:46",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json
index e523a41f8..c5a7c10d1 100644
--- a/testdata/d2oracle/TestSet/replace_link.exp.json
+++ b/testdata/d2oracle/TestSet/replace_link.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,0:0:0-3:0:38",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json
index e4b2192ba..46cfc6037 100644
--- a/testdata/d2oracle/TestSet/replace_position.exp.json
+++ b/testdata/d2oracle/TestSet/replace_position.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_position.d2,0:0:0-5:0:47",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json
index 1455ae8cb..8b1ab7ff5 100644
--- a/testdata/d2oracle/TestSet/replace_shape.exp.json
+++ b/testdata/d2oracle/TestSet/replace_shape.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_shape.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json
index e04fb53c1..d555df516 100644
--- a/testdata/d2oracle/TestSet/replace_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_style.d2,0:0:0-1:0:26",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
index 49fc47df6..88e135c5e 100644
--- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_style_edgecase.d2,0:0:0-2:0:52",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
index 91d3d5797..a56f85013 100644
--- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,0:0:0-3:0:25",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json
index 776fc20bc..88268bd77 100644
--- a/testdata/d2oracle/TestSet/set_dimensions.exp.json
+++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_dimensions.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json
index c08666648..eec94f364 100644
--- a/testdata/d2oracle/TestSet/set_position.exp.json
+++ b/testdata/d2oracle/TestSet/set_position.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_position.d2,0:0:0-1:0:19",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json
index 7b9668576..4eb5f8d32 100644
--- a/testdata/d2oracle/TestSet/set_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:0:0-1:0:21",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json
index f8ed5b5f5..0e70324e8 100644
--- a/testdata/d2oracle/TestSet/shape.exp.json
+++ b/testdata/d2oracle/TestSet/shape.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:0:0-1:0:24",
       "nodes": [
diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
index 8b4d3ce16..60376017b 100644
--- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
@@ -1,7 +1,7 @@
 {
   "graph": {
     "name": "",
-    "isContainerOnly": false,
+    "isFolderOnly": false,
     "ast": {
       "range": "d2/testdata/d2oracle/TestSet/shape_nested_style_set.d2,0:0:0-1:0:24",
       "nodes": [