diff --git a/fonts/ausgangsschrift/&.svg b/fonts/ausgangsschrift/&.svg
deleted file mode 100644
index 3992015..0000000
--- a/fonts/ausgangsschrift/&.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<g transform="translate(${posx},${posy})">
-    <circle
-       r="2.2"
-       transform="translate(70.645325,91.278533)"
-       id="circle4-9" />
-    <circle
-       r="2.2"
-       transform="translate(44.178969,91.202043)"
-       id="circle4-3" />
-    <circle
-       r="2.2"
-       transform="translate(40.923481,129.79975)"
-       id="circle4-91" />
-    <circle
-       r="2.2"
-       transform="translate(73.711955,130.05703)"
-       id="circle4-9-7" />
-</g>
diff --git a/fonts/ausgangsschrift/and.svg b/fonts/ausgangsschrift/and.svg
new file mode 100644
index 0000000..55c8b6e
--- /dev/null
+++ b/fonts/ausgangsschrift/and.svg
@@ -0,0 +1,143 @@
+<g transform="translate(${posx},${posy})">
+<text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="58.606346"
+       y="93.957718"
+       ><tspan
+         x="58.606346"
+         y="93.957718"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x1}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="62.274906"
+       y="52.331478"
+       ><tspan
+         x="62.274906"
+         y="52.331478"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x5}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="57.700447"
+       y="59.870399"
+       ><tspan
+         x="57.700447"
+         y="59.870399"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;text-anchor:end;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x4}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="70.130829"
+       y="141.60815"
+       ><tspan
+         x="70.130829"
+         y="141.60815"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x9}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="45.857143"
+       y="118.78668"
+       ><tspan
+         x="45.857143"
+         y="118.78668"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x7}</tspan></text>
+        />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="52.854389"
+       y="141.01926"
+       ><tspan
+         x="52.854389"
+         y="141.01926"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;text-anchor:end;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x8}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="68.971832"
+       y="93.670906"
+       ><tspan
+         x="68.971832"
+         y="93.670906"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x3}</tspan></text>
+        />
+        />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="89.820694"
+       y="128.01481"
+       ><tspan
+         x="89.820694"
+         y="128.01481"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x2}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="100.3325"
+       y="112.69671"
+       ><tspan
+         x="100.3325"
+         y="112.69671"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x10}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+       x="73.452469"
+       y="64.461929"
+       ><tspan
+         x="73.452469"
+         y="64.461929"
+         style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x6}</tspan></text>
+    <circle
+       transform="translate(39.857143,107.58113)"
+       r="2.2"
+       id="circle4" />
+    <circle
+       transform="translate(69.912454,129.74357)"
+       r="2.2"
+       id="circle4-6" />
+    <circle
+       transform="translate(47.004701,130.05703)"
+       r="2.2"
+       id="circle4-5" />
+    <circle
+       transform="translate(51.916894,63.675379)"
+       r="2.2"
+       id="circle4-9" />
+    <circle
+       transform="translate(62.704351,90.933613)"
+       r="2.2"
+       id="circle4-3" />
+    <circle
+       transform="translate(68.122757,56.351773)"
+       r="2.2"
+       id="circle4-91" />
+    <circle
+       transform="translate(90.71068,130.86956)"
+       r="2.2"
+       id="circle4-6-4" />
+    <circle
+       transform="translate(99.105352,102.31372)"
+       r="2.2"
+       id="circle4-6-2" />
+    <circle
+       transform="translate(79.003826,68.473611)"
+       r="2.2"
+       id="circle4-91-2" />
+    <line
+       x1="60.565174"
+       y1="90.933609"
+       x2="56.767944"
+       y2="90.949455"
+       style="stroke:#808080;stroke-width:1;stroke-miterlimit:0;stroke-opacity:0.50196078;stroke-dasharray:none;stroke-dashoffset:0.096" />
+    <line
+       x1="68.847816"
+       y1="90.917763"
+       x2="64.925804"
+       y2="90.933609"
+       style="stroke:#808080;stroke-width:1;stroke-miterlimit:0;stroke-opacity:0.50196078;stroke-dasharray:none;stroke-dashoffset:0.096" />
+</g>
diff --git a/fonts/ausgangsschrift/ausgangsschrift.cfg b/fonts/ausgangsschrift/ausgangsschrift.cfg
index 71dd850..d42222c 100644
--- a/fonts/ausgangsschrift/ausgangsschrift.cfg
+++ b/fonts/ausgangsschrift/ausgangsschrift.cfg
@@ -6,7 +6,7 @@ YSTEP=57.01624
 YMIN=82.02858
 YMAX=139.04482
 NPATTERN=11
