diff --git a/book/source/diag/OpenPGP Certificate.png b/book/source/diag/OpenPGP Certificate.png
index e7e0f9b..04bc8cd 100644
Binary files a/book/source/diag/OpenPGP Certificate.png and b/book/source/diag/OpenPGP Certificate.png differ
diff --git a/book/source/diag/OpenPGP Certificate.svg b/book/source/diag/OpenPGP Certificate.svg
index 5737d81..9a252c6 100644
--- a/book/source/diag/OpenPGP Certificate.svg	
+++ b/book/source/diag/OpenPGP Certificate.svg	
@@ -3,150 +3,74 @@
    viewBox="0 0 670.41901 716.77217"
    version="1.1"
    id="svg1"
-   sodipodi:docname="diag_library_draft.svg"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
    width="670.41901"
    height="716.77216"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs1"><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect35"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect32-0"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect35-9"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect32-1"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect35-9-7"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1 @ F,0,1,1,0,18.14255,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect32-1-0"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /></defs><sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:lockguides="false"
-     inkscape:zoom="0.535"
-     inkscape:cx="615.88785"
-     inkscape:cy="671.96262"
-     inkscape:window-width="2560"
-     inkscape:window-height="1371"
-     inkscape:window-x="0"
-     inkscape:window-y="305"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
-     showgrid="false"><inkscape:page
-       x="-1.2814883e-06"
-       y="-3.3031252e-08"
-       width="670.41901"
-       height="716.77216"
-       id="page39"
-       margin="0"
-       bleed="0"
-       inkscape:export-filename="OpenPGP Certificate.svg"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96" /></sodipodi:namedview><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><g
-     inkscape:groupmode="layer"
+     id="defs1" /><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><g
+     id="layer2"
+     transform="translate(-801.20752,-16.179556)"><g
+       id="g5"
+       transform="matrix(0.72583745,0,0,0.72583745,835.34343,1276.2358)"><rect
+         style="fill:#61a78d;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         id="rect3-6"
+         width="112.56998"
+         height="112.56998"
+         x="-1083.8834"
+         y="-1427.076" /><rect
+         style="fill:#61a78d;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         id="rect3-6-7"
+         width="112.56998"
+         height="112.56998"
+         x="-462.009"
+         y="-1061.1685" /><text
+         xml:space="preserve"
+         style="font-size:27.9422px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:7.2184;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:4.65703, 4.65703;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         x="767.18085"
+         y="-252.72313"
+         id="text3-0"><tspan
+           id="tspan3-6"
+           x="767.18085"
+           y="-252.72313"
+           style="fill:#000000;fill-opacity:1;stroke-width:7.2184">Sea green</tspan><tspan
+           x="767.18085"
+           y="-217.79538"
+           style="fill:#000000;fill-opacity:1;stroke-width:7.2184"
+           id="tspan4-2">#18A589</tspan></text></g><g
+       id="g6"
+       transform="matrix(0.72583745,0,0,0.72583745,835.34343,961.9282)"
+       style="display:inline"><text
+         xml:space="preserve"
+         style="font-size:27.9422px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:7.2184;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:4.65703, 4.65703;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         x="770.71838"
+         y="31.580709"
+         id="text3-0-3"><tspan
+           id="tspan3-6-7"
+           x="770.71838"
+           y="31.580709"
+           style="fill:#000000;fill-opacity:1;stroke-width:7.2184">Teal</tspan><tspan
+           x="770.71838"
+           y="66.508461"
+           style="fill:#000000;fill-opacity:1;stroke-width:7.2184"
+           id="tspan4-2-5">#006961</tspan></text><rect
+         style="display:inline;fill:#006961;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         id="rect3-6-2"
+         width="112.56998"
+         height="112.56998"
+         x="647.05475"
+         y="12.498367" /><rect
+         style="display:inline;fill:#397f22;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         id="rect3-6-2-5"
+         width="112.56998"
+         height="112.56998"
+         x="-1088.1649"
+         y="-1127.2731" /></g></g><g
      id="layer3"
-     inkscape:label="OpenPGP Certificate"
      style="opacity:1"
-     inkscape:highlight-color="#18a589"
      transform="translate(-801.20752,-16.179556)"><g
        id="g11"
-       transform="translate(68.036954,-122.53164)"
-       inkscape:label="Diagramm Header"><rect
+       transform="matrix(0.86376245,0,0,0.86376245,216.3412,-99.985813)"><rect
          style="font-variation-settings:'wght' 700;fill:#195962;stroke-width:2.29652;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
          id="rect1"
          width="329.94476"
@@ -166,34 +90,25 @@
            x="954.24536"
            y="158.38867"
            id="text1"><tspan
-             sodipodi:role="line"
              id="tspan1"
              x="954.24536"
              y="158.38867">OpenPGP Certificate</tspan></text></g></g><g
        id="g40"
        style="display:inline"
-       inkscape:label="Primary"
-       transform="translate(-2.4171303,3.0596819)"><path
+       transform="translate(104.75797,7.8979535)"><path
          id="rect11"
          d="m 884.2432,192.95468 h 359.0109 a 18.14255,18.14255 45 0 1 18.1425,18.14255 v 126.63435 a 18.14255,18.14255 135 0 1 -18.1425,18.14255 H 884.2432 A 18.14255,18.14255 45 0 1 866.10065,337.73158 V 211.09723 a 18.14255,18.14255 135 0 1 18.14255,-18.14255 z"
          style="font-variation-settings:'wght' 500;fill:#195962;fill-opacity:0.1;stroke:#195962;stroke-width:4.39384;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-         inkscape:path-effect="#path-effect35"
-         inkscape:original-d="M 866.10065,192.95468 H 1261.3966 V 355.87413 H 866.10065 Z"
          transform="matrix(0.92016709,0,0,0.69628804,50.430978,-3.7263769)" /><path
          id="path2-3"
