diff --git a/shacl12-core/images/Makefile b/shacl12-core/images/Makefile
new file mode 100644
index 00000000..5ee2d874
--- /dev/null
+++ b/shacl12-core/images/Makefile
@@ -0,0 +1,4 @@
+all: ValidationReport-UML.svg
+
+%.svg: %.puml
+	plantuml -Tsvg $^
diff --git a/shacl12-core/images/ValidationReport-UML.puml b/shacl12-core/images/ValidationReport-UML.puml
new file mode 100644
index 00000000..3624f203
--- /dev/null
+++ b/shacl12-core/images/ValidationReport-UML.puml
@@ -0,0 +1,23 @@
+@startuml
+hide circles
+hide empty members
+skinparam pathHoverColor red ' on cover, highlight blue links as red
+
+class "<color:blue><u>sh:ValidationReport" as ValidationReport [[#results-validation-report]] {
+  [[#conforms sh:conforms]] : xsd:boolean
+  [[#shapesGraphWellFormed sh:shapesGraphWellFormed]] : xsd:boolean
+}
+
+class "<color:blue><u>sh:ValidationResult" as ValidationResult [[#results-validation-result]] {
+  [[#results-focus-node sh:focusNode]] : any
+  [[#results-path sh:resultPath]] : [[#property-paths SHACL prop path]]
+  [[#results-value sh:value]] : any
+  [[#results-source-shape sh:sourceShape]] : [[#shapes sh:Shape]]
+  [[#results-source-constraint-component sh:sourceConstraintComponent]] : [[#dfn-constraint-component sh:ConstraintComponent]]
+  [[#results-message sh:resultMessage]] : xsd:string or rdf:langString
+  [[#results-severity sh:resultSeverity]] : [[#severity sh:Severity]]
+}
+
+ValidationReport --> ValidationResult : [[#result sh:result]] * 
+ValidationResult -> AbstractResult : [[#results-detail sh:detail]] * 
+@enduml
diff --git a/shacl12-core/images/ValidationReport-UML.svg b/shacl12-core/images/ValidationReport-UML.svg
new file mode 100644
index 00000000..876d6b7c
--- /dev/null
+++ b/shacl12-core/images/ValidationReport-UML.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="321px" preserveAspectRatio="none" style="width:500px;height:321px;background:#FFFFFF;" version="1.1" viewBox="0 0 500 321" width="500px" zoomAndPan="magnify"><defs><style type="text/css"><![CDATA[path:hover { stroke: #FFFFFF !important;}]]></style></defs><g><!--class ValidationReport--><a href="#results-validation-report" target="_top" title="#results-validation-report" xlink:actuate="onRequest" xlink:href="#results-validation-report" xlink:show="new" xlink:title="#results-validation-report" xlink:type="simple"><g id="elem_ValidationReport"><rect codeLine="5" fill="#F1F1F1" height="70.8281" id="ValidationReport" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="281" x="57" y="7"/><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="124" x="135.5" y="26.5332">sh:ValidationReport</text><line style="stroke:#181818;stroke-width:0.5;" x1="58" x2="337" y1="34.6094" y2="34.6094"/><a href="#conforms" target="_top" title="#conforms" xlink:actuate="onRequest" xlink:href="#conforms" xlink:show="new" xlink:title="#conforms" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="77" x="63" y="53.1426">sh:conforms</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="144" y="53.1426">: xsd:boolean</text><a href="#shapesGraphWellFormed" target="_top" title="#shapesGraphWellFormed" xlink:actuate="onRequest" xlink:href="#shapesGraphWellFormed" xlink:show="new" xlink:title="#shapesGraphWellFormed" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="181" x="63" y="70.752">sh:shapesGraphWellFormed</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="248" y="70.752">: xsd:boolean</text></g></a><!--class ValidationResult--><a href="#results-validation-result" target="_top" title="#results-validation-result" xlink:actuate="onRequest" xlink:href="#results-validation-result" xlink:show="new" xlink:title="#results-validation-result" xlink:type="simple"><g id="elem_ValidationResult"><rect codeLine="10" fill="#F1F1F1" height="158.875" id="ValidationResult" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="381" x="7" y="155.83"/><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="121" x="137" y="175.3632">sh:ValidationResult</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="387" y1="183.4394" y2="183.4394"/><a href="#results-focus-node" target="_top" title="#results-focus-node" xlink:actuate="onRequest" xlink:href="#results-focus-node" xlink:show="new" xlink:title="#results-focus-node" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="86" x="13" y="201.9726">sh:focusNode</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="31" x="103" y="201.9726">: any</text><a href="#results-path" target="_top" title="#results-path" xlink:actuate="onRequest" xlink:href="#results-path" xlink:show="new" xlink:title="#results-path" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="83" x="13" y="219.582">sh:resultPath</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="100" y="219.582">:</text><a href="#property-paths" target="_top" title="#property-paths" xlink:actuate="onRequest" xlink:href="#property-paths" xlink:show="new" xlink:title="#property-paths" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="110" x="108" y="219.582">SHACL prop path</text></a><a href="#results-value" target="_top" title="#results-value" xlink:actuate="onRequest" xlink:href="#results-value" xlink:show="new" xlink:title="#results-value" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="53" x="13" y="237.1913">sh:value</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="31" x="70" y="237.1913">: any</text><a href="#results-source-shape" target="_top" title="#results-source-shape" xlink:actuate="onRequest" xlink:href="#results-source-shape" xlink:show="new" xlink:title="#results-source-shape" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="103" x="13" y="254.8007">sh:sourceShape</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="120" y="254.8007">:</text><a href="#shapes" target="_top" title="#shapes" xlink:actuate="onRequest" xlink:href="#shapes" xlink:show="new" xlink:title="#shapes" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="60" x="128" y="254.8007">sh:Shape</text></a><a href="#results-source-constraint-component" target="_top" title="#results-source-constraint-component" xlink:actuate="onRequest" xlink:href="#results-source-constraint-component" xlink:show="new" xlink:title="#results-source-constraint-component" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="200" x="13" y="272.4101">sh:sourceConstraintComponent</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="217" y="272.4101">:</text><a href="#dfn-constraint-component" target="_top" title="#dfn-constraint-component" xlink:actuate="onRequest" xlink:href="#dfn-constraint-component" xlink:show="new" xlink:title="#dfn-constraint-component" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="157" x="225" y="272.4101">sh:ConstraintComponent</text></a><a href="#results-message" target="_top" title="#results-message" xlink:actuate="onRequest" xlink:href="#results-message" xlink:show="new" xlink:title="#results-message" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="111" x="13" y="290.0195">sh:resultMessage</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="128" y="290.0195">: xsd:string or rdf:langString</text><a href="#results-severity" target="_top" title="#results-severity" xlink:actuate="onRequest" xlink:href="#results-severity" xlink:show="new" xlink:title="#results-severity" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="105" x="13" y="307.6288">sh:resultSeverity</text></a><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="122" y="307.6288">:</text><a href="#severity" target="_top" title="#severity" xlink:actuate="onRequest" xlink:href="#severity" xlink:show="new" xlink:title="#severity" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="70" x="130" y="307.6288">sh:Severity</text></a></g></a><!--link ValidationReport to ValidationResult--><g id="link_ValidationReport_ValidationResult"><path codeLine="20" d="M197.5,77.97 C197.5,99.67 197.5,122.58 197.5,149.62 " fill="none" id="ValidationReport-to-ValidationResult" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="197.5,155.62,201.5,146.62,197.5,150.62,193.5,146.62,197.5,155.62" style="stroke:#181818;stroke-width:1.0;"/><a href="#result" target="_top" title="#result" xlink:actuate="onRequest" xlink:href="#result" xlink:show="new" xlink:title="#result" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="50" x="198.5" y="122.3251">sh:result</text></a><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="5" x="252.5" y="122.3251">*</text></g><!--link ValidationResult to ValidationResult--><g id="link_ValidationResult_ValidationResult"><path codeLine="21" d="M388.33,216.58 C409.4,220.13 423,226.36 423,235.26 C423,244.17 415.3171,249.4059 394.2471,252.9459 " fill="none" id="ValidationResult-to-ValidationResult" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="388.33,253.94,397.8684,256.3935,393.2609,253.1116,396.5428,248.5041,388.33,253.94" style="stroke:#181818;stroke-width:1.0;"/><a href="#results-detail" target="_top" title="#results-detail" xlink:actuate="onRequest" xlink:href="#results-detail" xlink:show="new" xlink:title="#results-detail" xlink:type="simple"><text fill="#0000FF" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="49" x="429" y="240.7551">sh:detail</text></a><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="5" x="482" y="240.7551">*</text></g><!--SRC=[ZLDDIyD04BtdLmnw4CJyWL0AKb0FAc913zB3DfasYvlTPMTJBE9_TsPZ4cigUWZCl7dpPkSZjQuGIXrAWvJLuc3ZunuQRDOOAADNRRqAgW6lOdtZTXWMphW00Iiu0sUX5Em2Qhsj3NyHrgP5CDg-4YWINfQLHX71oQoKr488yraxfxfuKaPNAcfd7z6x44yavIS8Bo-d0QaraVBT4Cj32gvMy9w1K4fdDouq1ApRsnmju8sgOksSGMKx9jNA8rq7vUjdDEQAcTmDfnqDJ3G-_jcGl7ZIa82_DYJGs51FsRYofTmwNWvNIDuzE-bTokuFoR8ceNN-0tk9nmmVdCSGzub2iBovNDo2W6crgzMX3h-hJVMISRmMkJQKcAUffV4bVobkNxIRg0I_uACAl2wAGMaRsMoyisZZABWOeei-sCjN6_jhyj6qm_8D4gajZlEwwu1XvIoWxHRatgjDOPJTBXFoemlaNq3pNpFeBB-GOGpV66DCBcbox7a-dnvCCPORYx3uEMGJxX_vb5SObJQYqrb9vnC0]--></g></svg>
\ No newline at end of file
diff --git a/shacl12-core/index.html b/shacl12-core/index.html
index f2e51773..f9406ada 100644
--- a/shacl12-core/index.html
+++ b/shacl12-core/index.html
@@ -2,6 +2,7 @@
 		<title>SHACL 1.2 Core</title>
 		<meta charset="utf-8">
 		<script src="https://www.w3.org/Tools/respec/respec-w3c" class="remove" defer=""></script>
+		<meta name="color-scheme" content="light dark">
 		<script class="remove">
 		
 			function prepareSyntaxRules() {
@@ -2920,8 +2921,9 @@ <h3>Validation Report</h3>
 				<p>
 					The <dfn data-lt="validation report|report">validation report</dfn> is the result of the <a>validation</a> process that reports the <a>conformance</a> and the set of all <dfn data-lt="validation result|result">validation results</dfn>.
 					The validation report is described with the SHACL <dfn>Validation Report Vocabulary</dfn> as defined in this section.
-					This vocabulary defines the RDF properties to represent structural information that may provide guidance on how to identify or fix violations in the data graph.
+					This vocabulary defines the RDF classes and properties to represent structural information that may provide guidance on how to identify or fix violations in the data graph:
 				</p>
+				<div id="ValidationReport-UML.svg"></div>
 				<p><!-- ISSUE-181 -->
 					SHACL-compliant processors MUST be capable of returning a validation report with all required <a>validation results</a>
 					described in this specification.
@@ -7976,11 +7978,24 @@ <h2>Changes between SHACL 1.0 Core and SHACL 1.2 Core</h2>
 
 	<script type="text/javascript">
 
-		tooltip = "Targets are not the only way to initiate validation, SHACL also allows specific nodes to be validated against specific shapes.";
-		var t = document.getElementsByClassName("target-can-be-skipped");
-		for (var i = 0; i < t.length; i++) {
-			t[i].title = tooltip;
-		}
+		// tooltip = "Targets are not the only way to initiate validation, SHACL also allows specific nodes to be validated against specific shapes.";
+		// var t = document.getElementsByClassName("target-can-be-skipped");
+		// for (var i = 0; i < t.length; i++) {
+		// 	t[i].title = tooltip;
+		// }
+
+    // Load and inline SVG diagrams for clickable links
+    // TODO: add <svg desc> for accessibility
+    function svgInline(svg) {
+      fetch('images/'+svg)
+        .then(response => response.text())
+        .then(svgText => {
+          const container = document.getElementById(svg);
+          container.innerHTML = svgText;
+        })};
+
+    // svgInline('SHACL-UML.svg');
+    svgInline('ValidationReport-UML.svg');
 		
 	</script>
 
diff --git a/shacl12-vocabularies/shacl-shacl.ttl b/shacl12-vocabularies/shacl-shacl.ttl
index 31f7e7a5..fc0536f3 100644
--- a/shacl12-vocabularies/shacl-shacl.ttl
+++ b/shacl12-vocabularies/shacl-shacl.ttl
@@ -23,11 +23,11 @@ shsh:
 shsh:ListShape
 	a sh:NodeShape ;
 	rdfs:label "List shape"@en ;
-	rdfs:comment "A shape describing well-formed RDF lists. Currently does not check for non-recursion. This could be expressed using SHACL-SPARQL."@en ;
+	rdfs:comment "A shape describing well-formed RDF lists. Currently does not check for non-recursion (this could be expressed using SHACL-SPARQL)."@en ;
 	rdfs:seeAlso <https://www.w3.org/TR/shacl/#syntax-rule-SHACL-list> ;
 	sh:property [
 		sh:path [ sh:zeroOrMorePath rdf:rest ] ;
-		rdfs:comment "Each list member (including this node) must be have the shape shsh:ListNodeShape."@en ;
+		rdfs:comment "Each list member (including this node) must have the shape shsh:ListNodeShape."@en ;
 		sh:hasValue rdf:nil ;
 		sh:node shsh:ListNodeShape ;
 	] .