-FILENAME=a.svg
+FONTNAME=a.svg
 #
 [b]
 XSTEP=47.496597
@@ -16,7 +16,7 @@ YSTEP=85.524531
 YMIN=55.253269
 YMAX=140.7778
 NPATTERN=8
-FILENAME=b.svg
+FONTNAME=b.svg
 #
 [c]
 XSTEP=48.057430
@@ -26,7 +26,7 @@ YSTEP=59.01221
 YMIN=81.69104
 YMAX=140.70325
 NPATTERN=7
-FILENAME=c.svg
+FONTNAME=c.svg
 #
 [d]
 XSTEP=42.857774
@@ -36,17 +36,17 @@ YSTEP=78.974687
 YMIN=56.351773
 YMAX=135.32646
 NPATTERN=9
-FILENAME=d.svg
+FONTNAME=d.svg
 #
 [e]
 XSTEP=40
-XMIN=34.977264 />
+XMIN=34.977264
 XMAX=67.112206
 YSTEP=56.548093
 YMIN=82.765427
 YMAX=139.31352
 NPATTERN=7
-FILENAME=e.svg
+FONTNAME=e.svg
 #
 [f]
 XSTEP=47.622308
@@ -56,17 +56,17 @@ YSTEP=119.265197
 YMIN=56.351773
 YMAX=175.61697
 NPATTERN=7
-FILENAME=f.svg
+FONTNAME=f.svg
 #
 [g]
 XSTEP=40
 XMIN=37.857143
-XMAX=79.144875 />
+XMAX=79.144875
 YSTEP=82.032989
 YMIN=83.943771
 YMAX=165.97676
 NPATTERN=10
-FILENAME=g.svg
+FONTNAME=g.svg
 #
 [h]
 XSTEP=39.362423
@@ -76,7 +76,7 @@ YSTEP=83.657337
 YMIN=56.351773
 YMAX=140.00911
 NPATTERN=8
-FILENAME=h.svg
+FONTNAME=h.svg
 #
 [i]
 XSTEP=27.986973
@@ -86,7 +86,7 @@ YSTEP=65.474584
 YMIN=74.534526
 YMAX=140.00911
 NPATTERN=3
-FILENAME=i.svg
+FONTNAME=i.svg
 #
 [j]
 XSTEP=32.778714
@@ -96,7 +96,7 @@ YSTEP=102.783018
 YMIN=75.039602
 YMAX=177.82262
 NPATTERN=4
-FILENAME=j.svg
+FONTNAME=j.svg
 #
 [k]
 XSTEP=39.362423
@@ -106,7 +106,7 @@ YSTEP=84.097073
 YMIN=55.912037
 YMAX=140.00911
 NPATTERN=9
-FILENAME=k.svg
+FONTNAME=k.svg
 #
 [l]
 XSTEP=30.443329
@@ -116,7 +116,7 @@ YSTEP=89.832138
 YMIN=49.880642
 YMAX=139.71278
 NPATTERN=5
-FILENAME=l.svg
+FONTNAME=l.svg
 #
 [m]
 XSTEP=51.439042
@@ -126,7 +126,7 @@ YSTEP=50.509499
 YMIN=89.691231
 YMAX=140.20073
 NPATTERN=6
-FILENAME=m.svg
+FONTNAME=m.svg
 #
 [n]
 XSTEP=33.861527
@@ -136,7 +136,7 @@ YSTEP=54.513933
 YMIN=86.444427
 YMAX=140.95836
 NPATTERN=4
-FILENAME=n.svg
+FONTNAME=n.svg
 #
 [o]
 XSTEP=40.528839
@@ -146,7 +146,7 @@ YSTEP=55.944876
 YMIN=83.855904
 YMAX=139.80078
 NPATTERN=7
-FILENAME=o.svg
+FONTNAME=o.svg
 #
 [ó]
 XSTEP=40.528839
@@ -156,7 +156,7 @@ YSTEP=55.944876
 YMIN=83.855904
 YMAX=139.80078
 NPATTERN=7
-FILENAME=o.svg
+FONTNAME=ó.svg
 #
 [p]
 XSTEP=51.892259
