diff --git a/book/source/diag/Binding_Subkeys.png b/book/source/diag/Binding_Subkeys.png
deleted file mode 100644
index a798631..0000000
Binary files a/book/source/diag/Binding_Subkeys.png and /dev/null differ
diff --git a/book/source/diag/Binding_Subkeys.svg b/book/source/diag/Binding_Subkeys.svg
new file mode 100644
index 0000000..a874757
--- /dev/null
+++ b/book/source/diag/Binding_Subkeys.svg
@@ -0,0 +1,779 @@
+
+
diff --git a/book/source/diag/Binding_a_UserID.png b/book/source/diag/Binding_a_UserID.png
deleted file mode 100644
index 2e9b815..0000000
Binary files a/book/source/diag/Binding_a_UserID.png and /dev/null differ
diff --git a/book/source/diag/Binding_a_UserID.svg b/book/source/diag/Binding_a_UserID.svg
new file mode 100644
index 0000000..f882e6b
--- /dev/null
+++ b/book/source/diag/Binding_a_UserID.svg
@@ -0,0 +1,446 @@
+
+
diff --git a/book/source/diag/Components_of_an_OpenPGP_Certificate.png b/book/source/diag/Components_of_an_OpenPGP_Certificate.png
deleted file mode 100644
index 02e6af5..0000000
Binary files a/book/source/diag/Components_of_an_OpenPGP_Certificate.png and /dev/null differ
diff --git a/book/source/diag/OpenPGP_Certificate.png b/book/source/diag/OpenPGP_Certificate.png
deleted file mode 100644
index 4b9f63d..0000000
Binary files a/book/source/diag/OpenPGP_Certificate.png and /dev/null differ
diff --git a/book/source/diag/OpenPGP_Certificate.svg b/book/source/diag/OpenPGP_Certificate.svg
new file mode 100644
index 0000000..02dde5f
--- /dev/null
+++ b/book/source/diag/OpenPGP_Certificate.svg
@@ -0,0 +1,1123 @@
+
+
diff --git a/book/source/diag/Primary_key_metadata.png b/book/source/diag/Primary_key_metadata.png
deleted file mode 100644
index dae4409..0000000
Binary files a/book/source/diag/Primary_key_metadata.png and /dev/null differ
diff --git a/book/source/diag/Primary_key_metadata.svg b/book/source/diag/Primary_key_metadata.svg
new file mode 100644
index 0000000..cb4ba78
--- /dev/null
+++ b/book/source/diag/Primary_key_metadata.svg
@@ -0,0 +1,433 @@
+
+
diff --git a/book/source/diag/Signature_Creation.png b/book/source/diag/Signature_Creation.png
deleted file mode 100644
index 69b2fdc..0000000
Binary files a/book/source/diag/Signature_Creation.png and /dev/null differ
diff --git a/book/source/diag/Signature_Creation.svg b/book/source/diag/Signature_Creation.svg
new file mode 100644
index 0000000..1c8f4d8
--- /dev/null
+++ b/book/source/diag/Signature_Creation.svg
@@ -0,0 +1,794 @@
+
+
diff --git a/book/source/diag/Signature_Verification.png b/book/source/diag/Signature_Verification.png
deleted file mode 100644
index 3f99878..0000000
Binary files a/book/source/diag/Signature_Verification.png and /dev/null differ
diff --git a/book/source/diag/Signature_Verification.svg b/book/source/diag/Signature_Verification.svg
new file mode 100644
index 0000000..30f6721
--- /dev/null
+++ b/book/source/diag/Signature_Verification.svg
@@ -0,0 +1,825 @@
+
+
diff --git a/book/source/diag/asymmetric_keypair.png b/book/source/diag/asymmetric_keypair.png
deleted file mode 100644
index 088b3c4..0000000
Binary files a/book/source/diag/asymmetric_keypair.png and /dev/null differ
diff --git a/book/source/diag/cryptographic_keypair.png b/book/source/diag/cryptographic_keypair.png
deleted file mode 100644
index d57a320..0000000
Binary files a/book/source/diag/cryptographic_keypair.png and /dev/null differ
diff --git a/book/source/diag/diag_library_draft.svg b/book/source/diag/diag_library_draft.svg
deleted file mode 100644
index 2be10cb..0000000
--- a/book/source/diag/diag_library_draft.svg
+++ /dev/null
@@ -1,4013 +0,0 @@
-
-
diff --git a/book/source/diag/id_card.svg b/book/source/diag/id_card.svg
new file mode 100644
index 0000000..5cbf1b3
--- /dev/null
+++ b/book/source/diag/id_card.svg
@@ -0,0 +1,108 @@
+
+
+
+
diff --git a/book/source/diag/key-minimal.png b/book/source/diag/key-minimal.png
deleted file mode 100644
index 12f62fe..0000000
Binary files a/book/source/diag/key-minimal.png and /dev/null differ
diff --git a/book/source/diag/meaning_of_signatures.png b/book/source/diag/meaning_of_signatures.png
deleted file mode 100644
index 7fd595b..0000000
Binary files a/book/source/diag/meaning_of_signatures.png and /dev/null differ
diff --git a/book/source/diag/meaning_of_signatures.svg b/book/source/diag/meaning_of_signatures.svg
new file mode 100644
index 0000000..10b44fc
--- /dev/null
+++ b/book/source/diag/meaning_of_signatures.svg
@@ -0,0 +1,466 @@
+
+
diff --git a/book/source/diag/passphrase_using_S2K.svg b/book/source/diag/passphrase_using_S2K.svg
index c425b4f..dde4212 100644
--- a/book/source/diag/passphrase_using_S2K.svg
+++ b/book/source/diag/passphrase_using_S2K.svg
@@ -134,15 +134,15 @@
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:lockguides="false"
- inkscape:zoom="0.77037643"
- inkscape:cx="956.67516"
- inkscape:cy="-256.36817"
+ inkscape:zoom="1.0894768"
+ inkscape:cx="2682.9392"
+ inkscape:cy="356.59318"
inkscape:window-width="2560"
inkscape:window-height="1371"
inkscape:window-x="0"
inkscape:window-y="305"
inkscape:window-maximized="1"
- inkscape:current-layer="layer3-5"
+ inkscape:current-layer="layer25"
showgrid="false"
inkscape:export-bgcolor="#ffffff00"
showguides="false">Protecting secret key material Converting a passphrase with a passphraseinto a symmetric keycorrect horse battery staplePassphrasepublic key materialPublic Key Materialpk_algoPublic-Key Algorithmcreation_timeCreation TimeversionVersionsecret key materialSecret Key Materials2k_usage (encryption information)S2K Usage (Secret Key Encryption)public key materialPublic Key Materialpk_algoPublic-Key Algorithm1010101creation_timeCreation TimeversionVersion
Subkey binding signature- signature creation time- key expiration time- key flags- issuer fingerprintSubkey binding signatureAdditional MetadataSignature over:- signature creation time- primary key- key expiration time- subkey
+ id="tspan23">- key flags- issuer fingerprintSignature over:Primary keySubkeySignature metadata:
diff --git a/book/source/diag/symmetric_key.png b/book/source/diag/symmetric_key.png
deleted file mode 100644
index b8138f9..0000000
Binary files a/book/source/diag/symmetric_key.png and /dev/null differ
diff --git a/book/source/diag/symmetric_key.svg b/book/source/diag/symmetric_key.svg
new file mode 100644
index 0000000..52b04de
--- /dev/null
+++ b/book/source/diag/symmetric_key.svg
@@ -0,0 +1,116 @@
+
+
diff --git a/book/source/diag/with_subkeys.svg b/book/source/diag/with_subkeys.svg
new file mode 100644
index 0000000..21d9ba6
--- /dev/null
+++ b/book/source/diag/with_subkeys.svg
@@ -0,0 +1,274 @@
+
+
+
+