-         style="display:inline;fill:none;stroke:#006961;stroke-width:6.90373;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;fill:none;stroke:#006961;stroke-width:10.4431;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
          d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z"
-         inkscape:label="Publickey ((Asym))"
-         sodipodi:nodetypes="cssscccccccccccccccsssss"
-         transform="matrix(0.31599962,0,0,-0.31599962,1092.094,435.54103)"
-         inkscape:path-effect="#path-effect32-0"
-         inkscape:original-d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z" /><text
+         transform="matrix(0.31599962,0,0,-0.31599962,1092.094,435.54103)" /><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="862.99152"
          y="209.20926"
          id="text11"><tspan
-           sodipodi:role="line"
            id="tspan11"
            x="862.99152"
            y="209.20926"
@@ -203,39 +118,33 @@
          x="861.96753"
          y="161.23524"
          id="text11-2"><tspan
-           sodipodi:role="line"
            id="tspan11-9"
            x="861.96753"
            y="161.23524"
-           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">Primary Component Key</tspan></text><text
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">Component Key (primary)</tspan></text><text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:17.9px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:center;text-anchor:middle;white-space:pre;inline-size:393.624;display:inline;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
-         x="749.5885"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:17.9px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;white-space:pre;inline-size:393.624;display:inline;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="559.75104"
          y="408.97891"
          id="text11-3"
-         transform="matrix(0.95580583,0,0,0.95580583,326.44807,-124.51895)"
-         inkscape:label="fingerprint primary"><tspan
-           x="749.5885"
+         transform="matrix(0.95580583,0,0,0.95580583,316.75897,-124.51895)"><tspan
+           x="559.75104"
            y="408.97891"
-           id="tspan4"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan3">AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6</tspan><tspan
-             y="408.97891"
-             id="tspan5">  </tspan></tspan><tspan
-           x="749.5885"
+           id="tspan3"><tspan
+   style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal'"
+   id="tspan2">AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6</tspan>  </tspan><tspan
+           x="559.75104"
            y="428.39824"
-           id="tspan7"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan6">7F33 00F9 FB0E C457 378C D29F 1026 98B3</tspan></tspan></text></g><g
+           id="tspan5"><tspan
+             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal'"
+             id="tspan4">7F33 00F9 FB0E C457 378C D29F 1026 98B3</tspan></tspan></text></g><g
        id="g42"
-       inkscape:label="Subkey sign"
-       transform="translate(-6.1126183,25.141672)"><text
+       transform="translate(-30.112618,37.141672)"><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="866.87903"
          y="545.59027"
          id="text11-2-8-9"><tspan
-           sodipodi:role="line"
            id="tspan11-9-0-9"
            x="866.87903"
            y="545.59027"
@@ -243,90 +152,70 @@
          id="rect11-2-0"
          d="m 884.2432,192.95468 h 359.0109 a 18.14255,18.14255 45 0 1 18.1425,18.14255 v 126.63435 a 18.14255,18.14255 135 0 1 -18.1425,18.14255 H 884.2432 A 18.14255,18.14255 45 0 1 866.10065,337.73158 V 211.09723 a 18.14255,18.14255 135 0 1 18.14255,-18.14255 z"
          style="font-variation-settings:'wght' 500;opacity:1;fill:none;fill-opacity:0.1;stroke:#195962;stroke-width:4.39384;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-         inkscape:path-effect="#path-effect35-9-7"
-         inkscape:original-d="M 866.10065,192.95468 H 1261.3966 V 355.87413 H 866.10065 Z"
          transform="matrix(0.92016709,0,0,0.69628804,54.126466,381.06173)" /><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="867.31079"
          y="595.50562"
          id="text11-1"><tspan
-           sodipodi:role="line"
            id="tspan11-2"
            x="867.31079"
            y="595.50562"
            style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">- key creation time</tspan></text><path
          id="path2-1-4"
-         style="display:inline;opacity:1;fill:none;stroke:#006961;stroke-width:6.90373;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:none;stroke:#006961;stroke-width:10.4431;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
          d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z"
-         inkscape:label="Publickey ((Asym))"
-         sodipodi:nodetypes="cssscccccccccccccccsssss"
-         transform="matrix(0.31599962,0,0,-0.31599962,1096.0212,820.57519)"
-         inkscape:path-effect="#path-effect32-1-0"
-         inkscape:original-d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z" /><text
+         transform="matrix(0.31599962,0,0,-0.31599962,1096.0212,820.57519)" /><text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:17.9px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:center;text-anchor:middle;white-space:pre;inline-size:393.624;display:inline;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
-         x="749.5885"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:17.9px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;white-space:pre;inline-size:393.624;display:inline;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="562.8924"
          y="408.97891"
          id="text11-3-4-9"
-         transform="matrix(0.95580583,0,0,0.95580583,327.42059,258.88933)"
-         inkscape:label="fingerprint sk sign"><tspan
-           x="749.5885"
+         transform="matrix(0.95580583,0,0,0.95580583,310.08279,258.88933)"><tspan
+           x="562.8924"
            y="408.97891"
-           id="tspan9"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan8">D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0</tspan><tspan
-             y="408.97891"
-             id="tspan10"> </tspan></tspan><tspan
-           x="749.5885"
+           id="tspan7"><tspan
+   style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal'"
+   id="tspan6">D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0</tspan> </tspan><tspan
+           x="562.8924"
            y="428.39824"
-           id="tspan13"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan12">5494 9A41 222E A738 576E D19C AEA3 DC99</tspan></tspan></text><text
+           id="tspan9"><tspan
+             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal'"
+             id="tspan8">5494 9A41 222E A738 576E D19C AEA3 DC99</tspan></tspan></text><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="867.58301"
          y="566.64807"
          id="text11-2-8-0-1"><tspan
