diff --git a/book/tmp/06-terminology.md b/book/mermaid/sig-types.md
similarity index 72%
rename from book/tmp/06-terminology.md
rename to book/mermaid/sig-types.md
index 14b1a74..0e94335 100644
--- a/book/tmp/06-terminology.md
+++ b/book/mermaid/sig-types.md
@@ -4,21 +4,24 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
 ```{mermaid}
-%%{ init: { 'flowchart': { 'curve': '' } } }%%
+%%{ init: { 'flowchart': { 'curve': 'monotoneX' } } }%%
 flowchart LR
     signature(OpenPGP Signature)
-    3rdcert(Third-Party Certification)
-    data(Data Signature)
-    selfcert(Self-Signature)
-    certification("Third-Party Certification
-    --------------------------------
-    Self-Certification")
 
-    signature --> data & selfcert & 3rdcert & confsig & standalone & timestamp
+    data(Signature on Data)
+
+    sigcomp(Signature on Component)
+    selfsig(Self-Signature)
+    thirdparty(Third-Party)
+    
+    signature --> confsig & standalone & timestamp & data & sigcomp
+    
     data --> binary & text
-    selfcert --> skbind & skrev
-    selfcert & 3rdcert --> certification
-    certification --> uidcert & uidrev & dksig & krev
+
+    sigcomp --> selfsig & thirdparty
+    selfsig --> skbind & skrev & uidcert & uidrev & dksig & krev
+    thirdparty --> uidcert & uidrev & dksig
+
     subgraph Signature Types and Targets
         standalone[0x02: Standalone]
         subgraph Signature Packet
@@ -51,4 +54,3 @@ flowchart LR
         end
     end
 ```
-
diff --git a/book/source/06-signatures.md b/book/source/06-signatures.md
index a2c482d..16b5e1c 100644
--- a/book/source/06-signatures.md
+++ b/book/source/06-signatures.md
@@ -38,7 +38,7 @@ Signature on components are a complex topic, which we discuss in depth in {ref}`
 - Who issued the signature (self-signature vs. third party signature)?
 - What kind of statement does the signature make (certify an identity, or bind component keys into a certificate)?
 
-```{figure} mermaid/06-terminology.png
+```{figure} mermaid/sig-types.png
 
 An overview of signature types in OpenPGP
 ```
diff --git a/book/source/mermaid/06-terminology.png b/book/source/mermaid/06-terminology.png
deleted file mode 100644
index 1c6fa2b..0000000
Binary files a/book/source/mermaid/06-terminology.png and /dev/null differ
diff --git a/book/source/mermaid/sig-types.png b/book/source/mermaid/sig-types.png
new file mode 100644
index 0000000..df7d388
Binary files /dev/null and b/book/source/mermaid/sig-types.png differ