@@ -166,7 +166,7 @@ YSTEP=89.135549
 YMIN=86.949501
 YMAX=176.08505
 NPATTERN=6
-FILENAME=p.svg
+FONTNAME=p.svg
 #
 [q]
 XSTEP=43.330403
@@ -176,7 +176,7 @@ YSTEP=92.892133
 YMIN=81.923447
 YMAX=174.81558
 NPATTERN=9
-FILENAME=q.svg
+FONTNAME=q.svg
 #
 [r]
 XSTEP=30.465303
@@ -186,7 +186,7 @@ YSTEP=52.883019
 YMIN=86.949501
 YMAX=139.83252
 NPATTERN=5
-FILENAME=r.svg
+FONTNAME=r.svg
 #
 [s]
 XSTEP=42.900151
@@ -196,7 +196,7 @@ YSTEP=61.320269
 YMIN=83.556641
 YMAX=144.87691
 NPATTERN=9
-FILENAME=s.svg
+FONTNAME=s.svg
 #
 [t]
 XSTEP=32.625934
@@ -206,7 +206,7 @@ YSTEP=88.003887
 YMIN=51.911003
 YMAX=139.91489
 NPATTERN=6
-FILENAME=t.svg
+FONTNAME=t.svg
 #
 [u]
 XSTEP=37.380482
@@ -216,7 +216,7 @@ YSTEP=53.702686
 YMIN=86.212204
 YMAX=139.91489
 NPATTERN=6
-FILENAME=u.svg
+FONTNAME=u.svg
 #
 [ú]
 XSTEP=37.380482
@@ -226,7 +226,7 @@ YSTEP=53.702686
 YMIN=86.212204
 YMAX=139.91489
 NPATTERN=6
-FILENAME=ú.svg
+FONTNAME=ú.svg
 #
 [v]
 XSTEP=31.058656
@@ -236,7 +236,7 @@ YSTEP=53.199558
 YMIN=86.715332
 YMAX=139.91489
 NPATTERN=3
-FILENAME=v.svg
+FONTNAME=v.svg
 #
 [w]
 XSTEP=54.652701
@@ -246,7 +246,7 @@ YSTEP=52.712848
 YMIN=87.202042
 YMAX=139.91489
 NPATTERN=5
-FILENAME=w.svg
+FONTNAME=w.svg
 #
 [x]
 XSTEP=32.314139
@@ -256,7 +256,7 @@ YSTEP=53.160329
 YMIN=87.145531
 YMAX=140.30586
 NPATTERN=5
-FILENAME=x.svg
+FONTNAME=x.svg
 #
 [y]
 XSTEP=37.180482
@@ -266,7 +266,7 @@ YSTEP=87.197057
 YMIN=87.220413
 YMAX=174.41747
 NPATTERN=6
-FILENAME=y.svg
+FONTNAME=y.svg
 #
 [z]
 XSTEP=32.788474
@@ -276,7 +276,7 @@ YSTEP=53.118306
 YMIN=87.472954
 YMAX=140.59126
 NPATTERN=4
-FILENAME=z.svg
+FONTNAME=z.svg
 #
 [A]
 XSTEP=73.575119
@@ -286,7 +286,7 @@ YSTEP=89.757975
 YMIN=52.646065
 YMAX=142.40404
 NPATTERN=6
-FILENAME=A.svg
+FONTNAME=A.svg
 #
 [B]
 XSTEP=40.141260
@@ -296,7 +296,7 @@ YSTEP=90.219353
 YMIN=52.366497
 YMAX=142.58585
 NPATTERN=9
-FILENAME=B.svg
+FONTNAME=B.svg
 #
 [C]
 XSTEP=60.648416
@@ -306,7 +306,7 @@ YSTEP=87.700902
 YMIN=52.926208
 YMAX=140.62711
 NPATTERN=6
-FILENAME=C.svg
+FONTNAME=C.svg
 #
 [D]
 XSTEP=53.051277
@@ -316,7 +316,7 @@ YSTEP=90.108481
 YMIN=52.423199
 YMAX=142.53168
 NPATTERN=8
-FILENAME=D.svg
+FONTNAME=D.svg
 #
 [E]
 XSTEP=45.158109
@@ -326,7 +326,7 @@ YSTEP=89.651262
 YMIN=51.260178
 YMAX=140.91144
 NPATTERN=7
-FILENAME=E.svg
+FONTNAME=E.svg
 #
 [F]
 XSTEP=47.158109