-           sodipodi:role="line"
            id="tspan11-9-0-2-7"
            x="867.58301"
            y="566.64807"
            style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Bold';text-align:start;text-anchor:start">signing</tspan></text></g><g
        id="g41"
        style="display:inline"
-       inkscape:label="Subkey encr"
-       transform="translate(-8.8417533,8.466395)"><path
+       transform="translate(-32.841753,20.466395)"><path
          id="rect11-2"
          d="m 884.2432,192.95468 h 359.0109 a 18.14255,18.14255 45 0 1 18.1425,18.14255 v 126.63435 a 18.14255,18.14255 135 0 1 -18.1425,18.14255 H 884.2432 A 18.14255,18.14255 45 0 1 866.10065,337.73158 V 211.09723 a 18.14255,18.14255 135 0 1 18.14255,-18.14255 z"
          style="font-variation-settings:'wght' 500;fill:none;fill-opacity:0.1;stroke:#195962;stroke-width:4.39384;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-         inkscape:path-effect="#path-effect35-9"
-         inkscape:original-d="M 866.10065,192.95468 H 1261.3966 V 355.87413 H 866.10065 Z"
          transform="matrix(0.92016709,0,0,0.69628804,56.855601,194.47989)" /><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="870.06543"
          y="407.40918"
          id="text11-6"><tspan
-           sodipodi:role="line"
            id="tspan11-94"
            x="870.06543"
            y="407.40918"
            style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">- key creation time</tspan></text><path
          id="path2-1"
-         style="display:inline;fill:none;stroke:#006961;stroke-width:6.90373;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;fill:none;stroke:#006961;stroke-width:10.4431;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
          d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z"
-         inkscape:label="Publickey ((Asym))"
-         sodipodi:nodetypes="cssscccccccccccccccsssss"
-         transform="matrix(0.31599962,0,0,-0.31599962,1098.5236,633.16385)"
-         inkscape:path-effect="#path-effect32-1"
-         inkscape:original-d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z" /><text
+         transform="matrix(0.31599962,0,0,-0.31599962,1098.5236,633.16385)" /><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="870.22443"
          y="359.37485"
          id="text11-2-8"><tspan
-           sodipodi:role="line"
            id="tspan11-9-0"
            x="870.22443"
            y="359.37485"
@@ -336,27 +225,80 @@
          x="870.28656"
          y="379.27567"
          id="text11-2-8-0"><tspan
-           sodipodi:role="line"
            id="tspan11-9-0-2"
            x="870.28656"
            y="379.27567"
            style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Bold';text-align:start;text-anchor:start">encryption</tspan></text><text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:17.9px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:center;text-anchor:middle;white-space:pre;inline-size:393.624;display:inline;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
-         x="749.5885"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:17.9px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;white-space:pre;inline-size:393.624;display:inline;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="562.8764"
          y="408.97891"
          id="text11-3-4"
-         transform="matrix(0.95580583,0,0,0.95580583,329.05744,76.348676)"
-         inkscape:label="fingerprint sk encr"><tspan
-           x="749.5885"
+         transform="matrix(0.95580583,0,0,0.95580583,312.85744,76.348676)"><tspan
+           x="562.8764"
            y="408.97891"
-           id="tspan15"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan14">C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D</tspan><tspan
-             y="408.97891"
-             id="tspan16"> </tspan></tspan><tspan
-           x="749.5885"
+           id="tspan12"><tspan
+   style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal'"
+   id="tspan10">C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D</tspan> </tspan><tspan
+           x="562.8764"
            y="428.39824"
