diff --git a/book/source/diag/Fingerprint.png b/book/source/diag/Fingerprint.png
deleted file mode 100644
index dd54dc8..0000000
Binary files a/book/source/diag/Fingerprint.png and /dev/null differ
diff --git a/book/source/diag/Fingerprint.svg b/book/source/diag/Fingerprint.svg
index dbdacdf..8666887 100644
--- a/book/source/diag/Fingerprint.svg
+++ b/book/source/diag/Fingerprint.svg
@@ -1,12 +1,12 @@
- key creation timeComponent KeyComponent Key- key creation time
+
diff --git a/book/source/diag/OpenPGPCert_with_privatekeystore.png b/book/source/diag/OpenPGPCert_with_privatekeystore.png
deleted file mode 100644
index a15b169..0000000
Binary files a/book/source/diag/OpenPGPCert_with_privatekeystore.png and /dev/null differ
diff --git a/book/source/diag/OpenPGPCert_with_privatekeystore.svg b/book/source/diag/OpenPGPCert_with_privatekeystore.svg
index 0429f64..21198af 100644
--- a/book/source/diag/OpenPGPCert_with_privatekeystore.svg
+++ b/book/source/diag/OpenPGPCert_with_privatekeystore.svg
@@ -1,12 +1,12 @@
+ style="color:#000000;display:inline;fill:#ee5937;fill-opacity:1;stroke-width:0.433475;stroke-linejoin:round;stroke-dasharray:0.845274, 0.845274;-inkscape-stroke:none;paint-order:fill markers stroke"
+ d="m 1170.8621,234.72015 0.028,-1.68273 c 0.2701,0.009 0.5376,0.009 0.8032,-0.009 l 0.064,1.68109 c -0.3003,0.0103 -0.5987,0.0139 -0.8949,0.009 z m -0.8915,-0.0372 c -0.2979,-0.0191 -0.5952,-0.0467 -0.8923,-0.083 l 0.2066,-1.67001 c 0.265,0.0328 0.5309,0.0571 0.798,0.0743 z m 2.6788,-0.0295 -0.154,-1.67512 c 0.2653,-0.0242 0.5293,-0.0555 0.7926,-0.0952 l 0.2536,1.66413 c -0.2965,0.045 -0.5938,0.0797 -0.8922,0.10625 z m -4.4584,-0.18621 c -0.2947,-0.0528 -0.5899,-0.1143 -0.8838,-0.18629 l 0.4084,-1.63384 c 0.2557,0.0623 0.5151,0.11741 0.7774,0.16439 z m 6.232,-0.0761 -0.3437,-1.64734 c 0.2612,-0.0528 0.5205,-0.11447 0.7774,-0.18282 l 0.4406,1.62546 c -0.2898,0.077 -0.5812,0.14484 -0.8743,0.2047 z m -7.9808,-0.34878 c -0.289,-0.0887 -0.5744,-0.18775 -0.8567,-0.29591 l 0.6116,-1.56887 c 0.2459,0.0941 0.4958,0.17972 0.7477,0.25699 z m 9.7127,-0.10875 -0.5275,-1.59933 c 0.2527,-0.0812 0.5032,-0.17114 0.752,-0.26797 l 0.6218,1.56567 c -0.2783,0.10834 -0.561,0.2093 -0.8463,0.30163 z m -11.4004,-0.53171 c -0.2716,-0.12302 -0.5418,-0.25411 -0.8091,-0.3961 l 0.8031,-1.48295 c 0.2318,0.12303 0.4694,0.23855 0.7128,0.34878 z m 13.0691,-0.11636 -0.7041,-1.53106 c 0.241,-0.10885 0.48,-0.22635 0.717,-0.35043 l 0.7937,1.4872 c -0.2635,0.13791 -0.5324,0.27055 -0.8066,0.39429 z m -14.6532,-0.71695 c -0.2584,-0.15445 -0.5092,-0.31547 -0.7537,-0.48038 l 0.9563,-1.39124 c 0.2235,0.15082 0.4482,0.29548 0.6746,0.43072 z m 16.2399,-0.11386 -0.8754,-1.44169 c 0.2285,-0.13601 0.4532,-0.27912 0.6728,-0.42812 l 0.9587,1.38872 c -0.2475,0.16777 -0.4994,0.32828 -0.7561,0.48109 z m -17.7148,-0.87962 c -0.2375,-0.17669 -0.4699,-0.35908 -0.6977,-0.5452 l 1.0813,-1.29769 c 0.2089,0.17079 0.421,0.33709 0.6363,0.49717 z m 19.1974,-0.12131 -1.0344,-1.33491 c 0.2129,-0.16179 0.4199,-0.32776 0.6211,-0.49959 l 1.1099,1.27407 c -0.2278,0.19469 -0.4603,0.38072 -0.6966,0.56043 z m -20.5635,-0.9901 c -0.2185,-0.19192 -0.4346,-0.38721 -0.6474,-0.58734 l 1.1696,-1.22017 c 0.1979,0.18603 0.3997,0.36911 0.6048,0.54935 z m 21.9202,-0.16604 -1.1746,-1.21499 c 0.1915,-0.18179 0.3784,-0.37084 0.5613,-0.56552 l 1.2437,1.14679 c -0.2029,0.2158 -0.4131,0.42752 -0.6304,0.63372 z m -23.1919,-1.02212 c -0.2049,-0.20247 -0.4078,-0.40814 -0.6083,-0.61598 l 1.2284,-1.16194 c 0.1905,0.19771 0.3842,0.39265 0.5801,0.58639 z m 24.4135,-0.2781 -1.3049,-1.07689 c 0.1708,-0.2029 0.336,-0.41047 0.4942,-0.62271 l 1.3661,0.99944 c -0.1781,0.23882 -0.3636,0.47225 -0.5554,0.70016 z m -25.021,-2.63659 h -0.1155 v -1.68264 h 0.8489 v 1.68264 h -0.5692 z m 0.2135,0.1324 c 0.1642,0.18014 0.3768,0.40744 0.5393,0.58075 l -1.2453,1.14507 c -0.1981,-0.21129 -0.3896,-0.42311 -0.5794,-0.63112 l 1.2812,-1.09497 z m 25.8759,1.0768 -1.4188,-0.92435 c 0.1474,-0.2222 0.2875,-0.44673 0.4202,-0.6742 l 1.4707,0.8418 c -0.1505,0.25827 -0.3085,0.51023 -0.4721,0.75675 z m -23.6734,-1.18392 -0.8499,-0.0164 0.033,-1.68179 0.8489,0.0156 z m -34.8043,-0.0251 v -1.68272 h 0.8488 v 1.68272 z m 1.6988,0 v -1.68272 h 0.8488 v 1.68272 z m 1.6977,0 v -1.68272 h 0.85 v 1.68272 z m 1.6988,0 v -1.68272 h 0.8497 v 1.68272 z m 1.6987,0 v -1.68272 h 0.849 v 1.68272 z m 1.6988,0 v -1.68272 h 0.849 v 1.68272 z m 1.6987,0 v -1.68272 h 0.849 v 1.68272 z m 1.6979,0 v -1.68272 h 0.8498 v 1.68272 z m 1.6988,0 v -1.68272 h 0.8498 v 1.68272 z m 1.6988,0 v -1.68272 h 0.8489 v 1.68272 z m 1.6987,0 v -1.68272 h 0.849 v 1.68272 z m 1.6988,0 v -1.68272 h 0.849 v 1.68272 z m 1.6978,0 v -1.68272 h 0.8498 v 1.68272 z m 1.6988,0 v -1.68272 h 0.8498 v 1.68272 z m 1.6988,0 v -1.68272 h 0.8488 v 1.68272 z m 1.6987,0 v -1.68272 h 0.8489 v 1.68272 z m 1.6987,0 v -1.68272 h 0.849 v 1.68272 z m 1.698,0 v -1.68272 h 0.8496 v 1.68272 z m 1.6987,0 v -1.68272 h 0.8498 v 1.68272 z m 28.8029,-0.32524 -1.5132,-0.76428 c 0.1205,-0.2343 0.2344,-0.47346 0.3419,-0.71625 l 1.5558,0.67585 c -0.1199,0.27082 -0.248,0.53948 -0.3845,0.80468 z m -60.8434,-0.0216 -0.5555,-0.63708 1.2853,-1.09965 0.5554,0.63614 z m -1.1111,-1.27329 -0.5546,-0.63622 1.2845,-1.10052 0.5555,0.63622 z m 62.675,-0.33209 -1.59,-0.59148 c 0.093,-0.24564 0.1784,-0.49623 0.2578,-0.74992 l 1.6232,0.49882 c -0.088,0.28199 -0.185,0.56319 -0.291,0.84258 z m -63.7852,-0.94122 -0.5554,-0.63613 1.2855,-1.1005 0.5554,0.63707 z m 54.5956,-0.59823 -0.041,-1.68282 c 0.209,-0.009 0.4167,-0.0372 0.6125,-0.0951 l 0.489,1.61118 c -0.3465,0.10331 -0.7035,0.16681 -1.0606,0.16681 z m -1.0632,-0.11465 c -0.3505,-0.0848 -0.6872,-0.21527 -1.0014,-0.38927 l 0.8285,-1.46867 c 0.18,0.0996 0.3747,0.17512 0.5743,0.22331 z m 10.7845,-0.0432 -1.6477,-0.41039 c 0.064,-0.25465 0.121,-0.51214 0.1709,-0.77275 l 1.6689,0.31356 c -0.055,0.29029 -0.1187,0.58024 -0.1921,0.86958 z m -7.6857,-0.44491 -0.8957,-1.43 c 0.1754,-0.10781 0.3373,-0.23976 0.4782,-0.39014 l 1.246,1.1435 c -0.2441,0.26089 -0.523,0.48871 -0.8285,0.67664 z m -57.7419,-0.0718 -0.5555,-0.63621 1.2853,-1.10044 0.5556,0.63709 z m 52.7853,-0.4617 c -0.2575,-0.24807 -0.4806,-0.52954 -0.6627,-0.8367 l 1.4639,-0.85287 c 0.1046,0.17643 0.2345,0.34081 0.3828,0.48359 z m 12.9766,-0.76514 -1.6835,-0.22496 c 0.036,-0.25958 0.062,-0.52304 0.083,-0.78868 l 1.6937,0.12892 c -0.021,0.29341 -0.053,0.58855 -0.094,0.88472 z m -66.24,-1.59673 -1.3044,-1.07611 0.5556,-0.63604 1.2852,1.09964 m -0.399,0.39222 0.5546,0.63708 -1.2844,1.09965 -0.5555,-0.63622 m 60.8141,0.47467 -1.5024,-0.78443 c 0.096,-0.18058 0.1674,-0.37492 0.211,-0.57392 l 1.6598,0.35727 c -0.078,0.34903 -0.2005,0.68561 -0.3684,1.00108 z m -7.4815,-0.80641 c -0.096,-0.34592 -0.142,-0.70102 -0.1421,-1.05422 h 1.6988 c 1e-4,0.20784 0.029,0.41429 0.081,0.60932 z m 14.1912,-0.723 -1.6977,-0.0372 c 0.01,-0.26364 0.01,-0.52771 -0.01,-0.79205 l 1.6979,-0.0606 c 0.011,0.29609 0.012,0.59261 0.01,0.88982 z m -7.9491,-0.44656 c -0.011,-0.20601 -0.048,-0.40987 -0.1116,-0.60247 l 1.6146,-0.52503 c 0.1128,0.34039 0.1768,0.69332 0.1939,1.04738 z m -4.6084,-0.37248 -1.6758,-0.27645 c 0.06,-0.35206 0.1661,-0.69445 0.3181,-1.01788 l 1.5398,0.70959 c -0.086,0.18482 -0.1485,0.38374 -0.1821,0.58474 z m -53.0664,0 -1.2854,-1.10043 0.5555,-0.6363 1.2845,1.09973 z m 57.2928,-0.78522 c -0.1132,-0.17114 -0.2506,-0.32879 -0.4058,-0.46429 l 1.1236,-1.26144 c 0.2694,0.23517 0.5057,0.50521 0.7028,0.80294 z m 6.5781,-0.0182 c -0.024,-0.26433 -0.055,-0.5265 -0.094,-0.78615 l 1.6799,-0.24859 c 0.045,0.29514 0.079,0.58975 0.1063,0.88394 z m -10.2885,-0.24218 -1.3007,-1.08199 c 0.2308,-0.27238 0.498,-0.51378 0.7937,-0.71616 l 0.9655,1.38439 c -0.1701,0.11647 -0.3255,0.25664 -0.4585,0.41376 z m -52.4724,-0.22799 -1.2853,-1.10052 0.5555,-0.63612 1.2854,1.10051 z m 55.259,-0.32109 c -0.1846,-0.0907 -0.3834,-0.15713 -0.5854,-0.19545 l 0.32,-1.65246 c 0.354,0.0676 0.6972,0.18204 1.0199,0.34047 z m -1.8153,-0.10695 -0.5691,-1.58505 c 0.3405,-0.11992 0.6948,-0.19269 1.0523,-0.21812 l 0.1225,1.6784 c -0.2072,0.0139 -0.4126,0.0571 -0.6057,0.12477 z m 9.0841,-0.6716 c -0.053,-0.26062 -0.1146,-0.51777 -0.1829,-0.77103 l 1.6408,-0.43478 c 0.078,0.28864 0.146,0.57833 0.2061,0.86707 z m -61.4167,-0.17357 -1.2855,-1.09965 0.5556,-0.63708 1.2852,1.10051 z m 4.8511,-0.17184 -0.7357,-0.41973 0.8473,-1.45769 0.6754,0.38503 -0.01,-0.0156 0.7538,-0.38763 0.7825,1.49228 -0.7537,0.38851 -0.7358,-1.40387 z m 11.0032,-0.19564 c -0.2677,0.0269 -0.6593,-0.0649 -0.6593,-0.0649 l 0.2348,-1.66672 c 0,0 0.094,0.0389 0.1767,0.0242 0.083,-0.0139 0.1278,-0.0519 0.1278,-0.0519 l 0.7631,1.50242 c -0.1869,0.1304 -0.3754,0.22955 -0.6431,0.25698 z m -1.5006,-0.18109 -0.8413,-0.11638 0.2348,-1.66655 0.8414,0.1162 z m 8.4904,-0.14917 -0.126,-0.0528 0.4075,-1.65299 v -0.009 l 0.2603,-0.14319 0.8252,1.47049 -0.6236,0.34281 c -0.2288,0.1258 -0.5035,0.14017 -0.7443,0.0389 z m -10.4426,-0.19633 -0.7512,-0.39178 0.7904,-1.48892 0.7511,0.39092 z m -4.482,-0.0691 -0.7828,-1.49316 0.7538,-0.38764 0.7827,1.49317 z m 9.3367,-0.0389 -0.763,-1.5032 0.7587,-0.37837 0.763,1.50336 z m -13.8775,-0.009 -0.7358,-0.41965 0.848,-1.45854 0.7358,0.42043 z m 18.5577,-0.0683 -0.7816,-0.32863 0.6642,-1.54862 0.7817,0.32862 z m -20.4209,-0.64402 -0.5555,0.63614 -1.2844,-1.09956 0.5545,-0.63709 c 0.4227,0.37371 0.8521,0.73919 1.2854,1.10051 z m 59.4911,0.36271 c -0.083,-0.25213 -0.1728,-0.50106 -0.2696,-0.74575 l 1.5821,-0.61433 c 0.1099,0.27749 0.2096,0.55722 0.3022,0.83834 z m -36.053,-0.12736 -0.8242,-1.47022 0.7417,-0.40884 0.8252,1.4704 z m -15.5613,-0.17772 -0.7825,-1.49316 0.7538,-0.3884 0.7618,1.47792 z m 1.5444,-1.89178 0.752,0.391 -0.7903,1.48979 -0.752,-0.39186 0.059,-0.10695 z m 9.4362,1.82101 -0.7818,-0.32862 0.6644,-1.54889 0.7818,0.32879 z m -1.7083,0.032 -0.7629,-1.5032 0.7588,-0.37837 0.763,1.50328 z m 14.1559,-0.46888 v -1.68273 c 0.2472,8e-5 0.4937,0 0.7402,0 l -0.2928,-0.15169 v -0.009 l 0.2994,0.15505 c 0.032,-1.7e-4 0.064,1.8e-4 0.096,0 v 0.0502 l 0.8506,0.44067 -0.01,-0.49631 c 0.282,0 0.5617,-0.009 0.8404,-0.009 l 0.029,1.68196 c -0.2876,0.009 -0.5733,0.009 -0.8575,0.01 l -0.01,-1.18219 -0.8507,-0.44076 0.01,1.62806 c -0.2854,0 -0.5703,0 -0.8542,0 z m -0.8508,0 h -0.8489 l 0.01,-1.68273 0.849,0.009 z m -1.7003,-0.009 h -0.445 -0.4049 l 0.01,-1.68274 h 0.4042 0.4447 z m -1.7319,-0.009 -0.815,-0.009 0.01,-1.68265 0.8159,0.009 v 0 h 0.033 l -0.01,1.68264 z m -1.6621,-0.009 h -0.85 v -1.68273 h 0.85 z m 9.3425,0 v -1.68273 h 0.8498 v 1.68281 z m 24.2061,-0.64375 c -0.11,-0.23967 -0.2276,-0.47675 -0.3521,-0.71114 l 1.5029,-0.78376 c 0.1393,0.26192 0.2714,0.5279 0.3956,0.79881 z m -25.1266,-1.34867 -1.47,-0.84258 c 0.1498,-0.25628 0.3071,-0.50841 0.4721,-0.75657 l 1.4181,0.92504 c -0.1463,0.2202 -0.2864,0.44508 -0.4202,0.67411 z m 24.3806,-0.0563 c -0.1361,-0.22583 -0.28,-0.44828 -0.4304,-0.66745 l 1.4052,-0.94623 c 0.1679,0.24477 0.33,0.49517 0.484,0.75077 z m -23.632,-1.02627 -1.3703,-0.99443 c 0.1753,-0.23725 0.3576,-0.47148 0.5486,-0.70189 l 1.3126,1.06772 c -0.1684,0.20298 -0.3317,0.41333 -0.4909,0.6286 z m 22.7328,-0.28658 c -0.1623,-0.21076 -0.3297,-0.41652 -0.5027,-0.61587 l 1.2879,-1.09636 c 0.1959,0.22583 0.3839,0.45676 0.5647,0.69185 z m -21.7128,-0.94961 -1.2616,-1.12664 c 0.2025,-0.2221 0.4104,-0.43608 0.6221,-0.64296 l 1.1933,1.19828 c -0.1914,0.18724 -0.3768,0.377 -0.5538,0.57132 z m 20.67,-0.25697 c -0.1844,-0.19105 -0.3739,-0.37656 -0.5692,-0.55705 l 1.1586,-1.23021 c 0.2189,0.2022 0.4321,0.41073 0.6388,0.62523 z m -19.5293,-0.85946 -1.1279,-1.25807 c 0.2221,-0.19528 0.4509,-0.38754 0.689,-0.57306 l 1.0505,1.32298 c -0.2069,0.16127 -0.4103,0.33104 -0.6116,0.50815 z m 18.3571,-0.22513 c -0.2037,-0.16899 -0.4132,-0.33226 -0.6278,-0.49034 l 1.014,-1.35074 c 0.2397,0.17659 0.4748,0.36064 0.7051,0.55195 z m -17.098,-0.76419 -0.986,-1.37012 c 0.246,-0.17365 0.4958,-0.33806 0.7477,-0.49458 l 0.9026,1.42576 c -0.2278,0.14138 -0.4493,0.28718 -0.6643,0.43894 z m 15.8134,-0.18274 c -0.2231,-0.1464 -0.4493,-0.28605 -0.6789,-0.41809 l 0.8525,-1.45526 c 0.26,0.14961 0.5148,0.3062 0.7639,0.4694 z m -14.4584,-0.65907 -0.82,-1.47282 c 0.2622,-0.14328 0.5288,-0.27913 0.7996,-0.40709 l 0.7315,1.51842 c -0.2402,0.11361 -0.4776,0.23396 -0.7111,0.36149 z m 13.0744,-0.14146 c -0.238,-0.12052 -0.4788,-0.2337 -0.7222,-0.3397 l 0.6831,-1.54039 c 0.275,0.11983 0.5454,0.2471 0.8115,0.38182 z m -11.6308,-0.54191 -0.6431,-1.55709 c 0.2768,-0.11223 0.5583,-0.21667 0.8429,-0.31271 l 0.5478,1.59266 c -0.2513,0.0848 -0.5006,0.17704 -0.7476,0.27714 z m 10.1634,-0.0985 c -0.2481,-0.0929 -0.4999,-0.17885 -0.7552,-0.25785 l 0.506,-1.60616 c 0.285,0.0882 0.5684,0.18455 0.8498,0.28994 z m -8.6518,-0.41281 -0.4543,-1.62131 c 0.2885,-0.0797 0.5801,-0.15099 0.8745,-0.21328 l 0.3545,1.64571 c -0.2592,0.0546 -0.5177,0.11818 -0.7747,0.18888 z m 7.1225,-0.0606 c -0.2566,-0.0649 -0.5166,-0.12079 -0.7802,-0.17106 l 0.3208,-1.65237 c 0.2924,0.0555 0.5856,0.11941 0.8778,0.19295 z m -5.5607,-0.27134 -0.2587,-1.66327 c 0.2971,-0.0458 0.5957,-0.0813 0.894,-0.10876 l 0.1575,1.67512 c -0.2654,0.0242 -0.5304,0.0571 -0.7928,0.0969 z m 3.9877,-0.0277 c -0.2628,-0.0346 -0.5283,-0.0632 -0.7953,-0.083 l 0.132,-1.67764 c 0.2974,0.0233 0.5958,0.0537 0.8939,0.0944 z m -2.3962,-0.11966 -0.061,-1.68101 c 0.3002,-0.0103 0.5999,-0.0121 0.8991,-0.009 l -0.041,1.68196 c -0.267,-0.009 -0.5332,-0.009 -0.7987,0.009 z"
+ id="path2-7-9-5-7-0-1"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccczcczccccccccccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccc" />
diff --git a/book/source/diag/TSK.png b/book/source/diag/TSK.png
deleted file mode 100644
index de7b024..0000000
Binary files a/book/source/diag/TSK.png and /dev/null differ
diff --git a/book/source/diag/TSK.svg b/book/source/diag/TSK.svg
index 0ae654e..471a9d3 100644
--- a/book/source/diag/TSK.svg
+++ b/book/source/diag/TSK.svg
@@ -1,18 +1,44 @@
+ id="text11-2-1-1-8-3-4-8-1-2-1-0"
+ aria-label="User ID" />- key creation timeComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B67F33 00F9 FB0E C457 378C D29F 1026 98B3certificationPrivate key store
diff --git a/book/source/diag/direct_key_signature_packet.png b/book/source/diag/direct_key_signature_packet.png
deleted file mode 100644
index b05152d..0000000
Binary files a/book/source/diag/direct_key_signature_packet.png and /dev/null differ
diff --git a/book/source/diag/direct_key_signature_packet.svg b/book/source/diag/direct_key_signature_packet.svg
new file mode 100644
index 0000000..f1731d4
--- /dev/null
+++ b/book/source/diag/direct_key_signature_packet.svg
@@ -0,0 +1,486 @@
+
+
diff --git a/book/source/diag/pubcert-minimal.png b/book/source/diag/pubcert-minimal.png
deleted file mode 100644
index dbee19d..0000000
Binary files a/book/source/diag/pubcert-minimal.png and /dev/null differ