diff --git a/jmsfx-generator/pom.xml b/jmsfx-generator/pom.xml
index 23f315a6..2cf3d4ce 100644
--- a/jmsfx-generator/pom.xml
+++ b/jmsfx-generator/pom.xml
@@ -115,9 +115,19 @@
                 </configuration>
             </plugin>
             <!--
-                Checks that the SVG fragments are still normalised, and fails naming the files if not,
-                the way Spotless does for Java. It reports only and never writes; the normaliser's apply
-                mode is the fix, and the failure message spells out the command.
+                Two checks over the SVG fragments, both of which report only and never write, and both
+                of which fail naming the files, the way Spotless does for Java.
+
+                The first checks they are still normalised. The normaliser's apply mode is the fix, and
+                the failure message spells out the command.
+
+                The second checks the free canvas fragments still hold the shape described in
+                svg/README.md - one main group, an optional template, any number of examples - because
+                injecting fragments into the generated classes needs a rule for "which element is the
+                content" and that is the rule. A fragment drifts off it easily: an editor leaves a group
+                anonymous, or a new icon arrives with its content loose at the root. Catching that here
+                costs nothing; catching it during injection means finding construction scaffolding
+                rendered as though it were the drawing.
 
                 Bound to verify rather than written as a test, so skipping tests cannot skip it, and at
                 verify for the same reason Spotless is there: late enough not to slow the inner loop,
@@ -151,6 +161,22 @@
                             </arguments>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>check-fragment-shape</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>io.github.ctgnz.jmsfx.generator.FragmentShapeChecker</mainClass>
+                            <arguments>
+                                <argument>--dir</argument>
+                                <argument>${project.basedir}/../jmsfx-standard/src/main/resources/svg</argument>
+                                <argument>--model</argument>
+                                <argument>/model-standard.yml</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FragmentMeasurer.java b/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FragmentMeasurer.java
index 1072a534..87b3591b 100644
--- a/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FragmentMeasurer.java
+++ b/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FragmentMeasurer.java
@@ -23,16 +23,11 @@
 import io.github.ctgnz.jmsfx.generator.model.AmplifierListModel;
 import io.github.ctgnz.jmsfx.generator.model.BoundsModel;
 import io.github.ctgnz.jmsfx.generator.model.DimensionModel;
-import io.github.ctgnz.jmsfx.generator.model.EntityModel;
-import io.github.ctgnz.jmsfx.generator.model.EntitySubTypeModel;
-import io.github.ctgnz.jmsfx.generator.model.EntityTypeModel;
-import io.github.ctgnz.jmsfx.generator.model.GraphicType;
 import io.github.ctgnz.jmsfx.generator.model.HqtfDummyModel;
 import io.github.ctgnz.jmsfx.generator.model.LibraryModel;
 import io.github.ctgnz.jmsfx.generator.model.StandardIdentityGroupModel;
 import io.github.ctgnz.jmsfx.generator.model.StandardIdentityModel;
 import io.github.ctgnz.jmsfx.generator.model.StatusModel;