-           id="tspan18"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan17">BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94</tspan></tspan></text></g></g></svg>
+           id="tspan14"><tspan
+             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal'"
+             id="tspan13">BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94</tspan></tspan></text></g><g
+       id="g45"
+       transform="translate(-14,-3.7892998)"><path
+         id="rect2"
+         style="fill:none;stroke:#3e4349;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 1455.6456,444.47696 -199.9308,0 a 13.422558,13.422558 45 0 1 -13.4226,-13.42256 v -77.38509" /><path
+         id="rect8-1-1-5"
+         style="fill:#3e4349;fill-opacity:1;stroke-width:2.44164;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+         d="m 1283.4135,355.75157 h 19.8752 a 1.7354951,2.1387124 0 0 1 1.7355,2.13871 v 0.51765 a 1.7354951,2.1387124 0 0 1 -1.7355,2.13871 h -19.8752 a 1.7354951,2.1387124 0 0 1 -1.7355,-2.13871 v -0.51765 a 1.7354951,2.1387124 0 0 1 1.7355,-2.13871 z m 0,7.79069 h 19.8752 a 1.7354951,2.1387124 0 0 1 1.7355,2.13871 v 0.51764 a 1.7354951,2.1387124 0 0 1 -1.7355,2.13872 h -19.8752 a 1.7354951,2.1387124 0 0 1 -1.7355,-2.13872 v -0.51764 a 1.7354951,2.1387124 0 0 1 1.7355,-2.13871 z m -1.3374,18.08848 c -26.0455,0 0.7509,0.0868 -27.354,0 0,-6.28805 5.3575,-11.38552 13.677,-11.38559 8.3194,0 13.677,5.09746 13.677,11.38559 z m -5.3977,-21.68203 a 8.2793726,8.2793726 0 0 1 -8.2793,8.2794 8.2793726,8.2793726 0 0 1 -8.2793,-8.2794 8.2793726,8.2793726 0 0 1 8.2793,-8.2794 8.2793726,8.2793726 0 0 1 8.2793,8.2794 z" /><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;white-space:pre;inline-size:70.579;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1255.3615"
+         y="425.2012"
+         id="text11-6-8"><tspan
+           x="1255.3615"
+           y="425.2012"
+           id="tspan16"><tspan
+             style="font-weight:500;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium'"
+             id="tspan15">Alice</tspan></tspan></text><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1363.3931"
+         y="366.49124"
+         id="text11-2-1"><tspan
+           id="tspan11-9-03"
+           x="1363.3931"
+           y="366.49124"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">User ID</tspan></text></g><g
+       id="g46"
+       transform="translate(-14.6167,-2.2060782)"><path
+         id="rect2-8"
+         style="fill:none;stroke:#3e4349;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+         d="m 1456.2623,563.67013 h -199.2774 a 14.076034,14.076034 45 0 1 -14.076,-14.07603 v -76.73162" /><path
+         id="rect8-1-1-5-5"
+         style="fill:#3e4349;stroke-width:2.44163;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+         d="m 1284.0302,474.94473 h 19.8752 a 1.7354938,2.1387107 0 0 1 1.7355,2.13872 v 0.51764 a 1.7354938,2.1387107 0 0 1 -1.7355,2.13872 h -19.8752 a 1.7354938,2.1387107 0 0 1 -1.7356,-2.13872 v -0.51764 a 1.7354938,2.1387107 0 0 1 1.7356,-2.13872 z m 0,7.79069 h 19.8752 a 1.7354938,2.1387107 0 0 1 1.7355,2.13871 v 0.51764 a 1.7354938,2.1387107 0 0 1 -1.7355,2.13872 h -19.8752 a 1.7354938,2.1387107 0 0 1 -1.7356,-2.13872 v -0.51764 a 1.7354938,2.1387107 0 0 1 1.7356,-2.13871 z m -1.3374,18.08847 c -26.0455,0 0.7509,0.0868 -27.354,0 0,-6.28805 5.3575,-11.38551 13.677,-11.38558 8.3194,0 13.677,5.09746 13.677,11.38558 z m -5.3977,-21.68201 a 8.2793665,8.2793665 0 0 1 -8.2793,8.27938 8.2793665,8.2793665 0 0 1 -8.2793,-8.27938 8.2793665,8.2793665 0 0 1 8.2793,-8.2794 8.2793665,8.2793665 0 0 1 8.2793,8.2794 z" /><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1255.3549"
+         y="530.50891"
+         id="text11-6-8-0"><tspan
+           id="tspan11-94-1-9"
+           x="1255.3549"
+           y="530.50891"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">Alice Adams </tspan><tspan
+           x="1255.3549"
+           y="551.98969"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start"
+           id="tspan43">&lt;alice@example.org&gt;</tspan></text><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1371.4757"
+         y="493.05322"
+         id="text11-2-1-1"><tspan
+           id="tspan11-9-03-8"
+           x="1371.4757"
+           y="493.05322"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">User ID</tspan></text></g></g></svg>
diff --git a/book/source/diag/diag_library_draft.svg b/book/source/diag/diag_library_draft.svg
index d0efb25..ab39d6a 100644
--- a/book/source/diag/diag_library_draft.svg
+++ b/book/source/diag/diag_library_draft.svg
@@ -13,7 +13,55 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs1"><rect
+     id="defs1"><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect44"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,14.076034,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect43"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,13.422558,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect39"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,1,1,0,3.1562223,0,1 @ F,0,1,1,0,3.1562223,0,1 @ F,0,1,1,0,3.1562223,0,1 @ F,0,0,1,0,3.1562223,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><rect
        x="244.4286"
        y="1053.183"
        width="51.701076"
@@ -1164,6 +1212,102 @@
        apply_no_radius="true"
        apply_with_radius="true"
        only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect39-4"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,1,1,0,3.1562223,0,1 @ F,0,1,1,0,3.1562223,0,1 @ F,0,1,1,0,3.1562223,0,1 @ F,0,0,1,0,3.1562223,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect39-44"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,1,1,0,3.1562223,0,1 @ F,0,1,1,0,3.1562223,0,1 @ F,0,1,1,0,3.1562223,0,1 @ F,0,0,1,0,3.1562223,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect39-2"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,1,1,0,3.1562223,0,1 @ F,0,1,1,0,3.1562223,0,1 @ F,0,1,1,0,3.1562223,0,1 @ F,0,0,1,0,3.1562223,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect39-4-6"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect44-7"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,14.076034,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect44-7-3"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,14.076034,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
        hide_knots="false" /></defs><sodipodi:namedview
      id="namedview1"
      pagecolor="#ffffff"
@@ -1174,16 +1318,17 @@
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
      inkscape:lockguides="false"
-     inkscape:zoom="1.07"
-     inkscape:cx="1137.8505"
-     inkscape:cy="420.09346"
+     inkscape:zoom="0.87885424"
+     inkscape:cx="910.27609"
+     inkscape:cy="641.17572"
      inkscape:window-width="2560"
      inkscape:window-height="1371"
      inkscape:window-x="0"
      inkscape:window-y="305"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g42"
-     showgrid="false"><inkscape:page
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:export-bgcolor="#ffffffff"><inkscape:page
        x="0"
        y="0"
        width="659.7699"
@@ -1198,9 +1343,9 @@
        id="page39"
        margin="0 0 0"
        bleed="0"
-       inkscape:export-filename="Seite 2.svg"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96" /></sodipodi:namedview><g
+       inkscape:export-filename="openpgp_certificate.svg"
+       inkscape:export-xdpi="94.510002"
+       inkscape:export-ydpi="94.510002" /></sodipodi:namedview><g
      inkscape:groupmode="layer"
      id="layer4"
      inkscape:label="Müllecke"
@@ -1414,7 +1559,7 @@
            id="tspan3-3"
            x="766.66174"
            y="-395.05405"
-           style="fill:#292a2b;fill-opacity:1;stroke-width:7.2184">Peach red</tspan><tspan
+           style="fill:#292a2b;fill-opacity:1;stroke-width:7.2184">Dark slategray</tspan><tspan
            sodipodi:role="line"
            x="766.66174"
            y="-360.12628"