@@ -336,7 +336,7 @@ YSTEP=89.041302
 YMIN=51.260178
 YMAX=140.30148
 NPATTERN=5
-FILENAME=F.svg
+FONTNAME=F.svg
 #
 [G]
 XSTEP=50.294076
@@ -346,7 +346,7 @@ YSTEP=121.310576
 YMIN=53.032864
 YMAX=174.34344
 NPATTERN=10
-FILENAME=G.svg
+FONTNAME=G.svg
 #
 [H]
 XSTEP=52.470657
@@ -356,7 +356,7 @@ YSTEP=90.501122
 YMIN=51.981968
 YMAX=142.48309
 NPATTERN=7
-FILENAME=H.svg
+FONTNAME=H.svg
 #
 [J]
 XSTEP=38.321710
@@ -366,7 +366,7 @@ YSTEP=121.396325
 YMIN=52.074085
 YMAX=173.47041
 NPATTERN=5
-FILENAME=J.svg
+FONTNAME=J.svg
 #
 [I]
 XSTEP=38.387359
@@ -376,7 +376,7 @@ YSTEP=89.567843
 YMIN=51.809307
 YMAX=141.37715
 NPATTERN=6
-FILENAME=I.svg
+FONTNAME=I.svg
 #
 [K]
 XSTEP=52.043342
@@ -386,7 +386,7 @@ YSTEP=87.291823
 YMIN=53.282627
 YMAX=140.57445
 NPATTERN=6
-FILENAME=K.svg
+FONTNAME=K.svg
 #
 [L]
 XSTEP=44.629892
@@ -396,7 +396,7 @@ YSTEP=89.486824
 YMIN=52.079216
 YMAX=141.56604
 NPATTERN=3
-FILENAME=L.svg
+FONTNAME=L.svg
 #
 [M]
 XSTEP=61.151627
@@ -406,7 +406,7 @@ YSTEP=89.253901
 YMIN=51.066059
 YMAX=140.31996
 NPATTERN=5
-FILENAME=M.svg
+FONTNAME=M.svg
 #
 [N]
 XSTEP=52.528086
@@ -416,7 +416,7 @@ YSTEP=90.696831
 YMIN=51.066059
 YMAX=141.76289
 NPATTERN=5
-FILENAME=N.svg
+FONTNAME=N.svg
 #
 [O]
 XSTEP=53.581896
@@ -426,7 +426,7 @@ YSTEP=88.162408
 YMIN=52.351772
 YMAX=140.51418
 NPATTERN=7
-FILENAME=O.svg
+FONTNAME=O.svg
 #
 [P]
 XSTEP=40.392654
@@ -436,7 +436,7 @@ YSTEP=88.422631
 YMIN=52.648319
 YMAX=141.07095
 NPATTERN=5
-FILENAME=P.svg
+FONTNAME=P.svg
 #
 [Q]
 XSTEP=54.401623
@@ -446,7 +446,7 @@ YSTEP=89.154588
 YMIN=52.351772
 YMAX=141.50636
 NPATTERN=9
-FILENAME=Q.svg
+FONTNAME=Q.svg
 #
 [R]
 XSTEP=43.835843
@@ -456,7 +456,7 @@ YSTEP=89.378208
 YMIN=52.351772
 YMAX=141.72998
 NPATTERN=6
-FILENAME=R.svg
+FONTNAME=R.svg
 #
 [S]
 XSTEP=50.634075
@@ -466,7 +466,7 @@ YSTEP=89.283908
 YMIN=52.351772
 YMAX=141.63568
 NPATTERN=8
-FILENAME=S.svg
+FONTNAME=S.svg
 #
 [T]
 XSTEP=40.496660
@@ -476,7 +476,7 @@ YSTEP=84.852817
 YMIN=55.109383
 YMAX=139.9622
 NPATTERN=4
-FILENAME=T.svg
+FONTNAME=T.svg
 #
 [U]
 XSTEP=50.749200
@@ -486,7 +486,7 @@ YSTEP=90.156119
 YMIN=51.553551
 YMAX=141.70967
 NPATTERN=6
-FILENAME=U.svg
+FONTNAME=U.svg
 #
 [V]
 XSTEP=39.890060
@@ -496,7 +496,7 @@ YSTEP=90.929069
 YMIN=51.553551
 YMAX=142.48262
 NPATTERN=4