-import io.github.ctgnz.jmsfx.generator.model.SymbolSetModel;
 import io.github.ctgnz.jmsfx.generator.yaml.JmsfxParser;
 
 /**
@@ -251,55 +246,27 @@ private void measureFrames(LibraryModel model) throws InterruptedException {
     }
 
     /**
-     * Main icons that carry {@code FREE_CANVAS}, at {@code /svg/Appendices/{graphicLocation}/{graphicIdentifier}.svg}.
+     * The extent of every {@code FREE_CANVAS} main icon, which is the only kind that has to be measured.
      * <p>
-     * Every other main icon's extent follows from its graphic type - the octagon, or the frame for a {@code FULL_FRAME} one - so only these need measuring. APP-6E 8.1.3 exempts
-     * Control Measures from the composition rules, and a few Cyberspace path and terrain graphics are the same kind of thing.
-     * <p>
-     * The identifier is derived the same three ways {@code MainElement.getGraphicIdentifier()} derives it. jmsfx#52 is a caution against duplicating that kind of derivation, so
-     * every derived path is checked against the disk and anything missing is reported rather than quietly skipped.
+     * Every other main icon's extent follows from its graphic type - the octagon, or the frame for a {@code FULL_FRAME} one - so only these need a number recorded. Which icons
+     * those are, and which fragment each draws, is {@link FreeCanvasIcons}. A fragment that resolves nowhere is reported rather than quietly skipped, because the identifier is
+     * derived rather than read, so a path going nowhere means either the derivation or the model is wrong. See jmsfx#52.
      */
     private void measureIcons(LibraryModel model) throws Exception {
         Map<String, BoundsModel> measured = new TreeMap<>();
         List<String> missing = new ArrayList<>();
-        int free = 0;
-        for (SymbolSetModel symbolSet : model.getSymbolSets()) {
-            Map<String, String> identifiers = new LinkedHashMap<>();
-            for (EntityModel entity : symbolSet.getEntities()) {
-                if (entity.getGraphicType() == GraphicType.FREE_CANVAS) {
-                    identifiers.put(baseCode(model, symbolSet, entity) + entity.getCode() + "0000", entity.getLabel());
-                }
-            }
-            for (EntityTypeModel entityType : symbolSet.getEntityTypes()) {
-                if (entityType.getGraphicType() == GraphicType.FREE_CANVAS) {
-                    EntityModel entity = entityType.getEntity();
-                    String identifier = entityType.getGraphic() != null ? entityType.getGraphic()
-                        : baseCode(model, symbolSet, entity) + entity.getCode() + entityType.getCode() + "00";
-                    identifiers.put(identifier, entityType.getLabel());
-                }
-            }
-            for (EntitySubTypeModel subType : symbolSet.getEntitySubTypes()) {
-                if (subType.getGraphicType() == GraphicType.FREE_CANVAS) {
-                    EntityTypeModel entityType = subType.getEntityType();
-                    EntityModel entity = entityType.getEntity();
-                    String identifier = subType.getGraphic() != null ? subType.getGraphic()
-                        : baseCode(model, symbolSet, entity) + entity.getCode() + entityType.getCode() + subType.getCode();
-                    identifiers.put(identifier, subType.getLabel());
-                }
-            }
-            for (Map.Entry<String, String> entry : identifiers.entrySet()) {
-                free++;
-                Path file = svg("Appendices", graphicLocation(model, symbolSet) + "/" + entry.getKey() + ".svg");
-                Bounds bounds = boundsOf(file);
-                if (bounds == null) {
-                    missing.add(String.format("%s / %s (%s)", symbolSet.getLabel(), entry.getValue(), entry.getKey()));
-                    continue;
-                }
-                measured.put(entry.getKey(), rectangle(bounds));
+        List<FreeCanvasIcons.Icon> icons = FreeCanvasIcons.collect(model, config.getResourceDir()
+            .resolve("svg"));
+        for (FreeCanvasIcons.Icon icon : icons) {
+            Bounds bounds = boundsOf(icon.fragment());
+            if (bounds == null) {
+                missing.add(String.format("%s / %s (%s)", icon.symbolSet(), icon.label(), icon.identifier()));
+                continue;
             }
+            measured.put(icon.identifier(), rectangle(bounds));
         }
         model.setIconBounds(measured.isEmpty() ? null : measured);
-        System.out.format("  %-24s %d free-canvas icons, %d measured, %d unreadable or absent%n", "main icons", free, measured.size(), missing.size());
+        System.out.format("  %-24s %d free-canvas icons, %d measured, %d unreadable or absent%n", "main icons", icons.size(), measured.size(), missing.size());
         missing.forEach(name -> System.out.format("      no fragment for %s%n", name));
     }
 
@@ -373,20 +340,6 @@ private Path svg(String directory, String fileName) {
             .resolve(fileName);
     }
 
-    /** The symbol set an element's fragment is filed under, which is its own unless the entity borrows another set's numbering. */
-    private String baseCode(LibraryModel model, SymbolSetModel symbolSet, EntityModel entity) {
-        if (entity.getBaseSymbolSet() == null) {
-            return symbolSet.getCode();
-        }
-        return model.getSymbolSets()
-            .stream()
-            .filter(candidate -> entity.getBaseSymbolSet()
-                .equals(candidate.getId()))
-            .findFirst()
-            .map(SymbolSetModel::getCode)
-            .orElse(symbolSet.getCode());
-    }
-
     /** Measured bounds for a fragment, or null when the file is absent or draws nothing. */
     private Bounds boundsOf(Path file) throws InterruptedException {
         if (!Files.exists(file)) {
@@ -413,15 +366,6 @@ private Path fragmentFor(AmplifierListModel list, AmplifierListItemModel item, S
             .resolve(name);
     }
 
-    /** Where a symbol set's fragments live, which falls back to the dimension's directory when the set does not name its own - as {@code SymbolSetEnum} does. */
-    private String graphicLocation(LibraryModel model, SymbolSetModel symbolSet) {
-        if (symbolSet.getGraphicLocation() != null) {
-            return symbolSet.getGraphicLocation();
-        }
-        DimensionModel dimension = model.getDimension(symbolSet.getDimensionId());
-        return dimension == null ? null : dimension.getGraphicLocation();
-    }
-
     private Bounds measureFile(Path file) {
         // parseFile(File), not parseFile(String) - the String overload resolves against the classpath,
         // and the fragments live in another module's source tree. Every overload swallows failures and
diff --git a/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FragmentShapeChecker.java b/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FragmentShapeChecker.java
new file mode 100644
index 00000000..ba012d43
--- /dev/null
+++ b/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FragmentShapeChecker.java
@@ -0,0 +1,231 @@
+package io.github.ctgnz.jmsfx.generator;
+
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import io.github.ctgnz.jmsfx.generator.model.LibraryModel;
+import io.github.ctgnz.jmsfx.generator.yaml.JmsfxParser;
+
+/**
+ * Checks that every free canvas fragment holds the shape the rest of the tooling is entitled to assume.
+ * <p>
+ * A free canvas fragment carries illustrative scaffolding alongside the content it draws, which is what makes it different from every other fragment in the tree, and the reason
+ * the rule is worth stating and worth enforcing:
+ * <ul>
+ * <li>exactly one {@code <g id="main">} - the content, and what a consumer renders;
+ * <li>zero or one {@code <g id="template">} - the construction guide;
+ * <li>zero or more {@code <g id="example">}, numbered {@code example1}, {@code example2} and so on where there is more than one;
+ * <li>any {@code <defs>} the main group references.
+ * </ul>
+ * Nothing else at the root: no bare drawing elements, and no groups under any other name. The template is optional rather than required because two kinds of fragment have nothing
+ * to construct - an area measure is defined by at least three control points the user places, so there is no fixed geometry a template could draw, and the Space Debris fragments
+ * are whole symbols in the way an ordinary icon is. See jmsfx#78 and {@code svg/README.md}.
+ * <p>
+ * <strong>Bound to {@code verify}</strong>, because injecting fragments into the generated classes needs a rule for "which element is the content" and this is that rule. A
+ * fragment that drifts off the shape - an editor leaving a group anonymous, a new icon arriving with its content loose at the root - fails the build where it is cheap to fix,
+ * rather than surfacing much later as an injection that picks up construction scaffolding along with the drawing.
+ *
+ * <pre>
+ * java io.github.ctgnz.jmsfx.generator.FragmentShapeChecker [--dir &lt;svg root&gt; [--model /model-standard.yml]] [/config.yml] [/config-hallux.yml]
+ * </pre>
+ *
+ * Only free canvas fragments are covered. Every other fragment holds a single content group, but the names it goes by are not yet consistent - {@code echelon}, {@code echelon_1_}
+ * and {@code amplifier} all appear on the same kind of element - so there is nothing settled to check against yet. jmsfx#80 is that work, and this is where the check belongs once
+ * it lands.
+ */
+public class FragmentShapeChecker {
+
+    /** An example group, alone when a fragment has one and numbered when it has several. */
+    private static final Pattern EXAMPLE = Pattern.compile("example\\d*");
+
+    private static final String MAIN = "main";
+    private static final String TEMPLATE = "template";
+    private static final String GROUP_ELEMENT = "g";
+    private static final String DEFS_ELEMENT = "defs";
+
+    /** What the build passes when it overrides the directory, since a config file's {@code resourceDir} is an absolute path that resolves nowhere on a runner. */
+    private static final String DEFAULT_MODEL = "/model-standard.yml";
+
+    private final JmsfxParser parser = new JmsfxParser();
+
+    public static void main(String[] args) throws Exception {
+        List<String> rest = new ArrayList<>(Arrays.asList(args));
+        String model = take(rest, "--model");
+        List<Path> directories = new ArrayList<>();
+        for (String dir = take(rest, "--dir"); dir != null; dir = take(rest, "--dir")) {
+            directories.add(Path.of(dir));
+        }
+
+        FragmentShapeChecker checker = new FragmentShapeChecker();
+        List<String> wrong = new ArrayList<>();
+        int checked = 0;
+        if (directories.isEmpty()) {
+            String left = !rest.isEmpty() ? rest.remove(0) : "/config.yml";
+            String right = !rest.isEmpty() ? rest.remove(0) : "/config-hallux.yml";
+            for (String config : List.of(left, right)) {
+                Result result = checker.run(checker.svgRoot(config), checker.model(checker.modelPath(config)), config);
+                checked += result.checked();
+                wrong.addAll(result.wrong());
+            }
+        } else {
+            LibraryModel library = checker.model(model != null ? model : DEFAULT_MODEL);
+            for (Path directory : directories) {
+                // A directory that is not there is not a failure, for the same reason it is not one in
+                // FragmentNormaliser: the build passes this in from the module layout, and a check bound
+                // to it has to survive a partial reactor build or a checkout without its siblings.
+                if (!Files.isDirectory(directory)) {
+                    System.out.format("%nno such directory, skipping: %s%n", directory);
+                    continue;
+                }
+                Result result = checker.run(directory, library, directory.toString());
+                checked += result.checked();
+                wrong.addAll(result.wrong());
+            }
+        }
+
+        if (!wrong.isEmpty()) {
+            // Thrown rather than exited, because this runs in Maven's own JVM under exec:java -
+            // System.exit would take the build down without a message worth reading.
+            throw new IllegalStateException(String.format("%d of %d free canvas fragment%s off the expected shape:%n    %s%n%nSee svg/README.md for the shape they should hold.%n",
+                wrong.size(), checked, wrong.size() == 1 ? " is" : "s are", String.join(System.lineSeparator() + "    ", wrong)));
+        }
+    }
+
+    /** What one tree's check found: how much was looked at, and what was wrong with it. */
+    record Result(int checked, List<String> wrong) {
+    }
+
+    /**
+     * Checks one resource tree, reporting as it goes.
+     * <p>
+     * A fragment the model names but the disk does not hold is a failure rather than a skip. The identifier is derived rather than read, so a path that resolves nowhere means
+     * either the derivation or the model is wrong, and neither should pass quietly. See jmsfx#52.
+     */
+    Result run(Path svgRoot, LibraryModel model, String label) throws Exception {
+        List<String> wrong = new ArrayList<>();
+        List<FreeCanvasIcons.Icon> icons = FreeCanvasIcons.collect(model, svgRoot);
+        for (FreeCanvasIcons.Icon icon : icons) {
+            if (!Files.isRegularFile(icon.fragment())) {
+                wrong.add(String.format("%s: no such fragment (%s / %s)", icon.identifier(), icon.symbolSet(), icon.label()));
+                continue;
+            }
+            List<String> faults = check(icon.fragment());
+            if (!faults.isEmpty()) {
+                wrong.add(String.format("%s: %s", icon.identifier(), String.join("; ", faults)));
+            }
+        }
+        System.out.format("%n%s%n  free canvas fragments  %d%n  off the shape          %d%n", label, icons.size(), wrong.size());
+        return new Result(icons.size(), wrong);
+    }
+
+    /** Everything wrong with one fragment, so a run reports a file once rather than once per fault. */
+    List<String> check(Path fragment) throws Exception {
+        List<String> faults = new ArrayList<>();
+        int main = 0;
+        int template = 0;
+        for (Element child : roots(fragment)) {
+            String name = child.getLocalName();
+            String id = child.getAttribute("id");
+            if (DEFS_ELEMENT.equals(name)) {
+                continue;
+            }
+            if (!GROUP_ELEMENT.equals(name)) {
+                faults.add(String.format("<%s> at the root, outside any group", name));
+            } else if (MAIN.equals(id)) {
+                main++;
+            } else if (TEMPLATE.equals(id)) {
+                template++;
+            } else if (!EXAMPLE.matcher(id)
+                .matches()) {
+                faults.add(id.isEmpty() ? "a group with no id" : String.format("a group called %s", id));
+            }
+        }
+        if (main != 1) {
+            faults.add(main == 0 ? "no <g id=\"main\">" : String.format("%d <g id=\"main\">", main));
+        }
+        if (template > 1) {
+            faults.add(String.format("%d <g id=\"template\">", template));
+        }
+        return faults;
+    }
+
+    /**
+     * The fragment's root elements.
+     * <p>
+     * Editor metadata is skipped rather than reported. {@link FragmentNormaliser} takes it out and its own check is bound to the same phase, so a file that still carries any is
+     * already failing the build with a message that says what to do about it; reporting the same file twice, for something that is not about its shape, would only be noise.
+     */
+    private List<Element> roots(Path fragment) throws Exception {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        List<Element> roots = new ArrayList<>();
+        try (InputStream in = Files.newInputStream(fragment)) {
+            NodeList children = factory.newDocumentBuilder()
+                .parse(in)
+                .getDocumentElement()
+                .getChildNodes();
+            for (int i = 0; i < children.getLength(); i++) {
+                Node child = children.item(i);
+                if (child.getNodeType() == Node.ELEMENT_NODE && !SvgFingerprint.isEditorMetadata(child)) {
+                    roots.add((Element) child);
+                }
+            }
+        }
+        return roots;
+    }
+
+    /** The model a config file names, which is a classpath path and so resolves the same wherever the build runs. */
+    private String modelPath(String configFile) throws Exception {
+        try (InputStream in = resource(configFile)) {
+            return parser.readConfig(in)
+                .getModelFilePath();
+        }
+    }
+
+    private LibraryModel model(String modelFile) throws Exception {
+        try (InputStream in = resource(modelFile)) {
+            return parser.readLibraryModel(in);
+        }
+    }
+
+    private Path svgRoot(String configFile) throws Exception {
+        try (InputStream in = resource(configFile)) {
+            GeneratorConfig config = parser.readConfig(in);
+            if (config.getResourceDir() == null) {
+                throw new IllegalStateException(configFile + " has no resourceDir, so its fragments cannot be found");
+            }
+            return config.getResourceDir()
+                .resolve("svg");
+        }
+    }
+
+    private InputStream resource(String path) {
+        InputStream in = FragmentShapeChecker.class.getResourceAsStream(path);
+        if (in == null) {
+            throw new IllegalArgumentException("not on the classpath: " + path);
+        }
+        return in;
+    }
+
+    /** The value following a flag, removing both from the list - so what is left is the positional arguments. */
+    private static String take(List<String> args, String flag) {
+        int at = args.indexOf(flag);
+        if (at < 0 || at + 1 >= args.size()) {
+            return null;
+        }
+        args.remove(at);
+        return args.remove(at);
+    }
+
+}
diff --git a/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FreeCanvasIcons.java b/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FreeCanvasIcons.java
new file mode 100644
index 00000000..851aaf42
--- /dev/null
+++ b/jmsfx-generator/src/main/java/io/github/ctgnz/jmsfx/generator/FreeCanvasIcons.java
@@ -0,0 +1,113 @@
+package io.github.ctgnz.jmsfx.generator;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.github.ctgnz.jmsfx.generator.model.DimensionModel;
+import io.github.ctgnz.jmsfx.generator.model.EntityModel;
+import io.github.ctgnz.jmsfx.generator.model.EntitySubTypeModel;
+import io.github.ctgnz.jmsfx.generator.model.EntityTypeModel;
+import io.github.ctgnz.jmsfx.generator.model.GraphicType;
+import io.github.ctgnz.jmsfx.generator.model.LibraryModel;
+import io.github.ctgnz.jmsfx.generator.model.SymbolSetModel;
+
+/**
+ * The main icons that carry {@code FREE_CANVAS}, each paired with the fragment it draws.
+ * <p>
+ * These are the Control Measures and a few Cyberspace path and terrain graphics: GIS construction samples showing how a measure is drawn on a map, rather than icons composed into
+ * a symbol. APP-6E 8.1.3 exempts them from the composition rules, and #59 gave them {@code FREE_CANVAS} for the same reason. Two tools need to find exactly this set -
+ * {@link FragmentMeasurer}, because only these have an extent that has to be measured rather than derived, and {@link FragmentShapeChecker}, because only these carry illustrative
+ * scaffolding alongside their content - so the collection lives here rather than in either of them.
+ * <p>
+ * The identifier is derived the same three ways {@code MainElement.getGraphicIdentifier()} derives it. jmsfx#52 is a caution against duplicating that kind of derivation, which is
+ * the reason for one copy here instead of one per caller; every path is handed back whether or not it exists, so a caller reports what is missing rather than quietly skipping it.
+ */
+public final class FreeCanvasIcons {
+
+    /** One free canvas icon: the graphic identifier that names it, enough label to report it by, and the fragment it draws. */
+    public record Icon(String identifier, String label, String symbolSet, Path fragment) {
+    }
+
+    private FreeCanvasIcons() {
+    }
+
+    /** Every free canvas icon in the model, in symbol set order, resolved against the {@code svg} directory of a resource tree. */
+    public static List<Icon> collect(LibraryModel model, Path svgRoot) {
+        List<Icon> icons = new ArrayList<>();
+        for (SymbolSetModel symbolSet : model.getSymbolSets()) {
+            Map<String, String> identifiers = identifiers(model, symbolSet);
+            if (identifiers.isEmpty()) {
+                continue;
+            }
+            // Asked for only once there is something to file, so a set that contributes no free canvas
+            // icons is never required to say where fragments it does not have would live.
+            String location = graphicLocation(model, symbolSet);
+            if (location == null) {
+                throw new IllegalStateException(String.format("symbol set %s has free canvas icons but no graphic location", symbolSet.getLabel()));
+            }
+            identifiers.forEach((identifier, label) -> icons.add(new Icon(identifier, label, symbolSet.getLabel(), svgRoot.resolve("Appendices")
+                .resolve(location)
+                .resolve(identifier + ".svg"))));
+        }
+        return icons;
+    }
+
+    /**
+     * The graphic identifiers one symbol set contributes, mapped to the label that names each.
+     * <p>
+     * A {@link LinkedHashMap} rather than a list of pairs because an entity type and its sub-type can name the same graphic, and the set should hold it once.
+     */
+    private static Map<String, String> identifiers(LibraryModel model, SymbolSetModel symbolSet) {
+        Map<String, String> identifiers = new LinkedHashMap<>();
+        for (EntityModel entity : symbolSet.getEntities()) {
+            if (entity.getGraphicType() == GraphicType.FREE_CANVAS) {
+                identifiers.put(baseCode(model, symbolSet, entity) + entity.getCode() + "0000", entity.getLabel());
+            }
+        }
+        for (EntityTypeModel entityType : symbolSet.getEntityTypes()) {
+            if (entityType.getGraphicType() == GraphicType.FREE_CANVAS) {
+                EntityModel entity = entityType.getEntity();
+                String identifier = entityType.getGraphic() != null ? entityType.getGraphic()
+                    : baseCode(model, symbolSet, entity) + entity.getCode() + entityType.getCode() + "00";
+                identifiers.put(identifier, entityType.getLabel());
+            }
+        }
+        for (EntitySubTypeModel subType : symbolSet.getEntitySubTypes()) {
+            if (subType.getGraphicType() == GraphicType.FREE_CANVAS) {
+                EntityTypeModel entityType = subType.getEntityType();
+                EntityModel entity = entityType.getEntity();
+                String identifier = subType.getGraphic() != null ? subType.getGraphic()
+                    : baseCode(model, symbolSet, entity) + entity.getCode() + entityType.getCode() + subType.getCode();
+                identifiers.put(identifier, subType.getLabel());
+            }
+        }
+        return identifiers;
+    }
+
+    /** The symbol set an element's fragment is filed under, which is its own unless the entity borrows another set's numbering. */
+    private static String baseCode(LibraryModel model, SymbolSetModel symbolSet, EntityModel entity) {
+        if (entity.getBaseSymbolSet() == null) {
+            return symbolSet.getCode();
+        }
+        return model.getSymbolSets()
+            .stream()
+            .filter(candidate -> entity.getBaseSymbolSet()
+                .equals(candidate.getId()))
+            .findFirst()
+            .map(SymbolSetModel::getCode)
+            .orElse(symbolSet.getCode());
+    }
+
+    /** Where a symbol set's fragments live, which falls back to the dimension's directory when the set does not name its own - as {@code SymbolSetEnum} does. */
+    private static String graphicLocation(LibraryModel model, SymbolSetModel symbolSet) {
+        if (symbolSet.getGraphicLocation() != null) {
+            return symbolSet.getGraphicLocation();
+        }
+        DimensionModel dimension = model.getDimension(symbolSet.getDimensionId());
+        return dimension == null ? null : dimension.getGraphicLocation();
+    }
+
+}
diff --git a/jmsfx-generator/src/main/resources/model-hallux.yml b/jmsfx-generator/src/main/resources/model-hallux.yml
index a0e8465d..3a2e4d95 100644
--- a/jmsfx-generator/src/main/resources/model-hallux.yml
+++ b/jmsfx-generator/src/main/resources/model-hallux.yml
@@ -1287,8 +1287,8 @@ iconBounds:
   "25360200": {minX: 227.28, minY: 185.97, width: 252.23, height: 234.48}
   "25360300": {minX: 223.19, minY: 129.96, width: 249.97, height: 308.29}
   "25370100": {minX: 9.5, minY: 54.99, width: 379.73, height: 281.13}
-  "60200100": {minX: 114.28, minY: 133.42, width: 371.45, height: 133.17}
-  "60200200": {minX: 88.87, minY: 92.18, width: 410.98, height: 172.99}
+  "60200100": {minX: 114.28, minY: 110.55, width: 371.45, height: 166.59}
+  "60200200": {minX: 88.87, minY: 70.67, width: 410.98, height: 215.52}
   "60210100": {minX: 88.61, minY: 90.65, width: 373.87, height: 229.45}
 modifierBounds:
   "10622": {minX: 121.0, minY: 442.52, width: 370.0, height: 5.28}
diff --git a/jmsfx-generator/src/main/resources/model-standard.yml b/jmsfx-generator/src/main/resources/model-standard.yml
index a3d7a2c7..ce321c5d 100644
--- a/jmsfx-generator/src/main/resources/model-standard.yml
+++ b/jmsfx-generator/src/main/resources/model-standard.yml
@@ -1225,8 +1225,8 @@ iconBounds:
   "25360200": {minX: 227.28, minY: 185.97, width: 252.23, height: 234.48}
   "25360300": {minX: 223.19, minY: 129.96, width: 249.97, height: 308.29}
   "25370100": {minX: 9.5, minY: 54.99, width: 379.73, height: 281.13}
-  "60200100": {minX: 114.28, minY: 133.42, width: 371.45, height: 133.17}
-  "60200200": {minX: 88.87, minY: 92.18, width: 410.98, height: 172.99}
+  "60200100": {minX: 114.28, minY: 110.55, width: 371.45, height: 166.59}
+  "60200200": {minX: 88.87, minY: 70.67, width: 410.98, height: 215.52}
   "60210100": {minX: 88.61, minY: 90.65, width: 373.87, height: 229.45}
 modifierBounds:
   "10622": {minX: 121.0, minY: 442.52, width: 370.0, height: 5.28}
diff --git a/jmsfx-generator/src/test/java/io/github/ctgnz/jmsfx/generator/FragmentShapeCheckerTest.java b/jmsfx-generator/src/test/java/io/github/ctgnz/jmsfx/generator/FragmentShapeCheckerTest.java
new file mode 100644
index 00000000..744602ab
--- /dev/null
+++ b/jmsfx-generator/src/test/java/io/github/ctgnz/jmsfx/generator/FragmentShapeCheckerTest.java
@@ -0,0 +1,119 @@
+package io.github.ctgnz.jmsfx.generator;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+/**
+ * The build fails when a free canvas fragment is off the expected shape, so the rule has to hold in both directions: a fragment that drifts off it must be reported, and the 577
+ * that are already on it must not be, or every build fails on nothing.
+ * <p>
+ * Each case here is a shape that was genuinely present in the tree before jmsfx#78, not an invented one.
+ */
+class FragmentShapeCheckerTest {
+
+    private static final String HEAD = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 612 792\">\n";
+    private static final String MAIN = "  <g id=\"main\"><line x1=\"1\" y1=\"1\" x2=\"2\" y2=\"2\"/></g>\n";
+    private static final String TEMPLATE = "  <g id=\"template\"><text x=\"1\" y=\"1\">T</text></g>\n";
+
+    private static List<String> check(Path dir, String name, String... body) throws Exception {
+        Path file = dir.resolve(name);
+        Files.writeString(file, HEAD + String.join("", body) + "</svg>\n", StandardCharsets.UTF_8);
+        return new FragmentShapeChecker().check(file);
+    }
+
+    @Test
+    void acceptsMainAndTemplate(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "a.svg", MAIN, TEMPLATE), is(empty()));
+    }
+
+    /** The 22 fragments that are content and nothing else - the Space Debris icons and the area measures with no fixed construction. */
+    @Test
+    void acceptsMainAlone(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "b.svg", MAIN), is(empty()));
+    }
+
+    /** Numbered where a fragment has more than one, which five of them do; 25240805 has four. */
+    @Test
+    void acceptsAnyNumberOfExamples(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "c.svg", MAIN, TEMPLATE, "  <g id=\"example\"/>\n", "  <g id=\"example1\"/>\n", "  <g id=\"example2\"/>\n"), is(empty()));
+    }
+
+    /** A pattern or a marker the main group references, which five fragments carry. */
+    @Test
+    void acceptsDefs(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "d.svg", "  <defs><pattern id=\"slash1\"/></defs>\n", MAIN, TEMPLATE), is(empty()));
+    }
+
+    /** Order is paint order and varies across the tree - 16 fragments put an example first - so it is not what this rule is about. */
+    @Test
+    void acceptsAnyOrder(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "e.svg", "  <g id=\"example\"/>\n", TEMPLATE, MAIN), is(empty()));
+    }
+
+    /** What 25218800 and 25281901 looked like: the id on the drawing element itself, with no group to hold it. */
+    @Test
+    void rejectsContentLooseAtTheRoot(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "f.svg", "  <polygon id=\"main\" points=\"1,1 2,2 3,3\"/>\n", TEMPLATE),
+            contains(containsString("<polygon> at the root"), containsString("no <g id=\"main\">")));
+    }
+
+    /** What 60200100 came back as after Inkscape, once the normaliser dropped the generated id its example group was carrying. */
+    @Test
+    void rejectsAnonymousGroup(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "g.svg", MAIN, "  <g style=\"display:none\"/>\n", TEMPLATE), contains(containsString("a group with no id")));
+    }
+
+    /** What 25200600 was called before the grey backdrop was recognised as an example rather than part of the construction guide. */
+    @Test
+    void rejectsAGroupUnderAnotherName(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "h.svg", MAIN, TEMPLATE, "  <g id=\"template2\"/>\n"), contains(containsString("a group called template2")));
+    }
+
+    @Test
+    void rejectsNoMain(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "i.svg", TEMPLATE), contains(containsString("no <g id=\"main\">")));
+    }
+
+    @Test
+    void rejectsTwoMains(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "j.svg", MAIN, MAIN, TEMPLATE), contains(containsString("2 <g id=\"main\">")));
+    }
+
+    @Test
+    void rejectsTwoTemplates(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "k.svg", MAIN, TEMPLATE, TEMPLATE), contains(containsString("2 <g id=\"template\">")));
+    }
+
+    /**
+     * Inkscape's own elements sit at the root beside the content, and taking them out is {@link FragmentNormaliser}'s job. Its check is bound to the same phase, so a file still
+     * carrying them is already failing the build with a message that says what to do; reporting it again here, for something that is not about its shape, would only be noise.
+     */
+    @Test
+    void ignoresEditorMetadata(@TempDir Path dir) throws Exception {
+        Path file = dir.resolve("l.svg");
+        Files.writeString(file, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                + "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\" viewBox=\"0 0 612 792\">\n"
+                                + "  <sodipodi:namedview id=\"namedview1\"/>\n" + MAIN + TEMPLATE + "</svg>\n",
+            StandardCharsets.UTF_8);
+        assertThat(new FragmentShapeChecker().check(file), is(empty()));
+    }
+
+    /** Every fault at once, so a run reports a file a single time rather than once per thing wrong with it. */
+    @Test
+    void reportsEveryFaultOnOneFragment(@TempDir Path dir) throws Exception {
+        assertThat(check(dir, "m.svg", "  <rect id=\"example2\" width=\"1\" height=\"1\"/>\n", "  <g id=\"scaffolding\"/>\n", TEMPLATE, TEMPLATE), hasSize(4));
+    }
+
+}
diff --git a/jmsfx-standard/src/main/java/io/github/ctgnz/jmsfx/standard/IconBounds.java b/jmsfx-standard/src/main/java/io/github/ctgnz/jmsfx/standard/IconBounds.java
index 926fa70f..411ff9d6 100644
--- a/jmsfx-standard/src/main/java/io/github/ctgnz/jmsfx/standard/IconBounds.java
+++ b/jmsfx-standard/src/main/java/io/github/ctgnz/jmsfx/standard/IconBounds.java
@@ -594,8 +594,8 @@ public final class IconBounds {
         Map.entry("25360200", new Rectangle2D(227.28, 185.97, 252.23, 234.48)),
         Map.entry("25360300", new Rectangle2D(223.19, 129.96, 249.97, 308.29)),
         Map.entry("25370100", new Rectangle2D(9.5, 54.99, 379.73, 281.13)),
-        Map.entry("60200100", new Rectangle2D(114.28, 133.42, 371.45, 133.17)),
-        Map.entry("60200200", new Rectangle2D(88.87, 92.18, 410.98, 172.99)),
+        Map.entry("60200100", new Rectangle2D(114.28, 110.55, 371.45, 166.59)),
+        Map.entry("60200200", new Rectangle2D(88.87, 70.67, 410.98, 215.52)),
         Map.entry("60210100", new Rectangle2D(88.61, 90.65, 373.87, 229.45)));
 
     /**
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25110300.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25110300.svg
index 38d4aee6..4e57039b 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25110300.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25110300.svg
@@ -1,26 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg:svg enable-background="new 0 0 612 792" font-style="normal" height="792" id="Version_1.0" version="1.1" viewBox=" 0  0 612 792" width="612" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0">
-  <svg:g font-style="normal" id="main" style="display:inline">
-    <svg:line fill="none" font-style="normal" stroke="#010101" stroke-width="10.9096" x1="94.28008" x2="520.36975" y1="375" y2="375"/>
-    <svg:text dx="0.0" dy="0.0" fill="#010101" font-family="sans-serif" font-size="36px" font-style="normal" x="91.93633" y="353">EWL</svg:text>
-    <svg:text dx="0.0" dy="0.0" fill="#010101" font-family="sans-serif" font-size="36px" font-style="normal" x="441.93616" y="353">EWL</svg:text>
-  </svg:g>
-  <svg:g display="none" font-style="normal" id="example" transform="translate(-66.72595)">
-    <svg:text display="inline" dx="0.0" dy="0.0" fill="#8C8C8C" font-family="sans-serif" font-size="24px" font-style="normal" x="265.25574" y="408.59613">326 EN BN (USA)</svg:text>
-    <svg:text display="inline" dx="0.0" dy="0.0" fill="#8C8C8C" font-family="sans-serif" font-size="24px" font-style="normal" x="264.60535" y="360.95029">127 EN BN (USA)</svg:text>
-  </svg:g>
-  <svg:g display="inline" font-style="normal" id="template">
-    <svg:g font-style="normal" transform="translate(0,-2)">
-      <svg:text dx="0.0" dy="0.0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="264.60254" y="418.51422">T1/AS1</svg:text>
-      <svg:rect font-style="normal" height="46.7103" rx="0" ry="0" style="fill:none;fill-rule:evenodd;stroke:#0000FF;stroke-width:4.03658;stroke-dasharray:none" width="126.7194" x="244.4147" y="387.82312"/>
-    </svg:g>
-    <svg:g display="inline" font-style="normal" transform="translate(0,4)">
-      <svg:text dx="0.0" dy="0.0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="278.37543" y="343.89902">T/AS</svg:text>
-      <svg:rect font-style="normal" height="46.7103" rx="0" ry="0" style="fill:none;fill-rule:evenodd;stroke:#0000FF;stroke-width:4.03658;stroke-dasharray:none" width="126.7194" x="243.51573" y="313.20792"/>
-    </svg:g>
-    <svg:text display="inline" dx="0.0" dy="0.0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="489.64783" y="461.101">PT 2</svg:text>
-    <svg:path d="m 517.77832,435.80202 0.052,-21.317 c 0.029,-1.003 0.839,-1.79 1.817,-1.79 1.001,0 1.813,0.813 1.813,1.82 l -0.084,21.291 c 0,1 -0.809,1.816 -1.813,1.816 -0.998,-0.001 -1.785,-0.816 -1.785,-1.82 z m -8.966,-17.741 10.938,-36.087 10.732,36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000FF" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
-    <svg:text display="inline" dx="0.0" dy="0.0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="67.3806" y="461.10104">PT 1</svg:text>
-    <svg:path d="m 92.5111,435.80203 0.052,-21.317 c 0.029,-1.003 0.839,-1.79 1.817,-1.79 1.001,0 1.813,0.813 1.813,1.82 l -0.084,21.291 c 0,1 -0.809,1.816 -1.813,1.816 -0.998,-10e-4 -1.785,-0.816 -1.785,-1.82 z m -8.966,-17.741 10.94,-36.087 10.732,36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000FF" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
-  </svg:g>
-</svg:svg>
+<svg enable-background="new 0 0 612 792" font-style="normal" height="792" id="Version_1.0" version="1.1" viewBox=" 0  0 612 792" width="612" x="0" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0">
+  <g font-style="normal" id="main" style="display:inline">
+    <line fill="none" font-style="normal" stroke="#010101" stroke-width="10.9096" x1="94.28008" x2="520.36975" y1="375" y2="375"/>
+    <text dx="0.0" dy="0.0" fill="#010101" font-family="sans-serif" font-size="36px" font-style="normal" x="91.93633" y="353">EWL</text>
+    <text dx="0.0" dy="0.0" fill="#010101" font-family="sans-serif" font-size="36px" font-style="normal" x="441.93616" y="353">EWL</text>
+  </g>
+  <g display="none" font-style="normal" id="example" transform="translate(-66.72595)">
+    <text display="inline" dx="0" dy="0" fill="#8c8c8c" font-family="sans-serif" font-size="24px" font-style="normal" x="265.25574" y="408.59613">326 EN BN (USA)</text>
+    <text display="inline" dx="0" dy="0" fill="#8c8c8c" font-family="sans-serif" font-size="24px" font-style="normal" x="264.60535" y="360.95029">127 EN BN (USA)</text>
+  </g>
+  <g display="inline" font-style="normal" id="template">
+    <g font-style="normal" id="varT1_AS1" transform="translate(0,-2)">
+      <text dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="264.60254" y="418.51422">T1/AS1</text>
+      <rect font-style="normal" height="46.7103" rx="0" ry="0" style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:4.03658;stroke-dasharray:none" width="126.7194" x="244.4147" y="387.82312"/>
+    </g>
+    <g display="inline" font-style="normal" id="varT_AS" transform="translate(0,4)">
+      <text dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="278.37543" y="343.89902">T/AS</text>
+      <rect font-style="normal" height="46.7103" rx="0" ry="0" style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:4.03658;stroke-dasharray:none" width="126.7194" x="243.51573" y="313.20792"/>
+    </g>
+    <g id="pt2">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="489.64783" y="461.101">PT 2</text>
+      <path d="m 517.77832,435.80202 0.052,-21.317 c 0.029,-1.003 0.839,-1.79 1.817,-1.79 1.001,0 1.813,0.813 1.813,1.82 l -0.084,21.291 c 0,1 -0.809,1.816 -1.813,1.816 -0.998,-0.001 -1.785,-0.816 -1.785,-1.82 z m -8.966,-17.741 10.938,-36.087 10.732,36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+    <g id="pt1">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="67.3806" y="461.10104">PT 1</text>
+      <path d="m 92.5111,435.80203 0.052,-21.317 c 0.029,-1.003 0.839,-1.79 1.817,-1.79 1.001,0 1.813,0.813 1.813,1.82 l -0.084,21.291 c 0,1 -0.809,1.816 -1.813,1.816 -0.998,-10e-4 -1.785,-0.816 -1.785,-1.82 z m -8.966,-17.741 10.94,-36.087 10.732,36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+  </g>
+</svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25172000.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25172000.svg
index e683fc7c..a319621e 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25172000.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25172000.svg
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 400 400" font-style="normal" height="400" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 400 400" width="400" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:pattern font-style="normal" id="slash1" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
-    <svg:g font-style="normal">
-      <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
-      <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
-    </svg:g>
-  </svg:pattern>
-  <svg:pattern font-style="normal" id="slash2" patternTransform="matrix(-0.766 0.6428 -0.6428 -0.766 -74808.3359 -37820.3828)" preserveAspectRatio="xMidYMid meet"/>
+  <svg:defs>
+    <svg:pattern font-style="normal" id="slash1" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
+      <svg:g font-style="normal">
+        <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
+        <svg:line fill="none" font-style="normal" stroke="#808080" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+      </svg:g>
+    </svg:pattern>
+    <svg:pattern font-style="normal" id="slash2" patternTransform="matrix(-0.766 0.6428 -0.6428 -0.766 -74808.3359 -37820.3828)" preserveAspectRatio="xMidYMid meet"/>
+  </svg:defs>
   <svg:g font-style="normal" id="main">
     <svg:path d="M110.779,75.89 L23.237,324.745h262.609l87.54-248.855H110.779z" font-style="normal" stroke="#000000" stroke-linecap="round" stroke-miterlimit="8" stroke-width="5"/>
     <svg:text dx="0.0" dy="0.0" font-family="sans-serif" font-size="21.1506" font-style="normal" transform="matrix(1 0 0 1 74.0078 247.0869)" x="0" y="0">TIME TO:</svg:text>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25200600.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25200600.svg
index f88628e5..a4f7b9ec 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25200600.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25200600.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 612 792" font-style="normal" height="792" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 612 792" width="612" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:rect display="none" fill="#474747" font-style="normal" height="329.5" id="template2" rx="0" ry="0" width="329.5" x="140.5" y="231.382"/>
+  <svg:g id="example">
+    <svg:rect display="none" fill="#474747" font-style="normal" height="329.5" rx="0" ry="0" width="329.5" x="140.5" y="231.382"/>
+  </svg:g>
   <svg:g font-style="normal" id="main">
     <svg:rect fill="#557788" fill-opacity="0.25" font-style="normal" height="242.474" rx="0" ry="0" stroke="#FFFFFF" stroke-miterlimit="8" stroke-width="5" transform="matrix(0.729 0.6845 -0.6845 0.729 348.5139 -121.4117)" width="118.325" x="268.433" y="258.218"/>
   </svg:g>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25200700.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25200700.svg
index dbcd115c..27c4d38b 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25200700.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25200700.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 612 792" font-style="normal" height="792" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 612 792" width="612" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:rect display="none" fill="#474747" font-style="normal" height="228.118" id="example2" rx="0" ry="0" width="315.279" x="136.681" y="256.588"/>
+  <svg:g id="example2">
+    <svg:rect display="none" fill="#474747" font-style="normal" height="228.118" rx="0" ry="0" width="315.279" x="136.681" y="256.588"/>
+  </svg:g>
   <svg:g font-style="normal" id="main">
     <svg:path d="M191.906,402.313c48.287,0,90.514,11.418,116.279,29.786l131.077-50.307c-60.922-50.379-160.555-81.82-272.368-84.596l0,0 L191.906,402.313" fill="#338888" fill-opacity="0.25" font-style="normal" stroke="#338888" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5"/>
   </svg:g>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25218800.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25218800.svg
index 6497cbd4..845bbcc4 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25218800.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25218800.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 612 792" font-style="normal" height="792" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 612 792" width="612" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:polygon fill="none" font-style="normal" id="main" points="427.73,265.805 500.014,395.5 124.143,395.5 189.197,294.626 249.712,388.461 304.85,236.984 367.281,389.11" stroke="#000000" stroke-width="5"/>
+  <svg:g id="main">
+    <svg:polygon fill="none" font-style="normal" points="427.73,265.805 500.014,395.5 124.143,395.5 189.197,294.626 249.712,388.461 304.85,236.984 367.281,389.11" stroke="#000000" stroke-width="5"/>
+  </svg:g>
   <svg:g display="inline" font-style="normal" id="template">
     <svg:text display="inline" dx="0.0" dy="0.0" fill="#0000FF" font-family="sans-serif" font-size="24" font-style="normal" transform="matrix(1.0032 0 0 1 253.5317 475.9629)" x="0" y="0">CENTER</svg:text>
     <svg:text display="inline" dx="0.0" dy="0.0" fill="#0000FF" font-family="sans-serif" font-size="24" font-style="normal" transform="matrix(1.0032 0 0 1 253.5317 504.7627)" x="0" y="0">POINT</svg:text>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240301.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240301.svg
index 4ce60683..9d8dca8b 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240301.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240301.svg
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 400 400" font-style="normal" height="400" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 400 400" width="400" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:pattern font-style="normal" id="SVGID_2_" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
-    <svg:g font-style="normal">
-      <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
+  <svg:defs>
+    <svg:pattern font-style="normal" id="SVGID_2_" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
       <svg:g font-style="normal">
-        <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+        <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
         <svg:g font-style="normal">
-          <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+          <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+          <svg:g font-style="normal">
+            <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+          </svg:g>
         </svg:g>
       </svg:g>
-    </svg:g>
-  </svg:pattern>
-  <svg:g font-style="normal" id="main">
+    </svg:pattern>
     <svg:pattern font-style="normal" id="SVGID_1_" patternTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -784.9438 4529.0039)" preserveAspectRatio="xMidYMid meet"/>
+  </svg:defs>
+  <svg:g font-style="normal" id="main">
     <svg:path d="M138.047,62.514c-38.923,6.124-60.916,93.731-71.078,122.264c-10.162,28.514-3.393,28.514,10.162,48.894 c13.537,20.381,38.904,59.094,71.059,73.352c32.155,14.26,96.464,38.713,121.852,12.229 c25.385-26.483,52.458-128.368,30.448-171.158C278.496,105.303,176.97,56.409,138.047,62.514" font-style="normal" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4.9263"/>
     <svg:rect fill="#FFFFFF" font-style="normal" height="37.241" rx="0" ry="0" width="58.761" x="155.408" y="107.5"/>
     <svg:text dx="0.0" dy="0.0" font-family="sans-serif" font-size="25.157" font-style="normal" transform="matrix(1 0 0 1 161.1631 135.2705)" x="0" y="0">NFA</svg:text>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240302.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240302.svg
index 15787f44..6d841521 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240302.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240302.svg
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 400 400" font-style="normal" height="400" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 400 400" width="400" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:pattern font-style="normal" id="SVGID_2_" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
-    <svg:g font-style="normal">
-      <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
+  <svg:defs>
+    <svg:pattern font-style="normal" id="SVGID_2_" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
       <svg:g font-style="normal">
-        <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+        <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
         <svg:g font-style="normal">
-          <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+          <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+          <svg:g font-style="normal">
+            <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+          </svg:g>
         </svg:g>
       </svg:g>
-    </svg:g>
-  </svg:pattern>
-  <svg:g font-style="normal" id="main">
+    </svg:pattern>
     <svg:pattern font-style="normal" id="SVGID_1_" patternTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -791.312 4530.0781)" preserveAspectRatio="xMidYMid meet"/>
+  </svg:defs>
+  <svg:g font-style="normal" id="main">
     <svg:rect font-style="normal" height="238.085" rx="0" ry="0" stroke="#000000" stroke-linecap="round" stroke-miterlimit="8" stroke-width="3.8817" width="328.646" x="19.126" y="85.696"/>
     <svg:rect fill="#FFFFFF" font-style="normal" height="34.661" rx="0" ry="0" width="55.288" x="144.712" y="145.5"/>
     <svg:text dx="0.0" dy="0.0" font-family="sans-serif" font-size="24" font-style="normal" transform="matrix(1 0 0 1 149.6216 169.3984)" x="0" y="0">NFA</svg:text>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240303.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240303.svg
index c75ec60e..3073b05a 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240303.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25240303.svg
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 400 400" font-style="normal" height="400" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 400 400" width="400" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:pattern font-style="normal" id="SVGID_2_" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
-    <svg:g font-style="normal">
-      <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
+  <svg:defs>
+    <svg:pattern font-style="normal" id="SVGID_2_" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
       <svg:g font-style="normal">
-        <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+        <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
         <svg:g font-style="normal">
-          <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
-          <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+          <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+          <svg:g font-style="normal">
+            <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
+            <svg:line fill="none" font-style="normal" stroke="#0000FF" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+          </svg:g>
         </svg:g>
       </svg:g>
-    </svg:g>
-  </svg:pattern>
-  <svg:g font-style="normal" id="main">
+    </svg:pattern>
     <svg:pattern font-style="normal" id="SVGID_1_" patternTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -786.6226 4528.2129)" preserveAspectRatio="xMidYMid meet"/>
+  </svg:defs>
+  <svg:g font-style="normal" id="main">
     <svg:path d="M183.543,46.847c-86.479,0-156.582,67.732-156.582,151.288c0,83.576,70.103,151.309,156.582,151.309 c86.48,0,156.581-67.731,156.581-151.309C340.124,114.579,270.023,46.847,183.543,46.847" font-style="normal" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="5"/>
     <svg:g font-style="normal">
       <svg:rect fill="#FFFFFF" font-style="normal" height="28.725" rx="0" ry="0" width="54.03" x="151.71" y="88.5"/>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25270400.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25270400.svg
index 10c75017..d969da3c 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25270400.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25270400.svg
@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 400 400" font-style="normal" height="400" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 400 400" width="400" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:pattern font-style="normal" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
-    <svg:g font-style="normal">
-      <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
+  <svg:defs>
+    <svg:pattern font-style="normal" overflow="visible" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid meet" viewBox="20 -72 72 72">
       <svg:g font-style="normal">
-        <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+        <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
         <svg:g font-style="normal">
-          <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
+          <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
           <svg:g font-style="normal">
-            <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+            <svg:polygon fill="none" font-style="normal" points="20,0 92,0 92,-72 20,-72"/>
             <svg:g font-style="normal">
-              <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
-              <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+              <svg:polygon fill="none" font-style="normal" points="20,-72 92,-72 92,0 20,0"/>
+              <svg:g font-style="normal">
+                <svg:polygon fill="none" font-style="normal" points="20,0 20,-72 92,-72 92,0"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-3.6" y2="-3.6"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-18" y2="-18"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-32.398" y2="-32.398"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-46.8" y2="-46.8"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-61.2" y2="-61.2"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="0" x2="14" y1="-61.2" y2="-61.2"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-10.8" y2="-10.8"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-25.2" y2="-25.2"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-39.6" y2="-39.6"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-54" y2="-54"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="19.75" x2="92.25" y1="-68.398" y2="-68.398"/>
+                <svg:line fill="none" font-style="normal" stroke="#00FF00" stroke-width="1.44" x1="0" x2="14" y1="-68.398" y2="-68.398"/>
+              </svg:g>
             </svg:g>
           </svg:g>
         </svg:g>
       </svg:g>
-    </svg:g>
-  </svg:pattern>
-  <svg:g font-style="normal" id="main">
+    </svg:pattern>
     <svg:pattern font-style="normal" patternTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -5616.3682 17018.2168)" preserveAspectRatio="xMidYMid meet"/>
+  </svg:defs>
+  <svg:g font-style="normal" id="main">
     <svg:polygon font-style="normal" points="360.041,173.999 333.5,188 361.347,209.506 363.479,267.482 333,285 364.747,301.973 366.752,356.5 306,356.5 289.5,324 275,356.5 221,356.5 204.629,322.5 189,356.5 136,356.5 120,323 102,356.5 50,356.5 50,265.5 85,250.04 50,231.5 50,171 85.5,155.5 50,136 50,29.5 110.644,47.024 119.5,85.5 142.252,56.157 193.774,71.045 202.5,110 227.096,80.673 275.723,94.725 285,132 307.922,104.029 358,118.5" stroke="#00FF00" stroke-width="5"/>
   </svg:g>
   <svg:g display="inline" font-style="normal" id="template">
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25281901.svg b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25281901.svg
index 1c662908..1b174088 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25281901.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/ControlMeasures/25281901.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg:svg contentScriptType="application/ecmascript" contentStyleType="text/css" enable-background="new 0 0 612 792" font-style="normal" height="792" id="Version_1.0" preserveAspectRatio="xMidYMid meet" version="1.1" viewBox=" 0  0 612 792" width="612" x="0" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0" zoomAndPan="magnify">
-  <svg:polygon font-style="normal" id="main" points="307,247 207,397 407,397" stroke="#000000"/>
+  <svg:g id="main">
+    <svg:polygon font-style="normal" points="307,247 207,397 407,397" stroke="#000000"/>
+  </svg:g>
   <svg:g display="inline" font-style="normal" id="template">
     <svg:line display="inline" fill="none" font-style="normal" stroke="#0000FF" stroke-width="3" x1="307" x2="307" y1="412" y2="459"/>
     <svg:polygon display="inline" fill="#FFFFFF" font-style="normal" points="307,399 297,413 317,413" stroke="#0000FF"/>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60200100.svg b/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60200100.svg
index 5fd5fddd..21f3b680 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60200100.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60200100.svg
@@ -2,13 +2,14 @@
 <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
 <svg enable-background="new 0 0 600 400" height="400px" id="Version_1.0" version="1.1" viewBox="0 0 600 400" width="600px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
   <g id="main" transform="translate(97.85574,28.0985)">
-    <path d="m 122.68503,150.65468 64.20305,-25.42695 50.8539,8.89943 42.59014,29.241" style="fill:none;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"/>
+    <path d="m 122.68503,150.65468 64.20305,-25.42695 c 0,0 93.44404,38.14043 93.44404,38.14043" style="fill:none;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"/>
+  </g>
+  <g id="example" style="display:none" transform="translate(97.85574,28.0985)">
     <g aria-label="C2" style="font-weight:bold;font-size:20px;line-height:1.25" transform="translate(-3.17837,12.0778)">
-      <path d="m 197.22284,108.34774 q -1.62109,0 -2.99805,-0.47852 -1.36719,-0.47851 -2.35351,-1.42578 -0.98633,-0.94726 -1.53321,-2.36328 -0.5371,-1.41601 -0.5371,-3.27148 0,-1.72852 0.51758,-3.13477 0.51758,-1.40625 1.50391,-2.4121 0.94726,-0.9668 2.34375,-1.49414 1.40625,-0.52734 3.0664,-0.52734 0.91797,0 1.6504,0.10742 0.74218,0.09766 1.36718,0.26367 0.6543,0.18555 1.18164,0.41992 0.5371,0.2246 0.9375,0.41992 v 3.52539 h -0.42968 q -0.27344,-0.23438 -0.69336,-0.55664 -0.41016,-0.32227 -0.9375,-0.63477 -0.5371,-0.3125 -1.16211,-0.52734 -0.625,-0.21484 -1.33789,-0.21484 -0.79102,0 -1.50391,0.2539 -0.7129,0.24414 -1.31836,0.820312 -0.57617,0.55664 -0.9375,1.47461 -0.35156,0.91797 -0.35156,2.22656 0,1.36719 0.38086,2.28516 0.39062,0.91797 0.97656,1.44531 0.5957,0.5371 1.32813,0.7715 0.73242,0.22461 1.44531,0.22461 0.6836,0 1.34765,-0.20508 0.67383,-0.20508 1.24024,-0.55664 0.47851,-0.28321 0.88867,-0.60547 0.41016,-0.32227 0.67383,-0.55664 h 0.39062 v 3.47656 q -0.54687,0.24414 -1.04492,0.45898 -0.49805,0.21485 -1.04492,0.3711 -0.7129,0.20508 -1.33789,0.3125 -0.625,0.10742 -1.71875,0.10742 z"/>
-      <path d="M 216.49042,108.06454 H 205.0744 v -2.40235 q 1.3086,-0.94726 2.61719,-2.01172 1.31836,-1.06445 2.10937,-1.83593 1.18164,-1.14258 1.67969,-1.99219 0.49805,-0.8496 0.49805,-1.67969 0,-0.9961 -0.64453,-1.5332 -0.63477,-0.54688 -1.83594,-0.54688 -0.89844,0 -1.89453,0.3711 -0.98633,0.3711 -1.83594,0.94727 h -0.3125 v -3.23242 q 0.69336,-0.30273 2.04102,-0.60547 1.35742,-0.30274 2.71484,-0.30274 2.73438,0 4.16992,1.15234 1.43555,1.14258 1.43555,3.24219 0,1.37695 -0.69336,2.61719 -0.6836,1.24023 -2.09961,2.55859 -0.88867,0.8203 -1.78711,1.51367 -0.89844,0.6836 -1.2793,0.95703 h 6.53321 z"/>
+      <text dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" x="175.41798" y="103.20982">C2</text>
     </g>
     <g>
-      <circle cx="73.42032" cy="178.30649" r="55" style="fill:#80e0ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round"/>
+      <circle cx="73.42032" cy="178.30649" r="55" style="fill:#80e0ff;fill-opacity:1;fill-rule:evenodd;stroke:#bababa;stroke-width:4;stroke-linecap:round;stroke-opacity:1"/>
       <g id="main-2" transform="matrix(0.5,0,0,0.5,-83.33564,-19.69944)">
         <rect height="74.80269" rx="5.99013" ry="6.41166" style="fill:#e1e1e1;fill-opacity:1;fill-rule:evenodd;stroke:#bababa;stroke-width:6.1973;stroke-opacity:1" width="119.80269" x="253.61058" y="351.59924"/>
         <path d="m 240.51192,431.52313 h 146 c 0,0 0.0119,9.13947 -9.99997,12 h -126 c -9.85294,-3.17837 -10.00003,-12 -10.00003,-12 z" style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke-width:0.5"/>
@@ -17,7 +18,7 @@
       </g>
     </g>
     <g>
-      <circle cx="330.8682" cy="181.48486" r="55" style="fill:#80e0ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round"/>
+      <circle cx="330.8682" cy="181.48486" r="55" style="fill:#80e0ff;fill-opacity:1;fill-rule:evenodd;stroke:#bababa;stroke-width:4;stroke-linecap:round;stroke-opacity:1"/>
       <g id="main-6" transform="matrix(0.39,0,0,0.39,211.8883,30.98225)">
         <circle cx="304.7537" cy="386.11124" r="24" style="fill:none;fill-rule:evenodd;stroke:#bababa;stroke-width:11.5385;stroke-dasharray:none;stroke-opacity:1"/>
         <g style="stroke:#bababa;stroke-width:2.45083;stroke-dasharray:none;stroke-opacity:1" transform="matrix(0,0.38135,-0.71757,0,560.33225,290.50518)">
@@ -39,4 +40,22 @@
       </g>
     </g>
   </g>
+  <g display="inline" font-style="normal" id="template" transform="translate(-86.72435,-134.18963)">
+    <g display="inline" font-style="normal" id="varT" transform="translate(-16.122385,10.30876)">
+      <text dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="383.53568" y="261.52139">T</text>
+      <rect font-style="normal" height="34.8595" rx="0" ry="0" style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.86791;stroke-dasharray:none" width="36.3596" x="372.7504" y="235.36702"/>
+    </g>
+    <g id="pt2" transform="translate(-55.376888,-49.7691)">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="489.64783" y="461.101">PT 2</text>
+      <path d="m 517.77832,435.80202 0.052,-21.317 c 0.029,-1.003 0.839,-1.79 1.817,-1.79 1.001,0 1.813,0.813 1.813,1.82 l -0.084,21.291 c 0,1 -0.809,1.816 -1.813,1.816 -0.998,-0.001 -1.785,-0.816 -1.785,-1.82 z m -8.966,-17.741 10.938,-36.087 10.732,36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+    <g id="pt1" transform="translate(213.79685,-61.68565)">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="67.3806" y="461.10104">PT 1</text>
+      <path d="m 92.5111,435.80203 0.052,-21.317 c 0.029,-1.003 0.839,-1.79 1.817,-1.79 1.001,0 1.813,0.813 1.813,1.82 l -0.084,21.291 c 0,1 -0.809,1.816 -1.813,1.816 -0.998,-10e-4 -1.785,-0.816 -1.785,-1.82 z m -8.966,-17.741 10.94,-36.087 10.732,36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+    <g id="pt3" transform="translate(-147.20439,-87.62166)">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="489.64783" y="461.101">PT 3</text>
+      <path d="m 517.77832,435.80202 0.052,-21.317 c 0.029,-1.003 0.839,-1.79 1.817,-1.79 1.001,0 1.813,0.813 1.813,1.82 l -0.084,21.291 c 0,1 -0.809,1.816 -1.813,1.816 -0.998,-0.001 -1.785,-0.816 -1.785,-1.82 z m -8.966,-17.741 10.938,-36.087 10.732,36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60200200.svg b/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60200200.svg
index 218a6376..bdcb100a 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60200200.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60200200.svg
@@ -1,23 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
 <svg enable-background="new 0 0 600 400" height="400px" id="Version_1.0" version="1.1" viewBox="0 0 600 400" width="600px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <rect height="164.30939" rx="9.31764" ry="9.33576" style="fill:none;fill-rule:evenodd;stroke:#909090;stroke-width:3.91257;stroke-linecap:round;stroke-opacity:1" width="131.06818" x="90.8257" y="98.90326"/>
-  <rect height="164.30939" rx="9.31764" ry="9.33576" style="fill:none;fill-rule:evenodd;stroke:#909090;stroke-width:3.91257;stroke-linecap:round;stroke-opacity:1" width="131.06818" x="366.82568" y="98.90326"/>
-  <rect height="12.71348" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86993;stroke-linecap:round" width="62.772785" x="99.41356" y="92.1839"/>
-  <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;fill:#909090;fill-opacity:1;stroke:#909090;stroke-opacity:1" x="99.25809" xml:space="preserve" y="103.63">
-    <tspan x="99.25809" y="103.63">MODNET</tspan>
-  </text>
-  <g transform="translate(0,14)">
+  <g id="example" style="display:none" transform="translate(0,14)">
+    <rect height="164.30939" rx="9.31764" ry="9.33576" style="fill:none;fill-rule:evenodd;stroke:#909090;stroke-width:3.91257;stroke-linecap:round;stroke-opacity:1" transform="translate(0,-14)" width="131.06818" x="90.8257" y="98.90326"/>
+    <rect height="164.30939" rx="9.31764" ry="9.33576" style="fill:none;fill-rule:evenodd;stroke:#909090;stroke-width:3.91257;stroke-linecap:round;stroke-opacity:1" transform="translate(0,-14)" width="131.06818" x="366.82568" y="98.90326"/>
+    <rect height="12.71348" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.86993;stroke-linecap:round" transform="translate(0,-14)" width="62.772785" x="99.41356" y="92.1839"/>
+    <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;fill:#909090;fill-opacity:1;stroke:#909090;stroke-opacity:1" transform="translate(0,-14)" x="99.25809" xml:space="preserve" y="103.63">
+      <tspan x="99.25809" y="103.63">MODNET</tspan>
+    </text>
     <rect height="12.71348" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.78072;stroke-linecap:round" width="59.91225" x="379.38763" y="78.1839"/>
     <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;fill:#909090;fill-opacity:1;stroke:#909090;stroke-opacity:1" x="379.49722" xml:space="preserve" y="89.63">
       <tspan x="379.49722" y="89.63">BOBNET</tspan>
     </text>
+    <text style="font-style:normal;font-weight:normal;font-size:18px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" x="273.09229" xml:space="preserve" y="126.51188">
+      <tspan style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" x="273.09229" y="126.51188">VPN</tspan>
+    </text>
+  </g>
+  <g id="main" transform="translate(0,14)">
     <path d="m 188.33598,111.857 24.7219,25.621 H 378.02043 L 403.591,111.857" style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"/>
     <path d="m 188.33598,213.6248 24.7219,-25.621 h 164.96254 l 25.57057,25.621" style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"/>
-    <g aria-label="VPN" style="font-weight:bold;font-size:18px;line-height:1.25" transform="translate(-3.59591,10.33825)">
-      <path d="m 286.82458,101.01752 -4.77246,13.0869 h -3.77929 l -4.77246,-13.0869 h 3.542 l 3.16406,9.19336 3.16406,-9.19336 z"/>
-      <path d="m 299.5072,105.14838 q 0,0.8789 -0.30762,1.72265 -0.30761,0.83496 -0.8789,1.40625 -0.78223,0.77344 -1.74902,1.16895 -0.95801,0.3955 -2.39063,0.3955 h -2.10059 v 4.2627 h -3.375 v -13.0869 h 5.55469 q 1.24805,0 2.10059,0.21972 0.86133,0.21094 1.52051,0.64161 0.791,0.51855 1.2041,1.32714 0.42187,0.8086 0.42187,1.9424 z m -3.48926,0.0791 q 0,-0.55371 -0.29882,-0.94922 -0.29883,-0.4043 -0.69434,-0.5625 -0.52734,-0.21094 -1.02832,-0.22852 -0.50098,-0.0264 -1.33594,-0.0264 h -0.58008 v 3.91992 h 0.9668 q 0.86133,0 1.41504,-0.10547 0.5625,-0.10547 0.94043,-0.42188 0.3252,-0.28125 0.46582,-0.66796 0.1494,-0.3955 0.1494,-0.95801 z"/>
-      <path d="m 313.79822,114.10443 h -3.25196 l -5.55468,-8.98242 v 8.98242 h -3.09375 v -13.0869 h 4.03418 l 4.77246,7.49707 v -7.49707 h 3.09375 z"/>
+  </g>
+  <g display="inline" font-style="normal" id="template" transform="translate(-7.72435,-86.18963)">
+    <g id="pt2" transform="translate(-136.30731,-88.72367)">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="489.64783" y="461.101">PT 2</text>
+      <path d="m 517.77832,435.80202 0.052,-21.317 c 0.029,-1.003 0.839,-1.79 1.817,-1.79 1.001,0 1.813,0.813 1.813,1.82 l -0.084,21.291 c 0,1 -0.809,1.816 -1.813,1.816 -0.998,-0.001 -1.785,-0.816 -1.785,-1.82 z m -8.966,-17.741 10.938,-36.087 10.732,36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+    <g id="pt1" transform="translate(288.47584,-286.98885)">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="67.3806" y="461.10104">PT 1</text>
+      <path d="m 93.50243,467.21928 0.052,21.317 c 0.029,1.003 0.839,1.79 1.817,1.79 1.001,0 1.813,-0.813 1.813,-1.82 l -0.084,-21.291 c 0,-1 -0.809,-1.816 -1.813,-1.816 -0.998,0.001 -1.785,0.816 -1.785,1.82 z m -8.966,17.741 10.94,36.087 10.732,-36.166 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+    <g display="inline" font-style="normal" id="varT" transform="translate(-87.26599,-39.578)">
+      <text dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="383.53568" y="261.52139">T</text>
+      <rect font-style="normal" height="34.8595" rx="0" ry="0" style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.86791;stroke-dasharray:none" width="36.3596" x="372.7504" y="235.36702"/>
+    </g>
+    <g id="pt3" transform="translate(-329.1202,-146.22056)">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="435.62057" y="418.96967">PT 3</text>
+      <path d="m 493.72044,408.00578 21.317,0.052 c 1.003,0.029 1.79,0.839 1.79,1.817 0,1.001 -0.813,1.813 -1.82,1.813 l -21.291,-0.084 c -1,0 -1.816,-0.809 -1.816,-1.813 10e-4,-0.998 0.816,-1.785 1.82,-1.785 z m 17.741,-8.966 36.087,10.938 -36.166,10.732 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
     </g>
   </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60210100.svg b/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60210100.svg
index 4a4ab5aa..f1838338 100644
--- a/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60210100.svg
+++ b/jmsfx-standard/src/main/resources/svg/Appendices/Cyberspace/60210100.svg
@@ -1,17 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
 <svg enable-background="new 0 0 600 400" height="400px" id="Version_1.0" version="1.1" viewBox="0 0 600 400" width="600px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <rect height="215.40518" rx="18" ry="18" style="fill:none;fill-rule:evenodd;stroke:#000001;stroke-width:8;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" width="365.8737" x="92.61177" y="100.68933"/>
-  <g transform="translate(-146.084,2.24745)">
-    <rect height="18.4852" rx="5" ry="5" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000001;stroke-width:1;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" width="67.16994" x="266.41504" y="89.29805"/>
-    <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" x="268.5376" xml:space="preserve" y="103.63">
-      <tspan x="268.5376" y="103.63">MODNET</tspan>
-    </text>
+  <g id="main">
+    <rect height="215.40518" rx="18" ry="18" style="fill:none;fill-rule:evenodd;stroke:#000001;stroke-width:8;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" width="365.8737" x="92.61177" y="100.68933"/>
+    <rect height="18.4852" rx="5" ry="5" style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000001;stroke-width:1;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" transform="translate(-146.084,2.24745)" width="67.16994" x="266.41504" y="89.29805"/>
+    <rect height="18.4852" rx="7.36592" ry="5" style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21375;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" transform="translate(-34)" width="98.95363" x="320.80322" y="90.64652"/>
   </g>
-  <g transform="translate(-34)">
-    <rect height="18.4852" rx="7.36592" ry="5" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21375;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" width="98.95363" x="320.80322" y="90.64652"/>
-    <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" x="322.92578" xml:space="preserve" y="104.97846">
-      <tspan x="322.92578" y="104.97846">192.168.25.0</tspan>
+  <g id="example" style="display:none">
+    <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;fill:#787878;fill-opacity:1;stroke:#787878;stroke-opacity:1" x="122.4536" xml:space="preserve" y="105.87745">
+      <tspan style="fill:#787878;fill-opacity:1;stroke:#787878;stroke-opacity:1" x="122.4536" y="105.87745">MODNET</tspan>
+    </text>
+    <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;display:inline;fill:#787878;fill-opacity:1;stroke:#787878;stroke-opacity:1" transform="translate(-34)" x="322.92578" xml:space="preserve" y="104.97846">
+      <tspan style="fill:#787878;fill-opacity:1;stroke:#787878;stroke-opacity:1" x="322.92578" y="104.97846">192.168.25.0</tspan>
     </text>
   </g>
+  <g display="inline" font-style="normal" id="template" transform="translate(-53.57225,-227.81012)">
+    <g id="pt2">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="403.5321" y="503.63568">PT 2</text>
+      <path d="m 462.95287,501.25474 16.6707,13.28552 c 0.76789,0.6459 0.88127,1.76957 0.27362,2.53588 -0.62195,0.78434 -1.76349,0.91545 -2.55253,0.28977 l -16.63045,-13.29443 c -0.78355,-0.62133 -0.92028,-1.76222 -0.29647,-2.5489 0.62087,-0.78137 1.74845,-0.89164 2.53513,-0.26783 z m 19.47182,3.99758 21.48004,30.99224 -35.00604,-14.06173 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+    <g id="pt1">
+      <text display="inline" dx="0" dy="0" fill="#0000FF" font-family="sans-serif" font-size="24px" font-style="normal" style="fill:#0000ff;fill-opacity:1" x="196.49986" y="392.60721">PT 1</text>
+      <path d="m 192.51104,374.4029 -15.47753,-14.6582 c -0.71004,-0.70902 -0.72722,-1.83825 -0.0565,-2.54998 0.68654,-0.72847 1.83511,-0.76179 2.56794,-0.0711 l 15.43667,14.66366 c 0.72774,0.68585 0.76672,1.83425 0.0781,2.5649 -0.6852,0.7256 -1.81809,0.73936 -2.54874,0.0508 z m -19.06018,-5.64285 -18.75865,-32.71189 33.67999,16.99453 z" display="inline" fill="#0000FF" font-style="normal" stroke="#0000ff" stroke-linejoin="bevel" stroke-miterlimit="10" stroke-width="0.4335" style="fill:#0000ff;fill-opacity:1"/>
+    </g>
+    <g id="varAY" transform="translate(19.88728,228.94802)">
+      <rect height="15.16186" style="display:inline;fill:none;fill-opacity:1;stroke:#0000ff;stroke-width:1;stroke-dasharray:none;stroke-opacity:1" width="79.38846" x="330.58582" y="92.3082"/>
+      <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;fill-opacity:1;stroke:#0000ff;stroke-opacity:1" x="362.07886" xml:space="preserve" y="104.97846">
+        <tspan style="fill:#0000ff;fill-opacity:1;stroke:#0000ff;stroke-opacity:1" x="362.07886" y="104.97846">AY</tspan>
+      </text>
+    </g>
+    <g id="varT" style="display:inline" transform="translate(-92.51175,230.05757)">
+      <rect height="18.4852" rx="5" ry="5" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" width="67.16994" x="266.41504" y="89.29805"/>
+      <text style="font-style:normal;font-weight:normal;font-size:14px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:#0000ff;stroke-opacity:1" x="295.23438" xml:space="preserve" y="103.63">
+        <tspan style="stroke:#0000ff;stroke-opacity:1" x="295.23438" y="103.63">T</tspan>
+      </text>
+    </g>
+  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/README.md b/jmsfx-standard/src/main/resources/svg/README.md
index 39f096ef..26f123f2 100644
--- a/jmsfx-standard/src/main/resources/svg/README.md
+++ b/jmsfx-standard/src/main/resources/svg/README.md
@@ -47,7 +47,36 @@ For symbol assembly purposes, the following SIDC positions are used to determine
 
 ## Details
 
-This section describes the details of the internal composition of the SVG files, for those developers who wish to make their own changes (TBD).
+This section describes the details of the internal composition of the SVG files, for those developers who
+wish to make their own changes.
+
+### Free canvas icons
+
+The Control Measure fragments, and three of the Cyberspace ones, are `FREE_CANVAS`: GIS construction samples
+showing how a measure is drawn on a map, rather than icons composed into a symbol. APP-6E 8.1.3 exempts them
+from the composition rules. They carry illustrative material alongside the drawn content, so each one holds:
+
+| element | how many | what it is |
+| --- | --- | --- |
+| `<g id="main">` | exactly one | the content - what a consumer renders |
+| `<g id="template">` | zero or one | the construction guide: anchor point labels (`T`, `AS`) and the `PT 1`/`PT 2` arrows that place them |
+| `<g id="example">` | zero or more | a worked sample, normally `display="none"`. Where there is more than one they are numbered `example1`, `example2` and so on |
+| `<defs>` | as needed | anything `main` references. Patterns and markers belong here, never loose in the document or inside `main` |
+
+The template is optional because two kinds of fragment have nothing to construct:
+
+* An **area** is defined by at least three control points the user places, so there is no fixed geometry a
+  template could draw. That covers every area measure without one, including Airhead Line, which is an area
+  despite the name.
+* The **Space Debris** fragments are whole symbols in the way an ordinary icon is, so `main` holds all of it.
+
+Nothing outside that list appears at the root of a free canvas fragment: no bare drawing elements, and no
+groups under any other name.
+
+### Everything else
+
+Every other fragment holds a single content group, named for what it is - `frame`, `main`, `echelon`, `mod1`,
+`mod2`. Those names are not yet consistent across the tree; making them so is tracked separately.
 
 ## Licensing