@@ -1444,13 +1589,19 @@
            style="fill:#292a2b;fill-opacity:1;stroke-width:7.2184"
            id="tspan4-6-3">#baa600</tspan></text></g><g
        id="g5"
-       transform="matrix(0.72583745,0,0,0.72583745,-417.21395,444.95804)"><rect
-         style="fill:#18a589;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+       transform="matrix(0.72583745,0,0,0.72583745,835.34343,1276.2358)"><rect
+         style="fill:#61a78d;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
          id="rect3-6"
          width="112.56998"
          height="112.56998"
-         x="641.25806"
-         y="-279.42941" /><text
+         x="-1083.8834"
+         y="-1427.076" /><rect
+         style="fill:#61a78d;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         id="rect3-6-7"
+         width="112.56998"
+         height="112.56998"
+         x="-462.009"
+         y="-1061.1685" /><text
          xml:space="preserve"
          style="font-size:27.9422px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:7.2184;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:4.65703, 4.65703;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
          x="767.18085"
@@ -1480,24 +1631,18 @@
          y="-110.75021"
          id="text3-9"><tspan
            sodipodi:role="line"
-           id="tspan3-2"
            x="770.19934"
            y="-110.75021"
-           style="fill:#292a2b;fill-opacity:1;stroke-width:7.2184">Text color grey</tspan><tspan
+           style="fill:#292a2b;fill-opacity:1;stroke-width:7.2184"
+           id="tspan44">Dark Slate Grey</tspan><tspan
            sodipodi:role="line"
            x="770.19934"
            y="-75.822464"
            style="fill:#292a2b;fill-opacity:1;stroke-width:7.2184"
-           id="tspan4-0">#E4349</tspan></text></g><g
+           id="tspan4-0">#3e4349</tspan></text></g><g
        id="g6"
-       transform="matrix(0.72583745,0,0,0.72583745,-417.21395,130.65047)"
-       style="display:inline"><rect
-         style="fill:#006961;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
-         id="rect3-6-2"
-         width="112.56998"
-         height="112.56998"
-         x="641.25806"
-         y="4.9937797" /><text
+       transform="matrix(0.72583745,0,0,0.72583745,835.34343,961.9282)"
+       style="display:inline"><text
          xml:space="preserve"
          style="font-size:27.9422px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:7.2184;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:4.65703, 4.65703;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
          x="770.71838"
@@ -1507,12 +1652,24 @@
            id="tspan3-6-7"
            x="770.71838"
            y="31.580709"
-           style="fill:#000000;fill-opacity:1;stroke-width:7.2184">Dusky green</tspan><tspan
+           style="fill:#000000;fill-opacity:1;stroke-width:7.2184">Teal</tspan><tspan
            sodipodi:role="line"
            x="770.71838"
            y="66.508461"
            style="fill:#000000;fill-opacity:1;stroke-width:7.2184"
-           id="tspan4-2-5">#006961</tspan></text></g></g><g
+           id="tspan4-2-5">#006961</tspan></text><rect
+         style="display:inline;fill:#006961;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         id="rect3-6-2"
+         width="112.56998"
+         height="112.56998"
+         x="647.05475"
+         y="12.498367" /><rect
+         style="display:inline;fill:#397f22;fill-opacity:1;stroke:none;stroke-width:3.1;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         id="rect3-6-2-5"
+         width="112.56998"
+         height="112.56998"
+         x="-1088.1649"
+         y="-1127.2731" /></g></g><g
      inkscape:groupmode="layer"
      id="layer1"
      inkscape:label="Elements"><path
@@ -1662,17 +1819,17 @@
            y="0"><tspan
              x="244.42773"
              y="1072.2306"
-             id="tspan9"><tspan
+             id="tspan29"><tspan
                style="letter-spacing:1.71px"
-               id="tspan7">PLA</tspan><tspan
+               id="tspan2">PLA</tspan><tspan
                dx="-1.4899971"
                style="text-align:end;text-anchor:end"
-               id="tspan8">&#10;</tspan></tspan><tspan
+               id="tspan28">&#10;</tspan></tspan><tspan
              x="244.42773"
              y="1096.6506"
-             id="tspan12"><tspan
+             id="tspan31"><tspan
                style="letter-spacing:3.34px"
-               id="tspan10">IN</tspan></tspan></text></g></g><g
+               id="tspan30">IN</tspan></tspan></text></g></g><g
        id="g11-9"
        transform="translate(-873.31616,1071.4522)"
        inkscape:label="Diagramm Header"
@@ -1699,14 +1856,60 @@
              sodipodi:role="line"
              id="tspan1-9"
              x="954.24536"