-FILENAME=V.svg
+FONTNAME=V.svg
 #
 [W]
 XSTEP=51.122231
@@ -506,7 +506,7 @@ YSTEP=90.18449
 YMIN=52.11953
 YMAX=142.30402
 NPATTERN=6
-FILENAME=W.svg
+FONTNAME=W.svg
 #
 [X]
 XSTEP=41.885445
@@ -516,7 +516,7 @@ YSTEP=89.59014
 YMIN=52.11953
 YMAX=141.70967
 NPATTERN=5
-FILENAME=X.svg
+FONTNAME=X.svg
 #
 [Y]
 XSTEP=38.115440
@@ -526,7 +526,7 @@ YSTEP=91.12879
 YMIN=52.11953
 YMAX=143.24832
 NPATTERN=5
-FILENAME=Y.svg
+FONTNAME=Y.svg
 #
 [Z]
 XSTEP=44.051246
@@ -536,7 +536,7 @@ YSTEP=88.18635
 YMIN=52.11953
 YMAX=140.30588
 NPATTERN=4
-FILENAME=Z.svg
+FONTNAME=Z.svg
 #
 [ü]
 XSTEP=37.380482
@@ -546,7 +546,7 @@ YSTEP=72.474117
 YMIN=67.440773
 YMAX=139.91489
 NPATTERN=6
-FILENAME=ü.svg
+FONTNAME=ü.svg
 #
 [Ü]
 XSTEP=50.749200
@@ -556,7 +556,7 @@ YSTEP=106.223383
 YMIN=35.486287
 YMAX=141.70967
 NPATTERN=6
-FILENAME=Ü.svg
+FONTNAME=Ü.svg
 #
 [ö]
 XSTEP=40.528839
@@ -566,7 +566,7 @@ YSTEP=74.412043
 YMIN=65.388737
 YMAX=139.80078
 NPATTERN=7
-FILENAME=ö.svg
+FONTNAME=ö.svg
 #
 [Ö]
 XSTEP=53.581896
@@ -576,17 +576,17 @@ YSTEP=106.513073
 YMIN=34.001107
 YMAX=140.51418
 NPATTERN=7
-FILENAME=Ö.svg
+FONTNAME=Ö.svg
 #
-[slash]
+[/]
 XSTEP=40
-XMIN=31.915796 />
+XMIN=31.915796
 XMAX=78.92363
 YSTEP=79.445534
 YMIN=70.280556
 YMAX=149.72609
 NPATTERN=0
-FILENAME=slash.svg
+FONTNAME=slash.svg
 #
 [ß]
 XSTEP=44.172814
@@ -596,7 +596,7 @@ YSTEP=124.317779
 YMIN=52.135281
 YMAX=176.45306
 NPATTERN=8
-FILENAME=ß.svg
+FONTNAME=ß.svg
 #
 [ï]
 XSTEP=27.986973
@@ -606,17 +606,17 @@ YSTEP=65.474584
 YMIN=74.534526
 YMAX=140.00911
 NPATTERN=3
-FILENAME=ï.svg
+FONTNAME=ï.svg
 #
 [+]
 XSTEP=40
-XMIN=44.661243 />
+XMIN=44.661243
 XMAX=70.079948
 YSTEP=25.418759
 YMIN=94.772781
 YMAX=120.19154
 NPATTERN=0
-FILENAME=+.svg
+FONTNAME=+.svg
 #
 [!]
 XSTEP=.328671
@@ -626,47 +626,47 @@ YSTEP=31.65348
 YMIN=62.7094
 YMAX=134.36288
 NPATTERN=0
-FILENAME=!.svg
+FONTNAME=!.svg
 #
 [+]
 XSTEP=40
-XMIN=44.661243 />
+XMIN=44.661243
 XMAX=70.079948
 YSTEP=25.418759
 YMIN=94.772781
 YMAX=120.19154
 NPATTERN=0
-FILENAME=+.svg
+FONTNAME=+.svg
 #
 [-]
 XSTEP=40
-XMIN=44.661243 />
+XMIN=44.661243
 XMAX=70.079948
 YSTEP=.18193
 YMIN=107.96148
 YMAX=108.14341
 NPATTERN=0
-FILENAME=-.svg
+FONTNAME=-.svg
 #
 [é]
 XSTEP=40
-XMIN=34.977264 />
+XMIN=34.977264
 XMAX=67.112206
 YSTEP=74.66113
 YMIN=64.65239
 YMAX=139.31352
 NPATTERN=7