-             y="158.38867">OpenPGP Certificate</tspan></text></g></g></g><g
+             y="158.38867">OpenPGP Certificate</tspan></text></g></g><path
+       id="path8-6-9"
+       style="fill:#3e4349;stroke-width:6.84806;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+       d="m 337.54636,1419.1583 c -68.60511,0 1.97781,0.2287 -72.05191,0 0,-16.5631 14.11191,-29.9901 36.02587,-29.9903 21.91394,0 36.02604,13.427 36.02604,29.9903 z m -14.21766,-57.1117 a 21.808331,21.808331 0 0 1 -21.80838,21.8084 21.808331,21.808331 0 0 1 -21.80821,-21.8084 21.808331,21.808331 0 0 1 21.80821,-21.8084 21.808331,21.808331 0 0 1 21.80838,21.8084 z"
+       inkscape:label="Person" /><path
+       id="rect8-1-1"
+       style="fill:#3e4349;stroke-width:6.4314;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+       d="m 115.95259,1350.9911 h 52.3525 a 4.5713909,5.6334878 0 0 1 4.57135,5.6335 v 1.3635 a 4.5713909,5.6334878 0 0 1 -4.57135,5.6335 h -52.3525 a 4.5713909,5.6334878 0 0 1 -4.57136,-5.6335 v -1.3635 a 4.5713909,5.6334878 0 0 1 4.57136,-5.6335 z m 3e-5,20.5211 h 52.35243 a 4.5713909,5.6334878 0 0 1 4.57139,5.6335 v 1.3635 a 4.5713909,5.6334878 0 0 1 -4.57139,5.6335 h -52.35243 a 4.5713909,5.6334878 0 0 1 -4.57139,-5.6335 v -1.3635 a 4.5713909,5.6334878 0 0 1 4.57139,-5.6335 z m -3.52278,47.6461 c -68.605125,0 1.97781,0.2287 -72.051915,0 0,-16.5631 14.11191,-29.9901 36.02586,-29.9903 21.91395,0 36.026055,13.427 36.026055,29.9903 z m -14.217665,-57.1117 a 21.808331,21.808331 0 0 1 -21.80839,21.8084 21.808331,21.808331 0 0 1 -21.8082,-21.8084 21.808331,21.808331 0 0 1 21.8082,-21.8084 21.808331,21.808331 0 0 1 21.80839,21.8084 z"
+       inkscape:label="Identity" /><g
+       id="g46-9"
+       inkscape:label="User ID 2"
+       transform="translate(-839.79465,303.28006)"><path
+         id="rect2-8-6"
+         style="fill:none;stroke:#3e4349;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+         d="m 1456.2623,563.67013 h -199.2774 a 14.076034,14.076034 45 0 1 -14.076,-14.07603 v -76.73162"
+         sodipodi:nodetypes="ccc"
+         inkscape:path-effect="#path-effect44-7-3"
+         inkscape:original-d="M 1456.2623,563.67013 H 1242.9089 V 472.86248" /><path
+         id="rect8-1-1-5-5-4"
+         style="fill:#3e4349;stroke-width:2.44163;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+         d="m 1284.0302,474.94473 h 19.8752 a 1.7354938,2.1387107 0 0 1 1.7355,2.13872 v 0.51764 a 1.7354938,2.1387107 0 0 1 -1.7355,2.13872 h -19.8752 a 1.7354938,2.1387107 0 0 1 -1.7356,-2.13872 v -0.51764 a 1.7354938,2.1387107 0 0 1 1.7356,-2.13872 z m 0,7.79069 h 19.8752 a 1.7354938,2.1387107 0 0 1 1.7355,2.13871 v 0.51764 a 1.7354938,2.1387107 0 0 1 -1.7355,2.13872 h -19.8752 a 1.7354938,2.1387107 0 0 1 -1.7356,-2.13872 v -0.51764 a 1.7354938,2.1387107 0 0 1 1.7356,-2.13871 z m -1.3374,18.08847 c -26.0455,0 0.7509,0.0868 -27.354,0 0,-6.28805 5.3575,-11.38551 13.677,-11.38558 8.3194,0 13.677,5.09746 13.677,11.38558 z m -5.3977,-21.68201 a 8.2793665,8.2793665 0 0 1 -8.2793,8.27938 8.2793665,8.2793665 0 0 1 -8.2793,-8.27938 8.2793665,8.2793665 0 0 1 8.2793,-8.2794 8.2793665,8.2793665 0 0 1 8.2793,8.2794 z"
+         inkscape:label="Identity" /><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1255.3549"
+         y="530.50891"
+         id="text11-6-8-0-3"><tspan
+           sodipodi:role="line"
+           id="tspan11-94-1-9-3"
+           x="1255.3549"
+           y="530.50891"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">Alice Adams </tspan><tspan
+           sodipodi:role="line"
+           x="1255.3549"
+           y="551.98969"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start"
+           id="tspan43-3">&lt;alice@example.org&gt;</tspan></text><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1371.4757"
+         y="493.05322"
+         id="text11-2-1-1-8"><tspan
+           sodipodi:role="line"
+           id="tspan11-9-03-8-6"
+           x="1371.4757"
+           y="493.05322"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">User ID</tspan></text></g></g><g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="OpenPGP Certificate"
      style="opacity:1"
      inkscape:highlight-color="#18a589"><g
        id="g11"
-       transform="translate(68.036954,-122.53164)"
+       transform="matrix(0.86376245,0,0,0.86376245,216.3412,-99.985813)"
        inkscape:label="Diagramm Header"><rect
          style="font-variation-settings:'wght' 700;fill:#195962;stroke-width:2.29652;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
          id="rect1"
@@ -1734,7 +1937,7 @@
        id="g40"
        style="display:inline"
        inkscape:label="Primary"
-       transform="translate(-2.4171303,3.0596819)"><path
+       transform="translate(104.75797,7.8979535)"><path
          id="rect11"
          d="m 884.2432,192.95468 h 359.0109 a 18.14255,18.14255 45 0 1 18.1425,18.14255 v 126.63435 a 18.14255,18.14255 135 0 1 -18.1425,18.14255 H 884.2432 A 18.14255,18.14255 45 0 1 866.10065,337.73158 V 211.09723 a 18.14255,18.14255 135 0 1 18.14255,-18.14255 z"
          style="font-variation-settings:'wght' 500;fill:#195962;fill-opacity:0.1;stroke:#195962;stroke-width:4.39384;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
@@ -1742,7 +1945,7 @@
          inkscape:original-d="M 866.10065,192.95468 H 1261.3966 V 355.87413 H 866.10065 Z"
          transform="matrix(0.92016709,0,0,0.69628804,50.430978,-3.7263769)" /><path
          id="path2-3"
-         style="display:inline;fill:none;stroke:#006961;stroke-width:6.90373;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;fill:none;stroke:#006961;stroke-width:10.4431;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
          d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z"
          inkscape:label="Publickey ((Asym))"
          sodipodi:nodetypes="cssscccccccccccccccsssss"