-FILENAME=é.svg
+FONTNAME=é.svg
 #
 [è]
 XSTEP=40
-XMIN=34.977264 />
+XMIN=34.977264
 XMAX=70.197098
 YSTEP=75.608488
 YMIN=63.705032
 YMAX=139.31352
 NPATTERN=7
-FILENAME=è.svg
+FONTNAME=è.svg
 #
 [ë]
 XSTEP=66.4969372
@@ -676,7 +676,7 @@ YSTEP=40
 YMIN=-62.894321
 YMAX=139.31352
 NPATTERN=7
-FILENAME=ë.svg
+FONTNAME=ë.svg
 #
 [ ]
 XSTEP=66.4969372
@@ -686,7 +686,7 @@ YSTEP=40
 YMIN=-62.894321
 YMAX=139.31352
 NPATTERN=0
-FILENAME=ë.svg
+FONTNAME=leerzeichen.svg
 #
 [ä]
 XSTEP=50.071972
@@ -696,7 +696,7 @@ YSTEP=73.646923
 YMIN=65.397897
 YMAX=139.04482
 NPATTERN=11
-FILENAME=ä.svg
+FONTNAME=ä.svg
 #
 [Ä]
 XSTEP=73.575119
@@ -706,7 +706,7 @@ YSTEP=101.15679
 YMIN=41.24725
 YMAX=142.40404
 NPATTERN=6
-FILENAME=Ä.svg
+FONTNAME=Ä.svg
 #
 [.]
 XSTEP=10
@@ -716,7 +716,7 @@ YSTEP=50
 YMIN=129.12337
 YMAX=129.12337
 NPATTERN=0
-FILENAME=..svg
+FONTNAME=..svg
 #
 [,]
 XSTEP=10
@@ -726,7 +726,7 @@ YSTEP=20
 YMIN=129.12337
 YMAX=129.12337
 NPATTERN=0
-FILENAME=,.svg
+FONTNAME=,.svg
 #
 [']
 XSTEP=10
@@ -736,7 +736,7 @@ YSTEP=20
 YMIN=129.12337
 YMAX=129.12337
 NPATTERN=0
-FILENAME='.svg
+FONTNAME='.svg
 #
 [:]
 XSTEP=10
@@ -746,7 +746,7 @@ YSTEP=20
 YMIN=129.12337
 YMAX=129.12337
 NPATTERN=0
-FILENAME=:.svg
+FONTNAME=:.svg
 #
 [0]
 XSTEP=40
@@ -756,7 +756,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=0.svg
+FONTNAME=0.svg
 #
 [1]
 XSTEP=40
@@ -766,7 +766,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=1.svg
+FONTNAME=1.svg
 #
 [2]
 XSTEP=40
@@ -776,7 +776,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=2.svg
+FONTNAME=2.svg
 #
 [3]
 XSTEP=40
@@ -786,7 +786,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=3.svg
+FONTNAME=3.svg
 #
 [4]
 XSTEP=40
@@ -796,7 +796,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=4.svg
+FONTNAME=4.svg
 #
 [5]
 XSTEP=40
@@ -806,7 +806,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=5.svg
+FONTNAME=5.svg
 #
 [6]
 XSTEP=40
@@ -816,7 +816,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=6.svg
+FONTNAME=6.svg
 #
 [7]
 XSTEP=40
@@ -826,7 +826,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=7.svg
+FONTNAME=7.svg
 #
 [8]
 XSTEP=40
@@ -836,7 +836,7 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=8.svg
+FONTNAME=8.svg
 #
 [9]
 XSTEP=40
@@ -846,15 +846,15 @@ YSTEP=55.9814631
 YMIN=2.3648279
 YMAX=58.346291
 NPATTERN=0
-FILENAME=9.svg
+FONTNAME=9.svg
 #
 [&]
-XSTEP=40
-XMIN=-19.706897
-XMAX=24.436552
-YSTEP=55.9814631
-YMIN=2.3648279
-YMAX=58.346291
-NPATTERN=0
-FILENAME=&.svg
+XSTEP=60.475357
+XMIN=39.857143
+XMAX=100.3325
+YSTEP=89.276672
+YMIN=52.331478
+YMAX=141.60815
+NPATTERN=10
+FONTNAME=and.svg
 #
diff --git a/fonts/ausgangsschrift/leerzeichen.svg b/fonts/ausgangsschrift/leerzeichen.svg
new file mode 100644
index 0000000..e245b8b
--- /dev/null
+++ b/fonts/ausgangsschrift/leerzeichen.svg
@@ -0,0 +1,9 @@
+<g transform="translate(${posx},${posy})">
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.0000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+  <line
+     style="fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:0.0000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     y2="107.96148"
+     x2="70.079948"
+     y1="108.14341"
+     x1="44.661243" />
+</g>
diff --git a/fonts/ausgangsschrift/slash.svg b/fonts/ausgangsschrift/slash.svg
index 623c584..44c0b97 100644
--- a/fonts/ausgangsschrift/slash.svg
+++ b/fonts/ausgangsschrift/slash.svg
@@ -1,8 +1,8 @@
 <g transform="translate(${posx},${posy})">
      style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.11563838;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
   <line
-     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.11563838;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     y2="70.280556"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3.11563838;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:3;stroke-dasharray:none;stroke-dashoffset:0"
+     y2="62.280556"
      x2="78.92363"
      y1="149.72609"
      x1="31.915796" />
diff --git a/fonts/ausgangsschrift/ë.svg b/fonts/ausgangsschrift/ë.svg
index 305bf98..45be62f 100644
--- a/fonts/ausgangsschrift/ë.svg
+++ b/fonts/ausgangsschrift/ë.svg
@@ -1,11 +1,11 @@
 <g transform="translate(${posx},${posy})">
     <text
        x="52.207233"
-       y="94.336525"
+       y="98.336525"
        xml:space="preserve"
        style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"><tspan
          x="52.207233"
-         y="94.336525"
+         y="98.336525"
          style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x1}</tspan></text>
     <text
        x="67.112206"