@@ -1768,7 +1971,7 @@
            id="tspan11-9"
            x="861.96753"
            y="161.23524"
-           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">Primary Component Key</tspan></text><text
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">Component Key (primary)</tspan></text><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:17.9px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:center;text-anchor:middle;white-space:pre;inline-size:393.624;display:inline;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="749.5885"
@@ -1778,19 +1981,19 @@
          inkscape:label="fingerprint primary"><tspan
            x="749.5885"
            y="408.97891"
-           id="tspan14"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan13">AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6</tspan><tspan
-             y="408.97891"
-             id="tspan15">  </tspan></tspan><tspan
+           id="tspan33"><tspan
+   style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
+   id="tspan32">AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6</tspan><tspan
+   y="408.97891"
+   id="tspan34">  </tspan></tspan><tspan
            x="749.5885"
            y="428.39824"
-           id="tspan17"><tspan
+           id="tspan36"><tspan
              style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan16">7F33 00F9 FB0E C457 378C D29F 1026 98B3</tspan></tspan></text></g><g
+             id="tspan35">7F33 00F9 FB0E C457 378C D29F 1026 98B3</tspan></tspan></text></g><g
        id="g42"
        inkscape:label="Subkey sign"
-       transform="translate(-6.1126183,25.141672)"><text
+       transform="translate(-30.112618,37.141672)"><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;opacity:1;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="866.87903"
@@ -1818,7 +2021,7 @@
            y="595.50562"
            style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">- key creation time</tspan></text><path
          id="path2-1-4"
-         style="display:inline;opacity:1;fill:none;stroke:#006961;stroke-width:6.90373;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:none;stroke:#006961;stroke-width:10.44305053;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
          d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z"
          inkscape:label="Publickey ((Asym))"
          sodipodi:nodetypes="cssscccccccccccccccsssss"
@@ -1834,16 +2037,16 @@
          inkscape:label="fingerprint sk sign"><tspan
            x="749.5885"
            y="408.97891"
-           id="tspan19"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan18">D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0</tspan><tspan
-             y="408.97891"
-             id="tspan20"> </tspan></tspan><tspan
+           id="tspan38"><tspan
+   style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
+   id="tspan37">D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0</tspan><tspan
+   y="408.97891"
+   id="tspan39"> </tspan></tspan><tspan
            x="749.5885"
            y="428.39824"
-           id="tspan22"><tspan
+           id="tspan41"><tspan
              style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan21">5494 9A41 222E A738 576E D19C AEA3 DC99</tspan></tspan></text><text
+             id="tspan40">5494 9A41 222E A738 576E D19C AEA3 DC99</tspan></tspan></text><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
          x="867.58301"
@@ -1857,7 +2060,7 @@
        id="g41"
        style="display:inline"
        inkscape:label="Subkey encr"
-       transform="translate(-8.8417533,8.466395)"><path
+       transform="translate(-32.841753,20.466395)"><path
          id="rect11-2"
          d="m 884.2432,192.95468 h 359.0109 a 18.14255,18.14255 45 0 1 18.1425,18.14255 v 126.63435 a 18.14255,18.14255 135 0 1 -18.1425,18.14255 H 884.2432 A 18.14255,18.14255 45 0 1 866.10065,337.73158 V 211.09723 a 18.14255,18.14255 135 0 1 18.14255,-18.14255 z"
          style="font-variation-settings:'wght' 500;fill:none;fill-opacity:0.1;stroke:#195962;stroke-width:4.39384;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
@@ -1875,7 +2078,7 @@
            y="407.40918"
            style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">- key creation time</tspan></text><path
          id="path2-1"
-         style="display:inline;fill:none;stroke:#006961;stroke-width:6.90373;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;fill:none;stroke:#006961;stroke-width:10.44305053;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
          d="m 156.30312,759.25868 c -9.78054,19.91382 -30.12868,33.02384 -53.81237,33.02384 -33.173715,0 -60.066326,-26.89261 -60.066326,-60.06633 0,-33.17372 26.892611,-60.06633 60.066326,-60.06633 23.31181,0 43.58824,15.15712 53.54415,34.5646 m -9.14624,1.20213 h 4.97796 c 10.89491,0.20296 25.86265,0 38.79397,0 l 11.43353,7.63836 14.59897,-7.63836 14.59896,7.3422 h 10.87817 l 11.54761,-7.3422 17.66083,7.3422 16.34856,-7.34219 22,25.45886 -22,25.45887 h -135.8606 -4.97796 M 89.058073,732.21619 c -4e-6,6.98969 -5.666271,12.65596 -12.655965,12.65596 -6.989695,0 -12.655963,-5.66627 -12.655967,-12.65596 -2e-6,-6.9897 5.666268,-12.65597 12.655967,-12.65597 6.989698,0 12.655967,5.66627 12.655965,12.65597 z"
          inkscape:label="Publickey ((Asym))"
          sodipodi:nodetypes="cssscccccccccccccccsssss"
@@ -1911,13 +2114,84 @@
          inkscape:label="fingerprint sk encr"><tspan
            x="749.5885"
            y="408.97891"
-           id="tspan24"><tspan
-             style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan23">C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D</tspan><tspan
-             y="408.97891"
-             id="tspan25"> </tspan></tspan><tspan
+           id="tspan45"><tspan
+   style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
+   id="tspan42">C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D</tspan><tspan
+   y="408.97891"
+   id="tspan46"> </tspan></tspan><tspan
            x="749.5885"
            y="428.39824"
-           id="tspan27"><tspan
+           id="tspan48"><tspan
              style="font-size:16px;font-family:Monospace;-inkscape-font-specification:'Monospace, Normal';text-align:start;text-anchor:start"