@@ -49,11 +49,11 @@
          style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x5}</tspan></text>
     <text
        x="63.959251"
-       y="82.765427"
+       y="85.765427"
        xml:space="preserve"
        style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"><tspan
          x="63.959251"
-         y="82.765427"
+         y="85.765427"
          style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">${x4}</tspan></text>
        style="stroke:#808080;stroke-width:1.18654954;stroke-miterlimit:0;stroke-opacity:0.50196078;stroke-dasharray:none;stroke-dashoffset:0.096"
        style="stroke:#808080;stroke-width:1;stroke-miterlimit:0;stroke-opacity:0.50196078;stroke-dasharray:none;stroke-dashoffset:0.096"
@@ -79,15 +79,13 @@
        r="2.2"
        transform="translate(57.189122,90.933613)"
        id="circle4-3" />
-     transform="translate(0.6152688,-62.894321)"
     <circle
-       r="3"
-       transform="translate(40.857143,129.12337)"
+       r="3.5"
+       transform="translate(45.857143,70.12337)"
        id="circle4-3-7" />
-     transform="translate(30.087687,-62.894321)"
     <circle
-       r="3"
-       transform="translate(40.857143,129.12337)"
+       r="3.5"
+       transform="translate(65.857143,70.12337)"
        id="circle4-3-7-6" />
     <line
        style="stroke:#808080;stroke-width:1.18654954;stroke-miterlimit:0;stroke-opacity:0.50196078;stroke-dasharray:none;stroke-dashoffset:0.096"
diff --git a/fonts/ausgangsschrift/ó.svg b/fonts/ausgangsschrift/ó.svg
index af4c34c..604823d 100644
--- a/fonts/ausgangsschrift/ó.svg
+++ b/fonts/ausgangsschrift/ó.svg
@@ -103,4 +103,10 @@
        x2="71.184624"
        y1="103.44228"
        x1="71.136818" />
+     <line
+      style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.83992004;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     y2="64.65239"
+     x2="81.489136"
+     y1="73.187584"
+     x1="56.924236" />
 </g>
diff --git a/fonts/ausgangsschrift/ú.svg b/fonts/ausgangsschrift/ú.svg
index 6d2e43c..a2cf6b2 100644
--- a/fonts/ausgangsschrift/ú.svg
+++ b/fonts/ausgangsschrift/ú.svg
@@ -71,4 +71,10 @@
        r="2.2"
        transform="translate(72.225907,129.29941)"
        id="circle4-1" />
+  <line
+     style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.83992004;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     y2="64.65239"
+     x2="84.489136"
+     y1="74.187584"
+     x1="59.924236" />
 </g>