-             id="tspan26">BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94</tspan></tspan></text></g></g></svg>
+             id="tspan47">BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94</tspan></tspan></text></g><g
+       id="g45"
+       inkscape:label="User ID 1"
+       transform="translate(-14,-3.7892998)"><path
+         id="rect2"
+         style="fill:none;stroke:#3e4349;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 1455.6456,444.47696 -199.9308,0 a 13.422558,13.422558 45 0 1 -13.4226,-13.42256 v -77.38509"
+         sodipodi:nodetypes="ccc"
+         inkscape:path-effect="#path-effect43"
+         inkscape:original-d="M 1455.6456,444.47696 H 1242.2922 V 353.66931" /><path
+         id="rect8-1-1-5"
+         style="fill:#3e4349;fill-opacity:1;stroke-width:2.44164;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+         d="m 1283.4135,355.75157 h 19.8752 a 1.7354951,2.1387124 0 0 1 1.7355,2.13871 v 0.51765 a 1.7354951,2.1387124 0 0 1 -1.7355,2.13871 h -19.8752 a 1.7354951,2.1387124 0 0 1 -1.7355,-2.13871 v -0.51765 a 1.7354951,2.1387124 0 0 1 1.7355,-2.13871 z m 0,7.79069 h 19.8752 a 1.7354951,2.1387124 0 0 1 1.7355,2.13871 v 0.51764 a 1.7354951,2.1387124 0 0 1 -1.7355,2.13872 h -19.8752 a 1.7354951,2.1387124 0 0 1 -1.7355,-2.13872 v -0.51764 a 1.7354951,2.1387124 0 0 1 1.7355,-2.13871 z m -1.3374,18.08848 c -26.0455,0 0.7509,0.0868 -27.354,0 0,-6.28805 5.3575,-11.38552 13.677,-11.38559 8.3194,0 13.677,5.09746 13.677,11.38559 z m -5.3977,-21.68203 a 8.2793726,8.2793726 0 0 1 -8.2793,8.2794 8.2793726,8.2793726 0 0 1 -8.2793,-8.2794 8.2793726,8.2793726 0 0 1 8.2793,-8.2794 8.2793726,8.2793726 0 0 1 8.2793,8.2794 z"
+         inkscape:label="Identity" /><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;white-space:pre;inline-size:70.579;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1255.3615"
+         y="425.2012"
+         id="text11-6-8"><tspan
+           x="1255.3615"
+           y="425.2012"
+           id="tspan50"><tspan
+             style="font-weight:500;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium'"
+             id="tspan49">Alice</tspan></tspan></text><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1363.3931"
+         y="366.49124"
+         id="text11-2-1"><tspan
+           sodipodi:role="line"
+           id="tspan11-9-03"
+           x="1363.3931"
+           y="366.49124"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">User ID</tspan></text></g><g
+       id="g46"
+       inkscape:label="User ID 2"
+       transform="translate(-14.6167,-2.2060782)"><path
+         id="rect2-8"
+         style="fill:none;stroke:#3e4349;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+         d="m 1456.2623,563.67013 h -199.2774 a 14.076034,14.076034 45 0 1 -14.076,-14.07603 v -76.73162"
+         sodipodi:nodetypes="ccc"
+         inkscape:path-effect="#path-effect44-7"
+         inkscape:original-d="M 1456.2623,563.67013 H 1242.9089 V 472.86248" /><path
+         id="rect8-1-1-5-5"
+         style="fill:#3e4349;stroke-width:2.44163;stroke-linecap:round;stroke-linejoin:round;paint-order:markers fill stroke"
+         d="m 1284.0302,474.94473 h 19.8752 a 1.7354938,2.1387107 0 0 1 1.7355,2.13872 v 0.51764 a 1.7354938,2.1387107 0 0 1 -1.7355,2.13872 h -19.8752 a 1.7354938,2.1387107 0 0 1 -1.7356,-2.13872 v -0.51764 a 1.7354938,2.1387107 0 0 1 1.7356,-2.13872 z m 0,7.79069 h 19.8752 a 1.7354938,2.1387107 0 0 1 1.7355,2.13871 v 0.51764 a 1.7354938,2.1387107 0 0 1 -1.7355,2.13872 h -19.8752 a 1.7354938,2.1387107 0 0 1 -1.7356,-2.13872 v -0.51764 a 1.7354938,2.1387107 0 0 1 1.7356,-2.13871 z m -1.3374,18.08847 c -26.0455,0 0.7509,0.0868 -27.354,0 0,-6.28805 5.3575,-11.38551 13.677,-11.38558 8.3194,0 13.677,5.09746 13.677,11.38558 z m -5.3977,-21.68201 a 8.2793665,8.2793665 0 0 1 -8.2793,8.27938 8.2793665,8.2793665 0 0 1 -8.2793,-8.27938 8.2793665,8.2793665 0 0 1 8.2793,-8.2794 8.2793665,8.2793665 0 0 1 8.2793,8.2794 z"
+         inkscape:label="Identity" /><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1255.3549"
+         y="530.50891"
+         id="text11-6-8-0"><tspan
+           sodipodi:role="line"
+           id="tspan11-94-1-9"
+           x="1255.3549"
+           y="530.50891"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">Alice Adams </tspan><tspan
+           sodipodi:role="line"
+           x="1255.3549"
+           y="551.98969"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:16px;line-height:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start"
+           id="tspan43">&lt;alice@example.org&gt;</tspan></text><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:Sans;-inkscape-font-specification:'Sans, @wght=500';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 500;text-align:start;text-anchor:start;display:inline;fill:#3e4349;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:markers fill stroke"
+         x="1371.4757"
+         y="493.05322"
+         id="text11-2-1-1"><tspan
+           sodipodi:role="line"
+           id="tspan11-9-03-8"
+           x="1371.4757"
+           y="493.05322"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:21.3333px;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';text-align:start;text-anchor:start">User ID</tspan></text></g></g></svg>