From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 6 Feb 2022 16:04:24 +0100
Subject: New upstream version 5.2.2GA

---
 app/bin/bitmaps/16pix/bridge.png              | Bin 0 -> 209 bytes
 app/bin/bitmaps/16pix/circle-center.png       | Bin 0 -> 249 bytes
 app/bin/bitmaps/16pix/circle-tangent.png      | Bin 0 -> 244 bytes
 app/bin/bitmaps/16pix/circle.png              | Bin 0 -> 242 bytes
 app/bin/bitmaps/16pix/curved-chord.png        | Bin 0 -> 244 bytes
 app/bin/bitmaps/16pix/curved-end.png          | Bin 0 -> 239 bytes
 app/bin/bitmaps/16pix/curved-middle.png       | Bin 0 -> 239 bytes
 app/bin/bitmaps/16pix/curved-tangent.png      | Bin 0 -> 241 bytes
 app/bin/bitmaps/16pix/description.png         | Bin 0 -> 228 bytes
 app/bin/bitmaps/16pix/elevation.png           | Bin 0 -> 216 bytes
 app/bin/bitmaps/16pix/exit.png                | Bin 0 -> 203 bytes
 app/bin/bitmaps/16pix/palette.png             | Bin 0 -> 179 bytes
 app/bin/bitmaps/16pix/pan-zoom.png            | Bin 0 -> 229 bytes
 app/bin/bitmaps/16pix/select.png              | Bin 0 -> 220 bytes
 app/bin/bitmaps/16pix/snap-curs.png           | Bin 0 -> 222 bytes
 app/bin/bitmaps/16pix/snap-grid.png           | Bin 0 -> 191 bytes
 app/bin/bitmaps/24pix/description.png         | Bin 0 -> 253 bytes
 app/bin/bitmaps/24pix/exit.png                | Bin 0 -> 236 bytes
 app/bin/bitmaps/24pix/pan-zoom.png            | Bin 0 -> 273 bytes
 app/bin/bitmaps/24pix/snap-curs.png           | Bin 0 -> 265 bytes
 app/bin/bitmaps/24pix/snap-grid.png           | Bin 0 -> 183 bytes
 app/bin/bitmaps/Info.xpm                      | 116 +++++++
 app/bin/bitmaps/SVG/Info.svg                  |  69 +++++
 app/bin/bitmaps/SVG/NotUsed/ease-broad.svg    |  66 ++++
 app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg    |  61 ++++
 app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg |  69 +++++
 app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg |  66 ++++
 app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg |  67 ++++
 app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg |  66 ++++
 app/bin/bitmaps/SVG/NotUsed/ease-none.svg     |  66 ++++
 app/bin/bitmaps/SVG/NotUsed/ease-normal.svg   |  66 ++++
 app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg    |  66 ++++
 app/bin/bitmaps/SVG/background.svg            | 153 ++++++++++
 app/bin/bitmaps/SVG/benchwork.svg             | 100 ++++++
 app/bin/bitmaps/SVG/bezier-line.svg           |  92 ++++++
 app/bin/bitmaps/SVG/bezier-track.svg          | 424 ++++++++++++++++++++++++++
 app/bin/bitmaps/SVG/block.svg                 | 233 ++++++--------
 app/bin/bitmaps/SVG/bottom.svg                |  62 ++++
 app/bin/bitmaps/SVG/box.svg                   |  72 +++++
 app/bin/bitmaps/SVG/bridge.svg                | 162 ++++++++++
 app/bin/bitmaps/SVG/building.svg              |  85 ++++++
 app/bin/bitmaps/SVG/car-inventory.svg         | 146 +++++++++
 app/bin/bitmaps/SVG/change-grid.svg           | 136 +++++++++
 app/bin/bitmaps/SVG/circle-center.svg         | 283 +++++++++++++++++
 app/bin/bitmaps/SVG/circle-filled-center.svg  |  72 +++++
 app/bin/bitmaps/SVG/circle-filled-tangent.svg |  78 +++++
 app/bin/bitmaps/SVG/circle-line-center.svg    |  78 +++++
 app/bin/bitmaps/SVG/circle-line-tangent.svg   |  78 +++++
 app/bin/bitmaps/SVG/circle-line.svg           | 228 ++++++++++++++
 app/bin/bitmaps/SVG/circle-tangent.svg        | 272 +++++++++++++++++
 app/bin/bitmaps/SVG/circle.svg                | 301 ++++++++++++++++++
 app/bin/bitmaps/SVG/connect.svg               | 159 ++++++++++
 app/bin/bitmaps/SVG/control.svg               |  84 +++++
 app/bin/bitmaps/SVG/convert-from.svg          | 110 +++++++
 app/bin/bitmaps/SVG/convert-to.svg            | 107 +++++++
 app/bin/bitmaps/SVG/copy.svg                  |  57 ++++
 app/bin/bitmaps/SVG/cornu.svg                 | 275 +++++++++++++++++
 app/bin/bitmaps/SVG/curved-chord.svg          | 172 +++++++++++
 app/bin/bitmaps/SVG/curved-end.svg            | 160 ++++++++++
 app/bin/bitmaps/SVG/curved-line-chord.svg     | 114 +++++++
 app/bin/bitmaps/SVG/curved-line-end.svg       | 108 +++++++
 app/bin/bitmaps/SVG/curved-line-middle.svg    |  99 ++++++
 app/bin/bitmaps/SVG/curved-line-tangent.svg   | 190 ++++++++++++
 app/bin/bitmaps/SVG/curved-middle.svg         | 202 ++++++++++++
 app/bin/bitmaps/SVG/curved-tangent.svg        | 191 ++++++++++++
 app/bin/bitmaps/SVG/cut.svg                   |  64 ++++
 app/bin/bitmaps/SVG/delete.svg                | 143 +++++++++
 app/bin/bitmaps/SVG/describe.svg              | 144 +++++++++
 app/bin/bitmaps/SVG/description.svg           | 143 +++++++++
 app/bin/bitmaps/SVG/dimension.svg             | 148 +++++++++
 app/bin/bitmaps/SVG/doc-export-bmap.svg       |  97 ++++++
 app/bin/bitmaps/SVG/doc-export-dxf.svg        | 114 +++++++
 app/bin/bitmaps/SVG/doc-export-svg.svg        |  76 +++++
 app/bin/bitmaps/SVG/doc-export-xtc.svg        |  60 ++++
 app/bin/bitmaps/SVG/doc-export.svg            |  66 ++++
 app/bin/bitmaps/SVG/doc-import-xtc.svg        |  60 ++++
 app/bin/bitmaps/SVG/doc-import.svg            |  66 ++++
 app/bin/bitmaps/SVG/doc-new.svg               |  63 ++++
 app/bin/bitmaps/SVG/doc-open.svg              |  72 +++++
 app/bin/bitmaps/SVG/doc-print.svg             |  94 ++++++
 app/bin/bitmaps/SVG/doc-revert.svg            |  55 ++++
 app/bin/bitmaps/SVG/doc-save-as.svg           |  99 ++++++
 app/bin/bitmaps/SVG/doc-save.svg              |  90 ++++++
 app/bin/bitmaps/SVG/doc-setup.svg             | 101 ++++++
 app/bin/bitmaps/SVG/down.svg                  |  56 ++++
 app/bin/bitmaps/SVG/elevation.svg             | 139 +++++++++
 app/bin/bitmaps/SVG/exit.svg                  |  88 ++++++
 app/bin/bitmaps/SVG/extend.svg                | 154 ++++++++++
 app/bin/bitmaps/SVG/filled-box.svg            |  72 +++++
 app/bin/bitmaps/SVG/filled-polygon.svg        |  59 ++++
 app/bin/bitmaps/SVG/go.svg                    | 106 +++++++
 app/bin/bitmaps/SVG/grid.svg                  |  18 ++
 app/bin/bitmaps/SVG/helix.svg                 | 170 +++++++++++
 app/bin/bitmaps/SVG/join-line.svg             |  94 ++++++
 app/bin/bitmaps/SVG/join.svg                  | 154 ++++++++++
 app/bin/bitmaps/SVG/layers.svg                |  98 ++++++
 app/bin/bitmaps/SVG/magnet.svg                |  83 +++++
 app/bin/bitmaps/SVG/manage.svg                |  77 +++++
 app/bin/bitmaps/SVG/map.svg                   | 146 +++++++++
 app/bin/bitmaps/SVG/move.svg                  | 231 ++++++++++++++
 app/bin/bitmaps/SVG/new-car.svg               | 136 +++++++++
 app/bin/bitmaps/SVG/ok.svg                    |  55 ++++
 app/bin/bitmaps/SVG/pan-zoom.svg              |  89 ++++++
 app/bin/bitmaps/SVG/parallel-line.svg         | 155 ++++++++++
 app/bin/bitmaps/SVG/parallel.svg              | 221 ++++++++++++++
 app/bin/bitmaps/SVG/parameter.svg             |  76 +++++
 app/bin/bitmaps/SVG/paste.svg                 |  64 ++++
 app/bin/bitmaps/SVG/polygon.svg               |  57 ++++
 app/bin/bitmaps/SVG/polyline.svg              |  56 ++++
 app/bin/bitmaps/SVG/profile.svg               | 176 +++++++++++
 app/bin/bitmaps/SVG/protractor.svg            |  68 +++++
 app/bin/bitmaps/SVG/redo.svg                  |  52 ++++
 app/bin/bitmaps/SVG/reflect.svg               |  71 +++++
 app/bin/bitmaps/SVG/rotate.svg                | 222 ++++++++++++++
 app/bin/bitmaps/SVG/ruler.svg                 |  81 +++++
 app/bin/bitmaps/SVG/select.svg                | 153 ++++++++++
 app/bin/bitmaps/SVG/sensor.svg                |  71 +++++
 app/bin/bitmaps/SVG/signal.svg                |  78 +++++
 app/bin/bitmaps/SVG/snap-curs.svg             | 130 ++++++++
 app/bin/bitmaps/SVG/snap-grid.svg             | 128 ++++++++
 app/bin/bitmaps/SVG/split-draw.svg            |  97 ++++++
 app/bin/bitmaps/SVG/split.svg                 | 153 ++++++++++
 app/bin/bitmaps/SVG/sticky-doc.svg            |  72 +++++
 app/bin/bitmaps/SVG/sticky-link.svg           |  76 +++++
 app/bin/bitmaps/SVG/sticky-note.svg           |  88 ++++++
 app/bin/bitmaps/SVG/stop.svg                  | 106 +++++++
 app/bin/bitmaps/SVG/straight-line.svg         | 126 ++++++++
 app/bin/bitmaps/SVG/straight.svg              | 160 ++++++++++
 app/bin/bitmaps/SVG/switch-ai.svg             |  89 ++++++
 app/bin/bitmaps/SVG/table-edge.svg            |  80 +++++
 app/bin/bitmaps/SVG/text.svg                  |  56 ++++
 app/bin/bitmaps/SVG/top.svg                   |  62 ++++
 app/bin/bitmaps/SVG/train.svg                 | 173 +++++++++++
 app/bin/bitmaps/SVG/trim.svg                  |  91 ++++++
 app/bin/bitmaps/SVG/tunnel.svg                | 164 ++++++++++
 app/bin/bitmaps/SVG/turnout-designer.svg      | 179 +++++++++++
 app/bin/bitmaps/SVG/turnout.svg               | 168 ++++++++++
 app/bin/bitmaps/SVG/turntable.svg             | 175 +++++++++++
 app/bin/bitmaps/SVG/undo.svg                  |  53 ++++
 app/bin/bitmaps/SVG/zoom-choose.svg           | 359 ++++++++++++++++++++++
 app/bin/bitmaps/SVG/zoom-extent.svg           | 247 +++++++++++++++
 app/bin/bitmaps/SVG/zoom-in.svg               | 222 ++++++++++++++
 app/bin/bitmaps/SVG/zoom-out.svg              | 215 +++++++++++++
 app/bin/bitmaps/above.xpm                     |  22 --
 app/bin/bitmaps/background.xpm                | 312 +++++++++----------
 app/bin/bitmaps/below.xpm                     |  22 --
 app/bin/bitmaps/benchwork.xpm                 | 112 +++++++
 app/bin/bitmaps/bezier-line.xpm               |  98 ++++++
 app/bin/bitmaps/bezier-track.xpm              | 130 ++++++++
 app/bin/bitmaps/bezier.xpm                    |  23 --
 app/bin/bitmaps/block.xpm                     | 162 ++++++++--
 app/bin/bitmaps/bottom.xpm                    | 101 ++++++
 app/bin/bitmaps/box.xpm                       |  93 ++++++
 app/bin/bitmaps/bridge.xbm                    |   7 -
 app/bin/bitmaps/bridge.xpm                    | 127 ++++++--
 app/bin/bitmaps/building.xpm                  | 125 ++++++++
 app/bin/bitmaps/car-inventory.xpm             | 103 +++++++
 app/bin/bitmaps/change-grid.xpm               | 118 +++++++
 app/bin/bitmaps/circle-center.xpm             | 114 +++++++
 app/bin/bitmaps/circle-filled-center.xpm      | 145 +++++++++
 app/bin/bitmaps/circle-filled-tangent.xpm     | 148 +++++++++
 app/bin/bitmaps/circle-line-center.xpm        |  93 ++++++
 app/bin/bitmaps/circle-line-tangent.xpm       |  93 ++++++
 app/bin/bitmaps/circle-line.xpm               |  95 ++++++
 app/bin/bitmaps/circle-tangent.xpm            | 110 +++++++
 app/bin/bitmaps/circle.xpm                    | 115 +++++++
 app/bin/bitmaps/circle1.xpm                   |  23 --
 app/bin/bitmaps/circle2.xpm                   |  22 --
 app/bin/bitmaps/circle3.xpm                   |  22 --
 app/bin/bitmaps/cnote.xpm                     |  22 --
 app/bin/bitmaps/connect.xpm                   | 116 +++++++
 app/bin/bitmaps/control.xpm                   | 153 ++++++++--
 app/bin/bitmaps/convert-from.xpm              |  99 ++++++
 app/bin/bitmaps/convert-to.xpm                |  99 ++++++
 app/bin/bitmaps/convertfr.xpm                 |  23 --
 app/bin/bitmaps/convertto.xpm                 |  23 --
 app/bin/bitmaps/copy.xpm                      |  95 ++++++
 app/bin/bitmaps/cornu.xpm                     | 140 +++++++--
 app/bin/bitmaps/curve1.xpm                    |  23 --
 app/bin/bitmaps/curve2.xpm                    |  23 --
 app/bin/bitmaps/curve3.xpm                    |  23 --
 app/bin/bitmaps/curve4.xpm                    |  23 --
 app/bin/bitmaps/curved-chord.xpm              | 109 +++++++
 app/bin/bitmaps/curved-end.xpm                | 107 +++++++
 app/bin/bitmaps/curved-line-chord.xpm         |  92 ++++++
 app/bin/bitmaps/curved-line-end.xpm           |  94 ++++++
 app/bin/bitmaps/curved-line-middle.xpm        |  95 ++++++
 app/bin/bitmaps/curved-line-tangent.xpm       |  98 ++++++
 app/bin/bitmaps/curved-middle.xpm             | 108 +++++++
 app/bin/bitmaps/curved-tangent.xpm            | 116 +++++++
 app/bin/bitmaps/cut.xpm                       |  92 ++++++
 app/bin/bitmaps/dbench.xpm                    |  22 --
 app/bin/bitmaps/dbezier.xpm                   |  22 --
 app/bin/bitmaps/dbox.xpm                      |  22 --
 app/bin/bitmaps/dcircle1.xpm                  |  22 --
 app/bin/bitmaps/dcircle2.xpm                  |  22 --
 app/bin/bitmaps/dcircle3.xpm                  |  22 --
 app/bin/bitmaps/dcurve1.xpm                   |  22 --
 app/bin/bitmaps/dcurve2.xpm                   |  22 --
 app/bin/bitmaps/dcurve3.xpm                   |  22 --
 app/bin/bitmaps/dcurve4.xpm                   |  22 --
 app/bin/bitmaps/ddimlin.xpm                   |  22 --
 app/bin/bitmaps/delete.xpm                    | 136 +++++++--
 app/bin/bitmaps/describe.xpm                  | 133 ++++++--
 app/bin/bitmaps/description.xpm               | 101 ++++++
 app/bin/bitmaps/dfilbox.xpm                   |  23 --
 app/bin/bitmaps/dfilpoly.xpm                  |  23 --
 app/bin/bitmaps/dflcrcl1.xpm                  |  22 --
 app/bin/bitmaps/dflcrcl2.xpm                  |  23 --
 app/bin/bitmaps/dflcrcl3.xpm                  |  23 --
 app/bin/bitmaps/dimension.xpm                 |  94 ++++++
 app/bin/bitmaps/dline.xpm                     |  22 --
 app/bin/bitmaps/doc-export-bmap.xpm           | 162 ++++++++++
 app/bin/bitmaps/doc-export-dxf.xpm            | 100 ++++++
 app/bin/bitmaps/doc-export-svg.xpm            | 114 +++++++
 app/bin/bitmaps/doc-export-xtc.xpm            | 108 +++++++
 app/bin/bitmaps/doc-export.xpm                | 119 ++++++++
 app/bin/bitmaps/doc-import-xtc.xpm            | 123 ++++++++
 app/bin/bitmaps/doc-import.xpm                | 123 ++++++++
 app/bin/bitmaps/doc-new.xpm                   | 127 ++++++++
 app/bin/bitmaps/doc-open.xpm                  | 136 +++++++++
 app/bin/bitmaps/doc-print.xpm                 | 108 +++++++
 app/bin/bitmaps/doc-revert.xpm                | 134 ++++++++
 app/bin/bitmaps/doc-save-as.xpm               | 135 ++++++++
 app/bin/bitmaps/doc-save.xpm                  | 116 +++++++
 app/bin/bitmaps/doc-setup.xpm                 | 110 +++++++
 app/bin/bitmaps/document-export.xpm           |  90 ------
 app/bin/bitmaps/document-exportdxf.xpm        |  84 -----
 app/bin/bitmaps/document-import.xpm           |  92 ------
 app/bin/bitmaps/document-importmod.xpm        |  71 -----
 app/bin/bitmaps/document-new.xpm              |  38 ---
 app/bin/bitmaps/document-open.xpm             |  35 ---
 app/bin/bitmaps/document-print.xpm            |  24 --
 app/bin/bitmaps/document-save.xpm             |  35 ---
 app/bin/bitmaps/down.xpm                      |  89 ++++++
 app/bin/bitmaps/dpoly.xpm                     |  22 --
 app/bin/bitmaps/dpolyline.xpm                 |  23 --
 app/bin/bitmaps/dtbledge.xpm                  |  23 --
 app/bin/bitmaps/ease-broad.xpm                |  89 ++++++
 app/bin/bitmaps/ease-cornu.xpm                |  96 ++++++
 app/bin/bitmaps/ease-gt-broad.xpm             |  89 ++++++
 app/bin/bitmaps/ease-gt-sharp.xpm             |  89 ++++++
 app/bin/bitmaps/ease-lt-broad.xpm             |  89 ++++++
 app/bin/bitmaps/ease-lt-sharp.xpm             |  89 ++++++
 app/bin/bitmaps/ease-none.xpm                 |  89 ++++++
 app/bin/bitmaps/ease-normal.xpm               |  89 ++++++
 app/bin/bitmaps/ease-sharp.xpm                |  89 ++++++
 app/bin/bitmaps/ebroad.xpm                    |  21 --
 app/bin/bitmaps/ecornu.xpm                    |  23 --
 app/bin/bitmaps/edit-redo.xpm                 |  29 --
 app/bin/bitmaps/edit-undo.xpm                 |  28 --
 app/bin/bitmaps/egtbroad.xpm                  |  21 --
 app/bin/bitmaps/egtsharp.xpm                  |  21 --
 app/bin/bitmaps/elev.xpm                      |  23 --
 app/bin/bitmaps/elevation.xpm                 | 117 +++++++
 app/bin/bitmaps/eltbroad.xpm                  |  21 --
 app/bin/bitmaps/eltsharp.xpm                  |  21 --
 app/bin/bitmaps/enone.xpm                     |  21 --
 app/bin/bitmaps/enormal.xpm                   |  21 --
 app/bin/bitmaps/esharp.xpm                    |  21 --
 app/bin/bitmaps/exit.xpm                      | 115 +++++--
 app/bin/bitmaps/extend.xpm                    | 166 ++++++++--
 app/bin/bitmaps/filled-box.xpm                | 120 ++++++++
 app/bin/bitmaps/filled-polygon.xpm            | 121 ++++++++
 app/bin/bitmaps/flip.xpm                      |  23 --
 app/bin/bitmaps/funnel.xpm                    |  62 ++++
 app/bin/bitmaps/funnelclear.xpm               | 124 ++++++++
 app/bin/bitmaps/go.xpm                        | 157 ++++++++--
 app/bin/bitmaps/helix.xpm                     |  95 ++++++
 app/bin/bitmaps/hndldto.xpm                   |  21 --
 app/bin/bitmaps/join-line.xpm                 |  99 ++++++
 app/bin/bitmaps/join.xpm                      | 139 +++++++--
 app/bin/bitmaps/joinline.xpm                  |  22 --
 app/bin/bitmaps/l1.xbm                        |  84 ++++-
 app/bin/bitmaps/l10.xbm                       |  84 ++++-
 app/bin/bitmaps/l11.xbm                       |  84 ++++-
 app/bin/bitmaps/l12.xbm                       |  84 ++++-
 app/bin/bitmaps/l13.xbm                       |  84 ++++-
 app/bin/bitmaps/l14.xbm                       |  84 ++++-
 app/bin/bitmaps/l15.xbm                       |  84 ++++-
 app/bin/bitmaps/l16.xbm                       |  84 ++++-
 app/bin/bitmaps/l17.xbm                       |  84 ++++-
 app/bin/bitmaps/l18.xbm                       |  84 ++++-
 app/bin/bitmaps/l19.xbm                       |  84 ++++-
 app/bin/bitmaps/l2.xbm                        |  84 ++++-
 app/bin/bitmaps/l20.xbm                       |  84 ++++-
 app/bin/bitmaps/l21.xbm                       |  84 ++++-
 app/bin/bitmaps/l22.xbm                       |  84 ++++-
 app/bin/bitmaps/l23.xbm                       |  84 ++++-
 app/bin/bitmaps/l24.xbm                       |  84 ++++-
 app/bin/bitmaps/l25.xbm                       |  84 ++++-
 app/bin/bitmaps/l26.xbm                       |  84 ++++-
 app/bin/bitmaps/l27.xbm                       |  84 ++++-
 app/bin/bitmaps/l28.xbm                       |  84 ++++-
 app/bin/bitmaps/l29.xbm                       |  84 ++++-
 app/bin/bitmaps/l3.xbm                        |  84 ++++-
 app/bin/bitmaps/l30.xbm                       |  84 ++++-
 app/bin/bitmaps/l31.xbm                       |  84 ++++-
 app/bin/bitmaps/l32.xbm                       |  84 ++++-
 app/bin/bitmaps/l33.xbm                       |  84 ++++-
 app/bin/bitmaps/l34.xbm                       |  84 ++++-
 app/bin/bitmaps/l35.xbm                       |  84 ++++-
 app/bin/bitmaps/l36.xbm                       |  84 ++++-
 app/bin/bitmaps/l37.xbm                       |  84 ++++-
 app/bin/bitmaps/l38.xbm                       |  84 ++++-
 app/bin/bitmaps/l39.xbm                       |  84 ++++-
 app/bin/bitmaps/l4.xbm                        |  84 ++++-
 app/bin/bitmaps/l40.xbm                       |  84 ++++-
 app/bin/bitmaps/l41.xbm                       |  84 ++++-
 app/bin/bitmaps/l42.xbm                       |  84 ++++-
 app/bin/bitmaps/l43.xbm                       |  84 ++++-
 app/bin/bitmaps/l44.xbm                       |  84 ++++-
 app/bin/bitmaps/l45.xbm                       |  84 ++++-
 app/bin/bitmaps/l46.xbm                       |  84 ++++-
 app/bin/bitmaps/l47.xbm                       |  84 ++++-
 app/bin/bitmaps/l48.xbm                       |  84 ++++-
 app/bin/bitmaps/l49.xbm                       |  84 ++++-
 app/bin/bitmaps/l5.xbm                        |  84 ++++-
 app/bin/bitmaps/l50.xbm                       |  84 ++++-
 app/bin/bitmaps/l51.xbm                       |  84 ++++-
 app/bin/bitmaps/l52.xbm                       |  84 ++++-
 app/bin/bitmaps/l53.xbm                       |  84 ++++-
 app/bin/bitmaps/l54.xbm                       |  84 ++++-
 app/bin/bitmaps/l55.xbm                       |  84 ++++-
 app/bin/bitmaps/l56.xbm                       |  84 ++++-
 app/bin/bitmaps/l57.xbm                       |  84 ++++-
 app/bin/bitmaps/l58.xbm                       |  84 ++++-
 app/bin/bitmaps/l59.xbm                       |  84 ++++-
 app/bin/bitmaps/l6.xbm                        |  84 ++++-
 app/bin/bitmaps/l60.xbm                       |  84 ++++-
 app/bin/bitmaps/l61.xbm                       |  84 ++++-
 app/bin/bitmaps/l62.xbm                       |  84 ++++-
 app/bin/bitmaps/l63.xbm                       |  84 ++++-
 app/bin/bitmaps/l64.xbm                       |  84 ++++-
 app/bin/bitmaps/l65.xbm                       |  84 ++++-
 app/bin/bitmaps/l66.xbm                       |  84 ++++-
 app/bin/bitmaps/l67.xbm                       |  84 ++++-
 app/bin/bitmaps/l68.xbm                       |  84 ++++-
 app/bin/bitmaps/l69.xbm                       |  84 ++++-
 app/bin/bitmaps/l7.xbm                        |  84 ++++-
 app/bin/bitmaps/l70.xbm                       |  84 ++++-
 app/bin/bitmaps/l71.xbm                       |  84 ++++-
 app/bin/bitmaps/l72.xbm                       |  84 ++++-
 app/bin/bitmaps/l73.xbm                       |  84 ++++-
 app/bin/bitmaps/l74.xbm                       |  84 ++++-
 app/bin/bitmaps/l75.xbm                       |  84 ++++-
 app/bin/bitmaps/l76.xbm                       |  84 ++++-
 app/bin/bitmaps/l77.xbm                       |  84 ++++-
 app/bin/bitmaps/l78.xbm                       |  84 ++++-
 app/bin/bitmaps/l79.xbm                       |  84 ++++-
 app/bin/bitmaps/l8.xbm                        |  84 ++++-
 app/bin/bitmaps/l80.xbm                       |  84 ++++-
 app/bin/bitmaps/l81.xbm                       |  84 ++++-
 app/bin/bitmaps/l82.xbm                       |  84 ++++-
 app/bin/bitmaps/l83.xbm                       |  84 ++++-
 app/bin/bitmaps/l84.xbm                       |  84 ++++-
 app/bin/bitmaps/l85.xbm                       |  84 ++++-
 app/bin/bitmaps/l86.xbm                       |  84 ++++-
 app/bin/bitmaps/l87.xbm                       |  84 ++++-
 app/bin/bitmaps/l88.xbm                       |  84 ++++-
 app/bin/bitmaps/l89.xbm                       |  84 ++++-
 app/bin/bitmaps/l9.xbm                        |  84 ++++-
 app/bin/bitmaps/l90.xbm                       |  84 ++++-
 app/bin/bitmaps/l91.xbm                       |  84 ++++-
 app/bin/bitmaps/l92.xbm                       |  84 ++++-
 app/bin/bitmaps/l93.xbm                       |  84 ++++-
 app/bin/bitmaps/l94.xbm                       |  84 ++++-
 app/bin/bitmaps/l95.xbm                       |  84 ++++-
 app/bin/bitmaps/l96.xbm                       |  84 ++++-
 app/bin/bitmaps/l97.xbm                       |  84 ++++-
 app/bin/bitmaps/l98.xbm                       |  84 ++++-
 app/bin/bitmaps/l99.xbm                       |  84 ++++-
 app/bin/bitmaps/layers.xpm                    | 110 +++++++
 app/bin/bitmaps/magnet.xpm                    | 161 ++++++++--
 app/bin/bitmaps/magnifier.xpm                 |  89 ------
 app/bin/bitmaps/manage.xpm                    | 110 +++++++
 app/bin/bitmaps/map.xpm                       | 193 ++++++++++--
 app/bin/bitmaps/move.xpm                      | 142 +++++++--
 app/bin/bitmaps/movedesc.xpm                  |  23 --
 app/bin/bitmaps/new-car.xpm                   | 100 ++++++
 app/bin/bitmaps/newcar.xpm                    |  23 --
 app/bin/bitmaps/note.xpm                      | 114 +++++++
 app/bin/bitmaps/ok.xpm                        |  92 ++++++
 app/bin/bitmaps/openbutt.xpm                  |  21 --
 app/bin/bitmaps/pan-zoom.xpm                  |  94 ++++++
 app/bin/bitmaps/pan.xpm                       |  22 --
 app/bin/bitmaps/parallel-line.xpm             | 130 ++++++--
 app/bin/bitmaps/parallel.xpm                  | 138 +++++++--
 app/bin/bitmaps/parameter.xpm                 | 104 +++++++
 app/bin/bitmaps/paste.xpm                     | 107 +++++++
 app/bin/bitmaps/pause.xpm                     | 147 +++++++++
 app/bin/bitmaps/polygon.xpm                   |  89 ++++++
 app/bin/bitmaps/polyline.xpm                  |  92 ++++++
 app/bin/bitmaps/profile.xpm                   | 145 +++++++--
 app/bin/bitmaps/protractor.xpm                |  99 ++++++
 app/bin/bitmaps/pull.xpm                      |  23 --
 app/bin/bitmaps/redo.xpm                      | 104 +++++++
 app/bin/bitmaps/reflect.xpm                   | 115 +++++++
 app/bin/bitmaps/rotate.xpm                    | 171 +++++++++--
 app/bin/bitmaps/ruler.xpm                     | 110 +++++--
 app/bin/bitmaps/select.xpm                    | 128 ++++++--
 app/bin/bitmaps/sensor.xpm                    | 160 ++++++++--
 app/bin/bitmaps/signal.xpm                    | 131 ++++++--
 app/bin/bitmaps/snap-curs.xpm                 | 102 +++++++
 app/bin/bitmaps/snap-grid.xpm                 |  92 ++++++
 app/bin/bitmaps/snapcurs.xbm                  |   7 -
 app/bin/bitmaps/snapvis.xbm                   |   7 -
 app/bin/bitmaps/split-draw.xpm                |  95 ++++++
 app/bin/bitmaps/split.xpm                     | 107 +++++++
 app/bin/bitmaps/splittrk.xpm                  |  22 --
 app/bin/bitmaps/sticky-doc.xpm                | 130 ++++++++
 app/bin/bitmaps/sticky-link.xpm               | 138 +++++++++
 app/bin/bitmaps/sticky-note-chain.xpm         |  84 -----
 app/bin/bitmaps/sticky-note-clip.xpm          |  99 ------
 app/bin/bitmaps/sticky-note-text.xpm          |  86 ------
 app/bin/bitmaps/sticky-note.xpm               | 124 ++++++++
 app/bin/bitmaps/stop.xpm                      | 150 +++++++--
 app/bin/bitmaps/straight-line.xpm             |  96 ++++++
 app/bin/bitmaps/straight.xpm                  | 155 ++++++++--
 app/bin/bitmaps/switch-ai.xpm                 |  96 ++++++
 app/bin/bitmaps/table-edge.xpm                | 114 +++++++
 app/bin/bitmaps/text.xpm                      | 110 +++++--
 app/bin/bitmaps/top.xpm                       | 111 +++++++
 app/bin/bitmaps/train.xpm                     | 140 +++++++--
 app/bin/bitmaps/trim.xpm                      |  99 ++++++
 app/bin/bitmaps/tunnel.xpm                    | 140 +++++++--
 app/bin/bitmaps/turnout-designer.xpm          | 129 ++++++++
 app/bin/bitmaps/turnout.xpm                   | 128 ++++++--
 app/bin/bitmaps/turntable.xpm                 | 133 ++++++++
 app/bin/bitmaps/turntbl.xpm                   |  21 --
 app/bin/bitmaps/undo.xpm                      | 103 +++++++
 app/bin/bitmaps/zoom-choose.xpm               | 127 ++++++++
 app/bin/bitmaps/zoom-extent.xpm               | 125 ++++++++
 app/bin/bitmaps/zoom-in.xpm                   | 128 ++++++++
 app/bin/bitmaps/zoom-out.xpm                  | 127 ++++++++
 app/bin/bitmaps/zoom.xpm                      |  24 --
 app/bin/bitmaps/zoomin.xpm                    |  24 --
 app/bin/bitmaps/zoomout.xpm                   |  24 --
 438 files changed, 36012 insertions(+), 3650 deletions(-)
 create mode 100644 app/bin/bitmaps/16pix/bridge.png
 create mode 100644 app/bin/bitmaps/16pix/circle-center.png
 create mode 100644 app/bin/bitmaps/16pix/circle-tangent.png
 create mode 100644 app/bin/bitmaps/16pix/circle.png
 create mode 100644 app/bin/bitmaps/16pix/curved-chord.png
 create mode 100644 app/bin/bitmaps/16pix/curved-end.png
 create mode 100644 app/bin/bitmaps/16pix/curved-middle.png
 create mode 100644 app/bin/bitmaps/16pix/curved-tangent.png
 create mode 100644 app/bin/bitmaps/16pix/description.png
 create mode 100644 app/bin/bitmaps/16pix/elevation.png
 create mode 100644 app/bin/bitmaps/16pix/exit.png
 create mode 100644 app/bin/bitmaps/16pix/palette.png
 create mode 100644 app/bin/bitmaps/16pix/pan-zoom.png
 create mode 100644 app/bin/bitmaps/16pix/select.png
 create mode 100644 app/bin/bitmaps/16pix/snap-curs.png
 create mode 100644 app/bin/bitmaps/16pix/snap-grid.png
 create mode 100644 app/bin/bitmaps/24pix/description.png
 create mode 100644 app/bin/bitmaps/24pix/exit.png
 create mode 100644 app/bin/bitmaps/24pix/pan-zoom.png
 create mode 100644 app/bin/bitmaps/24pix/snap-curs.png
 create mode 100644 app/bin/bitmaps/24pix/snap-grid.png
 create mode 100644 app/bin/bitmaps/Info.xpm
 create mode 100644 app/bin/bitmaps/SVG/Info.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-broad.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-none.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-normal.svg
 create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg
 create mode 100644 app/bin/bitmaps/SVG/background.svg
 create mode 100644 app/bin/bitmaps/SVG/benchwork.svg
 create mode 100644 app/bin/bitmaps/SVG/bezier-line.svg
 create mode 100644 app/bin/bitmaps/SVG/bezier-track.svg
 create mode 100644 app/bin/bitmaps/SVG/bottom.svg
 create mode 100644 app/bin/bitmaps/SVG/box.svg
 create mode 100644 app/bin/bitmaps/SVG/bridge.svg
 create mode 100644 app/bin/bitmaps/SVG/building.svg
 create mode 100644 app/bin/bitmaps/SVG/car-inventory.svg
 create mode 100644 app/bin/bitmaps/SVG/change-grid.svg
 create mode 100644 app/bin/bitmaps/SVG/circle-center.svg
 create mode 100644 app/bin/bitmaps/SVG/circle-filled-center.svg
 create mode 100644 app/bin/bitmaps/SVG/circle-filled-tangent.svg
 create mode 100644 app/bin/bitmaps/SVG/circle-line-center.svg
 create mode 100644 app/bin/bitmaps/SVG/circle-line-tangent.svg
 create mode 100644 app/bin/bitmaps/SVG/circle-line.svg
 create mode 100644 app/bin/bitmaps/SVG/circle-tangent.svg
 create mode 100644 app/bin/bitmaps/SVG/circle.svg
 create mode 100644 app/bin/bitmaps/SVG/connect.svg
 create mode 100644 app/bin/bitmaps/SVG/control.svg
 create mode 100644 app/bin/bitmaps/SVG/convert-from.svg
 create mode 100644 app/bin/bitmaps/SVG/convert-to.svg
 create mode 100644 app/bin/bitmaps/SVG/copy.svg
 create mode 100644 app/bin/bitmaps/SVG/cornu.svg
 create mode 100644 app/bin/bitmaps/SVG/curved-chord.svg
 create mode 100644 app/bin/bitmaps/SVG/curved-end.svg
 create mode 100644 app/bin/bitmaps/SVG/curved-line-chord.svg
 create mode 100644 app/bin/bitmaps/SVG/curved-line-end.svg
 create mode 100644 app/bin/bitmaps/SVG/curved-line-middle.svg
 create mode 100644 app/bin/bitmaps/SVG/curved-line-tangent.svg
 create mode 100644 app/bin/bitmaps/SVG/curved-middle.svg
 create mode 100644 app/bin/bitmaps/SVG/curved-tangent.svg
 create mode 100644 app/bin/bitmaps/SVG/cut.svg
 create mode 100644 app/bin/bitmaps/SVG/delete.svg
 create mode 100644 app/bin/bitmaps/SVG/describe.svg
 create mode 100644 app/bin/bitmaps/SVG/description.svg
 create mode 100644 app/bin/bitmaps/SVG/dimension.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-export-bmap.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-export-dxf.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-export-svg.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-export-xtc.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-export.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-import-xtc.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-import.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-new.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-open.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-print.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-revert.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-save-as.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-save.svg
 create mode 100644 app/bin/bitmaps/SVG/doc-setup.svg
 create mode 100644 app/bin/bitmaps/SVG/down.svg
 create mode 100644 app/bin/bitmaps/SVG/elevation.svg
 create mode 100644 app/bin/bitmaps/SVG/exit.svg
 create mode 100644 app/bin/bitmaps/SVG/extend.svg
 create mode 100644 app/bin/bitmaps/SVG/filled-box.svg
 create mode 100644 app/bin/bitmaps/SVG/filled-polygon.svg
 create mode 100644 app/bin/bitmaps/SVG/go.svg
 create mode 100644 app/bin/bitmaps/SVG/grid.svg
 create mode 100644 app/bin/bitmaps/SVG/helix.svg
 create mode 100644 app/bin/bitmaps/SVG/join-line.svg
 create mode 100644 app/bin/bitmaps/SVG/join.svg
 create mode 100644 app/bin/bitmaps/SVG/layers.svg
 create mode 100644 app/bin/bitmaps/SVG/magnet.svg
 create mode 100644 app/bin/bitmaps/SVG/manage.svg
 create mode 100644 app/bin/bitmaps/SVG/map.svg
 create mode 100644 app/bin/bitmaps/SVG/move.svg
 create mode 100644 app/bin/bitmaps/SVG/new-car.svg
 create mode 100644 app/bin/bitmaps/SVG/ok.svg
 create mode 100644 app/bin/bitmaps/SVG/pan-zoom.svg
 create mode 100644 app/bin/bitmaps/SVG/parallel-line.svg
 create mode 100644 app/bin/bitmaps/SVG/parallel.svg
 create mode 100644 app/bin/bitmaps/SVG/parameter.svg
 create mode 100644 app/bin/bitmaps/SVG/paste.svg
 create mode 100644 app/bin/bitmaps/SVG/polygon.svg
 create mode 100644 app/bin/bitmaps/SVG/polyline.svg
 create mode 100644 app/bin/bitmaps/SVG/profile.svg
 create mode 100644 app/bin/bitmaps/SVG/protractor.svg
 create mode 100644 app/bin/bitmaps/SVG/redo.svg
 create mode 100644 app/bin/bitmaps/SVG/reflect.svg
 create mode 100644 app/bin/bitmaps/SVG/rotate.svg
 create mode 100644 app/bin/bitmaps/SVG/ruler.svg
 create mode 100644 app/bin/bitmaps/SVG/select.svg
 create mode 100644 app/bin/bitmaps/SVG/sensor.svg
 create mode 100644 app/bin/bitmaps/SVG/signal.svg
 create mode 100644 app/bin/bitmaps/SVG/snap-curs.svg
 create mode 100644 app/bin/bitmaps/SVG/snap-grid.svg
 create mode 100644 app/bin/bitmaps/SVG/split-draw.svg
 create mode 100644 app/bin/bitmaps/SVG/split.svg
 create mode 100644 app/bin/bitmaps/SVG/sticky-doc.svg
 create mode 100644 app/bin/bitmaps/SVG/sticky-link.svg
 create mode 100644 app/bin/bitmaps/SVG/sticky-note.svg
 create mode 100644 app/bin/bitmaps/SVG/stop.svg
 create mode 100644 app/bin/bitmaps/SVG/straight-line.svg
 create mode 100644 app/bin/bitmaps/SVG/straight.svg
 create mode 100644 app/bin/bitmaps/SVG/switch-ai.svg
 create mode 100644 app/bin/bitmaps/SVG/table-edge.svg
 create mode 100644 app/bin/bitmaps/SVG/text.svg
 create mode 100644 app/bin/bitmaps/SVG/top.svg
 create mode 100644 app/bin/bitmaps/SVG/train.svg
 create mode 100644 app/bin/bitmaps/SVG/trim.svg
 create mode 100644 app/bin/bitmaps/SVG/tunnel.svg
 create mode 100644 app/bin/bitmaps/SVG/turnout-designer.svg
 create mode 100644 app/bin/bitmaps/SVG/turnout.svg
 create mode 100644 app/bin/bitmaps/SVG/turntable.svg
 create mode 100644 app/bin/bitmaps/SVG/undo.svg
 create mode 100644 app/bin/bitmaps/SVG/zoom-choose.svg
 create mode 100644 app/bin/bitmaps/SVG/zoom-extent.svg
 create mode 100644 app/bin/bitmaps/SVG/zoom-in.svg
 create mode 100644 app/bin/bitmaps/SVG/zoom-out.svg
 delete mode 100644 app/bin/bitmaps/above.xpm
 delete mode 100644 app/bin/bitmaps/below.xpm
 create mode 100644 app/bin/bitmaps/benchwork.xpm
 create mode 100644 app/bin/bitmaps/bezier-line.xpm
 create mode 100644 app/bin/bitmaps/bezier-track.xpm
 delete mode 100644 app/bin/bitmaps/bezier.xpm
 create mode 100644 app/bin/bitmaps/bottom.xpm
 create mode 100644 app/bin/bitmaps/box.xpm
 delete mode 100644 app/bin/bitmaps/bridge.xbm
 create mode 100644 app/bin/bitmaps/building.xpm
 create mode 100644 app/bin/bitmaps/car-inventory.xpm
 create mode 100644 app/bin/bitmaps/change-grid.xpm
 create mode 100644 app/bin/bitmaps/circle-center.xpm
 create mode 100644 app/bin/bitmaps/circle-filled-center.xpm
 create mode 100644 app/bin/bitmaps/circle-filled-tangent.xpm
 create mode 100644 app/bin/bitmaps/circle-line-center.xpm
 create mode 100644 app/bin/bitmaps/circle-line-tangent.xpm
 create mode 100644 app/bin/bitmaps/circle-line.xpm
 create mode 100644 app/bin/bitmaps/circle-tangent.xpm
 create mode 100644 app/bin/bitmaps/circle.xpm
 delete mode 100644 app/bin/bitmaps/circle1.xpm
 delete mode 100644 app/bin/bitmaps/circle2.xpm
 delete mode 100644 app/bin/bitmaps/circle3.xpm
 delete mode 100644 app/bin/bitmaps/cnote.xpm
 create mode 100644 app/bin/bitmaps/connect.xpm
 create mode 100644 app/bin/bitmaps/convert-from.xpm
 create mode 100644 app/bin/bitmaps/convert-to.xpm
 delete mode 100644 app/bin/bitmaps/convertfr.xpm
 delete mode 100644 app/bin/bitmaps/convertto.xpm
 create mode 100644 app/bin/bitmaps/copy.xpm
 delete mode 100644 app/bin/bitmaps/curve1.xpm
 delete mode 100644 app/bin/bitmaps/curve2.xpm
 delete mode 100644 app/bin/bitmaps/curve3.xpm
 delete mode 100644 app/bin/bitmaps/curve4.xpm
 create mode 100644 app/bin/bitmaps/curved-chord.xpm
 create mode 100644 app/bin/bitmaps/curved-end.xpm
 create mode 100644 app/bin/bitmaps/curved-line-chord.xpm
 create mode 100644 app/bin/bitmaps/curved-line-end.xpm
 create mode 100644 app/bin/bitmaps/curved-line-middle.xpm
 create mode 100644 app/bin/bitmaps/curved-line-tangent.xpm
 create mode 100644 app/bin/bitmaps/curved-middle.xpm
 create mode 100644 app/bin/bitmaps/curved-tangent.xpm
 create mode 100644 app/bin/bitmaps/cut.xpm
 delete mode 100644 app/bin/bitmaps/dbench.xpm
 delete mode 100644 app/bin/bitmaps/dbezier.xpm
 delete mode 100644 app/bin/bitmaps/dbox.xpm
 delete mode 100644 app/bin/bitmaps/dcircle1.xpm
 delete mode 100644 app/bin/bitmaps/dcircle2.xpm
 delete mode 100644 app/bin/bitmaps/dcircle3.xpm
 delete mode 100644 app/bin/bitmaps/dcurve1.xpm
 delete mode 100644 app/bin/bitmaps/dcurve2.xpm
 delete mode 100644 app/bin/bitmaps/dcurve3.xpm
 delete mode 100644 app/bin/bitmaps/dcurve4.xpm
 delete mode 100644 app/bin/bitmaps/ddimlin.xpm
 create mode 100644 app/bin/bitmaps/description.xpm
 delete mode 100644 app/bin/bitmaps/dfilbox.xpm
 delete mode 100644 app/bin/bitmaps/dfilpoly.xpm
 delete mode 100644 app/bin/bitmaps/dflcrcl1.xpm
 delete mode 100644 app/bin/bitmaps/dflcrcl2.xpm
 delete mode 100644 app/bin/bitmaps/dflcrcl3.xpm
 create mode 100644 app/bin/bitmaps/dimension.xpm
 delete mode 100644 app/bin/bitmaps/dline.xpm
 create mode 100644 app/bin/bitmaps/doc-export-bmap.xpm
 create mode 100644 app/bin/bitmaps/doc-export-dxf.xpm
 create mode 100644 app/bin/bitmaps/doc-export-svg.xpm
 create mode 100644 app/bin/bitmaps/doc-export-xtc.xpm
 create mode 100644 app/bin/bitmaps/doc-export.xpm
 create mode 100644 app/bin/bitmaps/doc-import-xtc.xpm
 create mode 100644 app/bin/bitmaps/doc-import.xpm
 create mode 100644 app/bin/bitmaps/doc-new.xpm
 create mode 100644 app/bin/bitmaps/doc-open.xpm
 create mode 100644 app/bin/bitmaps/doc-print.xpm
 create mode 100644 app/bin/bitmaps/doc-revert.xpm
 create mode 100644 app/bin/bitmaps/doc-save-as.xpm
 create mode 100644 app/bin/bitmaps/doc-save.xpm
 create mode 100644 app/bin/bitmaps/doc-setup.xpm
 delete mode 100644 app/bin/bitmaps/document-export.xpm
 delete mode 100644 app/bin/bitmaps/document-exportdxf.xpm
 delete mode 100644 app/bin/bitmaps/document-import.xpm
 delete mode 100644 app/bin/bitmaps/document-importmod.xpm
 delete mode 100644 app/bin/bitmaps/document-new.xpm
 delete mode 100644 app/bin/bitmaps/document-open.xpm
 delete mode 100644 app/bin/bitmaps/document-print.xpm
 delete mode 100644 app/bin/bitmaps/document-save.xpm
 create mode 100644 app/bin/bitmaps/down.xpm
 delete mode 100644 app/bin/bitmaps/dpoly.xpm
 delete mode 100644 app/bin/bitmaps/dpolyline.xpm
 delete mode 100644 app/bin/bitmaps/dtbledge.xpm
 create mode 100644 app/bin/bitmaps/ease-broad.xpm
 create mode 100644 app/bin/bitmaps/ease-cornu.xpm
 create mode 100644 app/bin/bitmaps/ease-gt-broad.xpm
 create mode 100644 app/bin/bitmaps/ease-gt-sharp.xpm
 create mode 100644 app/bin/bitmaps/ease-lt-broad.xpm
 create mode 100644 app/bin/bitmaps/ease-lt-sharp.xpm
 create mode 100644 app/bin/bitmaps/ease-none.xpm
 create mode 100644 app/bin/bitmaps/ease-normal.xpm
 create mode 100644 app/bin/bitmaps/ease-sharp.xpm
 delete mode 100644 app/bin/bitmaps/ebroad.xpm
 delete mode 100644 app/bin/bitmaps/ecornu.xpm
 delete mode 100644 app/bin/bitmaps/edit-redo.xpm
 delete mode 100644 app/bin/bitmaps/edit-undo.xpm
 delete mode 100644 app/bin/bitmaps/egtbroad.xpm
 delete mode 100644 app/bin/bitmaps/egtsharp.xpm
 delete mode 100644 app/bin/bitmaps/elev.xpm
 create mode 100644 app/bin/bitmaps/elevation.xpm
 delete mode 100644 app/bin/bitmaps/eltbroad.xpm
 delete mode 100644 app/bin/bitmaps/eltsharp.xpm
 delete mode 100644 app/bin/bitmaps/enone.xpm
 delete mode 100644 app/bin/bitmaps/enormal.xpm
 delete mode 100644 app/bin/bitmaps/esharp.xpm
 create mode 100644 app/bin/bitmaps/filled-box.xpm
 create mode 100644 app/bin/bitmaps/filled-polygon.xpm
 delete mode 100644 app/bin/bitmaps/flip.xpm
 create mode 100644 app/bin/bitmaps/funnel.xpm
 create mode 100644 app/bin/bitmaps/funnelclear.xpm
 create mode 100644 app/bin/bitmaps/helix.xpm
 delete mode 100644 app/bin/bitmaps/hndldto.xpm
 create mode 100644 app/bin/bitmaps/join-line.xpm
 delete mode 100644 app/bin/bitmaps/joinline.xpm
 create mode 100644 app/bin/bitmaps/layers.xpm
 delete mode 100644 app/bin/bitmaps/magnifier.xpm
 create mode 100644 app/bin/bitmaps/manage.xpm
 delete mode 100644 app/bin/bitmaps/movedesc.xpm
 create mode 100644 app/bin/bitmaps/new-car.xpm
 delete mode 100644 app/bin/bitmaps/newcar.xpm
 create mode 100644 app/bin/bitmaps/note.xpm
 create mode 100644 app/bin/bitmaps/ok.xpm
 delete mode 100644 app/bin/bitmaps/openbutt.xpm
 create mode 100644 app/bin/bitmaps/pan-zoom.xpm
 delete mode 100644 app/bin/bitmaps/pan.xpm
 create mode 100644 app/bin/bitmaps/parameter.xpm
 create mode 100644 app/bin/bitmaps/paste.xpm
 create mode 100644 app/bin/bitmaps/pause.xpm
 create mode 100644 app/bin/bitmaps/polygon.xpm
 create mode 100644 app/bin/bitmaps/polyline.xpm
 create mode 100644 app/bin/bitmaps/protractor.xpm
 delete mode 100644 app/bin/bitmaps/pull.xpm
 create mode 100644 app/bin/bitmaps/redo.xpm
 create mode 100644 app/bin/bitmaps/reflect.xpm
 create mode 100644 app/bin/bitmaps/snap-curs.xpm
 create mode 100644 app/bin/bitmaps/snap-grid.xpm
 delete mode 100644 app/bin/bitmaps/snapcurs.xbm
 delete mode 100644 app/bin/bitmaps/snapvis.xbm
 create mode 100644 app/bin/bitmaps/split-draw.xpm
 create mode 100644 app/bin/bitmaps/split.xpm
 delete mode 100644 app/bin/bitmaps/splittrk.xpm
 create mode 100644 app/bin/bitmaps/sticky-doc.xpm
 create mode 100644 app/bin/bitmaps/sticky-link.xpm
 delete mode 100644 app/bin/bitmaps/sticky-note-chain.xpm
 delete mode 100644 app/bin/bitmaps/sticky-note-clip.xpm
 delete mode 100644 app/bin/bitmaps/sticky-note-text.xpm
 create mode 100644 app/bin/bitmaps/sticky-note.xpm
 create mode 100644 app/bin/bitmaps/straight-line.xpm
 create mode 100644 app/bin/bitmaps/switch-ai.xpm
 create mode 100644 app/bin/bitmaps/table-edge.xpm
 create mode 100644 app/bin/bitmaps/top.xpm
 create mode 100644 app/bin/bitmaps/trim.xpm
 create mode 100644 app/bin/bitmaps/turnout-designer.xpm
 create mode 100644 app/bin/bitmaps/turntable.xpm
 delete mode 100644 app/bin/bitmaps/turntbl.xpm
 create mode 100644 app/bin/bitmaps/undo.xpm
 create mode 100644 app/bin/bitmaps/zoom-choose.xpm
 create mode 100644 app/bin/bitmaps/zoom-extent.xpm
 create mode 100644 app/bin/bitmaps/zoom-in.xpm
 create mode 100644 app/bin/bitmaps/zoom-out.xpm
 delete mode 100644 app/bin/bitmaps/zoom.xpm
 delete mode 100644 app/bin/bitmaps/zoomin.xpm
 delete mode 100644 app/bin/bitmaps/zoomout.xpm

(limited to 'app/bin/bitmaps')

diff --git a/app/bin/bitmaps/16pix/bridge.png b/app/bin/bitmaps/16pix/bridge.png
new file mode 100644
index 0000000..ebcde0a
Binary files /dev/null and b/app/bin/bitmaps/16pix/bridge.png differ
diff --git a/app/bin/bitmaps/16pix/circle-center.png b/app/bin/bitmaps/16pix/circle-center.png
new file mode 100644
index 0000000..062560d
Binary files /dev/null and b/app/bin/bitmaps/16pix/circle-center.png differ
diff --git a/app/bin/bitmaps/16pix/circle-tangent.png b/app/bin/bitmaps/16pix/circle-tangent.png
new file mode 100644
index 0000000..0dc831b
Binary files /dev/null and b/app/bin/bitmaps/16pix/circle-tangent.png differ
diff --git a/app/bin/bitmaps/16pix/circle.png b/app/bin/bitmaps/16pix/circle.png
new file mode 100644
index 0000000..eaecd31
Binary files /dev/null and b/app/bin/bitmaps/16pix/circle.png differ
diff --git a/app/bin/bitmaps/16pix/curved-chord.png b/app/bin/bitmaps/16pix/curved-chord.png
new file mode 100644
index 0000000..0068d1a
Binary files /dev/null and b/app/bin/bitmaps/16pix/curved-chord.png differ
diff --git a/app/bin/bitmaps/16pix/curved-end.png b/app/bin/bitmaps/16pix/curved-end.png
new file mode 100644
index 0000000..49dcee3
Binary files /dev/null and b/app/bin/bitmaps/16pix/curved-end.png differ
diff --git a/app/bin/bitmaps/16pix/curved-middle.png b/app/bin/bitmaps/16pix/curved-middle.png
new file mode 100644
index 0000000..d23a6a2
Binary files /dev/null and b/app/bin/bitmaps/16pix/curved-middle.png differ
diff --git a/app/bin/bitmaps/16pix/curved-tangent.png b/app/bin/bitmaps/16pix/curved-tangent.png
new file mode 100644
index 0000000..6d8fcfe
Binary files /dev/null and b/app/bin/bitmaps/16pix/curved-tangent.png differ
diff --git a/app/bin/bitmaps/16pix/description.png b/app/bin/bitmaps/16pix/description.png
new file mode 100644
index 0000000..9bd679c
Binary files /dev/null and b/app/bin/bitmaps/16pix/description.png differ
diff --git a/app/bin/bitmaps/16pix/elevation.png b/app/bin/bitmaps/16pix/elevation.png
new file mode 100644
index 0000000..9121d56
Binary files /dev/null and b/app/bin/bitmaps/16pix/elevation.png differ
diff --git a/app/bin/bitmaps/16pix/exit.png b/app/bin/bitmaps/16pix/exit.png
new file mode 100644
index 0000000..ba227c3
Binary files /dev/null and b/app/bin/bitmaps/16pix/exit.png differ
diff --git a/app/bin/bitmaps/16pix/palette.png b/app/bin/bitmaps/16pix/palette.png
new file mode 100644
index 0000000..efcf3d3
Binary files /dev/null and b/app/bin/bitmaps/16pix/palette.png differ
diff --git a/app/bin/bitmaps/16pix/pan-zoom.png b/app/bin/bitmaps/16pix/pan-zoom.png
new file mode 100644
index 0000000..04d18f7
Binary files /dev/null and b/app/bin/bitmaps/16pix/pan-zoom.png differ
diff --git a/app/bin/bitmaps/16pix/select.png b/app/bin/bitmaps/16pix/select.png
new file mode 100644
index 0000000..39605d1
Binary files /dev/null and b/app/bin/bitmaps/16pix/select.png differ
diff --git a/app/bin/bitmaps/16pix/snap-curs.png b/app/bin/bitmaps/16pix/snap-curs.png
new file mode 100644
index 0000000..acf8f66
Binary files /dev/null and b/app/bin/bitmaps/16pix/snap-curs.png differ
diff --git a/app/bin/bitmaps/16pix/snap-grid.png b/app/bin/bitmaps/16pix/snap-grid.png
new file mode 100644
index 0000000..381b451
Binary files /dev/null and b/app/bin/bitmaps/16pix/snap-grid.png differ
diff --git a/app/bin/bitmaps/24pix/description.png b/app/bin/bitmaps/24pix/description.png
new file mode 100644
index 0000000..e273ed5
Binary files /dev/null and b/app/bin/bitmaps/24pix/description.png differ
diff --git a/app/bin/bitmaps/24pix/exit.png b/app/bin/bitmaps/24pix/exit.png
new file mode 100644
index 0000000..d3ebf2f
Binary files /dev/null and b/app/bin/bitmaps/24pix/exit.png differ
diff --git a/app/bin/bitmaps/24pix/pan-zoom.png b/app/bin/bitmaps/24pix/pan-zoom.png
new file mode 100644
index 0000000..67ab631
Binary files /dev/null and b/app/bin/bitmaps/24pix/pan-zoom.png differ
diff --git a/app/bin/bitmaps/24pix/snap-curs.png b/app/bin/bitmaps/24pix/snap-curs.png
new file mode 100644
index 0000000..15154a2
Binary files /dev/null and b/app/bin/bitmaps/24pix/snap-curs.png differ
diff --git a/app/bin/bitmaps/24pix/snap-grid.png b/app/bin/bitmaps/24pix/snap-grid.png
new file mode 100644
index 0000000..3073985
Binary files /dev/null and b/app/bin/bitmaps/24pix/snap-grid.png differ
diff --git a/app/bin/bitmaps/Info.xpm b/app/bin/bitmaps/Info.xpm
new file mode 100644
index 0000000..c4fa897
--- /dev/null
+++ b/app/bin/bitmaps/Info.xpm
@@ -0,0 +1,116 @@
+static char *Info_x16[] = {
+	"16 16 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#3366FF",
+	"3	c	#6666FF",
+	"4	c	#6699FF",
+	"5	c	#9999FF",
+	"6	c	#99CCFF",
+	"7	c	#CCCCFF",
+	"8	c	#CCFFFF",
+	"9	c	#FFFFFF",
+	"                ",
+	"     122221     ",
+	"    25799763    ",
+	"   3899999994   ",
+	"  289994299993  ",
+	" 15999922999973 ",
+	" 27999912999992 ",
+	" 29999942999992 ",
+	" 29999954999992 ",
+	" 27999976999992 ",
+	" 26999999999972 ",
+	"  299994299994  ",
+	"  149997699952  ",
+	"   2379999833   ",
+	"     223312     ",
+	"                "};
+
+static char *Info_x24[] = {
+	"24 24 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#3366FF",
+	"3	c	#6666FF",
+	"4	c	#6699FF",
+	"5	c	#9999FF",
+	"6	c	#99CCFF",
+	"7	c	#CCCCFF",
+	"8	c	#CCFFFF",
+	"9	c	#FFFFFF",
+	"                        ",
+	"         111111         ",
+	"       1111111111       ",
+	"     11115777762111     ",
+	"    1114999999995111    ",
+	"    11799994499997211   ",
+	"   116999971179999811   ",
+	"  11499999611599999511  ",
+	"  119999995114999999211 ",
+	" 1159999996114999999611 ",
+	" 1179999996114999999711 ",
+	" 1179999997115999999911 ",
+	" 1179999999117999999911 ",
+	" 1179999999117999999811 ",
+	" 1159999999529999999711 ",
+	"  129999999779999999511 ",
+	"  11599999711599999711  ",
+	"   1179999211199999211  ",
+	"   114999971149999511   ",
+	"    1127999779997311    ",
+	"     11157999975111     ",
+	"      111111111111      ",
+	"        11111111        ",
+	"                        "};
+
+static char *Info_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#3366FF",
+	"3	c	#6666FF",
+	"4	c	#6699FF",
+	"5	c	#9999FF",
+	"6	c	#99CCFF",
+	"7	c	#CCCCFF",
+	"8	c	#CCFFFF",
+	"9	c	#FFFFFF",
+	"                                ",
+	"               11               ",
+	"          111111111111          ",
+	"        1111111111111111        ",
+	"       111111577775211111       ",
+	"      11114799999999751111      ",
+	"     1111799999779999972111     ",
+	"    111279999971179999994111    ",
+	"    1117999999411299999992111   ",
+	"   11179999999111199999997111   ",
+	"   113999999971111799999994111  ",
+	"  1117999999971111799999997111  ",
+	"  1119999999991111799999999411  ",
+	"  11499999999911117999999996111 ",
+	"  11599999999911117999999997111 ",
+	" 111799999999931119999999997111 ",
+	"  11799999999951119999999999111 ",
+	"  11699999999971149999999997111 ",
+	"  11599999999971159999999997111 ",
+	"  1129999999999317999999999511  ",
+	"  1117999999999979999999999111  ",
+	"  1114999999995114999999997111  ",
+	"   11179999997111179999999211   ",
+	"   11139999997111159999995111   ",
+	"    111499999911117999996111    ",
+	"     1114999997557999995111     ",
+	"      111279999999999731111     ",
+	"       111126799998731111       ",
+	"        1111111111111111        ",
+	"          111111111111          ",
+	"            11111111            ",
+	"                                "};
+
+static char **Info_xpm[3] = { Info_x16, Info_x24, Info_x32 };
+
diff --git a/app/bin/bitmaps/SVG/Info.svg b/app/bin/bitmaps/SVG/Info.svg
new file mode 100644
index 0000000..979601d
--- /dev/null
+++ b/app/bin/bitmaps/SVG/Info.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24 24"
+   style="enable-background:new 0 0 24 24;"
+   xml:space="preserve"
+   sodipodi:docname="Info.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata15"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs13" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1225"
+   inkscape:window-height="900"
+   id="namedview11"
+   showgrid="false"
+   inkscape:zoom="18.981108"
+   inkscape:cx="12.697376"
+   inkscape:cy="12"
+   inkscape:window-x="509"
+   inkscape:window-y="7"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFFFFF;stroke:#005CFE;stroke-miterlimit:10;}
+	.st1{fill:#00BEFC;stroke:#005CFE;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:#00AFFD;stroke:#005CFE;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<ellipse
+   transform="matrix(0.03517289,-0.99938124,0.99934733,0.03612357,0,0)"
+   class="st0"
+   cx="-11.55869"
+   cy="12.414656"
+   id="ellipse4"
+   style="stroke-width:2.09873;stroke-miterlimit:10;stroke-dasharray:none"
+   rx="9.9303188"
+   ry="9.7989435" />
+<path
+   class="st1"
+   d="m 13,17.344792 c 0,0.468616 -0.4,0.937232 -1,0.937232 -0.5,0 -1,-0.374893 -1,-0.937232 0,-0.562339 0.4,-0.937232 1,-0.937232 0.5,0.09372 1,0.468616 1,0.937232 z"
+   id="path6" />
+<path
+   class="st2"
+   d="m 12.01408,14.088782 c 0,0 -0.480201,-1.868907 -0.761396,-3.822605 -0.529551,-3.6792392 0.661396,-4.5482251 0.661396,-4.5482251 0,0 1.226159,0.9594783 0.796656,4.5532561 -0.255236,2.135635 -0.696656,3.817574 -0.696656,3.817574 z"
+   id="path8"
+   sodipodi:nodetypes="cscsc"
+   style="stroke-linejoin:round" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-broad.svg b/app/bin/bitmaps/SVG/NotUsed/ease-broad.svg
new file mode 100644
index 0000000..fadc6df
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-broad.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="ease-broad.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata15"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs13" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1555"
+   inkscape:window-height="828"
+   id="namedview11"
+   showgrid="false"
+   inkscape:zoom="7.6695312"
+   inkscape:cx="41.461112"
+   inkscape:cy="27.685221"
+   inkscape:window-x="166"
+   inkscape:window-y="170"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st1{font-family:'MyriadPro-Regular';}
+	.st2{font-size:14px;}
+</style>
+<text
+   transform="scale(1.0348781,0.96629742)"
+   id="text8"
+   x="-0.08601547"
+   y="19.259062"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.9881px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.03629"><tspan
+     x="-0.08601547"
+     y="19.259062"
+     class="st0 st1 st2"
+     id="tspan4"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.9881px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Easement </tspan><tspan
+     x="16.575085"
+     y="43.812256"
+     class="st0 st1 st2"
+     id="tspan6"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.9881px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Broad</tspan></text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg b/app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg
new file mode 100644
index 0000000..df906a9
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="ease-cornu.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata876"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs874" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1398"
+   inkscape:window-height="732"
+   id="namedview872"
+   showgrid="false"
+   inkscape:zoom="3.8254353"
+   inkscape:cx="40.172441"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style859">
+	.st0{fill:none;stroke:#F7931E;stroke-miterlimit:10;}
+	.st1{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st2{font-family:'MyriadPro-Regular';}
+	.st3{font-size:14px;}
+	.st4{fill:none;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="M13.2,28.5c-0.8,0.4-1.1,1.3-0.7,2.1c0.5,1,1.7,1.4,2.7,0.9c1.2-0.6,1.7-2.1,1.1-3.3c-0.8-1.5-2.6-2.1-4.2-1.4  c-1.9,1-2.7,3.3-1.7,5.2c1.2,2.4,4.1,3.3,6.5,2.1c3-1.5,4.2-5.1,2.7-8.1c-1.9-3.7-6.4-5.2-10.1-3.3c-4.7,2.3-6.5,9-4.2,13.7  c2.9,5.8,10.6,5.4,15.9,4.2c4.1-1.1,22.6-6.1,22.6-6.1l8.1-2.4c0,0,18-5.1,22.1-6.4c5.2-1.5,12.9-1.3,16.1,4.4  c2.6,4.5,1,10.3-3.5,12.9c-3.6,2.1-8.2,0.8-10.3-2.8c-1.7-2.9-0.6-6.6,2.3-8.2c2.3-1.3,5.3-0.5,6.6,1.8c1.1,1.9,0.4,4.2-1.4,5.3  c-1.5,0.8-3.4,0.3-4.2-1.2c-0.7-1.2-0.3-2.7,0.9-3.4c0.9-0.5,2.2-0.2,2.7,0.7c0.4,0.8,0.2,1.7-0.6,2.2"
+   id="path861" />
+
+<path
+   class="st4"
+   d="M73.8,28.6"
+   id="path869" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg b/app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg
new file mode 100644
index 0000000..9b2f26d
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="ease-gt-broad.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata15"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs13" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1561"
+   inkscape:window-height="828"
+   id="namedview11"
+   showgrid="false"
+   inkscape:zoom="7.6695312"
+   inkscape:cx="46.310737"
+   inkscape:cy="32.900664"
+   inkscape:window-x="219"
+   inkscape:window-y="132"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st1{font-family:'MyriadPro-Regular';}
+	.st2{font-size:14px;}
+</style>
+
+<text
+   xml:space="preserve"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Tahoma;-inkscape-font-specification:'Tahoma, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+   x="8.6054811"
+   y="42.636246"
+   id="text1429"><tspan
+     sodipodi:role="line"
+     id="tspan1427"
+     x="8.6054811"
+     y="42.636246">&gt; Broad</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:1.25;font-family:Tahoma;-inkscape-font-specification:'Tahoma, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+   x="1.434247"
+   y="20.079454"
+   id="text1433"><tspan
+     sodipodi:role="line"
+     id="tspan1431"
+     x="1.434247"
+     y="20.079454">Easement</tspan></text></svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg b/app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg
new file mode 100644
index 0000000..77031f6
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="Easement-Sharp.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata2655"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2653" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1540"
+   inkscape:window-height="857"
+   id="namedview2651"
+   showgrid="false"
+   inkscape:zoom="8.2200207"
+   inkscape:cx="42.464734"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2642">
+	.st0{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st1{font-family:'MyriadPro-Regular';}
+	.st2{font-size:14px;}
+</style>
+<text
+   transform="scale(1.1867603,0.84263014)"
+   id="text2648"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.18676"
+   x="3.2132704"
+   y="23.310022"><tspan
+     x="3.2132704"
+     y="23.310022"
+     class="st0 st1 st2"
+     id="tspan2644"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Easement </tspan><tspan
+     x="17.098368"
+     y="43.247597"
+     class="st0 st1 st2"
+     id="tspan2646"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Sharp</tspan></text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg b/app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg
new file mode 100644
index 0000000..3022616
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="ease-lt-broad.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata15"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs13" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1557"
+   inkscape:window-height="828"
+   id="namedview11"
+   showgrid="false"
+   inkscape:zoom="8.5185912"
+   inkscape:cx="47.999985"
+   inkscape:cy="23.061186"
+   inkscape:window-x="219"
+   inkscape:window-y="132"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st1{font-family:'MyriadPro-Regular';}
+	.st2{font-size:14px;}
+</style>
+
+<text
+   xml:space="preserve"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.4906px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;stroke:none;stroke-width:1.09316;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   x="8.7710075"
+   y="16.856054"
+   id="text848"
+   transform="scale(0.91477909,1.0931601)"><tspan
+     sodipodi:role="line"
+     id="tspan846"
+     x="8.7710075"
+     y="16.856054"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;stroke-width:1.09316">Easement</tspan><tspan
+     sodipodi:role="line"
+     x="8.7710075"
+     y="38.719307"
+     id="tspan850"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;stroke-width:1.09316"> &lt; Broad</tspan></text></svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg b/app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg
new file mode 100644
index 0000000..77031f6
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="Easement-Sharp.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata2655"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2653" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1540"
+   inkscape:window-height="857"
+   id="namedview2651"
+   showgrid="false"
+   inkscape:zoom="8.2200207"
+   inkscape:cx="42.464734"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2642">
+	.st0{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st1{font-family:'MyriadPro-Regular';}
+	.st2{font-size:14px;}
+</style>
+<text
+   transform="scale(1.1867603,0.84263014)"
+   id="text2648"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.18676"
+   x="3.2132704"
+   y="23.310022"><tspan
+     x="3.2132704"
+     y="23.310022"
+     class="st0 st1 st2"
+     id="tspan2644"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Easement </tspan><tspan
+     x="17.098368"
+     y="43.247597"
+     class="st0 st1 st2"
+     id="tspan2646"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Sharp</tspan></text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-none.svg b/app/bin/bitmaps/SVG/NotUsed/ease-none.svg
new file mode 100644
index 0000000..75fa776
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-none.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="Easement-None.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata1473"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1471" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1600"
+   inkscape:window-height="784"
+   id="namedview1469"
+   showgrid="false"
+   inkscape:zoom="8.2200207"
+   inkscape:cx="48"
+   inkscape:cy="27.685221"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style1460">
+	.st0{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st1{font-family:'MyriadPro-Regular';}
+	.st2{font-size:14px;}
+</style>
+<text
+   transform="scale(1.1867603,0.84263015)"
+   id="text1466"
+   x="4.3408761"
+   y="24.176271"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.18676"><tspan
+     x="4.3408761"
+     y="24.176271"
+     class="st0 st1 st2"
+     id="tspan1462"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Easement </tspan><tspan
+     x="19.531406"
+     y="44.113842"
+     class="st0 st1 st2"
+     id="tspan1464"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">None</tspan></text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-normal.svg b/app/bin/bitmaps/SVG/NotUsed/ease-normal.svg
new file mode 100644
index 0000000..3e94707
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-normal.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="Easement-Normal.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata2064"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2062" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1538"
+   inkscape:window-height="857"
+   id="namedview2060"
+   showgrid="false"
+   inkscape:zoom="7.6695312"
+   inkscape:cx="42.464734"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2051">
+	.st0{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st1{font-family:'MyriadPro-Regular';}
+	.st2{font-size:14px;}
+</style>
+<text
+   transform="scale(1.1867603,0.84263014)"
+   id="text2057"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.18676"
+   x="2.7634513"
+   y="24.342073"><tspan
+     x="2.7634513"
+     y="24.342073"
+     class="st0 st1 st2"
+     id="tspan2053"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Easement </tspan><tspan
+     x="11.070774"
+     y="44.27964"
+     class="st0 st1 st2"
+     id="tspan2055"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Normal</tspan></text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg b/app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg
new file mode 100644
index 0000000..77031f6
--- /dev/null
+++ b/app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 96 48"
+   style="enable-background:new 0 0 96 48;"
+   xml:space="preserve"
+   sodipodi:docname="Easement-Sharp.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata2655"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2653" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1540"
+   inkscape:window-height="857"
+   id="namedview2651"
+   showgrid="false"
+   inkscape:zoom="8.2200207"
+   inkscape:cx="42.464734"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2642">
+	.st0{fill:#0090FC;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st1{font-family:'MyriadPro-Regular';}
+	.st2{font-size:14px;}
+</style>
+<text
+   transform="scale(1.1867603,0.84263014)"
+   id="text2648"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.18676"
+   x="3.2132704"
+   y="23.310022"><tspan
+     x="3.2132704"
+     y="23.310022"
+     class="st0 st1 st2"
+     id="tspan2644"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Easement </tspan><tspan
+     x="17.098368"
+     y="43.247597"
+     class="st0 st1 st2"
+     id="tspan2646"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Calibri;-inkscape-font-specification:'Calibri, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">Sharp</tspan></text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/background.svg b/app/bin/bitmaps/SVG/background.svg
new file mode 100644
index 0000000..4856eac
--- /dev/null
+++ b/app/bin/bitmaps/SVG/background.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="background.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata23"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs21" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1391"
+   inkscape:window-height="949"
+   id="namedview19"
+   showgrid="false"
+   inkscape:snap-nodes="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="23.903852"
+   inkscape:cy="23.995614"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FF8200;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:#FF8200;}
+	.st2{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+
+<rect
+   style="fill:#c3a88f;fill-opacity:1;stroke:#000000;stroke-width:1.35834;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
+   id="rect838"
+   width="44.851173"
+   height="44.803501"
+   x="1.5744133"
+   y="1.5982494"
+   ry="0.17218179" /><path
+   style="fill:#dbba97;fill-opacity:1;stroke:none;stroke-width:1.52011px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="m 32.777013,18.174801 c -4.157865,0.903053 -7.696832,2.631511 -10.739238,5.022215 -4.639351,3.822421 -4.528826,7.116944 -6.136711,10.602452 -0.780291,3.794007 0.03684,6.389656 2.231529,7.951842 4.251402,1.505827 8.952585,1.886909 13.947067,1.534565 5.358135,-1.22642 6.897492,-4.362714 8.64718,-7.393815 1.69377,-4.003568 3.15454,-8.045977 2.649944,-12.416033 -2.302846,-2.690118 -5.339428,-4.829793 -10.599771,-5.301226 z"
+   id="path842"
+   sodipodi:nodetypes="cccccccc" /><path
+   style="fill:#56c3f5;fill-opacity:1;stroke:none;stroke-width:1.37152px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 2.1564527,25.837385 V 2.5176282 L 27.76259,2.3858789 l -1.803248,8.5637491 -7.693863,6.192253 -8.8960277,2.50325 -3.4862828,4.874752 z"
+   id="path844" /><path
+   style="fill:#e8d2bc;fill-opacity:1;stroke:none;stroke-width:1.3392px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="m 32.210606,25.083687 c -4.263344,2.518472 -5.063624,3.679963 -6.972564,5.275878 -1.696817,2.010047 -1.986404,3.38991 -1.442598,4.396562 1.270215,2.935761 3.010079,2.436341 4.568231,3.266019 2.510399,-0.677969 4.771475,-1.681583 6.010831,-4.019716 0.814054,-1.508562 1.38896,-3.391959 1.562814,-5.903956 -0.557331,-1.60132 -1.277486,-3.060858 -3.726714,-3.014787 z"
+   id="path846"
+   sodipodi:nodetypes="ccccccc" /><path
+   sodipodi:type="star"
+   style="fill:#2f8e42;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path848-6"
+   sodipodi:sides="8"
+   sodipodi:cx="-6.4232998"
+   sodipodi:cy="-6.5150614"
+   sodipodi:r1="2.8626306"
+   sodipodi:r2="3.6571999"
+   sodipodi:arg1="0.69302282"
+   sodipodi:arg2="1.085722"
+   inkscape:flatsided="false"
+   inkscape:rounded="0.2"
+   inkscape:randomized="0"
+   transform="matrix(1.5067484,0,0,1.4293975,17.484929,49.907452)"
+   d="m -4.2210255,-4.6862251 c -0.1905998,0.2295192 -0.2330922,1.2673614 -0.4970167,1.4064701 -0.2639243,0.1391086 -1.1441281,-0.4124009 -1.441197,-0.3848808 -0.297069,0.02752 -1.0609809,0.7313388 -1.3459684,0.6430807 -0.2849874,-0.088258 -0.5174093,-1.1006322 -0.7469284,-1.291232 -0.2295192,-0.1905998 -1.2673614,-0.2330922 -1.4064702,-0.4970167 -0.1391086,-0.2639243 0.412401,-1.1441281 0.3848808,-1.441197 -0.02752,-0.297069 -0.7313386,-1.0609809 -0.6430807,-1.3459684 0.088258,-0.2849874 1.1006323,-0.5174093 1.291232,-0.7469284 0.1905999,-0.2295192 0.2330922,-1.2673614 0.4970167,-1.4064701 0.2639243,-0.1391087 1.1441282,0.4124009 1.441197,0.3848807 0.297069,-0.02752 1.060981,-0.731339 1.3459685,-0.643081 0.2849873,0.088258 0.5174092,1.1006326 0.7469284,1.2912323 0.2295191,0.1905999 1.2673614,0.2330922 1.4064701,0.4970167 0.1391086,0.2639244 -0.4124009,1.1441282 -0.3848808,1.4411971 0.02752,0.297069 0.7313388,1.0609809 0.6430807,1.3459684 -0.088258,0.2849873 -1.1006323,0.5174093 -1.291232,0.7469284 z" /><path
+   sodipodi:type="star"
+   style="fill:#35a559;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path848-6-3"
+   sodipodi:sides="8"
+   sodipodi:cx="-6.4232998"
+   sodipodi:cy="-6.5150614"
+   sodipodi:r1="2.8626306"
+   sodipodi:r2="3.6571999"
+   sodipodi:arg1="0.69302282"
+   sodipodi:arg2="1.085722"
+   inkscape:flatsided="false"
+   inkscape:rounded="0.2"
+   inkscape:randomized="0"
+   transform="matrix(1.2663948,0,0,1.4473368,20.46062,35.996562)"
+   d="m -4.2210255,-4.6862251 c -0.1905998,0.2295192 -0.2330922,1.2673614 -0.4970167,1.4064701 -0.2639243,0.1391086 -1.1441281,-0.4124009 -1.441197,-0.3848808 -0.297069,0.02752 -1.0609809,0.7313388 -1.3459684,0.6430807 -0.2849874,-0.088258 -0.5174093,-1.1006322 -0.7469284,-1.291232 -0.2295192,-0.1905998 -1.2673614,-0.2330922 -1.4064702,-0.4970167 -0.1391086,-0.2639243 0.412401,-1.1441281 0.3848808,-1.441197 -0.02752,-0.297069 -0.7313386,-1.0609809 -0.6430807,-1.3459684 0.088258,-0.2849874 1.1006323,-0.5174093 1.291232,-0.7469284 0.1905999,-0.2295192 0.2330922,-1.2673614 0.4970167,-1.4064701 0.2639243,-0.1391087 1.1441282,0.4124009 1.441197,0.3848807 0.297069,-0.02752 1.060981,-0.731339 1.3459685,-0.643081 0.2849873,0.088258 0.5174092,1.1006326 0.7469284,1.2912323 0.2295191,0.1905999 1.2673614,0.2330922 1.4064701,0.4970167 0.1391086,0.2639244 -0.4124009,1.1441282 -0.3848808,1.4411971 0.02752,0.297069 0.7313388,1.0609809 0.6430807,1.3459684 -0.088258,0.2849873 -1.1006323,0.5174093 -1.291232,0.7469284 z" /><path
+   sodipodi:type="star"
+   style="fill:#2bbf4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path848-6-8"
+   sodipodi:sides="8"
+   sodipodi:cx="-6.4232998"
+   sodipodi:cy="-6.5150614"
+   sodipodi:r1="2.8626306"
+   sodipodi:r2="3.6571999"
+   sodipodi:arg1="0.69302282"
+   sodipodi:arg2="1.085722"
+   inkscape:flatsided="false"
+   inkscape:rounded="0.2"
+   inkscape:randomized="0"
+   transform="matrix(1.4380759,0,0,1.5370329,27.091592,46.182324)"
+   d="m -4.2210255,-4.6862251 c -0.1905998,0.2295192 -0.2330922,1.2673614 -0.4970167,1.4064701 -0.2639243,0.1391086 -1.1441281,-0.4124009 -1.441197,-0.3848808 -0.297069,0.02752 -1.0609809,0.7313388 -1.3459684,0.6430807 -0.2849874,-0.088258 -0.5174093,-1.1006322 -0.7469284,-1.291232 -0.2295192,-0.1905998 -1.2673614,-0.2330922 -1.4064702,-0.4970167 -0.1391086,-0.2639243 0.412401,-1.1441281 0.3848808,-1.441197 -0.02752,-0.297069 -0.7313386,-1.0609809 -0.6430807,-1.3459684 0.088258,-0.2849874 1.1006323,-0.5174093 1.291232,-0.7469284 0.1905999,-0.2295192 0.2330922,-1.2673614 0.4970167,-1.4064701 0.2639243,-0.1391087 1.1441282,0.4124009 1.441197,0.3848807 0.297069,-0.02752 1.060981,-0.731339 1.3459685,-0.643081 0.2849873,0.088258 0.5174092,1.1006326 0.7469284,1.2912323 0.2295191,0.1905999 1.2673614,0.2330922 1.4064701,0.4970167 0.1391086,0.2639244 -0.4124009,1.1441282 -0.3848808,1.4411971 0.02752,0.297069 0.7313388,1.0609809 0.6430807,1.3459684 -0.088258,0.2849873 -1.1006323,0.5174093 -1.291232,0.7469284 z" /><path
+   sodipodi:type="star"
+   style="opacity:1;fill:#2f9043;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path848-6-2"
+   sodipodi:sides="8"
+   sodipodi:cx="-6.4232998"
+   sodipodi:cy="-6.5150614"
+   sodipodi:r1="2.8626306"
+   sodipodi:r2="3.6571999"
+   sodipodi:arg1="0.69302282"
+   sodipodi:arg2="1.085722"
+   inkscape:flatsided="false"
+   inkscape:rounded="0.2"
+   inkscape:randomized="0"
+   transform="matrix(1.4552441,0,0,1.4473369,44.576027,19.07371)"
+   d="m -4.2210255,-4.6862251 c -0.1905998,0.2295192 -0.2330922,1.2673614 -0.4970167,1.4064701 -0.2639243,0.1391086 -1.1441281,-0.4124009 -1.441197,-0.3848808 -0.297069,0.02752 -1.0609809,0.7313388 -1.3459684,0.6430807 -0.2849874,-0.088258 -0.5174093,-1.1006322 -0.7469284,-1.291232 -0.2295192,-0.1905998 -1.2673614,-0.2330922 -1.4064702,-0.4970167 -0.1391086,-0.2639243 0.412401,-1.1441281 0.3848808,-1.441197 -0.02752,-0.297069 -0.7313386,-1.0609809 -0.6430807,-1.3459684 0.088258,-0.2849874 1.1006323,-0.5174093 1.291232,-0.7469284 0.1905999,-0.2295192 0.2330922,-1.2673614 0.4970167,-1.4064701 0.2639243,-0.1391087 1.1441282,0.4124009 1.441197,0.3848807 0.297069,-0.02752 1.060981,-0.731339 1.3459685,-0.643081 0.2849873,0.088258 0.5174092,1.1006326 0.7469284,1.2912323 0.2295191,0.1905999 1.2673614,0.2330922 1.4064701,0.4970167 0.1391086,0.2639244 -0.4124009,1.1441282 -0.3848808,1.4411971 0.02752,0.297069 0.7313388,1.0609809 0.6430807,1.3459684 -0.088258,0.2849873 -1.1006323,0.5174093 -1.291232,0.7469284 z" /><path
+   sodipodi:type="star"
+   style="fill:#2bbf4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path848-6-1"
+   sodipodi:sides="8"
+   sodipodi:cx="-6.4232998"
+   sodipodi:cy="-6.5150614"
+   sodipodi:r1="2.8626306"
+   sodipodi:r2="3.6571999"
+   sodipodi:arg1="0.69302282"
+   sodipodi:arg2="1.085722"
+   inkscape:flatsided="false"
+   inkscape:rounded="0.2"
+   inkscape:randomized="0"
+   transform="matrix(1.5067484,0,0,1.4293975,37.145326,26.702193)"
+   d="m -4.2210255,-4.6862251 c -0.1905998,0.2295192 -0.2330922,1.2673614 -0.4970167,1.4064701 -0.2639243,0.1391086 -1.1441281,-0.4124009 -1.441197,-0.3848808 -0.297069,0.02752 -1.0609809,0.7313388 -1.3459684,0.6430807 -0.2849874,-0.088258 -0.5174093,-1.1006322 -0.7469284,-1.291232 -0.2295192,-0.1905998 -1.2673614,-0.2330922 -1.4064702,-0.4970167 -0.1391086,-0.2639243 0.412401,-1.1441281 0.3848808,-1.441197 -0.02752,-0.297069 -0.7313386,-1.0609809 -0.6430807,-1.3459684 0.088258,-0.2849874 1.1006323,-0.5174093 1.291232,-0.7469284 0.1905999,-0.2295192 0.2330922,-1.2673614 0.4970167,-1.4064701 0.2639243,-0.1391087 1.1441282,0.4124009 1.441197,0.3848807 0.297069,-0.02752 1.060981,-0.731339 1.3459685,-0.643081 0.2849873,0.088258 0.5174092,1.1006326 0.7469284,1.2912323 0.2295191,0.1905999 1.2673614,0.2330922 1.4064701,0.4970167 0.1391086,0.2639244 -0.4124009,1.1441282 -0.3848808,1.4411971 0.02752,0.297069 0.7313388,1.0609809 0.6430807,1.3459684 -0.088258,0.2849873 -1.1006323,0.5174093 -1.291232,0.7469284 z" /></svg>
diff --git a/app/bin/bitmaps/SVG/benchwork.svg b/app/bin/bitmaps/SVG/benchwork.svg
new file mode 100644
index 0000000..1562ae3
--- /dev/null
+++ b/app/bin/bitmaps/SVG/benchwork.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="benchwork.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata23"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs21" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1352"
+   inkscape:window-height="949"
+   id="namedview19"
+   showgrid="false"
+   inkscape:snap-nodes="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="23.879304"
+   inkscape:cy="24.478283"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FF8200;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:#FF8200;}
+	.st2{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:10;}
+</style>
+<path
+   style="fill:#ff8200;fill-opacity:1;stroke:none;stroke-width:1.404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 8.5262885,15.440457 28.146087,1.6811615 38.776901,1.7919341 19.758367,15.440457 H 8.5262885"
+   id="path2655"
+   sodipodi:nodetypes="ccccc" /><rect
+   x="8.526289"
+   y="15.440457"
+   class="st0"
+   width="11.232078"
+   height="30.888212"
+   id="rect4"
+   style="stroke-width:1.55649;stroke-miterlimit:10;stroke-dasharray:none" />
+<polygon
+   class="st1"
+   points="37,29.4 24,39.5 24,17.8 37,8.1 "
+   id="polygon6"
+   transform="matrix(1.4040097,0,0,1.4040097,-13.23586,-9.1297125)" />
+<line
+   class="st2"
+   x1="19.758366"
+   y1="15.440457"
+   x2="38.712502"
+   y2="2.2427664"
+   id="line8"
+   style="stroke-width:1.55649;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st3"
+   d="M 40.256907,31.586568"
+   id="path10"
+   style="stroke-width:1.404" />
+<path
+   class="st3"
+   d="M 19.758367,46.890273"
+   id="path12"
+   style="stroke-width:1.404" />
+<line
+   class="st2"
+   x1="8.5213375"
+   y1="15.013557"
+   x2="28.155918"
+   y2="1.6713308"
+   id="line14"
+   style="stroke-width:1.55649;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none" />
+
+<path
+   style="fill:none;stroke:#000000;stroke-width:1.55649;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 20.106958,46.262547 38.702489,31.854252"
+   id="path848" /></svg>
diff --git a/app/bin/bitmaps/SVG/bezier-line.svg b/app/bin/bitmaps/SVG/bezier-line.svg
new file mode 100644
index 0000000..df4232b
--- /dev/null
+++ b/app/bin/bitmaps/SVG/bezier-line.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="bezier-line.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata1498"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1496" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1447"
+   inkscape:window-height="957"
+   id="namedview1494"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="23.959168"
+   inkscape:cy="28.551342"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style1477">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FE0000;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="m 2.5330556,42.626221 c 25.6476684,0 22.1392604,-36.7937448 42.9477454,-36.7937448"
+   id="path1479"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st1"
+   d="M 11.848483,31.072088"
+   id="path1481"
+   style="stroke-width:1.16495" />
+<path
+   class="st1"
+   d="M 18.502359,38.251356"
+   id="path1483"
+   style="stroke-width:1.16495" />
+<line
+   class="st2"
+   x1="45.480801"
+   y1="5.8324766"
+   x2="16.445704"
+   y2="5.8324766"
+   id="line1485"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<line
+   class="st2"
+   x1="2.5330553"
+   y1="42.649242"
+   x2="29.21492"
+   y2="42.378853"
+   id="line1487"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st2"
+   d="m 16.445704,5.8324767 c 0,1.9535366 -1.692253,3.6279968 -3.807572,3.6279968 -2.115318,0 -3.8075738,-1.6744602 -3.8075738,-3.6279968 0,-1.9535361 1.6922558,-3.6279958 3.8075738,-3.6279958 2.115319,0.1395386 3.807572,1.6744597 3.807572,3.6279958 z"
+   id="path1489"
+   style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st2"
+   d="m 37.501558,42.136003 c 0,1.970509 -1.670072,3.659516 -3.757664,3.659516 -2.087592,0 -3.757665,-1.689007 -3.757665,-3.659516 0,-1.970511 1.670073,-3.659519 3.757665,-3.659519 2.087592,0 3.757664,1.548259 3.757664,3.659519 z"
+   id="path1491"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/bezier-track.svg b/app/bin/bitmaps/SVG/bezier-track.svg
new file mode 100644
index 0000000..4f3cf33
--- /dev/null
+++ b/app/bin/bitmaps/SVG/bezier-track.svg
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="bezier-track.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata878"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs876"><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1638"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1634"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1630"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1626"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1622"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1564"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1560"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1556"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1552"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1548"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1544"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1540"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1536"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1532"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1528"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1524"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1520"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1516"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1512"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1508"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1456"><rect
+       style="display:block;opacity:1;fill:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none"
+       id="rect1458"
+       width="19.127279"
+       height="3.9545863"
+       x="27.197866"
+       y="6.6178784"
+       ry="0.079863898" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1460"><rect
+       style="display:block;opacity:1;fill:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none"
+       id="rect1462"
+       width="19.127279"
+       height="3.9545863"
+       x="27.197866"
+       y="6.6178784"
+       ry="0.079863898" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1464"><rect
+       style="display:none;opacity:1;fill:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none"
+       id="rect1466"
+       width="19.127279"
+       height="3.9545863"
+       x="27.197866"
+       y="6.6178784"
+       ry="0.079863898"
+       d="m 27.27773,6.6178784 h 18.967552 c 0.04424,0 0.07986,0.035619 0.07986,0.079864 v 3.7948587 c 0,0.04424 -0.03562,0.07986 -0.07986,0.07986 H 27.27773 c -0.04424,0 -0.07986,-0.03562 -0.07986,-0.07986 V 6.6977423 c 0,-0.044245 0.03562,-0.079864 0.07986,-0.079864 z" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1468"><rect
+       style="display:none;opacity:1;fill:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none"
+       id="rect1470"
+       width="19.127279"
+       height="3.9545863"
+       x="27.197866"
+       y="6.6178784"
+       ry="0.079863898"
+       d="m 27.27773,6.6178784 h 18.967552 c 0.04424,0 0.07986,0.035619 0.07986,0.079864 v 3.7948587 c 0,0.04424 -0.03562,0.07986 -0.07986,0.07986 H 27.27773 c -0.04424,0 -0.07986,-0.03562 -0.07986,-0.07986 V 6.6977423 c 0,-0.044245 0.03562,-0.079864 0.07986,-0.079864 z" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1472"><rect
+       style="display:none;opacity:1;fill:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none"
+       id="rect1474"
+       width="19.127279"
+       height="3.9545863"
+       x="27.197866"
+       y="6.6178784"
+       ry="0.079863898"
+       d="m 27.27773,6.6178784 h 18.967552 c 0.04424,0 0.07986,0.035619 0.07986,0.079864 v 3.7948587 c 0,0.04424 -0.03562,0.07986 -0.07986,0.07986 H 27.27773 c -0.04424,0 -0.07986,-0.03562 -0.07986,-0.07986 V 6.6977423 c 0,-0.044245 0.03562,-0.079864 0.07986,-0.079864 z" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1476"><rect
+       style="display:none;opacity:1;fill:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none"
+       id="rect1478"
+       width="19.127279"
+       height="3.9545863"
+       x="27.197866"
+       y="6.6178784"
+       ry="0.079863898"
+       d="m 27.27773,6.6178784 h 18.967552 c 0.04424,0 0.07986,0.035619 0.07986,0.079864 v 3.7948587 c 0,0.04424 -0.03562,0.07986 -0.07986,0.07986 H 27.27773 c -0.04424,0 -0.07986,-0.03562 -0.07986,-0.07986 V 6.6977423 c 0,-0.044245 0.03562,-0.079864 0.07986,-0.079864 z" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1504"><rect
+       style="display:none;opacity:1;fill:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none"
+       id="rect1506"
+       width="19.127279"
+       height="3.9545863"
+       x="27.197866"
+       y="6.6178784"
+       ry="0.079863898"
+       d="m 27.27773,6.6178784 h 18.967552 c 0.04424,0 0.07986,0.035619 0.07986,0.079864 v 3.7948587 c 0,0.04424 -0.03562,0.07986 -0.07986,0.07986 H 27.27773 c -0.04424,0 -0.07986,-0.03562 -0.07986,-0.07986 V 6.6977423 c 0,-0.044245 0.03562,-0.079864 0.07986,-0.079864 z" /></clipPath></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1504"
+   inkscape:window-height="972"
+   id="namedview874"
+   showgrid="false"
+   inkscape:zoom="12.390678"
+   inkscape:cx="23.92928"
+   inkscape:cy="21.225634"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:snap-nodes="false"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style833">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FE0000;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+
+
+
+
+<g
+   id="g906"
+   inkscape:label="ties"
+   transform="matrix(1.0591506,0,0,1.0591506,-1.4196144,-1.3413732)"><line
+     class="st0"
+     x1="4.1279888"
+     y1="34.576862"
+     x2="4.6168704"
+     y2="45.168163"
+     id="line835"
+     style="stroke:#dab16f;stroke-opacity:1;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none"
+     clip-path="none"
+     d="M 4.1279888,34.576862 4.6168704,45.168163" /><line
+     class="st0"
+     x1="42.886402"
+     y1="2.6856358"
+     x2="43.408516"
+     y2="13.62998"
+     id="line837"
+     style="fill:#f29a0d;fill-opacity:1;stroke:#dab16f;stroke-opacity:1;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none"
+     clip-path="none" /><line
+     class="st0"
+     x1="34.10844"
+     y1="5.7627635"
+     x2="39.163727"
+     y2="14.855262"
+     id="line841"
+     style="fill:#fbb03b;fill-opacity:1;stroke:#dab16f;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /><line
+     class="st0"
+     x1="35.005325"
+     y1="17.727415"
+     x2="27.096411"
+     y2="11.148679"
+     id="line843"
+     style="stroke:#dab16f;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /><line
+     class="st0"
+     x1="19.002396"
+     y1="21.82789"
+     x2="28.405186"
+     y2="27.61499"
+     id="line845"
+     style="stroke:#dab16f;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /><line
+     class="st0"
+     x1="22.733572"
+     y1="16.710386"
+     x2="31.354567"
+     y2="22.478386"
+     id="line847"
+     style="stroke:#dab16f;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /><line
+     class="st0"
+     x1="15.614336"
+     y1="26.927553"
+     x2="24.364897"
+     y2="33.04113"
+     id="line849"
+     style="stroke:#dab16f;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /><line
+     class="st0"
+     x1="11.880663"
+     y1="30.71059"
+     x2="20.037558"
+     y2="38.954033"
+     id="line851"
+     style="stroke:#dab16f;stroke-opacity:1;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none"
+     clip-path="none"
+     d="m 11.880663,30.71059 8.156895,8.243443" /><line
+     class="st0"
+     x1="8.2077017"
+     y1="33.453312"
+     x2="12.669186"
+     y2="43.218498"
+     id="line855"
+     style="stroke:#dab16f;stroke-opacity:1;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none"
+     clip-path="none"
+     d="m 8.2077017,33.453312 4.4614843,9.765186" /></g>
+
+<g
+   id="g910"
+   inkscape:label="rails"
+   transform="matrix(1.0591506,0,0,1.0591506,-1.4196144,-1.3413732)"><path
+     class="st1"
+     d="m 2.169398,37.254044 c 19.921904,0 19.094929,-31.9056952 43.661204,-31.9056952"
+     id="path857"
+     style="stroke-width:1.88830559;stroke-miterlimit:10;stroke-dasharray:none"
+     sodipodi:nodetypes="cc"
+     clip-path="none" /><path
+     class="st1"
+     d="m 2.4505108,42.567322 c 25.9106962,0 22.1552802,-31.807439 43.2993872,-31.219033"
+     id="path859"
+     style="stroke-width:1.88830559;stroke-miterlimit:10;stroke-dasharray:none"
+     sodipodi:nodetypes="cc"
+     clip-path="none" /></g>
+
+
+
+
+<g
+   id="g922"
+   inkscape:label="uhandle"
+   transform="matrix(1.0591506,0,0,1.0591506,-1.4196144,-1.3413732)"><line
+     class="st2"
+     x1="45.715103"
+     y1="8.5967131"
+     x2="16.382238"
+     y2="8.5967131"
+     id="line865"
+     style="stroke:#cc0000;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /><path
+     class="st2"
+     d="m 15.445121,8.6158886 c 0,1.8694864 -1.5274,3.4719024 -3.436654,3.4719024 -1.909251,0 -3.4366529,-1.602416 -3.4366529,-3.4719024 0,-1.8694855 1.5274019,-3.4719017 3.4366529,-3.4719017 1.909254,0.1335346 3.436654,1.6024162 3.436654,3.4719017 z"
+     id="path869"
+     style="stroke:#cc0000;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /></g>
+<g
+   id="g914"
+   inkscape:label="bhandle"
+   transform="matrix(1.0591506,0,0,1.0591506,-1.4196144,-1.3413732)"><line
+     class="st2"
+     x1="2.6384158"
+     y1="39.785053"
+     x2="30.46909"
+     y2="39.785053"
+     id="line867"
+     style="stroke:#cc0000;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /><path
+     class="st2"
+     d="m 38.117928,39.798562 c 0,1.791916 -1.509641,3.327846 -3.396691,3.327846 -1.887051,0 -3.396691,-1.53593 -3.396691,-3.327846 0,-1.791917 1.50964,-3.327846 3.396691,-3.327846 1.88705,0 3.396691,1.407935 3.396691,3.327846 z"
+     id="path871"
+     style="stroke:#cc0000;stroke-width:2.36038199;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/block.svg b/app/bin/bitmaps/SVG/block.svg
index 221d631..9d306d7 100755
--- a/app/bin/bitmaps/SVG/block.svg
+++ b/app/bin/bitmaps/SVG/block.svg
@@ -1,150 +1,95 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg2160"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\Dokumente und Einstellungen\MF\Eigene Dateien\xtc\source\xtrkcad\app\bin\bitmaps\SVG"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg39"
    sodipodi:docname="block.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2162">
-    <linearGradient
-       id="linearGradient3240">
-      <stop
-         style="stop-color:#c6ffc7;stop-opacity:1;"
-         offset="0"
-         id="stop3242" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3244" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       x="-0.40165289"
-       width="1.8033058"
-       y="-0.40165289"
-       height="1.8033058"
-       id="filter4024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.34075874"
-         id="feGaussianBlur4026" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata43"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="797"
-     inkscape:window-height="573"
-     inkscape:window-x="43"
-     inkscape:window-y="33" />
-  <metadata
-     id="metadata2165">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39860046px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 1.6993002,4.8001142 C 1.6993002,4.0323881 1.6993002,6.1874076 1.6993002,7.1314013 C 1.6993002,8.3269519 1.6993002,9.5225027 1.6993002,10.718053"
-       id="path3197"
-       inkscape:transform-center-x="-0.69930023" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.30206299px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 16.340038,7.9045778 C 16.170995,7.9045778 15.782267,7.9045778 15.510057,7.9045778 C 15.332995,7.9045778 15.155932,7.9045778 14.97887,7.9045778 C 14.646878,7.9045778 14.314885,7.9045778 13.982894,7.9045778 C 13.756061,7.9045778 14.109982,7.9045778 14.182089,7.9045778"
-       id="path3204" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#00c3ff;stroke-width:1.39256012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 4.8935538,8.0622511 C 5.3383788,8.0622511 6.3612827,8.0622511 7.0775815,8.0622511 C 7.5435072,8.0622511 8.0094329,8.0622511 8.4753585,8.0622511 C 9.3489697,8.0622511 10.22258,8.0622511 11.096191,8.0622511 C 11.693085,8.0622511 10.761766,8.0622511 10.572024,8.0622511"
-       id="path3214" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#00c3ff;stroke-width:1.38903475px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 11.694517,4.8941729 C 11.694517,4.1226995 11.694517,6.2882379 11.694517,7.2368393 C 11.694517,8.4382256 11.694517,9.639612 11.694517,10.840998"
-       id="path3216" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#00c3ff;stroke-width:1.3360846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 4.2655817,10.718063 C 4.2569707,11.44917 4.2811417,9.396941 4.2917297,8.4979743 C 4.305139,7.3594493 4.3185482,6.2209242 4.3319577,5.0823988"
-       id="path3220"
-       inkscape:transform-center-x="2.6989442"
-       inkscape:transform-center-y="1.5477264" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.34471488px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 14.327643,4.8345845 C 14.327643,4.0668584 14.327643,6.2218779 14.327643,7.1658716 C 14.327643,8.3614222 14.327643,9.5569733 14.327643,10.752524"
-       id="path3222" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#00cb05;fill-opacity:1;fill-rule:nonzero;stroke:#00cb05;stroke-linejoin:round;stroke-opacity:1"
-       id="path3224"
-       sodipodi:cx="8.1990099"
-       sodipodi:cy="3.1608911"
-       sodipodi:rx="1.5316832"
-       sodipodi:ry="1.5316832"
-       d="M 9.7306931 3.1608911 A 1.5316832 1.5316832 0 1 1  6.6673267,3.1608911 A 1.5316832 1.5316832 0 1 1  9.7306931 3.1608911 z"
-       transform="matrix(1.3326023,0,0,1.3326023,-3.0745345,-1.504785)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#8bf68e;fill-opacity:1;fill-rule:nonzero;stroke:#d3fcd3;stroke-linejoin:round;stroke-opacity:1;filter:url(#filter4024)"
-       id="path3250"
-       sodipodi:cx="7.5007424"
-       sodipodi:cy="2.4626236"
-       sodipodi:rx="0.51806933"
-       sodipodi:ry="0.51806933"
-       d="M 8.0188118 2.4626236 A 0.51806933 0.51806933 0 1 1  6.9826731,2.4626236 A 0.51806933 0.51806933 0 1 1  8.0188118 2.4626236 z"
-       transform="matrix(1.2433747,0,0,1.2433747,-2.0603915,-0.8322608)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-linejoin:round;stroke-opacity:1"
-       id="path4034"
-       sodipodi:cx="8.1990099"
-       sodipodi:cy="3.1608911"
-       sodipodi:rx="1.5316832"
-       sodipodi:ry="1.5316832"
-       d="M 9.7306931 3.1608911 A 1.5316832 1.5316832 0 1 1  6.6673267,3.1608911 A 1.5316832 1.5316832 0 1 1  9.7306931 3.1608911 z"
-       transform="matrix(1.3326023,0,0,1.3326023,-3.0379006,8.949671)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ed0202;fill-opacity:0.9766355;fill-rule:nonzero;stroke:#fff6f6;stroke-linejoin:round;stroke-opacity:1;filter:url(#filter4024)"
-       id="path4036"
-       sodipodi:cx="7.5007424"
-       sodipodi:cy="2.4626236"
-       sodipodi:rx="0.51806933"
-       sodipodi:ry="0.51806933"
-       d="M 8.0188118 2.4626236 A 0.51806933 0.51806933 0 1 1  6.9826731,2.4626236 A 0.51806933 0.51806933 0 1 1  8.0188118 2.4626236 z"
-       transform="matrix(1.3434079,0,0,1.3868861,-2.6614572,9.403929)" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.30206299px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 2.3873088,7.8910891 C 2.2182658,7.8910891 1.8295378,7.8910891 1.5573278,7.8910891 C 1.3802658,7.8910891 1.2032028,7.8910891 1.0261408,7.8910891 C 0.69414879,7.8910891 0.36215579,7.8910891 0.030164793,7.8910891 C -0.19666821,7.8910891 0.15725279,7.8910891 0.22935979,7.8910891"
-       id="path4052" />
-  </g>
-</svg>
+     inkscape:window-width="1578"
+     inkscape:window-height="996"
+     id="namedview41"
+     showgrid="false"
+     inkscape:zoom="8.7705101"
+     inkscape:cx="31.982176"
+     inkscape:cy="37.968145"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g37"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs5"><clipPath
+       id="clipPath3629"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     transform="matrix(1.3333,0,0,-1.3333,0,64)"
+     id="g37"><g
+       transform="matrix(1.2967909,0,0,1.2967909,2.1246308,45.683498)"
+       id="g9"
+       style="stroke-width:2.7112;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 9.091,-9.014"
+         fill="none"
+         stroke="#020000"
+         stroke-miterlimit="10"
+         id="path7"
+         style="stroke-width:2.7112;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.4132365,0,0,1.3859063,34.452001,13.107736)"
+       id="g13"
+       style="stroke-width:2.51221;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 8.089,-7.781"
+         fill="none"
+         stroke="#020000"
+         stroke-miterlimit="10"
+         id="path11"
+         style="stroke-width:2.51221;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.2967909,0,0,1.2967909,12.971957,34.587781)"
+       id="g17"
+       style="stroke-width:2.7112;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 16.564,-16.564"
+         fill="none"
+         stroke="#11d9f4"
+         stroke-miterlimit="10"
+         id="path15"
+         style="stroke:#009199;stroke-width:2.7112;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       clip-path="url(#clipPath3629)"
+       id="g35"
+       transform="matrix(1.5187104,0,0,1.5187104,-13.299409,-11.938881)"><g
+         transform="matrix(1.6641602,0,0,1.6641602,23.655168,17.693415)"
+         id="g29"
+         style="stroke:#000000;stroke-width:0.49871;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+           d="m 0,0 c 0,-1.681 -1.346,-3.043 -3.005,-3.043 -1.659,0 -3.005,1.362 -3.005,3.043 0,1.681 1.346,3.043 3.005,3.043 C -1.346,3.043 0,1.681 0,0"
+           fill="#f21434"
+           id="path27"
+           style="stroke:#000000;stroke-width:0.781659;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
+         transform="matrix(1.6663611,0,0,1.6663611,35.459199,29.364105)"
+         id="g33"
+         style="stroke-width:0.498051;stroke-miterlimit:4;stroke-dasharray:none"><path
+           d="m 0,0 c 0,-1.766 -1.397,-3.197 -3.121,-3.197 -1.723,0 -3.12,1.431 -3.12,3.197 0,1.766 1.397,3.197 3.12,3.197 C -1.397,3.197 0,1.766 0,0"
+           fill="#16ef16"
+           id="path31"
+           style="stroke:#000000;stroke-width:0.780626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g><path
+       style="fill:none;stroke:#009199;stroke-width:3.51586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8.9911407,28.141226 19.792915,38.943"
+       id="path871" /><path
+       style="fill:none;stroke:#009199;stroke-width:3.51586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 28.19633,9.0458839 38.998106,19.847659"
+       id="path871-4" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/bottom.svg b/app/bin/bitmaps/SVG/bottom.svg
new file mode 100644
index 0000000..e529c66
--- /dev/null
+++ b/app/bin/bitmaps/SVG/bottom.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="bottom.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1391"
+   inkscape:window-height="982"
+   id="namedview9"
+   showgrid="false"
+   inkscape:zoom="13.418604"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FF0603;}
+	.st1{fill:#808080;}
+</style>
+<path
+   class="st0"
+   d="m 29.039558,24.250588 c 0,7.267052 -6.073314,13.030574 -13.438823,13.030574 -7.4947277,0 -13.4388221,-5.888816 -13.4388221,-13.030574 0,-7.267051 6.0733144,-13.030575 13.4388221,-13.030575 7.365509,-0.125294 13.438823,5.763524 13.438823,13.030575 z"
+   id="path4"
+   style="stroke-width:1.27241;stroke:#990000;stroke-opacity:1" />
+<rect
+   x="17.409807"
+   y="8.3382511"
+   class="st1"
+   width="28.42828"
+   height="31.323498"
+   id="rect6"
+   style="stroke-width:1.27241;stroke:#000000;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/box.svg b/app/bin/bitmaps/SVG/box.svg
new file mode 100644
index 0000000..e936fa4
--- /dev/null
+++ b/app/bin/bitmaps/SVG/box.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="box.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata910"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs908" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1288"
+   inkscape:window-height="878"
+   id="namedview906"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style897">
+	.st0{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st1{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<rect
+   x="3.7880173"
+   y="5.0129852"
+   class="st0"
+   width="40.423965"
+   height="37.97403"
+   id="rect899"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="7.0859327"
+   y1="39.584835"
+   x2="40.014923"
+   y2="9.0605688"
+   id="line901"
+   style="stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1" />
+<polyline
+   class="st2"
+   points="39.9,18.3 39.4,11.4 32.7,11.4 "
+   id="polyline903"
+   transform="matrix(1.4025875,0,0,1.3570092,-15.557291,-6.2439345)"
+   style="stroke-width:2.17452736;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/bridge.svg b/app/bin/bitmaps/SVG/bridge.svg
new file mode 100644
index 0000000..af55093
--- /dev/null
+++ b/app/bin/bitmaps/SVG/bridge.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="bridge.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><g
+     id="parapet"
+     style="display:inline;stroke:#917c6f;stroke-width:2.56211;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.4366046,0,0,1.7036947,-13.366682,-16.698783)"><path
+       d="M 15.9996,38.6673 H 46.6655"
+       fill="none"
+       stroke="#ff6700"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path1633"
+       style="fill:#000000;fill-opacity:1;stroke:#917c6f;stroke-width:2.56211;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="m 46.53217,38.709966 5.334533,5.145205"
+       fill="none"
+       stroke="#ff6700"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path1637"
+       style="fill:#000000;fill-opacity:1;stroke:#917c6f;stroke-width:2.56211;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="M 15.928935,38.645967 11.357049,43.85517"
+       fill="none"
+       stroke="#ff6700"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path1641"
+       style="fill:#000000;fill-opacity:1;stroke:#917c6f;stroke-width:2.56211;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="M 46.6655,18.6678 H 15.9996"
+       fill="none"
+       stroke="#ff6700"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path1645"
+       style="fill:none;fill-opacity:1;stroke:#917c6f;stroke-width:2.56211;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="M 16.886244,18.657134 11.358382,13.313268"
+       fill="none"
+       stroke="#ff6700"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path1649"
+       style="fill:none;fill-opacity:1;stroke:#917c6f;stroke-width:2.56211;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="m 45.913519,18.657134 5.954518,-5.343866"
+       fill="none"
+       stroke="#ff6700"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path1653"
+       style="fill:none;fill-opacity:1;stroke:#917c6f;stroke-width:2.56211;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1393"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.3956422"
+     inkscape:cx="36.186989"
+     inkscape:cy="32.036128"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1659"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     id="track"
+     style="display:inline"
+     transform="matrix(1.0504573,0,0,1.0504573,-1.6146336,-1.5690294)"><g
+       id="ties"
+       inkscape:label="#ties"
+       style="stroke:#d88b0d;stroke-width:2.667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(1.3028702,0,0,1.3028702,-9.6908041,-5.2415278)"><path
+         d="M 11.9997,21.3344 V 36.0007"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2.6666"
+         id="path1597"
+         style="stroke:#d88b0d;stroke-width:2.667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+         d="M 0,0 V -11"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2"
+         id="path1601"
+         transform="matrix(1.3333,0,0,-1.3333,18.6662,21.3344)"
+         style="stroke:#d88b0d;stroke-width:2.0003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+         d="M 25.3327,21.3344 V 36.0007"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2.6666"
+         id="path1605"
+         style="stroke:#d88b0d;stroke-width:2.667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+         d="M 31.9992,21.3344 V 36.0007"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2.6666"
+         id="path1609"
+         style="stroke:#d88b0d;stroke-width:2.667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+         d="M 38.6657,21.3344 V 36.0007"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2.6666"
+         id="path1613"
+         style="stroke:#d88b0d;stroke-width:2.667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+         d="M 45.3322,21.3344 V 36.0007"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2.6666"
+         id="path1617"
+         style="stroke:#d88b0d;stroke-width:2.667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+         d="M 51.9987,21.3344 V 36.0007"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2.6666"
+         id="path1621"
+         style="stroke:#d88b0d;stroke-width:2.667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       id="rails"
+       inkscape:label="#rails"
+       style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none"
+       transform="matrix(1.3028702,0,0,1.3028702,-9.6908041,-5.2415278)"><path
+         d="M 9.3331,24.185806 H 54.6653"
+         fill="none"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         id="path1625"
+         style="stroke-width:2.30261;stroke-miterlimit:10;stroke-dasharray:none" /><path
+         d="M 9.3331,33.149294 H 54.6653"
+         fill="none"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         id="path1629"
+         style="stroke-width:2.30261;stroke-miterlimit:10;stroke-dasharray:none" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/building.svg b/app/bin/bitmaps/SVG/building.svg
new file mode 100644
index 0000000..4b63286
--- /dev/null
+++ b/app/bin/bitmaps/SVG/building.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="building.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata19"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs17" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1579"
+   inkscape:window-height="975"
+   id="namedview15"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="23.999379"
+   inkscape:cy="24.036645"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#000000;stroke-miterlimit:10;}
+</style>
+<polygon
+   class="st0"
+   points="39.5,37.5 39.5,29.5 34.5,29.3 29,19.5 17,19.5 10.5,29.3 5.5,29.5 5.5,37.5 "
+   id="polygon8"
+   style="fill:#cccccc;fill-opacity:1"
+   transform="matrix(1.3413882,0,0,1.3436174,-6.1812345,-6.1642108)" /><path
+   class="st0"
+   d="M 40.767352,3.1067495"
+   id="path4"
+   style="stroke-width:1.3425" />
+<rect
+   x="7.9033418"
+   y="5.2565374"
+   class="st0"
+   width="32.193317"
+   height="28.215967"
+   id="rect6"
+   style="stroke-width:1.3425" />
+
+
+
+<path
+   style="fill:none;stroke:#000000;stroke-width:1.3425px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 7.9033409,5.2565374 16.622364,20.036329"
+   id="path844" /><path
+   style="fill:none;stroke:#000000;stroke-width:1.3425px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 32.719023,20.036329 40.096659,5.2565374"
+   id="path846" /><path
+   style="fill:#b2b2b2;fill-opacity:1;stroke:#665900;stroke-width:0.0759312"
+   d="M 13.134754,12.71703 C 10.989166,9.0805473 9.2223194,6.0761113 9.2084336,6.0405055 9.1945466,6.0048995 15.867084,5.9757675 24.036296,5.9757675 c 8.169211,0 14.853113,0.017022 14.853113,0.037823 0,0.020802 -1.491218,3.0254477 -3.313816,6.6769895 l -3.313815,6.639165 -7.612975,-4.65e-4 -7.612975,-4.65e-4 z"
+   id="path848" /><path
+   style="fill:#cccccc;fill-opacity:1;stroke:#665900;stroke-width:0.0759312"
+   d="m 36.484379,25.297924 c -1.59357,-2.849671 -2.895525,-5.230247 -2.893235,-5.290169 0.0022,-0.05992 1.312768,-2.720941 2.912171,-5.913376 l 2.908008,-5.8044275 0.0042,11.0967005 c 0.0022,6.103184 -0.0043,11.095752 -0.01476,11.094597 -0.01056,-0.0012 -1.322766,-2.333652 -2.916335,-5.183325 z"
+   id="path850" /><path
+   style="fill:#b2b2b2;fill-opacity:1;stroke:#665900;stroke-width:0.0759312"
+   d="m 8.5921196,19.325952 c 0.00171,-8.408703 0.024691,-11.4526151 0.085796,-11.3472267 0.045906,0.079205 1.6620084,2.8197237 3.5913084,6.0900237 l 3.507818,5.946001 -3.526133,5.329145 c -1.939371,2.931029 -3.5564976,5.361579 -3.5936104,5.401224 -0.039496,0.04218 -0.066512,-4.693848 -0.065179,-11.419167 z"
+   id="path852" /></svg>
diff --git a/app/bin/bitmaps/SVG/car-inventory.svg b/app/bin/bitmaps/SVG/car-inventory.svg
new file mode 100644
index 0000000..27d805d
--- /dev/null
+++ b/app/bin/bitmaps/SVG/car-inventory.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="car-inventory.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata50"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs48" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1583"
+   inkscape:window-height="965"
+   id="namedview46"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24.039032"
+   inkscape:cy="26.235289"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#808080;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000401;stroke-miterlimit:10;}
+	.st2{fill:#000401;}
+	.st3{fill:url(#SVGID_1_);}
+	.st4{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st5{fill:#006837;}
+	.st6{fill:#FFE53F;}
+	.st7{font-family:'MyriadPro-Regular';}
+	.st8{font-size:6px;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="24.5506"
+   y1="21.5"
+   x2="30.4868"
+   y2="21.5"
+   gradientTransform="matrix(0,1.0571338,-1.0571338,0,51.676842,-1.8693808)">
+	<stop
+   offset="2.455360e-02"
+   style="stop-color:#006837"
+   id="stop26" />
+	<stop
+   offset="0.4355"
+   style="stop-color:#22B573"
+   id="stop28" />
+	<stop
+   offset="1"
+   style="stop-color:#006837"
+   id="stop30" />
+</linearGradient>
+
+
+<rect
+   x="1.0481793"
+   y="1.453462"
+   class="st5"
+   width="32.050381"
+   height="12.064563"
+   id="body"
+   style="fill:#682b00;fill-opacity:1;stroke:#d9d9d9;stroke-width:0.913228;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+
+
+<g
+   id="wheels"
+   transform="matrix(1.1266654,0,0,1.1266654,-5.5483902,-27.757493)"><path
+     class="st2"
+     d="m 11.136232,39.118101 c 0,1.134615 -0.882478,2.143161 -2.1431611,2.143161 -1.1346136,0 -2.1431594,-0.882478 -2.1431594,-2.143161 0,-1.260681 0.8824776,-2.143159 2.1431594,-2.143159 1.2606831,0.126067 2.1431611,1.008545 2.1431611,2.143159 z"
+     id="path39"
+     style="stroke-width:1.26068" /></g>
+<rect
+   x="8.0319376"
+   y="15.51599"
+   class="st5"
+   width="32.050381"
+   height="12.064563"
+   id="body-1"
+   style="fill:#004c68;fill-opacity:1;stroke:#d9d9d9;stroke-width:0.913228;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><g
+   id="wheels-5"
+   transform="matrix(1.1490837,0,0,1.1490837,1.0035607,-14.65363)"><path
+     class="st2"
+     d="m 11.344738,39.187603 c 0,1.134615 -0.882478,2.143161 -2.1431605,2.143161 -1.1346136,0 -2.1431594,-0.882478 -2.1431594,-2.143161 0,-1.260681 0.8824776,-2.143159 2.1431594,-2.143159 1.2606825,0.126067 2.1431605,1.008545 2.1431605,2.143159 z"
+     id="path39-0"
+     style="stroke-width:1.26068" /></g><rect
+   x="14.90144"
+   y="29.569271"
+   class="st5"
+   width="32.050381"
+   height="12.064563"
+   id="body-1-5"
+   style="fill:#006806;fill-opacity:1;stroke:#d9d9d9;stroke-width:0.913228;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><g
+   id="wheels-5-4"
+   transform="matrix(1.1643725,0,0,1.1643725,1.2420809,-1.0403268)"><path
+     class="st2"
+     d="m 33.655476,39.118101 c 0,1.134615 -0.882478,2.143161 -2.143161,2.143161 -1.260682,0 -2.143159,-0.882478 -2.143159,-2.143161 0,-1.260681 0.882477,-2.143159 2.143159,-2.143159 1.260683,0 2.143161,1.008546 2.143161,2.143159 z"
+     id="path43-6-1-4"
+     style="fill:#000401;stroke-width:1.26068" /><path
+     class="st2"
+     d="m 38.282412,39.118101 c 0,1.134615 -0.882478,2.143161 -2.14316,2.143161 -1.260683,0 -2.14316,-0.882478 -2.14316,-2.143161 0,-1.260681 0.882477,-2.143159 2.14316,-2.143159 1.260682,0 2.14316,1.008546 2.14316,2.143159 z"
+     id="path20-6-1"
+     style="stroke-width:1.26068" /><path
+     class="st2"
+     d="m 16.748068,39.118101 c 0,1.134615 -0.882478,2.143161 -2.143161,2.143161 -1.134614,0 -2.14316,-0.882478 -2.14316,-2.143161 0,-1.260681 0.882478,-2.143159 2.14316,-2.143159 1.260683,0.126067 2.143161,1.008545 2.143161,2.143159 z"
+     id="path39-0-8"
+     style="stroke-width:1.26068" /><path
+     class="st2"
+     d="m 21.527695,39.118101 c 0,1.134615 -0.882478,2.143161 -2.14316,2.143161 -1.260683,0 -2.14316,-0.882478 -2.14316,-2.143161 0,-1.260681 0.882477,-2.143159 2.14316,-2.143159 1.260682,0 2.14316,1.008545 2.14316,2.143159 z"
+     id="path43-68-8"
+     style="stroke-width:1.26068" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/change-grid.svg b/app/bin/bitmaps/SVG/change-grid.svg
new file mode 100644
index 0000000..0962f5f
--- /dev/null
+++ b/app/bin/bitmaps/SVG/change-grid.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="change-grid.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata73"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs71" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1524"
+   inkscape:window-height="969"
+   id="namedview69"
+   showgrid="false"
+   inkscape:zoom="12.260054"
+   inkscape:cx="19.942816"
+   inkscape:cy="21.981959"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="g66"
+   inkscape:snap-nodes="false"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFFFFF;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:none;}
+	.st2{fill:#231F20;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<g
+   id="g66">
+	
+	
+<g
+   id="g927"
+   transform="matrix(1.2365151,0,0,1.2365151,-0.45780653,-10.909155)"><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 37.67926,36.998679 H 1.6603668"
+     id="path906-0"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 10.957925,10.259045 v 35.36001"
+     id="path900"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 19.779626,10.259045 V 45.985102"
+     id="path904"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 28.601326,10.259045 V 46.277938"
+     id="path906"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 37.75247,19.465092 H 1.6603668"
+     id="path902-1"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 37.825679,28.231886 H 1.6603668"
+     id="path904-7"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 37.423027,10.259045 V 46.277937"
+     id="path906-06"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 2.1362255,10.259045 V 46.277938"
+     id="path906-01"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 38.281206,10.763375 1.2699144,10.6983"
+     id="path900-5-5"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#00cc0d;stroke-width:1.83335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 38.281207,45.765474 H 1.3349898"
+     id="path900-5-8"
+     sodipodi:nodetypes="cc" /></g><g
+   id="g6458"
+   transform="translate(-4.3292157,4.0470317)"><path
+     style="fill:#f1b76f;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 21.519231,26.538462 V 21.461538 L 38.798077,4.2403846 43.701923,9.2596154 26.798077,26.451923 Z"
+     id="path1780"
+     sodipodi:nodetypes="cccccc" /><path
+     style="fill:none;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 24.346154,18.461538 c 5.134615,5.134616 5.134615,5.134616 5.134615,5.134616"
+     id="path4988" /></g></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/circle-center.svg b/app/bin/bitmaps/SVG/circle-center.svg
new file mode 100644
index 0000000..dc1b0fc
--- /dev/null
+++ b/app/bin/bitmaps/SVG/circle-center.svg
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle-center.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata3349"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs3347"><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect868"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect864"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath856"><path
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.27456px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 37.481595,37.263175 1.203443,-8.895802 -3.93469,-1.125417 -8.186482,7.583889 1.789451,3.620637 z"
+       id="path858"
+       sodipodi:nodetypes="cccccc" /><path
+       id="lpe_path-effect864"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.27456px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       class="powerclip"
+       d="M -0.81667071,-1.0453595 H 49.139391 V 48.910703 H -0.81667071 Z M 37.481595,37.263175 l 1.203443,-8.895802 -3.93469,-1.125417 -8.186482,7.583889 1.789451,3.620637 z" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath860"><path
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.27456px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 37.481595,37.263175 1.203443,-8.895802 -3.93469,-1.125417 -8.186482,7.583889 1.789452,3.620637 z"
+       id="path862"
+       sodipodi:nodetypes="cccccc" /><path
+       id="lpe_path-effect868"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.27456px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       class="powerclip"
+       d="M -2,-2.5284135 H 50.322721 V 50.393757 H -2 Z m 39.481595,39.7915885 1.203443,-8.895802 -3.93469,-1.125417 -8.186482,7.583889 1.789452,3.620637 z" /></clipPath></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1429"
+   inkscape:window-height="935"
+   id="namedview3345"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="23.999379"
+   inkscape:cy="24.036645"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style3300">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<style
+   type="text/css"
+   id="style2554">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st4{fill:#FB0000;}
+	.st5{font-family:'MyriadPro-Regular';}
+	.st6{font-size:12px;}
+</style><g
+   id="g2669"
+   inkscape:label="ties"
+   transform="matrix(1.0980006,0,0,1.0732591,-2.5664524,-1.7232245)"
+   clip-path="url(#clipPath860)"
+   inkscape:path-effect="#path-effect868"><line
+     class="st0"
+     x1="32"
+     y1="43.900002"
+     x2="28.799999"
+     y2="35.900002"
+     id="line2586"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 32,43.900002 -3.200001,-8" /><line
+     class="st0"
+     x1="23.9"
+     y1="2.482697"
+     x2="24"
+     y2="11.482697"
+     id="line2556"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 23.9,2.482697 0.1,9" /><line
+     class="st0"
+     x1="23.900255"
+     y1="36.408672"
+     x2="23.999744"
+     y2="45.382671"
+     id="line2558"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 23.900255,36.408672 0.09949,8.973999" /><line
+     class="st0"
+     x1="36.5"
+     y1="24"
+     x2="45.299999"
+     y2="24.200001"
+     id="line2560"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 36.5,24 8.799999,0.200001" /><line
+     class="st0"
+     x1="3"
+     y1="25"
+     x2="12"
+     y2="25"
+     id="line2562"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 3,25 h 9" /><line
+     class="st0"
+     x1="8.3002796"
+     y1="9.5427513"
+     x2="14.785051"
+     y2="15.379046"
+     id="line2564"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 8.3002796,9.5427513 14.785051,15.379046" /><line
+     class="st0"
+     x1="38.767326"
+     y1="8.2077475"
+     x2="32.819508"
+     y2="15.283601"
+     id="line2566"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 38.767326,8.2077475 32.819508,15.283601" /><line
+     class="st0"
+     x1="32.130051"
+     y1="4.2333679"
+     x2="28.829287"
+     y2="12.58843"
+     id="line2568"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 32.130051,4.2333679 28.829287,12.58843" /><line
+     class="st0"
+     x1="43.626308"
+     y1="14.811062"
+     x2="35.262169"
+     y2="19.377419"
+     id="line2570"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 43.626308,14.811062 -8.364139,4.566357" /><line
+     class="st0"
+     x1="14.7"
+     y1="4.9000001"
+     x2="18.6"
+     y2="12.6"
+     id="line2572"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 14.7,4.9000001 18.6,12.6" /><line
+     class="st0"
+     x1="4.0999999"
+     y1="16.9"
+     x2="12.4"
+     y2="19.700001"
+     id="line2574"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 4.0999999,16.9 12.4,19.700001" /><line
+     class="st0"
+     x1="8.6999998"
+     y1="39"
+     x2="15.3"
+     y2="32.799999"
+     id="line2576"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 8.6999998,39 15.3,32.799999" /><line
+     class="st0"
+     x1="4.5999999"
+     y1="32.799999"
+     x2="12.8"
+     y2="28.9"
+     id="line2578"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 4.5999999,32.799999 12.8,28.9" /><line
+     class="st0"
+     x1="15.3"
+     y1="43.900002"
+     x2="19.4"
+     y2="35.400002"
+     id="line2580"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 15.3,43.900002 4.1,-8.5" /><line
+     class="st0"
+     x1="39.200001"
+     y1="39.599998"
+     x2="32.400002"
+     y2="33.5"
+     id="line2582"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 39.200001,39.599998 32.400002,33.5" /><line
+     class="st0"
+     x1="43.900002"
+     y1="32.799999"
+     x2="34.700001"
+     y2="29.6"
+     id="line2584"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 43.900002,32.799999 34.700001,29.6" /></g><g
+   id="g2682"
+   inkscape:label="rail"
+   transform="matrix(1.0980006,0,0,1.0732591,-2.5664522,-1.7232244)"
+   style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+   clip-path="url(#clipPath856)"
+   inkscape:path-effect="#path-effect864"><path
+     class="st1"
+     d="m 43.203111,23.932672 c 0,10.53579 -8.50596,19.041751 -19.041752,19.041751 -10.53579,0 -19.0417497,-8.505961 -19.0417497,-19.041751 0,-10.535792 8.5059597,-19.0417515 19.0417497,-19.0417515 10.535792,0 19.041752,8.5059595 19.041752,19.0417515 z"
+     id="path2588"
+     style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+     inkscape:original-d="m 43.203111,23.932672 c 0,10.53579 -8.50596,19.041751 -19.041752,19.041751 -10.53579,0 -19.0417497,-8.505961 -19.0417497,-19.041751 0,-10.535792 8.5059597,-19.0417515 19.0417497,-19.0417515 10.535792,0 19.041752,8.5059595 19.041752,19.0417515 z" /><path
+     class="st1"
+     d="m 38.997085,23.932672 c 0,8.230037 -6.605687,14.835726 -14.835725,14.835726 -8.230037,0 -14.8357248,-6.605689 -14.8357248,-14.835726 0,-8.230038 6.6056878,-14.8357262 14.8357248,-14.8357262 8.121748,0 14.835725,6.6056882 14.835725,14.8357262 z"
+     id="path2590"
+     style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+     inkscape:original-d="m 38.997085,23.932672 c 0,8.230037 -6.605687,14.835726 -14.835725,14.835726 -8.230037,0 -14.8357248,-6.605689 -14.8357248,-14.835726 0,-8.230038 6.6056878,-14.8357262 14.8357248,-14.8357262 8.121748,0 14.835725,6.6056882 14.835725,14.8357262 z" /></g><g
+   id="g3424"
+   inkscape:label="arrow"
+   transform="matrix(1.0504397,0,0,1.0504397,-1.5029059,-2.1739336)"><line
+     class="st2"
+     x1="35.225948"
+     y1="35.590187"
+     x2="24.211658"
+     y2="24.43399"
+     id="line876"
+     style="fill:none;stroke:#cc0000;stroke-width:2.61571;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+     class="st3"
+     points="32.3,37.8 36.9,37.2 37.5,32.7 "
+     id="polyline878"
+     transform="matrix(1.2491748,0,0,1.2491748,-10.868603,-10.879114)"
+     style="fill:none;stroke:#cc0000;stroke-width:2.22802;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/circle-filled-center.svg b/app/bin/bitmaps/SVG/circle-filled-center.svg
new file mode 100644
index 0000000..252ce43
--- /dev/null
+++ b/app/bin/bitmaps/SVG/circle-filled-center.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle-filled-center.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata1478"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1476" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1421"
+   inkscape:window-height="922"
+   id="namedview1474"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24.039032"
+   inkscape:cy="24.039032"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style1463">
+	.st0{fill:#00C9FF;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="M 45.714152,24 C 45.714152,36.014429 36.014429,45.714152 24,45.714152 11.98557,45.714152 2.2858483,36.014429 2.2858483,24 2.2858483,11.98557 11.98557,2.2858481 24,2.2858481 36.014429,2.2858481 45.714152,11.98557 45.714152,24 Z"
+   id="path1465"
+   style="fill:#80e2ff;fill-opacity:1" />
+
+
+
+<line
+   class="st2"
+   x1="36.442284"
+   y1="36.748508"
+   x2="22.401169"
+   y2="22.70739"
+   id="line876"
+   style="fill:none;stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+   class="st3"
+   points="32.3,37.8 36.9,37.2 37.5,32.7 "
+   id="polyline878"
+   transform="matrix(1.6532977,0,0,1.6532977,-24.564402,-24.754165)"
+   style="fill:none;stroke:#cc0000;stroke-width:1.81456;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></svg>
diff --git a/app/bin/bitmaps/SVG/circle-filled-tangent.svg b/app/bin/bitmaps/SVG/circle-filled-tangent.svg
new file mode 100644
index 0000000..afbf7ea
--- /dev/null
+++ b/app/bin/bitmaps/SVG/circle-filled-tangent.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle-filled-tangent.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata3982"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs3980" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1426"
+   inkscape:window-height="903"
+   id="namedview3978"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="24.036645"
+   inkscape:cy="24.036645"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style3967">
+	.st0{fill:#3FD1FF;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="m 46.005278,23.999999 c 0,12.17551 -9.829769,22.005279 -22.005279,22.005279 -12.175509,0 -22.0052775,-9.829769 -22.0052775,-22.005279 0,-12.175509 9.8297685,-22.0052775 22.0052775,-22.0052775 12.17551,0 22.005279,9.8297685 22.005279,22.0052775 z"
+   id="path3969"
+   style="fill:#80e1ff;fill-opacity:1" />
+<line
+   class="st1"
+   x1="43.5"
+   y1="45"
+   x2="43.5"
+   y2="45"
+   id="line3971" />
+
+
+<line
+   class="st2"
+   x1="24.167141"
+   y1="23.9102"
+   x2="38.231514"
+   y2="37.811775"
+   id="line4088"
+   style="fill:none;stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+   class="st3"
+   points="28.8,24 24.4,24.7 23.7,29.1 "
+   id="polyline4090"
+   transform="matrix(1.6700933,0,0,1.6023948,-16.583136,-15.668951)"
+   style="fill:none;stroke:#cc0000;stroke-width:1.83385977;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></svg>
diff --git a/app/bin/bitmaps/SVG/circle-line-center.svg b/app/bin/bitmaps/SVG/circle-line-center.svg
new file mode 100644
index 0000000..18e05df
--- /dev/null
+++ b/app/bin/bitmaps/SVG/circle-line-center.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle-line-center.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata885"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs883" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1460"
+   inkscape:window-height="897"
+   id="namedview881"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="24.012177"
+   inkscape:cy="24.012177"
+   inkscape:window-x="115"
+   inkscape:window-y="26"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style870">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="m 45.672182,24.000001 c 0,11.991207 -9.680974,21.672181 -21.672181,21.672181 -11.991208,0 -21.6721826,-9.680974 -21.6721826,-21.672181 0,-11.991208 9.6809746,-21.6721826 21.6721826,-21.6721826 11.991207,0 21.672181,9.6809746 21.672181,21.6721826 z"
+   id="path872"
+   style="stroke-width:2.75028;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="43.5"
+   y1="45"
+   x2="43.5"
+   y2="45"
+   id="line874" />
+<line
+   class="st2"
+   x1="36.391674"
+   y1="36.691673"
+   x2="23.238926"
+   y2="23.538925"
+   id="line876"
+   style="stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st3"
+   points="32.3,37.8 36.9,37.2 37.5,32.7 "
+   id="polyline878"
+   transform="matrix(1.3660384,0,0,1.3660384,-13.920935,-14.030747)"
+   style="stroke:#cc0000;stroke-width:2.19613153;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/circle-line-tangent.svg b/app/bin/bitmaps/SVG/circle-line-tangent.svg
new file mode 100644
index 0000000..02f8c39
--- /dev/null
+++ b/app/bin/bitmaps/SVG/circle-line-tangent.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle-line-tangent.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata3363"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs3361" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1346"
+   inkscape:window-height="914"
+   id="namedview3359"
+   showgrid="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="23.995613"
+   inkscape:cy="24.041494"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style3348">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="m 45.560452,24.091762 c 0,11.878615 -9.590075,21.468691 -21.46869,21.468691 -11.878617,0 -21.4686915,-9.590076 -21.4686915,-21.468691 0,-11.878617 9.5900745,-21.4686919 21.4686915,-21.4686919 11.878615,0 21.46869,9.5900749 21.46869,21.4686919 z"
+   id="path3350"
+   style="stroke-width:2.72446;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="43.5"
+   y1="45"
+   x2="43.5"
+   y2="45"
+   id="line3352" />
+
+
+<line
+   class="st2"
+   x1="23.34251"
+   y1="22.752092"
+   x2="37.761456"
+   y2="37.004139"
+   id="line4088"
+   style="fill:none;stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+   class="st3"
+   points="28.8,24 24.4,24.7 23.7,29.1 "
+   id="polyline4090"
+   transform="matrix(1.6557924,0,0,1.5886737,-17.058824,-16.488148)"
+   style="fill:none;stroke:#cc0000;stroke-width:1.84969856;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></svg>
diff --git a/app/bin/bitmaps/SVG/circle-line.svg b/app/bin/bitmaps/SVG/circle-line.svg
new file mode 100644
index 0000000..2aa4811
--- /dev/null
+++ b/app/bin/bitmaps/SVG/circle-line.svg
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle-line.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata1023"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1021" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1316"
+   inkscape:window-height="850"
+   id="namedview1019"
+   showgrid="false"
+   inkscape:zoom="10.889218"
+   inkscape:cx="24.01458"
+   inkscape:cy="23.968663"
+   inkscape:window-x="362"
+   inkscape:window-y="40"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style940">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:#FB0000;}
+	.st6{font-family:'MyriadPro-Regular';}
+	.st7{font-size:12px;}
+</style>
+<path
+   class="st0"
+   d="M24,11.9"
+   id="path942" />
+<path
+   class="st0"
+   d="M23.9,2.9"
+   id="path944" />
+<path
+   class="st0"
+   d="M24,45.1"
+   id="path946" />
+<path
+   class="st0"
+   d="M23.9,36.9"
+   id="path948" />
+<path
+   class="st0"
+   d="M45.3,24.2"
+   id="path950" />
+<path
+   class="st0"
+   d="M36.5,24"
+   id="path952" />
+<path
+   class="st0"
+   d="M12,25"
+   id="path954" />
+<path
+   class="st0"
+   d="M3,25"
+   id="path956" />
+<path
+   class="st0"
+   d="M14.7,15.3"
+   id="path958" />
+<path
+   class="st0"
+   d="M8.7,9.9"
+   id="path960" />
+<path
+   class="st0"
+   d="M32.8,15.3"
+   id="path962" />
+<path
+   class="st0"
+   d="M38.6,8.4"
+   id="path964" />
+<path
+   class="st0"
+   d="M28.8,12.6"
+   id="path966" />
+<path
+   class="st0"
+   d="M32,4.5"
+   id="path968" />
+<path
+   class="st0"
+   d="M35.1,19"
+   id="path970" />
+<path
+   class="st0"
+   d="M43.3,14.7"
+   id="path972" />
+<path
+   class="st0"
+   d="M18.6,12.6"
+   id="path974" />
+<path
+   class="st0"
+   d="M14.7,4.9"
+   id="path976" />
+<path
+   class="st0"
+   d="M12.4,19.7"
+   id="path978" />
+<path
+   class="st0"
+   d="M4.1,16.9"
+   id="path980" />
+<path
+   class="st0"
+   d="M15.3,32.8"
+   id="path982" />
+<path
+   class="st0"
+   d="M8.7,39"
+   id="path984" />
+<path
+   class="st0"
+   d="M12.8,28.9"
+   id="path986" />
+<path
+   class="st0"
+   d="M4.6,32.8"
+   id="path988" />
+<path
+   class="st0"
+   d="M19.4,35.4"
+   id="path990" />
+<path
+   class="st0"
+   d="M15.3,43.9"
+   id="path992" />
+<path
+   class="st0"
+   d="M32.4,33.5"
+   id="path994" />
+<path
+   class="st0"
+   d="M39.2,39.6"
+   id="path996" />
+<path
+   class="st0"
+   d="M34.7,29.6"
+   id="path998" />
+<path
+   class="st0"
+   d="M43.9,32.8"
+   id="path1000" />
+<path
+   class="st0"
+   d="M28.8,35.9"
+   id="path1002" />
+<path
+   class="st0"
+   d="M32,43.9"
+   id="path1004" />
+<path
+   class="st1"
+   d="M 45.599801,24 C 45.599801,35.951159 35.951158,45.599801 24,45.599801 12.048841,45.599801 2.4001988,35.951159 2.4001988,24 2.4001988,12.048842 12.048841,2.4001989 24,2.4001989 35.951158,2.4001989 45.599801,12.048842 45.599801,24 Z"
+   id="path1006"
+   style="stroke-width:2.74109;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="43.5"
+   y1="45"
+   x2="43.5"
+   y2="45"
+   id="line1008" />
+<line
+   class="st3"
+   x1="6.2269526"
+   y1="24.224487"
+   x2="41.573009"
+   y2="24.275513"
+   id="line1010"
+   style="stroke:#cc0000;stroke-width:2.44399;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st4"
+   points="8.6,20.9 5.6,24.5 8.6,28.1 "
+   id="polyline1012"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.1988158,0,0,1.1988158,-0.48641593,-5.1464998)" />
+<polyline
+   class="st4"
+   points="39.2,27.7 42.6,24.2 39.2,20.9 "
+   id="polyline1014"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.1777431,0,0,1.1777431,-8.5988466,-4.2258703)" />
+
+<text
+   xml:space="preserve"
+   style="font-weight:bold;font-size:17.0194px;line-height:0;font-family:Arial;-inkscape-font-specification:'Arial Bold';fill:#cc0000;fill-opacity:1;stroke-width:1.41828"
+   x="12.717101"
+   y="21.812561"
+   id="text1608"
+   transform="scale(1.0582049,0.94499656)"><tspan
+     sodipodi:role="line"
+     id="tspan1606"
+     x="12.717101"
+     y="21.812561"
+     style="fill:#cc0000;fill-opacity:1;stroke-width:1.41828">36</tspan></text></svg>
diff --git a/app/bin/bitmaps/SVG/circle-tangent.svg b/app/bin/bitmaps/SVG/circle-tangent.svg
new file mode 100644
index 0000000..3e970c6
--- /dev/null
+++ b/app/bin/bitmaps/SVG/circle-tangent.svg
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle-tangent.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata4097"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs4095"><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect890"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect886"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath878"><path
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.07687px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 30.578006,35.073034 3.682037,4.464428 4.595747,-4.216244 -3.946461,-4.268054 z"
+       id="path880"
+       sodipodi:nodetypes="ccccc" /><path
+       id="lpe_path-effect886"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.07687px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       class="powerclip"
+       d="M -0.929284,-0.7316369 H 48.929284 V 49.126931 H -0.929284 Z m 31.50729,35.8046709 3.682037,4.464428 4.595747,-4.216244 -3.946461,-4.268054 z" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath882"><path
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.07687px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 30.578006,35.073034 3.682037,4.464428 4.595747,-4.216244 -3.946461,-4.268054 z"
+       id="path884"
+       sodipodi:nodetypes="ccccc" /><path
+       id="lpe_path-effect890"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.07687px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       class="powerclip"
+       d="M -2,-2.1111104 H 50.322721 V 50.112193 H -2 Z m 32.578006,37.1841444 3.682037,4.464428 4.595747,-4.216244 -3.946461,-4.268054 z" /></clipPath></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1545"
+   inkscape:window-height="922"
+   id="namedview4093"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24.039032"
+   inkscape:cy="28.51141"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style4048">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<g
+   id="g872"
+   inkscape:label="ties"
+   transform="matrix(1.0865725,0,0,1.0985893,-2.2578819,-2.3618824)"
+   clip-path="url(#clipPath882)"
+   inkscape:path-effect="#path-effect890"><line
+     class="st0"
+     x1="23.9"
+     y1="2.9000001"
+     x2="24"
+     y2="11.9"
+     id="line4050"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 23.9,2.9000001 24,11.9" /><line
+     class="st0"
+     x1="23.9"
+     y1="36.900002"
+     x2="24"
+     y2="45.099998"
+     id="line4052"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 23.9,36.900002 24,45.099998" /><line
+     class="st0"
+     x1="36.5"
+     y1="24"
+     x2="45.299999"
+     y2="24.200001"
+     id="line4054"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="m 36.5,24 8.799999,0.200001" /><line
+     class="st0"
+     x1="3"
+     y1="25"
+     x2="12"
+     y2="25"
+     id="line4056"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="m 3,25 h 9" /><line
+     class="st0"
+     x1="8.6179476"
+     y1="9.9343204"
+     x2="14.894994"
+     y2="15.583662"
+     id="line4058"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 8.6179476,9.9343204 14.894994,15.583662" /><line
+     class="st0"
+     x1="38.599998"
+     y1="8.3999996"
+     x2="32.799999"
+     y2="15.3"
+     id="line4060"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 38.599998,8.3999996 32.799999,15.3" /><line
+     class="st0"
+     x1="32"
+     y1="4.5"
+     x2="28.799999"
+     y2="12.6"
+     id="line4062"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="m 32,4.5 -3.200001,8.1" /><line
+     class="st0"
+     x1="43.299999"
+     y1="14.7"
+     x2="35.099998"
+     y2="19"
+     id="line4064"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 43.299999,14.7 35.099998,19" /><line
+     class="st0"
+     x1="14.7"
+     y1="4.9000001"
+     x2="18.6"
+     y2="12.6"
+     id="line4066"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 14.7,4.9000001 18.6,12.6" /><line
+     class="st0"
+     x1="4.0999999"
+     y1="16.9"
+     x2="12.4"
+     y2="19.700001"
+     id="line4068"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 4.0999999,16.9 12.4,19.700001" /><line
+     class="st0"
+     x1="8.6999998"
+     y1="39"
+     x2="15.3"
+     y2="32.799999"
+     id="line4070"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 8.6999998,39 15.3,32.799999" /><line
+     class="st0"
+     x1="4.5999999"
+     y1="32.799999"
+     x2="12.8"
+     y2="28.9"
+     id="line4072"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 4.5999999,32.799999 12.8,28.9" /><line
+     class="st0"
+     x1="15.3"
+     y1="43.900002"
+     x2="19.4"
+     y2="35.400002"
+     id="line4074"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="m 15.3,43.900002 4.1,-8.5" /><line
+     class="st0"
+     x1="39.200001"
+     y1="39.599998"
+     x2="32.799999"
+     y2="33.099998"
+     id="line4076"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="m 39.200001,39.599998 -6.400002,-6.5" /><line
+     class="st0"
+     x1="43.900002"
+     y1="32.799999"
+     x2="34.700001"
+     y2="29.6"
+     id="line4078"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="M 43.900002,32.799999 34.700001,29.6" /><line
+     class="st0"
+     x1="32"
+     y1="43.900002"
+     x2="28.799999"
+     y2="35.900002"
+     id="line4080"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     d="m 32,43.900002 -3.200001,-8" /></g>
+
+<g
+   id="g854"
+   inkscape:label="rails"
+   transform="matrix(1.0865725,0,0,1.0985893,-2.2578819,-2.3618824)"
+   clip-path="url(#clipPath878)"
+   inkscape:path-effect="#path-effect886"><path
+     class="st1"
+     d="m 43.179284,24.197647 c 0,10.611888 -8.567397,19.179284 -19.179285,19.179284 -10.611888,0 -19.179283,-8.567396 -19.179283,-19.179284 0,-10.611888 8.567395,-19.1792839 19.179283,-19.1792839 10.611888,0 19.179285,8.5673959 19.179285,19.1792839 z"
+     id="path4082"
+     style="stroke-width:1.83055574;stroke-miterlimit:10;stroke-dasharray:none"
+     inkscape:original-d="m 43.179284,24.197647 c 0,10.611888 -8.567397,19.179284 -19.179285,19.179284 -10.611888,0 -19.179283,-8.567396 -19.179283,-19.179284 0,-10.611888 8.567395,-19.1792839 19.179283,-19.1792839 10.611888,0 19.179285,8.5673959 19.179285,19.1792839 z" /><path
+     class="st1"
+     d="m 38.685289,24 c 0,8.021276 -6.43813,14.459406 -14.459407,14.459406 -8.021276,0 -14.459406,-6.43813 -14.459406,-14.459406 0,-8.021277 6.43813,-14.4594063 14.459406,-14.4594063 7.915734,0 14.459407,6.4381293 14.459407,14.4594063 z"
+     id="path4084"
+     style="stroke-width:1.83055574;stroke-miterlimit:10;stroke-dasharray:none"
+     inkscape:original-d="m 38.685289,24 c 0,8.021276 -6.43813,14.459406 -14.459407,14.459406 -8.021276,0 -14.459406,-6.43813 -14.459406,-14.459406 0,-8.021277 6.43813,-14.4594063 14.459406,-14.4594063 7.915734,0 14.459407,6.4381293 14.459407,14.4594063 z" /></g>
+
+
+<g
+   id="g876"
+   inkscape:label="arrow"
+   transform="matrix(1.065425,0,0,1.1038274,-2.1546271,-3.2465836)"><line
+     class="st2"
+     x1="24.711523"
+     y1="25.142181"
+     x2="36"
+     y2="36.299999"
+     id="line4088"
+     style="stroke:#cc0000;stroke-width:2.76636;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+     class="st3"
+     points="28.8,24 24.4,24.7 23.7,29.1 "
+     id="polyline4090"
+     transform="matrix(1.3657905,0,0,1.3104272,-8.6137653,-7.225371)"
+     style="stroke:#cc0000;stroke-width:2.06781049;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/circle.svg b/app/bin/bitmaps/SVG/circle.svg
new file mode 100644
index 0000000..660e7fd
--- /dev/null
+++ b/app/bin/bitmaps/SVG/circle.svg
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="circle.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata2607"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2605"><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1130"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1126"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1118"><path
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:#fefefe;stroke-width:0.93628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.7756386,23.899697 5.5479404,-6.428566 28.268076,0.264187 5.636002,6.340504 -6.340502,6.60469 -28.0038892,-0.176125 z"
+       id="path1120" /><path
+       id="lpe_path-effect1126"
+       style="fill:#ffffff;fill-opacity:1;stroke:#fefefe;stroke-width:0.93628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       class="powerclip"
+       d="M -0.81667071,-1.0453595 H 49.139391 V 48.910703 H -0.81667071 Z m 5.59230931,24.9450565 5.1076272,6.60469 28.0038892,0.176125 6.340502,-6.60469 -5.636002,-6.340504 -28.268076,-0.264187 z" /></clipPath><clipPath
+     clipPathUnits="userSpaceOnUse"
+     id="clipPath1122"><path
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:#fefefe;stroke-width:0.93628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.7756386,23.899697 5.5479404,-6.428566 28.268076,0.264187 5.636002,6.340504 -6.340502,6.60469 -28.0038892,-0.176125 z"
+       id="path1124" /><path
+       id="lpe_path-effect1130"
+       style="fill:#ffffff;fill-opacity:1;stroke:#fefefe;stroke-width:0.93628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       class="powerclip"
+       d="M -2,-2.5284135 H 50.322721 V 50.393757 H -2 Z m 6.7756386,26.4281105 5.1076272,6.60469 28.0038892,0.176125 6.340502,-6.60469 -5.636002,-6.340504 -28.268076,-0.264187 z" /></clipPath></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1594"
+   inkscape:window-height="933"
+   id="namedview2603"
+   showgrid="false"
+   inkscape:zoom="10.631993"
+   inkscape:cx="24.031242"
+   inkscape:cy="23.843131"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:snap-nodes="false"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2554">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st4{fill:#FB0000;}
+	.st5{font-family:'MyriadPro-Regular';}
+	.st6{font-size:12px;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<g
+   id="g2669"
+   inkscape:label="ties"
+   transform="matrix(1.1036179,0,0,1.0877739,-2.4767987,-1.9863076)"
+   clip-path="url(#clipPath1122)"
+   inkscape:path-effect="#path-effect1130"><line
+     class="st0"
+     x1="32"
+     y1="43.900002"
+     x2="28.799999"
+     y2="35.900002"
+     id="line2586"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 32,43.900002 -3.200001,-8" /><line
+     class="st0"
+     x1="23.9"
+     y1="2.482697"
+     x2="24"
+     y2="11.482697"
+     id="line2556"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 23.9,2.482697 0.1,9" /><line
+     class="st0"
+     x1="23.900255"
+     y1="36.408672"
+     x2="23.999744"
+     y2="45.382671"
+     id="line2558"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 23.900255,36.408672 0.09949,8.973999" /><line
+     class="st0"
+     x1="36.5"
+     y1="24"
+     x2="45.299999"
+     y2="24.200001"
+     id="line2560"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 36.5,24 8.799999,0.200001" /><line
+     class="st0"
+     x1="3"
+     y1="25"
+     x2="12"
+     y2="25"
+     id="line2562"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 3,25 h 9" /><line
+     class="st0"
+     x1="8.3002796"
+     y1="9.5427513"
+     x2="14.785051"
+     y2="15.379046"
+     id="line2564"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 8.3002796,9.5427513 14.785051,15.379046" /><line
+     class="st0"
+     x1="38.767326"
+     y1="8.2077475"
+     x2="32.819508"
+     y2="15.283601"
+     id="line2566"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 38.767326,8.2077475 32.819508,15.283601" /><line
+     class="st0"
+     x1="32.130051"
+     y1="4.2333679"
+     x2="28.829287"
+     y2="12.58843"
+     id="line2568"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 32.130051,4.2333679 28.829287,12.58843" /><line
+     class="st0"
+     x1="43.299999"
+     y1="14.7"
+     x2="35.099998"
+     y2="19"
+     id="line2570"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 43.299999,14.7 35.099998,19" /><line
+     class="st0"
+     x1="14.7"
+     y1="4.9000001"
+     x2="18.6"
+     y2="12.6"
+     id="line2572"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 14.7,4.9000001 18.6,12.6" /><line
+     class="st0"
+     x1="4.0999999"
+     y1="16.9"
+     x2="12.4"
+     y2="19.700001"
+     id="line2574"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 4.0999999,16.9 12.4,19.700001" /><line
+     class="st0"
+     x1="8.6999998"
+     y1="39"
+     x2="15.3"
+     y2="32.799999"
+     id="line2576"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 8.6999998,39 15.3,32.799999" /><line
+     class="st0"
+     x1="4.5999999"
+     y1="32.799999"
+     x2="12.8"
+     y2="28.9"
+     id="line2578"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 4.5999999,32.799999 12.8,28.9" /><line
+     class="st0"
+     x1="15.3"
+     y1="43.900002"
+     x2="19.4"
+     y2="35.400002"
+     id="line2580"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="m 15.3,43.900002 4.1,-8.5" /><line
+     class="st0"
+     x1="39.200001"
+     y1="39.599998"
+     x2="32.400002"
+     y2="33.5"
+     id="line2582"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 39.200001,39.599998 32.400002,33.5" /><line
+     class="st0"
+     x1="43.900002"
+     y1="32.799999"
+     x2="34.700001"
+     y2="29.6"
+     id="line2584"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     d="M 43.900002,32.799999 34.700001,29.6" /></g>
+<g
+   id="g2682"
+   inkscape:label="rail"
+   transform="matrix(1.1036179,0,0,1.0877739,-2.4767987,-1.9863076)"
+   style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+   clip-path="url(#clipPath1118)"
+   inkscape:path-effect="#path-effect1126"><path
+     class="st1"
+     d="m 43.203111,23.932672 c 0,10.53579 -8.50596,19.041751 -19.041752,19.041751 -10.53579,0 -19.0417497,-8.505961 -19.0417497,-19.041751 0,-10.535792 8.5059597,-19.0417515 19.0417497,-19.0417515 10.535792,0 19.041752,8.5059595 19.041752,19.0417515 z"
+     id="path2588"
+     style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+     inkscape:original-d="m 43.203111,23.932672 c 0,10.53579 -8.50596,19.041751 -19.041752,19.041751 -10.53579,0 -19.0417497,-8.505961 -19.0417497,-19.041751 0,-10.535792 8.5059597,-19.0417515 19.0417497,-19.0417515 10.535792,0 19.041752,8.5059595 19.041752,19.0417515 z" /><path
+     class="st1"
+     d="m 38.997085,23.932672 c 0,8.230037 -6.605687,14.835726 -14.835725,14.835726 -8.230037,0 -14.8357248,-6.605689 -14.8357248,-14.835726 0,-8.230038 6.6056878,-14.8357262 14.8357248,-14.8357262 8.121748,0 14.835725,6.6056882 14.835725,14.8357262 z"
+     id="path2590"
+     style="stroke-width:1.87256;stroke-miterlimit:10;stroke-dasharray:none"
+     inkscape:original-d="m 38.997085,23.932672 c 0,8.230037 -6.605687,14.835726 -14.835725,14.835726 -8.230037,0 -14.8357248,-6.605689 -14.8357248,-14.835726 0,-8.230038 6.6056878,-14.8357262 14.8357248,-14.8357262 8.121748,0 14.835725,6.6056882 14.835725,14.8357262 z" /></g>
+
+
+
+
+
+<text
+   xml:space="preserve"
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Calibri;-inkscape-font-specification:'Calibri Bold'"
+   x="14.594995"
+   y="29.897146"
+   id="text2688"><tspan
+     sodipodi:role="line"
+     id="tspan2686"
+     x="14.594995"
+     y="29.897146">30</tspan></text><g
+   id="g2674"
+   inkscape:label="larrow"
+   transform="translate(-0.94356603,-0.07462151)"><line
+     class="st2"
+     x1="7.8782554"
+     y1="24.262081"
+     x2="14.726001"
+     y2="24.237926"
+     id="line2594"
+     style="stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+     class="st3"
+     points="10.2,20.9 7.5,24.5 10.2,28.1 "
+     id="polyline2596"
+     transform="matrix(1.3546522,0,0,1.2105618,-2.4320948,-5.5707793)"
+     style="stroke:#cc0000;stroke-width:2.34268;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+   id="g2679"
+   inkscape:label="rarrow"
+   transform="translate(1.5967442,-0.1432525)"><polyline
+     class="st3"
+     points="37.4,27.7 40.4,24.2 37.4,20.9 "
+     id="polyline2598"
+     transform="matrix(1.3089049,0,0,1.3063324,-12.571103,-7.6491877)"
+     style="stroke:#cc0000;stroke-width:2.29425;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><line
+     class="st2"
+     x1="32.984512"
+     y1="23.985939"
+     x2="39.342487"
+     y2="23.961742"
+     id="line2594-8"
+     style="fill:none;stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/connect.svg b/app/bin/bitmaps/SVG/connect.svg
new file mode 100644
index 0000000..91578a6
--- /dev/null
+++ b/app/bin/bitmaps/SVG/connect.svg
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="connect.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata39"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs37" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1436"
+   inkscape:window-height="950"
+   id="namedview35"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#5494FF;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#003794;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FB0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FB0000;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FB0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="4.3307743"
+   y1="9.274683"
+   x2="4.3307743"
+   y2="23.698782"
+   id="line4" />
+<line
+   class="st0"
+   x1="10.887182"
+   y1="9.274683"
+   x2="10.887182"
+   y2="23.698782"
+   id="line6" />
+<line
+   class="st0"
+   x1="17.44359"
+   y1="9.274683"
+   x2="17.44359"
+   y2="23.698782"
+   id="line8" />
+<line
+   class="st0"
+   x1="30.556406"
+   y1="9.274683"
+   x2="30.556406"
+   y2="23.698782"
+   id="line10" />
+<line
+   class="st0"
+   x1="37.112816"
+   y1="9.274683"
+   x2="37.112816"
+   y2="23.698782"
+   id="line12" />
+<line
+   class="st0"
+   x1="43.669224"
+   y1="9.274683"
+   x2="43.669224"
+   y2="23.698782"
+   id="line14" />
+<line
+   class="st1"
+   x1="27.249117"
+   y1="12.130193"
+   x2="46.29179"
+   y2="12.130193"
+   id="line16"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="1.7082114"
+   y1="12.130193"
+   x2="20.750879"
+   y2="12.130193"
+   id="line18"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="27.249117"
+   y1="20.76922"
+   x2="46.29179"
+   y2="20.76922"
+   id="line20"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="1.7082114"
+   y1="20.76922"
+   x2="20.750879"
+   y2="20.76922"
+   id="line22"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="25.311279"
+   y1="31.447706"
+   x2="46.29179"
+   y2="31.447706"
+   id="line24"
+   style="stroke:#cc0000;stroke-width:3.27821;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st3"
+   d="M 26.229179,29.861805"
+   id="path26"
+   style="stroke-width:1.31128" />
+<polyline
+   class="st4"
+   points="28.5,33.3 24.2,29 28.5,24.8 "
+   id="polyline28"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.3112816,0,0,1.3112816,-6.1594786,-6.5794627)" />
+<line
+   class="st2"
+   x1="21.503935"
+   y1="31.447706"
+   x2="1.8347114"
+   y2="31.447706"
+   id="line30"
+   style="stroke:#cc0000;stroke-width:3.27821;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st4"
+   points="18.3,33.3 21.8,29 18.3,24.8 "
+   id="polyline32"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.3112816,0,0,1.3112816,-7.3442601,-6.5794627)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/control.svg b/app/bin/bitmaps/SVG/control.svg
new file mode 100644
index 0000000..051e57f
--- /dev/null
+++ b/app/bin/bitmaps/SVG/control.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg31"
+   sodipodi:docname="control.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata35"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1322"
+     inkscape:window-height="814"
+     id="namedview33"
+     showgrid="false"
+     inkscape:zoom="6.6431949"
+     inkscape:cx="31.987621"
+     inkscape:cy="32.062886"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg31"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs5"><clipPath
+       id="clipPath4350"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     transform="matrix(2.0501569,0,0,-2.0501569,-18.313258,76.783813)"
+     id="g29"><g
+       transform="translate(11.888,33.208)"
+       id="g9"><path
+         d="M -1.406431,2.5974208 26.856335,-25.32524"
+         fill="none"
+         stroke="#020000"
+         stroke-miterlimit="10"
+         id="path7"
+         style="stroke-width:2.00867;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+       transform="translate(11.425,9.4795)"
+       id="g13"><path
+         d="M -1.0910131,-1.3970219 27.226401,26.266849"
+         fill="none"
+         stroke="#020000"
+         stroke-miterlimit="10"
+         id="path11"
+         style="stroke-width:2.00867;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+       clip-path="url(#clipPath4350)"
+       id="g27"><path
+         d="m 31.918,21.701 c 0,4.148 -3.363,7.511 -7.512,7.511 -4.148,0 -7.511,-3.363 -7.511,-7.511 0,-4.148 3.363,-7.512 7.511,-7.512 4.149,0 7.512,3.364 7.512,7.512 z"
+         fill="none"
+         stroke="#020000"
+         stroke-miterlimit="10"
+         id="path15"
+         style="stroke-width:2.29562;stroke-miterlimit:10;stroke-dasharray:none"
+         inkscape:label="circle" /><path
+         d="m 19.343502,27.02497 c 0,0 5.776086,4.650897 10.170815,-0.415086 4.573168,-5.272793 -0.02944,-10.123552 -0.02944,-10.123552 z"
+         fill="#f40f0f"
+         id="path19"
+         style="stroke-width:0.993037"
+         inkscape:label="red" /><path
+         d="m 29.65346,16.520082 c 0,0 -5.706152,-4.856377 -10.361581,0.407837 -4.65536,5.265211 0.108718,9.878092 0.108718,9.878092"
+         fill="#1cf211"
+         id="path23"
+         inkscape:label="green" /><path
+         style="fill:none;stroke:#000000;stroke-width:0.777716;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 19.343502,27.02497 29.65346,16.520082"
+         id="path860"
+         sodipodi:nodetypes="cc"
+         inkscape:label="divide" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/convert-from.svg b/app/bin/bitmaps/SVG/convert-from.svg
new file mode 100644
index 0000000..259abd8
--- /dev/null
+++ b/app/bin/bitmaps/SVG/convert-from.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg5557"
+   sodipodi:docname="convert-from.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+     id="metadata5561"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1623"
+     inkscape:window-height="905"
+     id="namedview5559"
+     showgrid="false"
+     inkscape:zoom="9.3956422"
+     inkscape:cx="32"
+     inkscape:cy="35.011765"
+     inkscape:window-x="210"
+     inkscape:window-y="45"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="arrow"
+     inkscape:document-rotation="0" /><defs
+     id="defs5523"><clipPath
+       id="clipPath3916"><path
+         d="m0 48h48v-48h-48z"
+         id="path5520" /></clipPath></defs><g
+     id="arrow"
+     transform="matrix(2.0520076,0,0,-2.195505,-30.0162,95.07383)"><g
+       transform="matrix(1.3333,0,0,-1.3333,30.307242,34.6674)"
+       id="g4851"><path
+         d="M 0,0 V 6"
+         fill="none"
+         stroke="#f7113e"
+         stroke-miterlimit="10"
+         id="path4849"
+         style="stroke:#c4082d;stroke-width:1.23675;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       transform="matrix(1.3333,0,0,-1.3333,30.307242,26.6676)"
+       id="g4855"
+       style="stroke-width:1.06008;stroke-miterlimit:10;stroke-dasharray:none"><path
+         d="M 0,0 -3.352,-2.71"
+         fill="none"
+         stroke="#f7113e"
+         stroke-miterlimit="10"
+         id="path4853"
+         style="stroke:#c4082d;stroke-width:1.23675;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       transform="matrix(1.3333,0,0,-1.3333,30.307242,26.6676)"
+       id="g4859"
+       style="stroke-width:1.06008;stroke-miterlimit:10;stroke-dasharray:none"><path
+         d="M 0,0 2.889,-2.479"
+         fill="none"
+         stroke="#f7113e"
+         stroke-miterlimit="10"
+         id="path4857"
+         style="stroke:#c4082d;stroke-width:1.23675;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></g><g
+     id="f"
+     transform="matrix(1.4137631,0,0,1.3410122,-11.127876,-9.7695704)"
+     style="stroke-width:1.00007;stroke-miterlimit:4;stroke-dasharray:none"><g
+       transform="matrix(1.3333,0,0,-1.3333,35.654587,38.167384)"
+       id="g4839"
+       style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 -7.911,0.006"
+         fill="none"
+         stroke="#000202"
+         stroke-miterlimit="10"
+         id="path4837"
+         style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.3333,0,0,-1.3333,25.99935,38.6673)"
+       id="g4843"
+       style="stroke-width:1.36178154;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 V -10"
+         fill="none"
+         stroke="#000202"
+         stroke-miterlimit="10"
+         id="path4841"
+         style="stroke-width:1.36178154;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.3333,0,0,-1.3333,26.590717,44.286256)"
+       id="g4847"
+       style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 H 5"
+         fill="none"
+         stroke="#000202"
+         stroke-miterlimit="10"
+         id="path4845"
+         style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none" /></g></g><g
+     transform="matrix(1.799285,0,0,-2.0116395,10.651964,14.444271)"
+     id="cornu"
+     style="stroke-width:1.31406;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="M 0,0 C 1.185,-0.401 2.471,0.235 2.872,1.42 3.373,2.901 2.578,4.508 1.097,5.009 -0.755,5.636 -2.764,4.643 -3.39,2.791 c -0.783,-2.315 0.459,-4.826 2.773,-5.609 1.645,-0.556 4.729,0.566 4.729,0.566 0,0 6.054,3.132 8.366,4.21 2.311,1.079 7.842,2.739 7.842,2.739 0,0 2.679,0.676 4.067,0.207 2.314,-0.782 3.555,-3.294 2.773,-5.609 -0.627,-1.852 -2.636,-2.845 -4.487,-2.218 -1.482,0.501 -2.277,2.107 -1.775,3.589 0.401,1.185 1.686,1.821 2.872,1.42"
+       fill="none"
+       stroke="#000202"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       id="path4833"
+       style="stroke-width:1.31406;stroke-miterlimit:4;stroke-dasharray:none" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/convert-to.svg b/app/bin/bitmaps/SVG/convert-to.svg
new file mode 100644
index 0000000..5876444
--- /dev/null
+++ b/app/bin/bitmaps/SVG/convert-to.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg4865"
+   sodipodi:docname="convert-to.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><g
+     id="g5467"
+     transform="matrix(1.4137631,0,0,1.3410122,-10.478931,-46.220575)"
+     style="stroke-width:1.00007;stroke-miterlimit:4;stroke-dasharray:none"><g
+       transform="matrix(1.3333,0,0,-1.3333,35.654587,38.167384)"
+       id="g4839"
+       style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 -7.911,0.006"
+         fill="none"
+         stroke="#000202"
+         stroke-miterlimit="10"
+         id="path4837"
+         style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.3333,0,0,-1.3333,25.99935,38.6673)"
+       id="g4843"
+       style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 V -10"
+         fill="none"
+         stroke="#000202"
+         stroke-miterlimit="10"
+         id="path4841"
+         style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.3333,0,0,-1.3333,26.590717,44.286256)"
+       id="g4847"
+       style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 H 5"
+         fill="none"
+         stroke="#000202"
+         stroke-miterlimit="10"
+         id="path4845"
+         style="stroke-width:1.36178;stroke-miterlimit:4;stroke-dasharray:none" /></g></g><metadata
+     id="metadata4869"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1669"
+     inkscape:window-height="967"
+     id="namedview4867"
+     showgrid="false"
+     inkscape:zoom="9.3956422"
+     inkscape:cx="35.831564"
+     inkscape:cy="27.742707"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g4855"
+     inkscape:document-rotation="0" /><defs
+     id="defs4831"><clipPath
+       id="clipPath3691"><path
+         d="m0 48h48v-48h-48z"
+         id="path4828" /></clipPath></defs><g
+     transform="matrix(1.799285,0,0,-2.0116395,10.947264,53.336766)"
+     id="g4835"><path
+       d="m -0.35491538,-0.05290825 c 1.185,-0.401 2.47099998,0.235 2.87199998,1.42000005 0.501,1.481 -0.294,3.088 -1.77499998,3.589 -1.85200002,0.627 -3.86100002,-0.366 -4.48700002,-2.218 -0.783,-2.31500005 0.459,-4.826 2.77300002,-5.609 1.645,-0.556 4.72899998,0.566 4.72899998,0.566 0,0 6.054,3.13199995 8.3659994,4.21 2.311,1.079 7.842,2.739 7.842,2.739 0,0 2.679,0.676 4.067,0.207 2.314,-0.782 3.555,-3.294 2.773,-5.60900005 -0.627,-1.85199995 -2.636,-2.84499995 -4.487,-2.21799995 -1.482,0.501 -2.277,2.10699995 -1.775,3.58899995 0.401,1.18500005 1.686,1.82100005 2.872,1.42000005"
+       fill="none"
+       stroke="#000202"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       id="path4833"
+       style="stroke-width:1.31406;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+     id="g5475"
+     transform="matrix(2.0520076,0,0,-2.195505,-29.734387,99.778597)"><g
+       transform="matrix(1.3333,0,0,-1.3333,30.307242,34.6674)"
+       id="g4851"><path
+         d="M 0,0 V 6"
+         fill="none"
+         stroke="#f7113e"
+         stroke-miterlimit="10"
+         id="path4849"
+         style="stroke:#c4082d;stroke-width:1.23675;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       transform="matrix(1.3333,0,0,-1.3333,30.307242,26.6676)"
+       id="g4855"><path
+         d="M 0,0 -3.352,-2.71"
+         fill="none"
+         stroke="#f7113e"
+         stroke-miterlimit="10"
+         id="path4853"
+         style="stroke:#c4082d;stroke-width:1.23675;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       transform="matrix(1.3333,0,0,-1.3333,30.307242,26.6676)"
+       id="g4859"><path
+         d="M 1.6008594e-7,0 2.8890002,-2.479"
+         fill="none"
+         stroke="#f7113e"
+         stroke-miterlimit="10"
+         id="path4857"
+         style="stroke:#c4082d;stroke-width:1.23675441;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/copy.svg b/app/bin/bitmaps/SVG/copy.svg
new file mode 100644
index 0000000..a865437
--- /dev/null
+++ b/app/bin/bitmaps/SVG/copy.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="copy.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><rect
+     style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:2.00172;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect900"
+     width="49.334457"
+     height="45.780003"
+     x="2.1271074"
+     y="-48.169491"
+     transform="rotate(90)" /><rect
+     style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:2.00172;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect900-2"
+     width="49.334457"
+     height="45.780003"
+     x="12.440801"
+     y="-61.699257"
+     transform="rotate(90)" /><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1571"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="25.305762"
+     inkscape:cy="32.961287"
+     inkscape:window-x="18"
+     inkscape:window-y="57"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1659"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Export" /></svg>
diff --git a/app/bin/bitmaps/SVG/cornu.svg b/app/bin/bitmaps/SVG/cornu.svg
new file mode 100644
index 0000000..be91077
--- /dev/null
+++ b/app/bin/bitmaps/SVG/cornu.svg
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg6443"
+   sodipodi:docname="cornu.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1507"
+     inkscape:window-height="985"
+     id="namedview6445"
+     showgrid="false"
+     inkscape:zoom="10.785861"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6443"
+     inkscape:document-rotation="0"
+     inkscape:snap-nodes="false" /><metadata
+     id="metadata6308"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6325"><clipPath
+       id="clipPath1912"><path
+         d="m0 48h48v-48h-48z"
+         id="path6310" /></clipPath><clipPath
+       id="clipPath1936"><path
+         d="m0 48h48v-48h-48z"
+         id="path6313" /></clipPath><clipPath
+       id="clipPath1964"><path
+         d="m0 48h48v-48h-48z"
+         id="path6316" /></clipPath><clipPath
+       id="clipPath1996"><path
+         d="m0 48h48v-48h-48z"
+         id="path6319" /></clipPath><clipPath
+       id="clipPath2020"><path
+         d="m0 48h48v-48h-48z"
+         id="path6322" /></clipPath></defs><g
+     transform="matrix(1.4051383,0.1207861,0.1207861,-1.4051383,52.653185,59.584292)"
+     id="g6329"
+     style="stroke:#da8b0d;stroke-opacity:1"><path
+       d="M -0.53043187,-0.32477071 -4.1384319,7.4052293"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6327"
+       style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+     clip-path="url(#clipPath1912)"
+     id="g6335"
+     transform="matrix(1.3333,0,0,-1.3333,0,64)"
+     style="stroke:#da8b0d;stroke-opacity:1"><g
+       transform="translate(23.421,3.4521)"
+       id="g6333"
+       style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.4103202,0,0,-1.4103202,26.835818,59.959223)"
+     id="g6339"
+     style="stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0.43863234,-0.15445476 2.8143677,7.9924548"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6337"
+       style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.3333,0,0,-1.3333,20.002167,54.772364)"
+     id="g6343"
+     style="stroke:#da8b0d;stroke-opacity:1" /><g
+     transform="matrix(1.3961819,-0.199196,-0.199196,-1.3961819,18.606956,56.393024)"
+     id="g6347"
+     style="stroke:#da8b0d;stroke-opacity:1"
+     inkscape:transform-center-x="-0.58841826"
+     inkscape:transform-center-y="-0.19613932"><path
+       d="M 0,0 5.955,6.266"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6345"
+       style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+     clip-path="url(#clipPath1936)"
+     id="g6361"
+     transform="matrix(1.4103202,0,0,-1.4103202,-2.756989,65.624888)"
+     style="stroke:#da8b0d;stroke-opacity:1"><g
+       transform="translate(37.121,3.6514)"
+       id="g6351"
+       style="stroke:#da8b0d;stroke-opacity:1"><path
+         d="M -4.1461428,-0.66416076 -5.0396534,7.7465653"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2"
+         id="path6349"
+         style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+       transform="translate(32.61,3.1055)"
+       id="g6355"
+       style="stroke:#da8b0d;stroke-opacity:1" /><g
+       transform="translate(28.022,2.8711)"
+       id="g6359"
+       style="stroke:#da8b0d;stroke-opacity:1"><path
+         d="m -0.97125371,0 0.79568866,8.345"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2"
+         id="path6357"
+         style="stroke:#da8b0d;stroke-opacity:1" /></g></g><g
+     transform="matrix(1.4075989,-0.08756851,-0.08756851,-1.4075989,11.637587,51.494181)"
+     id="g6365"
+     style="stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0,0 7.415,5.462"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6363"
+       style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.4081934,-0.07742166,-0.07742166,-1.4081934,6.2032358,44.084047)"
+     id="g6369"
+     style="stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0,0 8.257,3.587"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6367"
+       style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.4103202,0,0,-1.4103202,3.0355272,35.271384)"
+     id="g6373"
+     style="stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0,0 8.792,1.248"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6371"
+       style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.4039347,-0.13405287,-0.13405287,-1.4039347,2.3960496,26.427677)"
+     id="g6381"
+     style="stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0,0 8.792,-1.482"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6379"
+       style="stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.4103202,0,0,-1.4103202,38.869264,3.0702429)"
+     id="g6385"
+     style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0,0 -2.576,-8.066"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6383"
+       style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.3739992,0.02466772,0.02412428,-1.3437294,11.230952,9.1341216)"
+     id="g6391"
+     style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0,0 6.117,-6.317"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6389"
+       style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.4726035,0.09971061,0.09767207,-1.4424968,46.983641,7.6869091)"
+     id="g6395"
+     style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0,0 -4.663,-6.551"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6393"
+       style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1" /></g><g
+     clip-path="url(#clipPath1996)"
+     id="g6401"
+     transform="matrix(1.4103202,0,-0.09291026,-1.4103202,-0.3046177,66.311376)"
+     style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1"><g
+       transform="translate(23.871,45.375)"
+       id="g6399"
+       style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1"><path
+         d="M 0,0 -0.165,-8.405"
+         fill="none"
+         stroke="#fbb03b"
+         stroke-miterlimit="10"
+         stroke-width="2"
+         id="path6397"
+         style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1" /></g></g><g
+     transform="matrix(1.4017562,0.15518603,0.15518603,-1.4017562,19.744526,4.1692554)"
+     id="g6405"
+     style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1"
+     inkscape:transform-center-x="-0.098070038"
+     inkscape:transform-center-y="0.29420937"><path
+       d="M 0,0 4.052,-7.409"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6403"
+       style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.4055377,-0.11604642,-0.11604642,-1.4055377,5.3000909,16.561813)"
+     id="g6409"
+     style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1"><path
+       d="M 0,0 7.263,-4.523"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6407"
+       style="fill:#000000;fill-opacity:1;stroke:#da8b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.3333,0,0,-1.3333,55.595943,54.600502)"
+     id="g6417" /><g
+     id="g7089"
+     transform="matrix(1.0440666,0,0,1.0440666,-1.9914136,-1.4628919)"
+     style="stroke-width:2.02624;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="M -0.42269799,0.07044967 C -13.122597,-5.531302 -28.031,-1.495 -34.561,9.957 c -3.953906,9.303899 -0.254255,21.297396 8.737,25.215 8.531148,2.893154 16.037859,1.590047 21.061255,-5.246805"
+       fill="none"
+       stroke="#000000"
+       stroke-miterlimit="10"
+       id="path6415"
+       transform="matrix(1.3333,0,0,-1.3333,55.595943,54.600502)"
+       style="stroke-width:1.51972;stroke-miterlimit:10;stroke-dasharray:none"
+       sodipodi:nodetypes="cccc" /><g
+       transform="matrix(1.3333,0,0,-1.3333,52.142696,47.797738)"
+       id="g6421"
+       style="stroke-width:1.51972;stroke-miterlimit:10;stroke-dasharray:none"><path
+         d="M 0.40159691,-0.79662787 C -9.968697,-5.7615966 -22.124981,-2.6274606 -26.983513,6.223499 c -3.88599,7.083272 -2.647838,15.389633 4.828833,19.071098 5.980293,2.944754 13.8382692,1.482331 16.8805774,-3.902071"
+         fill="none"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         id="path6419"
+         style="stroke-width:1.51972;stroke-miterlimit:10;stroke-dasharray:none"
+         sodipodi:nodetypes="cccc" /></g></g><g
+     transform="matrix(1.2168566,0,0,-1.2168566,52.523609,17.239565)"
+     id="g6425"
+     style="stroke-width:2.12718;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="m 0,0 c 0,-1.831 -1.455,-3.315 -3.248,-3.315 -1.796,0 -3.251,1.484 -3.251,3.315 0,1.831 1.455,3.314 3.251,3.314 C -1.455,3.314 0,1.831 0,0 Z"
+       fill="none"
+       stroke="#ff0000"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6423"
+       style="stroke:#cc0000;stroke-width:2.12718;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
+     transform="matrix(1.2061086,0,0,-1.2061086,60.422316,51.690421)"
+     id="g6429"
+     style="stroke-width:2.12718;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="m 0,0 c 0,-1.83 -1.454,-3.314 -3.249,-3.314 -1.795,0 -3.25,1.484 -3.25,3.314 0,1.83 1.455,3.314 3.25,3.314 C -1.454,3.314 0,1.83 0,0 Z"
+       fill="none"
+       stroke="#ff0000"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6427"
+       style="stroke:#cc0000;stroke-width:2.12718;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/curved-chord.svg b/app/bin/bitmaps/SVG/curved-chord.svg
new file mode 100644
index 0000000..5db0f01
--- /dev/null
+++ b/app/bin/bitmaps/SVG/curved-chord.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="curved-chord.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata7187"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs7185" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1490"
+   inkscape:window-height="975"
+   id="namedview7183"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="23.9991"
+   inkscape:cy="24.717875"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style7140">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FC1500;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FF0000;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+
+
+<g
+   id="g1493"
+   transform="matrix(1.1059459,0,0,1.1059459,-1.3574074,-1.8908062)"><line
+     class="st0"
+     x1="40.118973"
+     y1="1.8465961"
+     x2="41.373394"
+     y2="11.88195"
+     id="line7142"
+     style="stroke:#db8b0b;stroke-opacity:1" /><line
+     class="st0"
+     x1="1.8591815"
+     y1="42.364338"
+     x2="13.023514"
+     y2="42.866108"
+     id="line7144"
+     style="stroke:#db8b0b;stroke-opacity:1" /><line
+     class="st0"
+     x1="25.19138"
+     y1="6.8642731"
+     x2="31.087151"
+     y2="16.021534"
+     id="line7146"
+     style="stroke:#db8b0b;stroke-opacity:1" /><line
+     class="st0"
+     x1="5.2461133"
+     y1="27.562191"
+     x2="16.159559"
+     y2="31.576334"
+     id="line7148"
+     style="stroke:#db8b0b;stroke-opacity:1" /><line
+     class="st0"
+     x1="32.341572"
+     y1="3.4773419"
+     x2="36.355713"
+     y2="13.136369"
+     id="line7150"
+     style="stroke:#db8b0b;stroke-opacity:1" /><line
+     class="st0"
+     x1="18.417515"
+     y1="11.003859"
+     x2="26.069473"
+     y2="19.408464"
+     id="line7152"
+     style="stroke:#db8b0b;stroke-opacity:1" /><line
+     class="st0"
+     x1="8.8839293"
+     y1="21.164652"
+     x2="19.044725"
+     y2="26.558657"
+     id="line7154"
+     style="stroke:#db8b0b;stroke-opacity:1" /><line
+     class="st0"
+     x1="2.862716"
+     y1="34.837818"
+     x2="14.027048"
+     y2="37.095776"
+     id="line7156"
+     style="stroke:#db8b0b;stroke-opacity:1" /><line
+     class="st0"
+     x1="13.458588"
+     y1="15.277812"
+     x2="21.817545"
+     y2="23.181286"
+     id="line2709"
+     style="stroke:#db8b0b;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g>
+<g
+   id="g1497"
+   transform="matrix(1.1059459,0,0,1.1059459,-1.3574074,-1.8908062)"><path
+     class="st1"
+     d="M 4.2120581,44.280211 C 4.2120581,21.700663 24.56417,4.0360619 43.380459,4.0360619"
+     id="path7158"
+     style="stroke-width:2.2605084;stroke-miterlimit:10;stroke-dasharray:none"
+     sodipodi:nodetypes="cc" /><path
+     class="st1"
+     d="m 10.476705,44.352425 c 0,-16.432893 17.276742,-34.933535 32.831541,-34.933535"
+     id="path7160"
+     style="stroke-width:2.2605084;stroke-miterlimit:10;stroke-dasharray:none"
+     sodipodi:nodetypes="cc" /></g>
+
+
+
+
+
+
+
+
+
+<g
+   id="g1799"
+   transform="translate(0.23959168,0.39931946)"><line
+     class="st3"
+     x1="23.655668"
+     y1="25.22048"
+     x2="39.666615"
+     y2="39.675983"
+     id="line7174"
+     style="stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+     class="st5"
+     points="18.4,25.3 18.2,20.3 22.8,20.4 "
+     id="polyline7178"
+     style="stroke:#cc0000;stroke-width:1.59116;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.8962586,0,0,1.8746343,-10.856238,-12.834596)" /><line
+     class="st3"
+     x1="45.968658"
+     y1="33.376415"
+     x2="33.764027"
+     y2="45.851318"
+     id="line7180"
+     style="stroke:#cc0000;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/curved-end.svg b/app/bin/bitmaps/SVG/curved-end.svg
new file mode 100644
index 0000000..4c76cb4
--- /dev/null
+++ b/app/bin/bitmaps/SVG/curved-end.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   id="svg7888"
+   sodipodi:docname="curved-end.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   width="48"
+   height="48"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1395"
+     inkscape:window-height="914"
+     id="namedview7890"
+     showgrid="false"
+     inkscape:zoom="8.1826993"
+     inkscape:cx="34.462955"
+     inkscape:cy="28.230293"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7888"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><metadata
+     id="metadata7821"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7826"><clipPath
+       id="clipPath1727"><path
+         d="M 0,48 H 48 V 0 H 0 Z"
+         id="path7823" /></clipPath></defs><g
+     id="g8500"
+     style="stroke:#d98b0d;stroke-opacity:1"
+     transform="matrix(0.8692292,0,0,0.8692292,-6.7606978,-1.3620069)"
+     inkscape:label="ties"><path
+       d="m 21.586127,24.580985 9.447217,9.122165"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path7828"
+       style="stroke:#d98b0d;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /><path
+       d="M 8.6820496,53.493729 21.126063,54.043783"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path7832"
+       style="stroke:#d98b0d;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /><path
+       d="m 34.24023,15.374714 5.791335,11.37158"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path7836"
+       style="stroke:#d98b0d;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /><path
+       d="m 12.133163,36.783347 12.305351,5.82105"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path7840"
+       style="stroke:#d98b0d;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /><path
+       d="m 41.608402,12.254396 4.134977,12.213093"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2.76092"
+       id="path7844"
+       style="stroke:#d98b0d;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /><path
+       d="m 27.582419,19.225126 7.784728,10.504797"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path7848"
+       style="stroke:#d98b0d;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /><path
+       d="m 16.448922,30.578169 10.642725,7.318346"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path7852"
+       style="stroke:#d98b0d;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /><path
+       d="M 9.4353641,44.787147 22.080108,47.785739"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2.6666"
+       id="path7856"
+       style="stroke:#d98b0d;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /></g><g
+     id="g1503"
+     inkscape:label="rails"
+     transform="matrix(1.2781936,0,0,-1.2781936,-2.2194528,64.491016)"
+     style="stroke-width:1.86098;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="m 4.0384022,13.324335 c 0,16.356939 11.8763738,25.429747 23.5178358,28.703908"
+       fill="none"
+       stroke="#000000"
+       stroke-miterlimit="10"
+       id="path7864"
+       style="stroke-width:1.59502;stroke-miterlimit:10;stroke-dasharray:none"
+       sodipodi:nodetypes="cc" /><path
+       d="M 8.9184235,13.479289 C 8.5091535,25.096957 18.605799,34.573361 28.746871,37.156338"
+       fill="none"
+       stroke="#000000"
+       stroke-miterlimit="10"
+       id="path7868"
+       style="stroke-width:1.59502;stroke-miterlimit:10;stroke-dasharray:none"
+       sodipodi:nodetypes="cc" /></g><g
+     id="g1511"
+     inkscape:label="arrow"
+     transform="matrix(1.1307026,0,0,-1.1307026,-5.699386,54.663387)"><path
+       d="m 38.000997,46.245811 4.610186,-16.6826"
+       fill="none"
+       stroke="#ff0000"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path7872"
+       style="stroke:#cc0000;stroke-width:2.34037;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc" /><path
+       d="m 34.988266,41.74949 3.012731,4.496321 4.770156,-2.523132"
+       fill="none"
+       stroke="#ff0000"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path7876"
+       style="stroke:#cc0000;stroke-width:2.34037;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccc" /><path
+       d="m 45.584906,34.274145 -2.973723,-4.710934 -5.024264,2.58388"
+       fill="none"
+       stroke="#ff0000"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path7880"
+       style="stroke:#cc0000;stroke-width:2.34037;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccc" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/curved-line-chord.svg b/app/bin/bitmaps/SVG/curved-line-chord.svg
new file mode 100644
index 0000000..b1cc041
--- /dev/null
+++ b/app/bin/bitmaps/SVG/curved-line-chord.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="curved-line-chord.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata2200"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2198" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1351"
+   inkscape:window-height="907"
+   id="namedview2196"
+   showgrid="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2171">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#FC1500;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="M 3.5220297,43.111597 C 3.5220297,21.615075 23.58545,4.1790071 41.499219,4.1790071"
+   id="path2173"
+   style="stroke-width:2.57;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st1"
+   d="M 38.315236,-0.27323563"
+   id="path2175"
+   style="stroke-width:1.16155" />
+<path
+   class="st1"
+   d="M 43.095812,2.5733838"
+   id="path2177"
+   style="stroke-width:1.16155" />
+<path
+   class="st1"
+   d="M 38.315236,-0.27323563"
+   id="path2179"
+   style="stroke-width:1.16155" />
+<path
+   class="st1"
+   d="M 35.894182,15.118161"
+   id="path2181"
+   style="stroke-width:1.16155" />
+<path
+   class="st1"
+   d="M 39.611153,16.744336"
+   id="path2183"
+   style="stroke-width:1.16155" />
+<path
+   class="st1"
+   d="M 43.095812,14.88585"
+   id="path2185"
+   style="stroke-width:1.16155" />
+<line
+   class="st2"
+   x1="17.087498"
+   y1="19.028881"
+   x2="38.513435"
+   y2="38.767605"
+   id="line2187"
+   style="stroke:#cc0000;stroke-width:2.36307;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st3"
+   d="M 39.611153,25.455986"
+   id="path2189"
+   style="stroke-width:1.16155" />
+<polyline
+   class="st4"
+   points="18.4,25.3 18.2,20.3 22.8,20.4 "
+   id="polyline2191"
+   style="stroke:#cc0000;stroke-width:1.34728;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.855595,0,0,1.855595,-16.684331,-18.639697)" />
+<line
+   class="st2"
+   x1="44.85672"
+   y1="30.743393"
+   x2="31.731171"
+   y2="44.56588"
+   id="line2193"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/curved-line-end.svg b/app/bin/bitmaps/SVG/curved-line-end.svg
new file mode 100644
index 0000000..365e1bd
--- /dev/null
+++ b/app/bin/bitmaps/SVG/curved-line-end.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="curved-line-end.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata2891"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2889" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1378"
+   inkscape:window-height="904"
+   id="namedview2887"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2828">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FC1500;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FC1500;stroke-width:2;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FC1500;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<path
+   class="st1"
+   d="m 4.8384113,46.012013 c 0,-23.034633 15.2509007,-30.767254 31.7708447,-33.565002"
+   id="path2862"
+   style="stroke-width:2.57544;stroke-miterlimit:10;stroke-dasharray:none"
+   sodipodi:nodetypes="cc" />
+
+
+
+
+
+
+
+
+
+
+<g
+   id="g1523"
+   inkscape:label="arrow"
+   transform="matrix(0.99329824,-0.11557947,0.10755047,0.99423249,-1.8346051,4.0269541)"
+   inkscape:transform-center-x="-0.51362946"
+   inkscape:transform-center-y="0.29967713"><line
+     class="st4"
+     x1="39.305443"
+     y1="22.109104"
+     x2="38.916668"
+     y2="4.0958133"
+     id="line2874"
+     style="stroke:#cc1400;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+     class="st5"
+     points="35.6,7.8 38.5,5.4 41.4,7.8 "
+     id="polyline2882"
+     style="stroke:#cc1400;stroke-width:1.62975;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.5339802,0,0,1.5339802,-20.141572,-4.1876794)" /><polyline
+     class="st5"
+     points="41.4,17 38.8,19.1 35.6,17 "
+     id="polyline2884"
+     style="stroke:#cc1400;stroke-width:1.62975;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.5339802,0,0,1.5339802,-20.21299,-7.1899163)" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/curved-line-middle.svg b/app/bin/bitmaps/SVG/curved-line-middle.svg
new file mode 100644
index 0000000..237b453
--- /dev/null
+++ b/app/bin/bitmaps/SVG/curved-line-middle.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="curved-line-middle.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata3510"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs3508" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1293"
+   inkscape:window-height="809"
+   id="namedview3506"
+   showgrid="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style3483">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#FC1500;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="m 4.2736318,45.488353 c 0,-23.039286 21.5033322,-41.7267057 40.7027362,-41.7267057"
+   id="path3485"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st1"
+   d="M 38.28716,5.3096567"
+   id="path3487" />
+<path
+   class="st1"
+   d="M 41.58716,7.0096567"
+   id="path3489" />
+<path
+   class="st1"
+   d="M 38.28716,5.3096567"
+   id="path3491" />
+<path
+   class="st1"
+   d="M 35.38716,17.809657"
+   id="path3493" />
+<path
+   class="st1"
+   d="M 38.58716,19.209657"
+   id="path3495" />
+<path
+   class="st1"
+   d="M 41.58716,17.609657"
+   id="path3497" />
+<line
+   class="st2"
+   x1="17.988567"
+   y1="20.386417"
+   x2="42.018471"
+   y2="42.110428"
+   id="line3499"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st3"
+   d="M 38.58716,26.709657"
+   id="path3501" />
+<polyline
+   class="st4"
+   points="18,26 18,20.3 23.4,20.7 "
+   id="polyline3503"
+   style="stroke:#cc0000;stroke-width:1.99118;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.2541677,-0.05864525,0.05864525,1.2541677,-5.956031,-4.2156616)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/curved-line-tangent.svg b/app/bin/bitmaps/SVG/curved-line-tangent.svg
new file mode 100644
index 0000000..dbac2e2
--- /dev/null
+++ b/app/bin/bitmaps/SVG/curved-line-tangent.svg
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="curved-line-tangent.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata4209"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs4207" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1231"
+   inkscape:window-height="814"
+   id="namedview4205"
+   showgrid="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style4142">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FC1500;stroke-miterlimit:10;}
+	.st4{fill:#BF8700;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FF0000;stroke-miterlimit:10;}
+	.st6{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="M 12.078246,44.927861"
+   id="path4144" />
+<path
+   class="st0"
+   d="M 1.0635811,44.409525"
+   id="path4146" />
+<path
+   class="st0"
+   d="M 30.738383,17.196825"
+   id="path4148" />
+<path
+   class="st0"
+   d="M 25.555012,7.2188348"
+   id="path4150" />
+<path
+   class="st0"
+   d="M 14.799516,33.265276"
+   id="path4152" />
+<path
+   class="st0"
+   d="M 4.8215252,28.341074"
+   id="path4154" />
+<path
+   class="st0"
+   d="M 25.166258,20.306848"
+   id="path4156" />
+<path
+   class="st0"
+   d="M 18.168707,11.495116"
+   id="path4158" />
+<path
+   class="st0"
+   d="M 18.168707,28.081905"
+   id="path4160" />
+<path
+   class="st0"
+   d="M 8.9682223,21.991444"
+   id="path4162" />
+<path
+   class="st0"
+   d="M 13.114921,38.966985"
+   id="path4164" />
+<path
+   class="st0"
+   d="M 1.5819182,36.634468"
+   id="path4166" />
+<path
+   class="st0"
+   d="M 41.364295,12.920544"
+   id="path4168" />
+<path
+   class="st0"
+   d="M 40.068452,2.5538006"
+   id="path4170" />
+<path
+   class="st0"
+   d="M 35.662586,14.34597"
+   id="path4172" />
+<path
+   class="st0"
+   d="M 32.682147,4.2383963"
+   id="path4174" />
+<path
+   class="st0"
+   d="M 21.667483,24.194376"
+   id="path4176" />
+<path
+   class="st0"
+   d="M 12.726167,16.419319"
+   id="path4178" />
+<path
+   class="st1"
+   d="m 3.1707748,45.065034 c 0,-22.568039 22.1983802,-40.8732267 42.0183602,-40.8732267"
+   id="path4180"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st2"
+   d="M 43.437643,11.495116"
+   id="path4182"
+   style="stroke-width:1.29584" />
+<path
+   class="st2"
+   d="M 9.7457276,46.612458"
+   id="path4184"
+   style="stroke-width:1.29584" />
+<path
+   class="st3"
+   d="M 43.913924,-1.2068227"
+   id="path4186"
+   style="stroke-width:1.29584" />
+<path
+   class="st3"
+   d="M 46.418082,1.3875421"
+   id="path4188"
+   style="stroke-width:1.29584" />
+<path
+   class="st3"
+   d="M 43.913924,-1.2068227"
+   id="path4190"
+   style="stroke-width:1.29584" />
+<path
+   class="st3"
+   d="M 38.383856,15.382645"
+   id="path4192"
+   style="stroke-width:1.29584" />
+<path
+   class="st3"
+   d="M 42.530553,17.196825"
+   id="path4194"
+   style="stroke-width:1.29584" />
+<path
+   class="st3"
+   d="M 46.418082,15.123476"
+   id="path4196"
+   style="stroke-width:1.29584" />
+<line
+   class="st4"
+   x1="42.983685"
+   y1="43.366608"
+   x2="16.089582"
+   y2="18.271143"
+   id="line4198"
+   style="stroke:#cc0000;stroke-width:2.47961;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st5"
+   d="M 42.530553,26.915646"
+   id="path4200"
+   style="stroke-width:1.29584" />
+<polyline
+   class="st6"
+   points="38,34 38,39 33,39 "
+   id="polyline4202"
+   style="stroke:#cc0000;stroke-width:1.43697;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.7397675,0,0,1.7397675,-23.134377,-24.49174)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/curved-middle.svg b/app/bin/bitmaps/SVG/curved-middle.svg
new file mode 100644
index 0000000..011b402
--- /dev/null
+++ b/app/bin/bitmaps/SVG/curved-middle.svg
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="curved-middle.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata8594"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs8592"><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect895"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect891"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect887"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect883"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1432"
+   inkscape:window-height="931"
+   id="namedview8590"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="23.9991"
+   inkscape:cy="23.9991"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style8549">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FC1500;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FF0000;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+
+
+<g
+   id="g2961"
+   transform="matrix(1.0375641,0,0,1.0375641,-0.76566984,-0.77459533)"
+   clip-path="none"><line
+     class="st0"
+     x1="1.2915986"
+     y1="43.841686"
+     x2="13.326716"
+     y2="44.362141"
+     id="line8551"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="26.443645"
+     y1="7.0198193"
+     x2="32.799274"
+     y2="16.51804"
+     id="line8553"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="4.9427028"
+     y1="28.4884"
+     x2="16.707367"
+     y2="32.652"
+     id="line8555"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="34.151535"
+     y1="3.506778"
+     x2="38.478771"
+     y2="13.525451"
+     id="line8557"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="19.141439"
+     y1="11.313536"
+     x2="27.39023"
+     y2="20.03108"
+     id="line8559"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     clip-path="none" /><line
+     class="st0"
+     x1="8.8642578"
+     y1="21.852655"
+     x2="19.81757"
+     y2="27.4475"
+     id="line8561"
+     style="stroke:#d98a0d;stroke-opacity:1"
+     clip-path="none" /><line
+     class="st0"
+     x1="2.3734066"
+     y1="36.034924"
+     x2="14.408527"
+     y2="38.376953"
+     id="line8563"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="42.535553"
+     y1="1.8153136"
+     x2="43.887806"
+     y2="12.224323"
+     id="line8565"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="14.26063"
+     y1="15.951141"
+     x2="22.961445"
+     y2="23.591101"
+     id="line2092"
+     style="stroke:#d98a0d;stroke-width:2.56562462;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     clip-path="none" /></g>
+<g
+   id="g2946"
+   transform="matrix(1.0375641,0,0,1.0375641,-0.76566984,-0.77459533)"
+   clip-path="none"><path
+     class="st1"
+     d="m 4.0790933,46.133467 c 0,-23.42027 22.0049877,-41.5439928 42.1291687,-42.10304"
+     id="path8567"
+     style="stroke-width:1.92759175;stroke-miterlimit:10;stroke-dasharray:none"
+     sodipodi:nodetypes="cc" /><path
+     class="st1"
+     d="m 9.8063606,46.204656 c 0,-17.044752 19.4799254,-37.2195265 36.2479574,-37.2195265"
+     id="path8569"
+     style="stroke-width:1.92759175;stroke-miterlimit:10;stroke-dasharray:none"
+     sodipodi:nodetypes="cc"
+     clip-path="none" /></g>
+
+
+
+
+
+
+
+
+<g
+   id="g2950"
+   transform="matrix(0.85711663,0,0,0.85711663,6.9828261,7.7567279)"><line
+     class="st3"
+     x1="20.775936"
+     y1="20.909582"
+     x2="45.645229"
+     y2="44.291237"
+     id="line8583"
+     style="stroke:#cc0000;stroke-width:3.5001071;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+     class="st5"
+     points="18,26 18,20.3 23.4,20.7 "
+     id="polyline8587"
+     style="stroke:#cc0000;stroke-width:2.22328741;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.6049305,0,0,1.5442415,-8.1128129,-10.43852)" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/curved-tangent.svg b/app/bin/bitmaps/SVG/curved-tangent.svg
new file mode 100644
index 0000000..e9aee6b
--- /dev/null
+++ b/app/bin/bitmaps/SVG/curved-tangent.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="curved-tangent.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata9253"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs9251" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1417"
+   inkscape:window-height="972"
+   id="namedview9249"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style9206">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FC1500;stroke-miterlimit:10;}
+	.st3{fill:#BF8700;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FF0000;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="1.7949519"
+   y1="43.925362"
+   x2="13.456883"
+   y2="44.449497"
+   id="line9208"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="27.084311"
+   y1="6.3189082"
+   x2="32.32563"
+   y2="16.408443"
+   id="line9210"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="6.1190376"
+   y1="27.677277"
+   x2="16.208576"
+   y2="32.656528"
+   id="line9212"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="19.615433"
+   y1="10.642995"
+   x2="26.691212"
+   y2="19.553236"
+   id="line9214"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="10.312092"
+   y1="21.256664"
+   x2="19.615433"
+   y2="27.415213"
+   id="line9216"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="2.8432145"
+   y1="36.063385"
+   x2="14.505148"
+   y2="38.421978"
+   id="line9218"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="41.760006"
+   y1="1.6017218"
+   x2="43.070328"
+   y2="12.084357"
+   id="line9220"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="34.291126"
+   y1="3.3051503"
+   x2="37.304882"
+   y2="13.525721"
+   id="line9222"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="14.112048"
+   y1="15.622247"
+   x2="23.153322"
+   y2="23.484222"
+   id="line9224"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<path
+   class="st1"
+   d="m 3.4983796,46.152922 c 0,-23.58593 22.0135354,-42.716739 41.6684764,-42.716739"
+   id="path9226"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st1"
+   d="m 11.098291,46.152922 c 0,-17.165315 17.820479,-35.509928 34.068565,-35.509928"
+   id="path9228"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st2"
+   d="M 43.195559,-1.4682949"
+   id="path9230"
+   style="stroke-width:1.30331" />
+<path
+   class="st2"
+   d="M 47.496477,0.74732904"
+   id="path9232"
+   style="stroke-width:1.30331" />
+<path
+   class="st2"
+   d="M 43.195559,-1.4682949"
+   id="path9234"
+   style="stroke-width:1.30331" />
+<path
+   class="st2"
+   d="M 40.056571,14.573983"
+   id="path9236"
+   style="stroke-width:1.31033" />
+<path
+   class="st2"
+   d="M 44.249625,16.408445"
+   id="path9238"
+   style="stroke-width:1.31033" />
+<path
+   class="st2"
+   d="M 48.180614,14.311918"
+   id="path9240"
+   style="stroke-width:1.31033" />
+<rect
+   style="opacity:1;fill:#ebebeb;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;fill-opacity:1"
+   id="rect2707"
+   width="6.7369518"
+   height="5.6268826"
+   x="26.763359"
+   y="-0.49409166"
+   transform="matrix(0.75078063,0.66055162,-0.68047575,0.7327706,0,0)" /><line
+   class="st3"
+   x1="44.249977"
+   y1="43.668476"
+   x2="19.586525"
+   y2="19.91222"
+   id="line9242"
+   style="stroke:#cc0000;stroke-width:3.18605;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st4"
+   d="M 44.249625,26.235915"
+   id="path9244"
+   style="stroke-width:1.31033" />
+<polyline
+   class="st5"
+   points="40,36 40,41 35,41 "
+   id="polyline9246"
+   style="stroke:#cc0000;stroke-width:2.20162;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.436209,0,0,1.4581584,-13.19838,-16.116015)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/cut.svg b/app/bin/bitmaps/SVG/cut.svg
new file mode 100644
index 0000000..8b8d9f0
--- /dev/null
+++ b/app/bin/bitmaps/SVG/cut.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="cut.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1571"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="25.305762"
+     inkscape:cy="33.492921"
+     inkscape:window-x="18"
+     inkscape:window-y="57"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1659"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Export" /><path
+     style="fill:none;stroke:#404040;stroke-width:3.64621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 24.366275,17.817103 c -0.216559,-2.583731 -2.637624,-5.586626 -7.305886,-6.813095 -3.724698,0.679851 -10.2494995,4.973226 -8.4980529,6.619454 l 7.7248489,5.748191 c 2.883549,0.704931 5.350618,-2.382586 8.07909,-5.55455 z"
+     id="path1208"
+     sodipodi:nodetypes="ccccc" /><path
+     style="fill:none;stroke:#404040;stroke-width:3.6332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 5.4748051,36.029254 c -2.7151332,0.433054 -0.1962835,7.037401 3.9655015,9.447893 3.7582774,0.32979 7.4204664,0.187587 9.8059744,-2.735214 -0.349439,-2.94556 -0.1757,-6.819736 -3.306541,-7.756504 z"
+     id="path1208-1"
+     sodipodi:nodetypes="ccccc" /><path
+     style="fill:none;stroke:#404040;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8.5623361,17.623462 29.746591,34.057704 5.4748051,36.029254"
+     id="path1718"
+     sodipodi:nodetypes="ccc" /><path
+     style="fill:#404040;fill-opacity:1;stroke:#404040;stroke-width:1.15889;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 32.967253,35.68144 59.33674,33.709891 53.175645,30.629342 29.763484,32.600893 Z"
+     id="path3015" /><path
+     style="fill:#404040;fill-opacity:1;stroke:#404040;stroke-width:1.14488;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 34.637458,37.491514 55.088511,53.974054 48.31229,52.934405 30.168362,38.01363 Z"
+     id="path3015-0"
+     inkscape:transform-center-x="-0.043751259"
+     inkscape:transform-center-y="-0.14231423"
+     sodipodi:nodetypes="ccccc" /></svg>
diff --git a/app/bin/bitmaps/SVG/delete.svg b/app/bin/bitmaps/SVG/delete.svg
new file mode 100644
index 0000000..55d6471
--- /dev/null
+++ b/app/bin/bitmaps/SVG/delete.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="delete.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata31"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs29" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1438"
+   inkscape:window-height="878"
+   id="namedview27"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="22.56245"
+   inkscape:cy="24"
+   inkscape:window-x="3"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+<g
+   id="ties"
+   inkscape:label="ties"
+   transform="matrix(1.3006641,0,0,1.3006641,-7.3756654,-4.111636)"><line
+     class="st0"
+     x1="9"
+     y1="16"
+     x2="9"
+     y2="27"
+     id="line4"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="14"
+     y1="16"
+     x2="14"
+     y2="27"
+     id="line6"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="19"
+     y1="16"
+     x2="19"
+     y2="27"
+     id="line8"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="24"
+     y1="16"
+     x2="24"
+     y2="27"
+     id="line10"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="29"
+     y1="16"
+     x2="29"
+     y2="27"
+     id="line12"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="34"
+     y1="16"
+     x2="34"
+     y2="27"
+     id="line14"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="39"
+     y1="16"
+     x2="39"
+     y2="27"
+     id="line16"
+     style="stroke:#d98a0d;stroke-opacity:1" /></g>
+
+<g
+   id="rail"
+   inkscape:label="rail"
+   transform="matrix(1.3006641,0,0,1.1040829,-7.3756654,0.10254712)"
+   style="stroke-width:1.47801;stroke-miterlimit:10;stroke-dasharray:none"><line
+     class="st1"
+     x1="7"
+     y1="17.5"
+     x2="41"
+     y2="17.5"
+     id="line18"
+     style="stroke-width:1.47801;stroke-miterlimit:10;stroke-dasharray:none" /><line
+     class="st1"
+     x1="7"
+     y1="25.5"
+     x2="41"
+     y2="25.5"
+     id="line20"
+     style="stroke-width:1.47801;stroke-miterlimit:10;stroke-dasharray:none" /></g>
+
+<g
+   id="x"
+   inkscape:label="x"
+   style="stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none"
+   transform="matrix(1.2833014,0,0,1.2251804,-6.9372327,-2.6670144)"><path
+     class="st2"
+     d="M 14.106487,7.2987516 C 26.983061,20.825658 26.983061,20.825658 15.277084,36.30356"
+     id="path22"
+     style="stroke:#cc0000;stroke-width:3.8281;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><path
+     class="st2"
+     d="m 34.006647,36.30356 c -12.096176,-14.047171 -12.096176,-14.047171 0,-29.0048084"
+     id="path24"
+     style="stroke:#cc0000;stroke-width:3.8281;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/describe.svg b/app/bin/bitmaps/SVG/describe.svg
new file mode 100644
index 0000000..495a3b8
--- /dev/null
+++ b/app/bin/bitmaps/SVG/describe.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="describe.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata928"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs926" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1580"
+   inkscape:window-height="966"
+   id="namedview924"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="24"
+   inkscape:cy="19.482353"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style893">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FB0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FB0000;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FB0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FB0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+<g
+   id="ties"
+   inkscape:label="ties"
+   transform="matrix(1.3046527,0,0,1.3046527,-5.9214072,-2.9615326)"><line
+     class="st0"
+     x1="8"
+     y1="16"
+     x2="8"
+     y2="27"
+     id="line895"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="13"
+     y1="16"
+     x2="13"
+     y2="27"
+     id="line897"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="18"
+     y1="16"
+     x2="18"
+     y2="27"
+     id="line899"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="28"
+     y1="16"
+     x2="28"
+     y2="27"
+     id="line903"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="33"
+     y1="16"
+     x2="33"
+     y2="27"
+     id="line905"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="38"
+     y1="16"
+     x2="38"
+     y2="27"
+     id="line907"
+     style="stroke:#d98b0d;stroke-opacity:1" /></g>
+
+<g
+   id="rail"
+   inkscape:label="rail"
+   transform="matrix(1.3046527,0,0,1.1147635,-6.0070121,1.1958036)"
+   style="stroke-width:1.49671;stroke-miterlimit:10;stroke-dasharray:none"><line
+     class="st1"
+     x1="6"
+     y1="17.5"
+     x2="40"
+     y2="17.5"
+     id="line909"
+     style="stroke-width:1.49671;stroke-miterlimit:10;stroke-dasharray:none" /><line
+     class="st1"
+     x1="6"
+     y1="25.5"
+     x2="40"
+     y2="25.5"
+     id="line911"
+     style="stroke-width:1.49671;stroke-miterlimit:10;stroke-dasharray:none" /></g>
+
+
+
+
+<g
+   id="question"
+   inkscape:label="question"
+   transform="matrix(1.8239805,0,0,1.6303501,-18.297728,-12.564437)"><path
+     class="st4"
+     d="M 18.825677,15.7 C 17.914059,11.7 27.6,11.1 27.6,15.3 c 0,3.9 -1.937188,5.6 -4.672042,5.7 v 7.5"
+     id="path919"
+     style="stroke:#cc0000;stroke-width:3.20245;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><rect
+     x="22.491764"
+     y="31.943529"
+     class="st5"
+     width="1"
+     height="1.1"
+     id="rect921"
+     style="stroke:#cc0000;stroke-opacity:1" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/description.svg b/app/bin/bitmaps/SVG/description.svg
new file mode 100644
index 0000000..15f43e2
--- /dev/null
+++ b/app/bin/bitmaps/SVG/description.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="description.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata2191"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2189" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1578"
+   inkscape:window-height="889"
+   id="namedview2187"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="22.641414"
+   inkscape:cy="24.158828"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2160">
+	.st0{fill:none;stroke:#07ABFB;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000CBF;stroke-miterlimit:10;}
+	.st2{font-family:'MyriadPro-Regular';}
+	.st3{font-size:12px;}
+	.st4{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="4.4900389"
+   y1="31.815163"
+   x2="4.4900389"
+   y2="46.122471"
+   id="line2162" />
+<line
+   class="st0"
+   x1="10.993358"
+   y1="31.815163"
+   x2="10.993358"
+   y2="46.122471"
+   id="line2164" />
+<line
+   class="st0"
+   x1="17.496681"
+   y1="31.815163"
+   x2="17.496681"
+   y2="46.122471"
+   id="line2166" />
+<line
+   class="st0"
+   x1="24"
+   y1="31.815163"
+   x2="24"
+   y2="46.122471"
+   id="line2168" />
+<line
+   class="st0"
+   x1="30.503323"
+   y1="31.815163"
+   x2="30.503323"
+   y2="46.122471"
+   id="line2170" />
+<line
+   class="st0"
+   x1="37.006641"
+   y1="31.815163"
+   x2="37.006641"
+   y2="46.122471"
+   id="line2172" />
+<line
+   class="st0"
+   x1="43.509964"
+   y1="31.815163"
+   x2="43.509964"
+   y2="46.122471"
+   id="line2174" />
+<line
+   class="st1"
+   x1="1.8887103"
+   y1="35.076363"
+   x2="46.11129"
+   y2="35.076363"
+   id="line2176"
+   style="stroke-width:2.4;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="1.8887103"
+   y1="42.861271"
+   x2="46.11129"
+   y2="42.861271"
+   id="line2178"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+
+<line
+   class="st4"
+   x1="24.15"
+   y1="30.152931"
+   x2="24.15"
+   y2="15.152927"
+   id="line2182"
+   style="stroke:#cc0e00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st5"
+   points="27.9,19.7 24,16 19.8,19.7 "
+   id="polyline2184"
+   transform="translate(0.14999976,-0.84707096)"
+   style="stroke:#cc0e00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<text
+   xml:space="preserve"
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.6667px;line-height:1.25;font-family:'Gill Sans MT';-inkscape-font-specification:'Gill Sans MT Bold'"
+   x="3.2639496"
+   y="12.011017"
+   id="text2756"><tspan
+     sodipodi:role="line"
+     id="tspan2754"
+     x="3.2639496"
+     y="12.011017">DESC</tspan></text></svg>
diff --git a/app/bin/bitmaps/SVG/dimension.svg b/app/bin/bitmaps/SVG/dimension.svg
new file mode 100644
index 0000000..7443b8a
--- /dev/null
+++ b/app/bin/bitmaps/SVG/dimension.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="dimension.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata1539"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1537" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1346"
+   inkscape:window-height="842"
+   id="namedview1535"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24"
+   inkscape:cy="24.695735"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style1492">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{font-family:'MyriadPro-Regular';}
+	.st6{font-size:12px;}
+</style>
+<path
+   class="st0"
+   d="M5.9,35.8"
+   id="path1494" />
+<path
+   class="st0"
+   d="M9.2,32.3"
+   id="path1496" />
+<path
+   class="st0"
+   d="M12.5,28.8"
+   id="path1498" />
+<path
+   class="st0"
+   d="M15.8,25.3"
+   id="path1500" />
+<path
+   class="st0"
+   d="M19.1,21.8"
+   id="path1502" />
+<path
+   class="st0"
+   d="M22.4,18.3"
+   id="path1504" />
+<path
+   class="st0"
+   d="M25.7,14.7"
+   id="path1506" />
+<path
+   class="st0"
+   d="M37.2,19.2"
+   id="path1508" />
+<path
+   class="st0"
+   d="M29,11.2"
+   id="path1510" />
+<path
+   class="st0"
+   d="M40.6,15.7"
+   id="path1512" />
+<path
+   class="st0"
+   d="M32.3,7.7"
+   id="path1514" />
+<path
+   class="st1"
+   d="M36.5,6.9"
+   id="path1516" />
+<path
+   class="st1"
+   d="M5.6,39.5"
+   id="path1518" />
+<path
+   class="st2"
+   d="M24.6,23.8"
+   id="path1520" />
+<path
+   class="st2"
+   d="M6,43.1"
+   id="path1522" />
+<line
+   class="st3"
+   x1="32.164993"
+   y1="15.832255"
+   x2="44.44154"
+   y2="3.2073443"
+   id="line1524"
+   style="stroke:#cc0e00;stroke-width:3.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st4"
+   points="42.6,12.6 42.1,5.8 35.5,5.8 "
+   id="polyline1526"
+   style="stroke:#cc0e00;stroke-width:2.94445055;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.1864868,0,0,1.1908708,-5.5442267,-3.6659913)" />
+<line
+   class="st3"
+   x1="15.726236"
+   y1="32.24678"
+   x2="4.0029783"
+   y2="44.370842"
+   id="line1528"
+   style="stroke:#cc0e00;stroke-width:3.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st4"
+   points="8,34 8.5,40.9 15.1,40.9 "
+   id="polyline1530"
+   style="stroke:#cc0e00;stroke-width:2.68761367;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.3022705,0,0,1.3022705,-6.8028116,-9.1468245)" />
+<text
+   class="st5 st6"
+   id="text1532"
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.3333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'"
+   x="12.357784"
+   y="30.296465">36</text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/doc-export-bmap.svg b/app/bin/bitmaps/SVG/doc-export-bmap.svg
new file mode 100644
index 0000000..90a88b0
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-export-bmap.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-export-bmap.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   inkscape:export-filename="C:\Users\Russell\OneDrive\Desktop\XTC-Ribbon\svg\doc-export-bmap-64.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1331"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="7.6322099"
+     inkscape:cx="34.721267"
+     inkscape:cy="38.914024"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer2"
+     inkscape:document-rotation="0"
+     inkscape:snap-nodes="false"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Export DXF"><path
+       style="fill:#e5d0bc;fill-opacity:1;stroke:#000000;stroke-width:1.08845;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 45.81776,41.744039 3.150401,4.442557 -0.337543,17.068768 H 0.92453011 V 0.82575003 L 48.74313,0.94265931 48.968158,17.076152 46.549182,20.088854"
+       id="path849"
+       sodipodi:nodetypes="cccccccc" /><path
+       style="opacity:0.999;fill:#54a7d6;fill-opacity:1;stroke:#000000;stroke-width:0.348134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.488555,32.04338 7.6505091,3.398841 3.3862919,3.398843 1.505019,6.069362 0.627092,6.312136 1.25418,6.554908 2.006693,4.855492 -16.429785,0.121386 z"
+       id="lake"
+       sodipodi:nodetypes="ccccccccc" /><g
+       id="arrow"
+       transform="matrix(0.99468395,0,0,0.97646706,3.2675238,0.70437977)"
+       inkscape:label="arrow"
+       style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+         style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 46.398031,40.401712 11.404136,-8.5769 -11.209194,-8.430286"
+         id="path1484" /><path
+         style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:4.46101;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 57.802167,31.824812 H 30.622099"
+         id="path1706" /></g><path
+       style="fill:none;stroke:#000000;stroke-width:2.17239;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 17.73639,35.772982 0.356685,-15.69413 c 1.305829,-5.853103 2.125288,-5.497379 4.874693,-9.987174"
+       id="path922"
+       sodipodi:nodetypes="ccc" /><rect
+       style="fill:#d58e5d;fill-opacity:1;stroke:#784521;stroke-width:0.536317;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect924-2-7"
+       width="12.223145"
+       height="8.0698709"
+       x="-39.133907"
+       y="-51.56028"
+       ry="0.11891395"
+       transform="matrix(-0.99999989,-4.716658e-4,0.00537433,-0.99998556,0,0)"
+       inkscape:transform-center-x="20.953983"
+       inkscape:transform-center-y="0.72420852" /><path
+       sodipodi:type="star"
+       style="fill:#488825;fill-opacity:1;stroke:#488825;stroke-width:0.560074;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path992-2"
+       sodipodi:sides="6"
+       sodipodi:cx="11.855275"
+       sodipodi:cy="15.882116"
+       sodipodi:r1="3.846628"
+       sodipodi:r2="3.0109019"
+       sodipodi:arg1="0.84914148"
+       sodipodi:arg2="1.3727403"
+       inkscape:flatsided="false"
+       inkscape:rounded="0.2"
+       inkscape:randomized="0"
+       d="m 14.396465,18.769832 c -0.292751,0.25762 -1.566414,-0.01241 -1.948754,0.06433 -0.382339,0.07673 -1.453195,0.81727 -1.822676,0.692551 C 10.255554,19.40199 9.8525707,18.163952 9.5949503,17.871202 9.3373299,17.578452 8.1605758,17.021333 8.0838452,16.638993 8.0071147,16.256654 8.8777948,15.288641 9.002514,14.91916 c 0.1247191,-0.369481 0.018821,-1.667139 0.3115714,-1.924759 0.2927505,-0.257621 1.5664136,0.0124 1.9487536,-0.06433 0.382339,-0.07673 1.453195,-0.81727 1.822676,-0.692551 0.369481,0.124719 0.772465,1.362756 1.030085,1.655507 0.25762,0.29275 1.434375,0.849869 1.511105,1.232208 0.07673,0.38234 -0.79395,1.350352 -0.918669,1.719833 -0.124719,0.369481 -0.01882,1.66714 -0.311571,1.92476 z" /><path
+       style="opacity:0.998;fill:none;stroke:#000000;stroke-width:2.11841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 45.772104,42.452438 0.01591,4.896454 C 45.426458,53.678042 43.785788,57.38601 36.32066,58.414645 L 29.558257,58.291694 C 22.244079,57.158368 18.761734,53.151166 18.000693,47.102987 L 17.877741,36.406092 C 17.586359,28.846724 11.453325,27.410748 6.0742709,23.741953 5.1148889,21.906907 4.1108952,20.205698 4.1070261,15.504114 5.7689541,8.76985 9.6724691,7.159212 13.574394,5.5449374 L 33.12389,5.2990318 c 7.305654,0.2514013 12.330785,3.466217 12.418233,11.0657502 l 0.114988,4.535242"
+       id="track"
+       sodipodi:nodetypes="cccccccccccc" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-export-dxf.svg b/app/bin/bitmaps/SVG/doc-export-dxf.svg
new file mode 100644
index 0000000..30e6e79
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-export-dxf.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-export-dxf.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1443"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="32.004346"
+     inkscape:cy="32.961287"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer2"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:snap-bbox="true"><inkscape:grid
+       type="xygrid"
+       id="grid849" /></sodipodi:namedview><g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Export DXF"><g
+       id="grid"
+       transform="matrix(1.160237,0,0,1.0808223,-1.5115895,-2.4478775)"
+       inkscape:label="grid"
+       style="stroke:#666666;stroke-width:1.89694;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><g
+         id="g1735"
+         style="stroke:#666666;stroke-width:1.89694;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+           style="fill:none;stroke:#666666;stroke-width:1.89694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 3.141179,15.31105 H 44.70585"
+           id="path855" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 3.141179,48.484986 H 44.705851"
+           id="path855-1" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 3.141179,37.427011 H 40.909775"
+           id="path855-2"
+           sodipodi:nodetypes="cc" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 3.141179,26.369029 H 40.81244"
+           id="path855-4"
+           sodipodi:nodetypes="cc" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 3.141179,4.2530693 H 44.70585"
+           id="path855-91" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89694;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 3.3519333,59.542966 44.432822,59.44459"
+           id="path855-40"
+           sodipodi:nodetypes="cc" /></g><g
+         id="g1721"
+         transform="matrix(1.0000001,0,0,1.0070684,-4.0552238e-7,-0.02780768)"
+         style="stroke:#666666;stroke-width:1.89027;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+           style="fill:none;stroke:#666666;stroke-width:1.89027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 13.691837,3.93409 V 59.542971"
+           id="path949-0" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 24.02984,3.93409 V 59.542971"
+           id="path949-7" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 34.367842,35.060202 V 59.542971"
+           id="path949-9"
+           clip-path="none"
+           sodipodi:nodetypes="cc" /><path
+           style="fill:none;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 34.166366,3.5704399 V 28.660365"
+           id="path949-9-6"
+           clip-path="none"
+           sodipodi:nodetypes="cc" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 44.436613,43.120547 0.0019,16.965895"
+           id="path949-2-3"
+           sodipodi:nodetypes="cc" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 3.3538333,3.3828771 V 59.542971"
+           id="path949-2-8" /><path
+           style="fill:none;stroke:#666666;stroke-width:1.89027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 44.437406,3.280868 0.0019,16.965896"
+           id="path949-2-3-4"
+           sodipodi:nodetypes="cc" /></g></g><g
+       id="arrow"
+       transform="translate(1.8075544,0.21265346)"
+       inkscape:label="arrow"
+       style="stroke:#cc0000;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+         style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 46.398031,40.401712 11.404136,-8.5769 -11.209194,-8.749266"
+         id="path1484"
+         sodipodi:nodetypes="ccc" /><path
+         style="fill:none;stroke:#cc0000;stroke-width:4.46101;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 57.802167,31.824812 H 30.622099"
+         id="path1706" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-export-svg.svg b/app/bin/bitmaps/SVG/doc-export-svg.svg
new file mode 100644
index 0000000..fcde438
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-export-svg.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-export-svg.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1532"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="33.439757"
+     inkscape:cy="32.961287"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer2"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Export DXF"><path
+       sodipodi:type="star"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#008000;stroke-width:6.80619;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2519"
+       inkscape:flatsided="false"
+       sodipodi:sides="8"
+       sodipodi:cx="27.432297"
+       sodipodi:cy="27.113317"
+       sodipodi:r1="24.592754"
+       sodipodi:r2="24.592754"
+       sodipodi:arg1="0.67204007"
+       sodipodi:arg2="1.0647392"
+       inkscape:rounded="0.2"
+       inkscape:randomized="0"
+       d="m 46.677435,42.424367 c -1.194815,1.501816 -5.645649,5.26905 -7.324235,6.199311 -1.678585,0.930262 -7.232276,2.707471 -9.139082,2.924554 -1.906807,0.217082 -7.717858,-0.266296 -9.562592,-0.795441 -1.844733,-0.529145 -7.028463,-3.19952 -8.530278,-4.394335 C 10.619431,45.16364 6.8521971,40.712806 5.9219358,39.034221 4.9916746,37.355636 3.2144648,31.801944 2.9973824,29.895139 2.7802999,27.988332 3.263678,22.17728 3.792823,20.332547 4.3219679,18.487814 6.9923437,13.304084 8.1871586,11.802268 9.3819738,10.300452 13.832808,6.5332178 15.511393,5.6029565 17.189978,4.6726954 22.74367,2.8954856 24.650476,2.6784031 c 1.906806,-0.2170824 7.717858,0.2662956 9.562591,0.7954407 1.844733,0.5291449 7.028463,3.1995206 8.530279,4.3943355 1.501816,1.1948153 5.26905,5.6456497 6.199312,7.3242347 0.930261,1.678585 2.707471,7.232277 2.924553,9.139082 0.217083,1.906807 -0.266295,7.717859 -0.795441,9.562592 -0.529144,1.844733 -3.19952,7.028463 -4.394335,8.530279 z"
+       transform="matrix(0.59879059,0,0,0.57681546,1.2240368,1.2665708)" /><g
+       id="arrow"
+       inkscape:label="arrow"
+       style="stroke:#cc0000;stroke-width:5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="translate(3.296128,0.10188103)"><path
+         style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 46.398031,40.401712 11.404136,-8.5769 -11.209194,-8.430286"
+         id="path1484" /><path
+         style="fill:none;stroke:#cc0000;stroke-width:5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 57.802167,31.824812 H 30.622099"
+         id="path1706" /></g><path
+       style="fill:none;stroke:#1a66e5;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.3166078,61.082184 20.880646,38.63199 37.365489,61.229149 Z"
+       id="path851"
+       sodipodi:nodetypes="cccc" /><path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 50.110141,5.2235118 C 40.279181,5.3434014 34.524473,6.4224094 28.769764,8.5804247 20.377481,11.937336 12.824425,17.092597 8.7481732,24.285983 c 0,0 -5.155259,11.149748 0.2397801,18.582913 4.7955897,7.792835 16.1251727,10.190629 16.1251727,10.190629 10.43041,3.956362 24.757235,2.517685 24.757235,2.517685"
+       id="path853"
+       sodipodi:nodetypes="cccccc" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-export-xtc.svg b/app/bin/bitmaps/SVG/doc-export-xtc.svg
new file mode 100644
index 0000000..dab12aa
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-export-xtc.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-export-xtc.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><rect
+     style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.9309;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect900"
+     width="59.649868"
+     height="42.871033"
+     x="2.1262496"
+     y="-45.047009"
+     transform="rotate(90)" /><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1571"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="25.305762"
+     inkscape:cy="32.961287"
+     inkscape:window-x="18"
+     inkscape:window-y="57"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1659"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Export"><g
+       id="arrow"
+       transform="translate(2.5460266,-0.85071321)"
+       inkscape:label="arrow"
+       style="stroke:#cc0000;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+         style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 46.398031,40.401712 11.404136,-8.5769 -11.209194,-8.430286"
+         id="path1484" /><path
+         style="fill:none;stroke:#cc0000;stroke-width:4.44353;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 57.802167,31.824812 H 30.834752"
+         id="path1706" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-export.svg b/app/bin/bitmaps/SVG/doc-export.svg
new file mode 100644
index 0000000..6954caf
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-export.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-export.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><rect
+     style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.91414;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect900"
+     width="59.480015"
+     height="42.939346"
+     x="2.3393428"
+     y="-45.517216"
+     transform="rotate(90)" /><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1583"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="29.984138"
+     inkscape:cy="31.366386"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1659"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><rect
+     style="fill:#d0d0d0;fill-opacity:1;stroke:#9c9c9c;stroke-width:1.10215;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect36"
+     width="29.763172"
+     height="30.887873"
+     x="9.1128759"
+     y="15.885306" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Export"><g
+       id="arrow"
+       transform="translate(2.4397,-0.74438648)"
+       inkscape:label="arrow"
+       style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+         style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 46.398031,40.401712 11.404136,-8.5769 -11.209194,-8.430286"
+         id="path1484" /><path
+         style="fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:4.39951;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 57.802167,31.824812 H 31.366386"
+         id="path1706" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-import-xtc.svg b/app/bin/bitmaps/SVG/doc-import-xtc.svg
new file mode 100644
index 0000000..01f2275
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-import-xtc.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-import-xtc.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><rect
+     style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect900"
+     width="60.646675"
+     height="46.762989"
+     x="1.8175089"
+     y="-62.21909"
+     transform="rotate(90)" /><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1571"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="12.227574"
+     inkscape:cy="32.961287"
+     inkscape:window-x="18"
+     inkscape:window-y="57"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1659"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Export"><g
+       id="arrow"
+       transform="translate(-29.564658,-0.31907955)"
+       inkscape:label="arrow"
+       style="stroke:#02833c;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+         style="fill:none;fill-opacity:1;stroke:#02833c;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 46.398031,40.401712 11.404136,-8.5769 -11.209194,-8.430286"
+         id="path1484" /><path
+         style="fill:none;stroke:#02833c;stroke-width:4.44353;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 57.802167,31.824812 H 30.834752"
+         id="path1706" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-import.svg b/app/bin/bitmaps/SVG/doc-import.svg
new file mode 100644
index 0000000..e2bfc72
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-import.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-import.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><rect
+     style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect900"
+     width="60.646675"
+     height="46.762989"
+     x="1.8175089"
+     y="-62.325417"
+     transform="rotate(90)" /><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1571"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="12.227574"
+     inkscape:cy="32.961287"
+     inkscape:window-x="18"
+     inkscape:window-y="57"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1659"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Export"><rect
+       style="fill:#d0d0d0;fill-opacity:1;stroke:#9c9c9c;stroke-width:1.17;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect36"
+       width="32.256348"
+       height="31.92165"
+       x="22.810884"
+       y="16.09137" /><g
+       id="arrow"
+       transform="translate(-29.458331,-0.31907955)"
+       inkscape:label="arrow"
+       style="stroke:#02833c;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+         style="fill:none;fill-opacity:1;stroke:#02833c;stroke-width:4.7811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 46.398031,40.401712 11.404136,-8.5769 -11.209194,-8.430286"
+         id="path1484" /><path
+         style="fill:none;stroke:#02833c;stroke-width:4.44353;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 57.802167,31.824812 H 30.834752"
+         id="path1706" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-new.svg b/app/bin/bitmaps/SVG/doc-new.svg
new file mode 100644
index 0000000..6aac25e
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-new.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-new.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1688"
+     inkscape:window-height="943"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="8.1826993"
+     inkscape:cx="32.079879"
+     inkscape:cy="27.558143"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layout"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     id="Layout"
+     inkscape:label="#layout"
+     transform="translate(-0.22803691,0.91214765)"
+     style="opacity:1"><rect
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect900"
+       width="60.915188"
+       height="46.970028"
+       x="0.63025844"
+       y="-55.713051"
+       transform="rotate(90)" /><g
+       id="plus"
+       transform="matrix(1.6740309,0,0,1.6334616,-51.092795,-24.413751)"
+       inkscape:label="plus"><path
+         style="display:inline;fill:#005a20;fill-opacity:1;stroke:#00993d;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 46.809533,31.077554 v -4.700241 h 4.630089 v -3.086726 l -4.559936,0.07015 -0.07015,-4.559936 h -3.016572 l 0.140305,4.559936 -4.840547,0.07015 0.07015,3.086726 4.489783,-0.07015 0.140306,4.630088 z"
+         id="path1718" /><path
+         style="fill:none;fill-opacity:1;stroke:#00e552;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 45.350068,18.723791 V 31.070694"
+         id="path1702" /><path
+         style="fill:none;fill-opacity:1;stroke:#00e552;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 51.516636,24.897242 H 39.169733"
+         id="path1708" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-open.svg b/app/bin/bitmaps/SVG/doc-open.svg
new file mode 100644
index 0000000..ede9909
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-open.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-open.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663"><marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true"><path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path875" /></marker></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1581"
+     inkscape:window-height="943"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="8.1826993"
+     inkscape:cx="26.519366"
+     inkscape:cy="32.446506"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layout"
+     inkscape:document-rotation="0"
+     inkscape:snap-nodes="false"
+     inkscape:pagecheckerboard="0" /><g
+     id="Layout"
+     inkscape:label="#layout"
+     transform="translate(-0.22803691,0.91214765)"
+     style="opacity:1"><g
+       id="g1480"
+       transform="matrix(1.0113034,0,0,-2.2164172,-2.7819274,137.03913)"
+       style="stroke-width:1.4036;stroke-miterlimit:10;stroke-dasharray:none"><path
+         style="fill:#f6db93;fill-opacity:1;stroke:#674d09;stroke-width:0.741175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+         d="m 4.9612505,58.671862 23.1549845,-0.06124 c 3.509047,-0.280952 3.845853,-1.595448 5.296087,-2.143264 l 24.386632,0.06124 V 36.933048 H 5.0844153 Z"
+         id="path1147"
+         sodipodi:nodetypes="ccccccc" /></g><path
+       id="path898"
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#9e9e9e;stroke-width:0.771915;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="-0.086408966"
+       inkscape:transform-center-y="-2.125661"
+       d="m 50.078287,40.375329 -40.355118,0.05576 -0.1334945,-30.28419 31.4443435,0.07855 8.923599,8.061481 z"
+       sodipodi:nodetypes="cccccc" /><path
+       style="fill:#f6db93;fill-opacity:1;stroke:#674d09;stroke-width:1.10194px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 2.3773227,55.056954 10.246792,24.974007 h 51.861103 l -6.579394,30.082947 z"
+       id="path1149" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-print.svg b/app/bin/bitmaps/SVG/doc-print.svg
new file mode 100644
index 0000000..1926edf
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-print.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-print.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1694"
+     inkscape:window-height="943"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="8.7705101"
+     inkscape:cx="31.982176"
+     inkscape:cy="38.025154"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layout"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     id="Layout"
+     inkscape:label="#layout"
+     transform="translate(-0.22803691,0.91214765)"
+     style="opacity:1"><rect
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.74846;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect900-3"
+       width="21.686026"
+       height="43.641754"
+       x="1.2954774"
+       y="-54.048908"
+       transform="rotate(90)" /><g
+       id="g882"
+       transform="matrix(1.3128287,0,0,1.1627519,-9.9792225,-5.0700017)"
+       style="stroke-width:1.00005;stroke-miterlimit:4;stroke-dasharray:none"><rect
+         style="fill:#d9d9d9;fill-opacity:1;stroke:#797979;stroke-width:1.00005;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect884"
+         width="45.182987"
+         height="24.276136"
+         x="9.5583668"
+         y="24.055124"
+         ry="0.13436399" /></g><rect
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.74846;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect900"
+       width="20.560341"
+       height="43.58411"
+       x="40.319885"
+       y="-54.020088"
+       transform="rotate(90)" /><path
+       style="fill:none;stroke:#333333;stroke-width:1.16565px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13.25529,43.106167 H 42.861672"
+       id="path886" /><path
+       style="fill:none;stroke:#333333;stroke-width:1.16565px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13.25529,46.681085 H 48.198877"
+       id="path888" /><path
+       style="fill:none;stroke:#333333;stroke-width:1.16565px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13.25529,50.256011 H 45.077114"
+       id="path890" /><path
+       style="fill:none;stroke:#333333;stroke-width:1.16565px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13.25529,53.830931 H 49.910812"
+       id="path892" /><path
+       style="fill:none;stroke:#333333;stroke-width:1.16565px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13.25529,57.405849 H 42.257459"
+       id="path894" /><circle
+       style="fill:#d9d9d9;fill-opacity:1;stroke:#797979;stroke-width:2.04343;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path896"
+       sodipodi:type="arc"
+       sodipodi:cx="11.140548"
+       sodipodi:cy="28.202278"
+       sodipodi:rx="0.89170206"
+       sodipodi:ry="0.89170206"
+       sodipodi:start="1.5742817"
+       sodipodi:end="1.5686094"
+       sodipodi:arc-type="slice"
+       d="m 11.13744,29.093975 a 0.89170206,0.89170206 0 0 1 -0.888592,-0.89354 0.89170206,0.89170206 0 0 1 0.892279,-0.889859 0.89170206,0.89170206 0 0 1 0.891123,0.891017 0.89170206,0.89170206 0 0 1 -0.889752,0.892385 l -0.0019,-0.8917 z" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-revert.svg b/app/bin/bitmaps/SVG/doc-revert.svg
new file mode 100644
index 0000000..f5b6290
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-revert.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-revert.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1688"
+     inkscape:window-height="943"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="8.1826993"
+     inkscape:cx="32.079879"
+     inkscape:cy="27.558143"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layout"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     id="Layout"
+     inkscape:label="#layout"
+     transform="translate(-0.22803691,0.91214765)"
+     style="opacity:1"><rect
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.2515;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect900"
+       width="60.915188"
+       height="46.970032"
+       x="0.64903259"
+       y="-55.527374"
+       transform="rotate(90)" /><path
+       class="st0"
+       d="m 46.746873,49.389829 c 1.100724,0.102144 0.963134,0.102144 3.164588,0.102144 0,-11.746454 -3.577362,-30.030067 -21.876939,-30.336495 -0.275181,-2.96215 -0.137592,-5.617871 -0.137592,-5.617871 l -12.658353,8.375733 13.071127,9.499308 c 0,0 -0.275182,-2.349291 -0.275182,-5.720013 12.933536,-0.102143 18.161987,15.321463 18.712351,23.697194 z"
+       id="path4"
+       style="fill:#ffd000;fill-opacity:1;stroke:#a5690d;stroke-width:1.84077;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-save-as.svg b/app/bin/bitmaps/SVG/doc-save-as.svg
new file mode 100644
index 0000000..cf9244d
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-save-as.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-save-as.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1582"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="38.756094"
+     inkscape:cy="32.961287"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Save"><g
+       id="g1480"
+       transform="matrix(1.1058567,0,0,1.1058567,-3.4510105,-2.7972238)"><rect
+         style="fill:#97c6dd;fill-opacity:1;stroke:#3b3b3b;stroke-width:1.05972;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect1447"
+         width="55.608879"
+         height="18.713505"
+         x="4.2530689"
+         y="36.789047" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 8.0023498,39.872525 V 52.206426"
+         id="path1449" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 29.447147,39.872525 V 52.206426"
+         id="path1451" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 24.085947,39.872525 V 52.206426"
+         id="path1453" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 18.72475,39.872525 V 52.206426"
+         id="path1455" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 13.36355,39.872525 V 52.206426"
+         id="path1457" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 56.253142,39.872525 V 52.206426"
+         id="path1459" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 50.891944,39.872525 V 52.206426"
+         id="path1461" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 45.530746,39.872525 V 52.206426"
+         id="path1463" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 40.169551,39.872525 V 52.206426"
+         id="path1465" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 34.808346,39.872525 V 52.206426"
+         id="path1467" /></g><g
+       id="g1488"
+       transform="matrix(1.0806052,0,0,1.0806052,-3.5200239,-1.5422888)"><path
+         style="fill:none;stroke:#0078ff;stroke-width:7.55906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.4608021,9.6803465 C 10.957255,9.6711193 10.684816,9.7556021 20.50994,9.7866732 30.747015,10.118781 32.138765,14.439738 32.840598,20.628278 v 11.158588"
+         id="path1482"
+         sodipodi:nodetypes="cccc" /><path
+         style="fill:none;fill-opacity:1;stroke:#0078ff;stroke-width:6.00947;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 24.263698,20.382729 8.5769,11.404137 8.430286,-11.209195"
+         id="path1484" /></g><g
+       id="g6458"
+       transform="matrix(1.2768147,0,0,1.2768147,5.6348825,14.0807)"><path
+         style="fill:#f1b76f;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 21.519231,26.538462 V 21.461538 L 38.798077,4.2403846 43.701923,9.2596154 26.798077,26.451923 Z"
+         id="path1780"
+         sodipodi:nodetypes="cccccc" /><path
+         style="fill:none;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 24.346154,18.461538 c 5.134615,5.134616 5.134615,5.134616 5.134615,5.134616"
+         id="path4988" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-save.svg b/app/bin/bitmaps/SVG/doc-save.svg
new file mode 100644
index 0000000..3a553dd
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-save.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-save.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1582"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="38.756094"
+     inkscape:cy="32.961287"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Save"><g
+       id="g1480"
+       transform="matrix(1.1058567,0,0,1.1058567,-3.4510105,-2.7972238)"><rect
+         style="fill:#97c6dd;fill-opacity:1;stroke:#3b3b3b;stroke-width:1.05972;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect1447"
+         width="55.608879"
+         height="18.713505"
+         x="4.2530689"
+         y="36.789047" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 8.0023498,39.872525 V 52.206426"
+         id="path1449" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 29.447147,39.872525 V 52.206426"
+         id="path1451" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 24.085947,39.872525 V 52.206426"
+         id="path1453" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 18.72475,39.872525 V 52.206426"
+         id="path1455" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 13.36355,39.872525 V 52.206426"
+         id="path1457" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 56.253142,39.872525 V 52.206426"
+         id="path1459" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 50.891944,39.872525 V 52.206426"
+         id="path1461" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 45.530746,39.872525 V 52.206426"
+         id="path1463" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 40.169551,39.872525 V 52.206426"
+         id="path1465" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.10301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 34.808346,39.872525 V 52.206426"
+         id="path1467" /></g><g
+       id="g1488"
+       transform="matrix(1.0806052,0,0,1.0806052,-3.5200239,-1.5422888)"><path
+         style="fill:none;stroke:#0078ff;stroke-width:7.55906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.4608021,9.6803465 C 10.957255,9.6711193 10.684816,9.7556021 20.50994,9.7866732 30.747015,10.118781 32.138765,14.439738 32.840598,20.628278 v 11.158588"
+         id="path1482"
+         sodipodi:nodetypes="cccc" /><path
+         style="fill:none;fill-opacity:1;stroke:#0078ff;stroke-width:6.00947;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 24.263698,20.382729 8.5769,11.404137 8.430286,-11.209195"
+         id="path1484" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/doc-setup.svg b/app/bin/bitmaps/SVG/doc-setup.svg
new file mode 100644
index 0000000..1219b1e
--- /dev/null
+++ b/app/bin/bitmaps/SVG/doc-setup.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="doc-setup.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1697"
+     inkscape:window-height="943"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="8.1826993"
+     inkscape:cx="32.018774"
+     inkscape:cy="27.558143"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layout"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     id="Layout"
+     inkscape:label="#layout"
+     transform="translate(-0.22803691,0.91214765)"
+     style="opacity:1"><rect
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.81321;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect900"
+       width="53.023766"
+       height="40.88517"
+       x="0.59824014"
+       y="-42.753574"
+       transform="rotate(90)" /><rect
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.20881;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect900-3"
+       width="12.982697"
+       height="26.126856"
+       x="25.675159"
+       y="-58.653503"
+       transform="rotate(90)" /><g
+       id="g882"
+       transform="matrix(0.78594653,0,0,0.69610055,20.322029,21.864359)"
+       style="stroke-width:1.00005;stroke-miterlimit:4;stroke-dasharray:none"><rect
+         style="fill:#d9d9d9;fill-opacity:1;stroke:#797979;stroke-width:1.00005;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect884"
+         width="45.182987"
+         height="24.276136"
+         x="9.5583668"
+         y="24.055124"
+         ry="0.13436399" /></g><rect
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.20881;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect900-7"
+       width="12.872938"
+       height="26.065588"
+       x="49.05114"
+       y="-58.622875"
+       transform="rotate(90)" /><path
+       style="fill:none;stroke:#333333;stroke-width:0.906604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.231752,51.148999 H 51.956101"
+       id="path886" /><path
+       style="fill:none;stroke:#333333;stroke-width:0.906604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.231752,53.289181 H 55.151307"
+       id="path888" /><path
+       style="fill:none;stroke:#333333;stroke-width:0.906604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.231752,55.42937 H 53.282414"
+       id="path890" /><path
+       style="fill:none;stroke:#333333;stroke-width:0.906604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.231752,57.569555 H 56.176185"
+       id="path892" /><path
+       style="fill:none;stroke:#333333;stroke-width:0.906604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.231752,59.70974 H 51.594381"
+       id="path894" /><circle
+       style="fill:#d9d9d9;fill-opacity:1;stroke:#797979;stroke-width:1.17965;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path896"
+       sodipodi:type="arc"
+       sodipodi:cx="32.965714"
+       sodipodi:cy="41.783356"
+       sodipodi:rx="0.53383213"
+       sodipodi:ry="0.53383213"
+       sodipodi:start="1.5742817"
+       sodipodi:end="1.5686094"
+       sodipodi:arc-type="slice"
+       d="m 32.963853,42.317185 a 0.53383213,0.53383213 0 0 1 -0.53197,-0.534933 0.53383213,0.53383213 0 0 1 0.534177,-0.532728 0.53383213,0.53383213 0 0 1 0.533485,0.533421 0.53383213,0.53383213 0 0 1 -0.532664,0.534242 l -0.0012,-0.533831 z" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/down.svg b/app/bin/bitmaps/SVG/down.svg
new file mode 100644
index 0000000..41f83fb
--- /dev/null
+++ b/app/bin/bitmaps/SVG/down.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24 48"
+   style="enable-background:new 0 0 24 48;"
+   xml:space="preserve"
+   sodipodi:docname="down.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1647"
+   inkscape:window-height="933"
+   id="namedview9"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="10.715926"
+   inkscape:cy="22.589078"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{stroke:#000000;stroke-miterlimit:10;}
+</style>
+
+
+<path
+   id="path838"
+   style="fill:#000000;fill-opacity:1;stroke-width:0.542529;stroke-linecap:square"
+   inkscape:transform-center-x="0.02977867"
+   inkscape:transform-center-y="-0.65983518"
+   d="m 21.394513,16.625061 -18.8746311,0.01685 0.1253841,3.396706 9.422005,11.319468 9.386564,-11.355799 z"
+   sodipodi:nodetypes="cccccc" /></svg>
diff --git a/app/bin/bitmaps/SVG/elevation.svg b/app/bin/bitmaps/SVG/elevation.svg
new file mode 100644
index 0000000..b6f9813
--- /dev/null
+++ b/app/bin/bitmaps/SVG/elevation.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="elevation.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata33"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs31" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1194"
+   inkscape:window-height="666"
+   id="namedview29"
+   showgrid="false"
+   inkscape:zoom="6.7085072"
+   inkscape:cx="21.31684"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#F80E00;stroke-miterlimit:10;}
+	.st5{font-family:'MyriadPro-Regular';}
+	.st6{font-size:12px;}
+</style>
+<line
+   class="st0"
+   x1="5.7602229"
+   y1="29.971048"
+   x2="5.7602229"
+   y2="43.648643"
+   id="line4" />
+<line
+   class="st0"
+   x1="11.977306"
+   y1="29.971048"
+   x2="11.977306"
+   y2="43.648643"
+   id="line6" />
+<line
+   class="st0"
+   x1="18.194395"
+   y1="29.971048"
+   x2="18.194395"
+   y2="43.648643"
+   id="line8" />
+<line
+   class="st0"
+   x1="24.411482"
+   y1="29.971048"
+   x2="24.411482"
+   y2="43.648643"
+   id="line10" />
+<line
+   class="st0"
+   x1="30.628567"
+   y1="29.971048"
+   x2="30.628567"
+   y2="43.648643"
+   id="line12" />
+<line
+   class="st0"
+   x1="36.84565"
+   y1="29.971048"
+   x2="36.84565"
+   y2="43.648643"
+   id="line14" />
+<line
+   class="st0"
+   x1="43.062733"
+   y1="29.971048"
+   x2="43.062733"
+   y2="43.648643"
+   id="line16" />
+<line
+   class="st1"
+   x1="3.2733886"
+   y1="31.836174"
+   x2="45.549568"
+   y2="31.836174"
+   id="line18"
+   style="stroke-width:1.24342" />
+<line
+   class="st1"
+   x1="3.2733886"
+   y1="41.783516"
+   x2="45.549568"
+   y2="41.783516"
+   id="line20"
+   style="stroke-width:1.24342" />
+<line
+   class="st2"
+   x1="21.44589"
+   y1="36.504807"
+   x2="21.44589"
+   y2="12.933911"
+   id="line22"
+   style="stroke:#cc0e00;stroke-width:3.10854;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st3"
+   points="28.5,15.8 24,11.4 19.8,15.6 "
+   id="polyline24"
+   transform="matrix(1.2434171,0,0,1.2434171,-8.3961197,-2.041122)"
+   style="stroke:#cc0e00;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<text
+   class="st4 st5 st6"
+   id="text26"
+   x="30.474941"
+   y="21.261095"
+   style="font-size:23.2105px;fill:#cc0e00;fill-opacity:1;stroke:#cc0e00;stroke-width:1.24342;stroke-opacity:1">Z</text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/exit.svg b/app/bin/bitmaps/SVG/exit.svg
new file mode 100644
index 0000000..210bdb9
--- /dev/null
+++ b/app/bin/bitmaps/SVG/exit.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="exit.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata33"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs31" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1475"
+   inkscape:window-height="929"
+   id="namedview29"
+   showgrid="false"
+   inkscape:zoom="10.160412"
+   inkscape:cx="21.357402"
+   inkscape:cy="34.496633"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#F80E00;stroke-miterlimit:10;}
+	.st5{font-family:'MyriadPro-Regular';}
+	.st6{font-size:12px;}
+</style>
+
+
+
+
+
+
+
+
+
+<line
+   class="st2"
+   x1="23.713451"
+   y1="26.070175"
+   x2="23.713451"
+   y2="3.7465641"
+   id="line22"
+   style="stroke:#cc0e00;stroke-width:4.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st3"
+   points="28.5,15.8 24,11.4 19.8,15.6 "
+   id="polyline24"
+   transform="matrix(1.9103283,0,0,1.8174965,-22.134428,-16.972896)"
+   style="stroke:#cc0e00;stroke-width:2.41503;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+
+<text
+   xml:space="preserve"
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial Bold'"
+   x="-0.028499108"
+   y="46.119984"
+   id="text844"><tspan
+     sodipodi:role="line"
+     x="-0.028499108"
+     y="46.119984"
+     id="tspan1266">EXIT</tspan></text></svg>
diff --git a/app/bin/bitmaps/SVG/extend.svg b/app/bin/bitmaps/SVG/extend.svg
new file mode 100644
index 0000000..eac7840
--- /dev/null
+++ b/app/bin/bitmaps/SVG/extend.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="extend.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata39"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs37" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1501"
+   inkscape:window-height="979"
+   id="namedview35"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="22.802042"
+   inkscape:cy="25.410264"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:snap-nodes="true" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#6AC2FF;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#CCCCCC;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#666666;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#2A73FF;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#005EFF;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FF3515;stroke-width:2;stroke-miterlimit:10;}
+	.st6{fill:none;stroke:#FF3515;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="8.0488663"
+   y1="46.883717"
+   x2="7.7823558"
+   y2="35.003647"
+   id="line4" />
+<line
+   class="st0"
+   x1="32.46632"
+   y1="33.972927"
+   x2="23.902817"
+   y2="27.012367"
+   id="line6" />
+<line
+   class="st1"
+   x1="43.030769"
+   y1="9.9180746"
+   x2="31.705139"
+   y2="9.3531666"
+   id="line8" />
+<line
+   class="st0"
+   x1="21.559429"
+   y1="42.421944"
+   x2="15.962461"
+   y2="32.486633"
+   id="line10" />
+<line
+   class="st1"
+   x1="39.806316"
+   y1="23.599007"
+   x2="29.234509"
+   y2="19.125751"
+   id="line12" />
+<line
+   class="st0"
+   x1="15.522112"
+   y1="45.15593"
+   x2="11.712162"
+   y2="34.346085"
+   id="line14" />
+<line
+   class="st0"
+   x1="27.655085"
+   y1="38.615269"
+   x2="20.143089"
+   y2="29.865065"
+   id="line16" />
+<line
+   class="st1"
+   x1="36.311913"
+   y1="29.410093"
+   x2="26.634504"
+   y2="23.426489"
+   id="line18" />
+<line
+   class="st1"
+   x1="42.116776"
+   y1="16.602833"
+   x2="30.827339"
+   y2="14.766017"
+   id="line20" />
+<path
+   class="st2"
+   d="m 41.023581,7.9807585 c 0,8.6737585 -2.714909,15.9041265 -7.964815,22.2953165"
+   id="path22"
+   sodipodi:nodetypes="cc"
+   style="stroke-width:1.82605;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st3"
+   d="M 27.139223,26.464154 C 21.448838,33.020546 12.504364,37.904414 4.9171842,37.904414"
+   id="path24"
+   sodipodi:nodetypes="cc"
+   style="stroke-width:1.82605;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st2"
+   d="M 33.914475,7.8666305 C 33.572089,15.170848 32.617385,19.844707 27.139223,26.464154"
+   id="path26"
+   sodipodi:nodetypes="cc"
+   style="stroke-width:1.826;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st4"
+   d="M 33.058766,30.276075 C 25.868678,39.07873 15.954277,44.437137 5.3752468,44.694932"
+   id="path28"
+   sodipodi:nodetypes="cc"
+   style="stroke-width:1.82605;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st5"
+   d="M 30.495417,28.297573 C 36.264116,21.614347 38.199674,10.242642 37.674486,2.4997028"
+   id="path30"
+   style="stroke:#cc1b00;stroke-width:2.28257;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   sodipodi:nodetypes="cc" />
+<polyline
+   class="st6"
+   points="33.8,8.5 37.6,6.4 40.7,8.5 "
+   id="polyline32"
+   style="stroke:#cc1b00;stroke-width:1.56957;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.3817155,0,0,1.5306208,-14.278017,-7.2962703)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/filled-box.svg b/app/bin/bitmaps/SVG/filled-box.svg
new file mode 100644
index 0000000..2d8e2dd
--- /dev/null
+++ b/app/bin/bitmaps/SVG/filled-box.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="filled-box.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata15"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs13" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1502"
+   inkscape:window-height="991"
+   id="namedview11"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#00C9FF;stroke:#000000;stroke-miterlimit:10;}
+	.st1{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<rect
+   x="3.4919739"
+   y="4.7348843"
+   class="st0"
+   width="41.016052"
+   height="38.530231"
+   id="rect4"
+   style="fill:#80e2ff;fill-opacity:1;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="6.4384027"
+   y1="40.359879"
+   x2="40.216499"
+   y2="8.7573147"
+   id="line6"
+   style="stroke:#cc0e00;stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st2"
+   points="39.9,18.3 39.4,11.4 32.7,11.4 "
+   id="polyline8"
+   style="stroke:#cc0e00;stroke-width:2.48773465;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.1910839,0,0,1.2209336,-6.7122048,-5.1613282)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/filled-polygon.svg b/app/bin/bitmaps/SVG/filled-polygon.svg
new file mode 100644
index 0000000..6fe8cce
--- /dev/null
+++ b/app/bin/bitmaps/SVG/filled-polygon.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="filled-polygon.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata857"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs855" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1330"
+   inkscape:window-height="961"
+   id="namedview853"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style846">
+	.st0{fill:#15C7FF;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<polygon
+   class="st0"
+   points="10.9,10 28.2,7.8 39.7,20.1 40,36.5 24.7,39.8 11.8,32.9 7.4,19.8 "
+   id="polygon848"
+   style="fill:#80e1ff;fill-opacity:1"
+   transform="matrix(1.3119381,0,0,1.3037001,-7.0644654,-7.0270096)" />
+<path
+   class="st1"
+   d="M3.5,28.2"
+   id="path850" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/go.svg b/app/bin/bitmaps/SVG/go.svg
new file mode 100644
index 0000000..943e561
--- /dev/null
+++ b/app/bin/bitmaps/SVG/go.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="go.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata42"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs40"><radialGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_1_"
+     id="radialGradient867"
+     cx="23.599313"
+     cy="23.299802"
+     fx="23.599313"
+     fy="23.299802"
+     r="18.802058"
+     gradientTransform="matrix(1,0,0,1.1475892,0,-3.4387987)"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1523"
+   inkscape:window-height="918"
+   id="namedview38"
+   showgrid="false"
+   inkscape:zoom="14.378038"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:url(#SVGID_1_);stroke:#000000;stroke-miterlimit:10;}
+</style>
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="2.3596"
+   y1="25.2837"
+   x2="44.5404"
+   y2="25.2837"
+   gradientTransform="matrix(5.000000e-03 1 -1 5.000000e-03 48.7725 -0.2285)">
+	
+	
+	
+	
+	
+	
+	
+	
+	<stop
+   offset="0.08821"
+   style="stop-color:#b1e7ba;stop-opacity:1"
+   id="stop20" />
+	<stop
+   offset="0.3086791"
+   style="stop-color:#a0deac;stop-opacity:1"
+   id="stop22" />
+	<stop
+   offset="0.54394364"
+   style="stop-color:#6ece7c;stop-opacity:1"
+   id="stop24" />
+	<stop
+   offset="0.75441277"
+   style="stop-color:#36c450;stop-opacity:1"
+   id="stop26" />
+	
+	<stop
+   offset="0.9501"
+   style="stop-color:#06ab21;stop-opacity:1"
+   id="stop30" />
+	<stop
+   offset="0.9992"
+   style="stop-color:#00a91a;stop-opacity:1"
+   id="stop32" />
+</linearGradient>
+<polygon
+   class="st0"
+   points="23.5,44.3 5.3,33.7 5.5,12.7 23.7,2.3 41.9,12.9 41.8,33.9 "
+   id="polygon35"
+   style="fill-opacity:1;fill:url(#radialGradient867)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/grid.svg b/app/bin/bitmaps/SVG/grid.svg
new file mode 100644
index 0000000..23b9b93
--- /dev/null
+++ b/app/bin/bitmaps/SVG/grid.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-miterlimit:10;}
+</style>
+<line class="st0" x1="4.9" y1="10.2" x2="42" y2="10.4"/>
+<line class="st0" x1="5" y1="17.5" x2="42" y2="17.5"/>
+<line class="st0" x1="5" y1="24.5" x2="42" y2="24.5"/>
+<line class="st0" x1="5" y1="31.5" x2="42" y2="31.5"/>
+<line class="st0" x1="5" y1="38.5" x2="42" y2="38.5"/>
+<line class="st0" x1="9.5" y1="7" x2="9.5" y2="42"/>
+<line class="st0" x1="16.5" y1="7" x2="16.5" y2="42"/>
+<line class="st0" x1="23.5" y1="7" x2="23.5" y2="42"/>
+<line class="st0" x1="30.5" y1="7" x2="30.5" y2="42"/>
+<line class="st0" x1="37.5" y1="7" x2="37.5" y2="42"/>
+</svg>
diff --git a/app/bin/bitmaps/SVG/helix.svg b/app/bin/bitmaps/SVG/helix.svg
new file mode 100644
index 0000000..c88f470
--- /dev/null
+++ b/app/bin/bitmaps/SVG/helix.svg
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="helix.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata2607"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2605"><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1130"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /><inkscape:path-effect
+     effect="powerclip"
+     id="path-effect1126"
+     is_visible="true"
+     lpeversion="1"
+     inverse="true"
+     flatten="false"
+     hide_clip="false"
+     message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="741"
+   id="namedview2603"
+   showgrid="false"
+   inkscape:zoom="10.631993"
+   inkscape:cx="24.031242"
+   inkscape:cy="23.843131"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:snap-nodes="true"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2554">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FF0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FF0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st4{fill:#FB0000;}
+	.st5{font-family:'MyriadPro-Regular';}
+	.st6{font-size:12px;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<path
+   style="opacity:1;fill:none;fill-rule:evenodd;stroke:#666666;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path6188"
+   sodipodi:type="arc"
+   sodipodi:cx="24.133484"
+   sodipodi:cy="30.883982"
+   sodipodi:rx="21.415539"
+   sodipodi:ry="14.88994"
+   sodipodi:start="1.5677882"
+   sodipodi:end="4.7181141"
+   sodipodi:arc-type="arc"
+   d="M 24.197904,45.773855 A 21.415539,14.88994 0 0 1 5.5881225,38.330203 21.415539,14.88994 0 0 1 5.6172887,23.402754 21.415539,14.88994 0 0 1 24.25609,15.994285"
+   sodipodi:open="true" /><path
+   style="opacity:1;fill:none;fill-rule:evenodd;stroke:#595959;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path6188-2"
+   sodipodi:type="arc"
+   sodipodi:cx="-24.210531"
+   sodipodi:cy="27.442301"
+   sodipodi:rx="21.415539"
+   sodipodi:ry="11.448045"
+   sodipodi:start="1.5617363"
+   sodipodi:end="4.744592"
+   sodipodi:arc-type="arc"
+   sodipodi:open="true"
+   d="m -24.016509,38.889876 a 21.415539,11.448045 0 0 1 -18.790484,-5.770157 21.415539,11.448045 0 0 1 0.25075,-11.583362 21.415539,11.448045 0 0 1 19.035238,-5.536165"
+   transform="scale(-1,1)" /><path
+   style="opacity:1;fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path6188-25"
+   sodipodi:type="arc"
+   sodipodi:cx="23.952087"
+   sodipodi:cy="24.000002"
+   sodipodi:rx="21.415539"
+   sodipodi:ry="14.88994"
+   sodipodi:start="1.5677882"
+   sodipodi:end="4.7181141"
+   sodipodi:arc-type="arc"
+   sodipodi:open="true"
+   d="M 24.016508,38.889875 A 21.415539,14.88994 0 0 1 5.406726,31.446223 21.415539,14.88994 0 0 1 5.4358922,16.518774 21.415539,14.88994 0 0 1 24.074693,9.1103057" /><path
+   style="opacity:1;fill:none;fill-rule:evenodd;stroke:#404040;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path6188-2-6"
+   sodipodi:type="arc"
+   sodipodi:cx="-24.029137"
+   sodipodi:cy="20.558321"
+   sodipodi:rx="21.415539"
+   sodipodi:ry="11.448045"
+   sodipodi:start="1.5617363"
+   sodipodi:end="4.744592"
+   sodipodi:arc-type="arc"
+   sodipodi:open="true"
+   transform="scale(-1,1)"
+   d="m -23.835114,32.005896 a 21.415539,11.448045 0 0 1 -18.790484,-5.770156 21.415539,11.448045 0 0 1 0.25075,-11.583363 21.415539,11.448045 0 0 1 19.035237,-5.5361653" /><path
+   style="opacity:1;fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path6188-5"
+   sodipodi:type="arc"
+   sodipodi:cx="23.770693"
+   sodipodi:cy="17.116022"
+   sodipodi:rx="21.415539"
+   sodipodi:ry="14.88994"
+   sodipodi:start="1.5677882"
+   sodipodi:end="4.7181141"
+   sodipodi:arc-type="arc"
+   sodipodi:open="true"
+   d="M 23.835113,32.005895 A 21.415539,14.88994 0 0 1 5.2253314,24.562244 21.415539,14.88994 0 0 1 5.2544977,9.6347943 21.415539,14.88994 0 0 1 23.893299,2.2263259" /><path
+   style="opacity:1;fill:none;fill-rule:evenodd;stroke:#262626;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="path6188-2-96"
+   sodipodi:type="arc"
+   sodipodi:cx="-23.847742"
+   sodipodi:cy="13.674341"
+   sodipodi:rx="21.415539"
+   sodipodi:ry="11.448045"
+   sodipodi:start="1.5617363"
+   sodipodi:end="4.744592"
+   sodipodi:arc-type="arc"
+   sodipodi:open="true"
+   transform="scale(-1,1)"
+   d="M -23.653719,25.121916 A 21.415539,11.448045 0 0 1 -42.444204,19.35176 21.415539,11.448045 0 0 1 -42.193454,7.7683976 21.415539,11.448045 0 0 1 -23.158216,2.2322319" /></svg>
diff --git a/app/bin/bitmaps/SVG/join-line.svg b/app/bin/bitmaps/SVG/join-line.svg
new file mode 100644
index 0000000..feb8a93
--- /dev/null
+++ b/app/bin/bitmaps/SVG/join-line.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1519"
+   sodipodi:docname="join-line.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+     id="metadata1523"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1454"
+     inkscape:window-height="888"
+     id="namedview1521"
+     showgrid="false"
+     inkscape:zoom="8.7705101"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1515"
+     inkscape:document-rotation="0" /><defs
+     id="defs1493"><clipPath
+       id="clipPath2821"><path
+         d="m0 48h48v-48h-48z"
+         id="path1490" /></clipPath></defs><g
+     transform="matrix(1.3333,0,0,-1.3333,0,64)"
+     id="g1517"><g
+       clip-path="url(#clipPath2821)"
+       id="g1515"><g
+         transform="matrix(1.3145504,0,0,1.3145504,44.440574,45.894188)"
+         id="g1497"
+         style="stroke-width:1.42638;stroke-miterlimit:10;stroke-dasharray:none"><path
+           d="M 0,0 C -0.224,-3.8 -0.994,-8.962 -2.938,-12.877"
+           fill="none"
+           stroke="#000000"
+           stroke-miterlimit="10"
+           id="path1495"
+           style="stroke-width:1.42638;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+         transform="matrix(1.3145504,0,0,1.3145504,20.707682,7.9609974)"
+         id="g1501"
+         style="stroke-width:1.42638;stroke-miterlimit:10;stroke-dasharray:none"><path
+           d="M 0,0 C -4.396,-2.414 -9.159,-3.782 -13.756,-3.782"
+           fill="none"
+           stroke="#000000"
+           stroke-miterlimit="10"
+           id="path1499"
+           style="stroke-width:1.42638;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+         transform="translate(20.860044,9.2266046)"
+         id="g1505"><path
+           d="M -1.3643768,-1.428611 C 7.6547534,2.8134428 16.617357,12.690975 20.206079,20.918744"
+           fill="none"
+           stroke="#ff3515"
+           stroke-miterlimit="10"
+           stroke-width="2"
+           id="path1503"
+           style="stroke:#cc1a00;stroke-width:2.46485;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+         transform="matrix(1.3145504,0,0,1.3145504,35.788203,30.460053)"
+         id="g1509"
+         style="stroke-width:0.999775;stroke-miterlimit:10;stroke-dasharray:none"><path
+           d="M 0,0 4.322,0.468 6.307,-2.751"
+           fill="none"
+           stroke="#ff3515"
+           stroke-linecap="round"
+           stroke-miterlimit="10"
+           stroke-width="2"
+           id="path1507"
+           style="stroke:#cc1a00;stroke-width:1.87505;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+         transform="matrix(1.3145504,0,0,1.3145504,24.610582,5.2201604)"
+         id="g1513"><path
+           d="m 0,0 -3.818,2.082 0.207,3.776"
+           fill="none"
+           stroke="#ff3515"
+           stroke-linecap="round"
+           stroke-miterlimit="10"
+           stroke-width="2"
+           id="path1511"
+           style="stroke:#cc1a00;stroke-width:1.87505;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/join.svg b/app/bin/bitmaps/SVG/join.svg
new file mode 100644
index 0000000..c441656
--- /dev/null
+++ b/app/bin/bitmaps/SVG/join.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="join.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata962"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs960" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1364"
+   inkscape:window-height="842"
+   id="namedview958"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:snap-nodes="false" />
+<style
+   type="text/css"
+   id="style911">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#CCCCCC;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#B3B3B3;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#808080;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FF3515;stroke-width:2;stroke-miterlimit:10;}
+	.st6{fill:none;stroke:#FF3515;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="4.7765999"
+   y1="46.437527"
+   x2="4.25386"
+   y2="34.322994"
+   id="line913"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+
+<line
+   class="st0"
+   x1="45.788837"
+   y1="3.8463986"
+   x2="33.064186"
+   y2="3.1967058"
+   id="line917"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+<path
+   class="st2"
+   d="M 15.061216,31.402502"
+   id="path919" />
+<path
+   class="st2"
+   d="M 21.125158,41.15754"
+   id="path921" />
+<path
+   class="st2"
+   d="M 30.616547,15.188049"
+   id="path923" />
+<path
+   class="st2"
+   d="M 42.217131,19.406444"
+   id="path925" />
+<line
+   class="st0"
+   x1="13.55937"
+   y1="45.097534"
+   x2="9.8468332"
+   y2="33.243919"
+   id="line927"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+
+
+<line
+   class="st0"
+   x1="44.724155"
+   y1="11.753452"
+   x2="32.387802"
+   y2="9.2630863"
+   id="line933"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+<path
+   class="st3"
+   d="M 43.37784,1.6100916 C 43.114189,6.6194351 42.059591,13.474326 39.554918,18.615495"
+   id="path935"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st3"
+   d="M 16.115816,32.773806 C 11.633771,35.410302 6.7562524,36.860375 2.1423833,36.860375"
+   id="path937"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st3"
+   d="M 35.942594,1.4782669 C 36.074418,6.2239605 34.756171,11.628778 32.646973,15.978998"
+   id="path939"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st3"
+   d="M 20.202385,38.890802 C 14.402092,42.054599 8.0745012,43.900146 2.1423833,43.900146"
+   id="path941"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+
+<path
+   class="st4"
+   d="M 18.333961,46.5495"
+   id="path945" />
+<path
+   class="st4"
+   d="M 20.333961,46.5495"
+   id="path947" />
+
+<path
+   class="st5"
+   d="M 14.948598,37.230225 C 24.078207,33.30287 33.464632,24.34554 36.647664,15.972193"
+   id="path951"
+   style="stroke:#cc1a00;stroke-width:3.46926;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   sodipodi:nodetypes="cc" />
+<polyline
+   class="st6"
+   points="30.9,20.2 35.2,19.9 37.1,23.2 "
+   id="polyline953"
+   style="stroke:#cc1a00;stroke-width:1.91786;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.8215816,-0.10780836,0.10780836,1.8215816,-28.758825,-17.280872)" />
+<polyline
+   class="st6"
+   points="21.8,39.1 18,37 18.4,33.2 "
+   id="polyline955"
+   style="stroke:#cc1a00;stroke-width:1.93219;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.8040301,0,0,1.8040301,-16.833582,-29.960531)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/layers.svg b/app/bin/bitmaps/SVG/layers.svg
new file mode 100644
index 0000000..b261d30
--- /dev/null
+++ b/app/bin/bitmaps/SVG/layers.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="layers.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata1539"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs1537" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1338"
+   inkscape:window-height="936"
+   id="namedview1535"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="24"
+   inkscape:cy="24.722465"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style1492">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{font-family:'MyriadPro-Regular';}
+	.st6{font-size:12px;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<rect
+   style="fill:#999999;fill-opacity:1;stroke:#000000;stroke-width:2.00793;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98"
+   id="rect860-7"
+   width="33.315411"
+   height="15.514964"
+   x="25.02117"
+   y="30.31708"
+   ry="0.29794645"
+   transform="matrix(1,0,-0.45844986,0.88872027,0,0)" /><rect
+   style="fill:#bfbfbf;fill-opacity:1;stroke:#000000;stroke-width:2.00793;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98"
+   id="rect860-8"
+   width="33.315411"
+   height="15.514964"
+   x="19.462948"
+   y="18.680857"
+   ry="0.29794645"
+   transform="matrix(1,0,-0.45844986,0.88872027,0,0)" /><rect
+   style="opacity:1;fill:#e5e5e5;fill-opacity:1;stroke:#000000;stroke-width:2.00793;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98"
+   id="rect860"
+   width="33.315411"
+   height="15.514964"
+   x="14.359009"
+   y="7.5478206"
+   ry="0.29794645"
+   transform="matrix(1,0,-0.45844986,0.88872027,0,0)" /></svg>
diff --git a/app/bin/bitmaps/SVG/magnet.svg b/app/bin/bitmaps/SVG/magnet.svg
new file mode 100644
index 0000000..9d0b3a6
--- /dev/null
+++ b/app/bin/bitmaps/SVG/magnet.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg23"
+   sodipodi:docname="magnet.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata27"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1446"
+     inkscape:window-height="937"
+     id="namedview25"
+     showgrid="false"
+     inkscape:zoom="7.9847123"
+     inkscape:cx="32.123888"
+     inkscape:cy="32.123888"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g925"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true" /><defs
+     id="defs5"><clipPath
+       id="clipPath1505"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     id="g880"
+     transform="matrix(1.3226362,0,0,1.3226362,-8.1164854,-11.85842)"><path
+       d="m 14.435367,34.575808 c 0,0 14.228208,-19.311121 19.633295,-19.660002 5.403604,-0.348882 14.272694,6.170391 14.272694,11.69849 -0.591669,5.412776 -17.564682,22.176623 -17.564682,22.176623"
+       fill="none"
+       stroke="#f80e00"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="8.82763"
+       id="path7"
+       style="stroke-width:8.97904;stroke-miterlimit:10;stroke-dasharray:none" /><path
+       style="fill:none;stroke:#000000;stroke-width:1.51213;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 11.330754,30.48781 c 5.957485,-7.27871 12.690173,-17.209345 21.393032,-20.040332 5.117394,-0.344091 9.646675,1.097298 13.772433,4.543503 4.922997,3.906705 6.190886,6.874275 6.767488,11.533505 -0.721479,7.262755 -11.340738,17.177757 -18.740785,25.161964"
+       id="path870"
+       sodipodi:nodetypes="ccccc" /><path
+       style="fill:none;stroke:#000000;stroke-width:1.65482;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 18.475636,36.915263 c 8.069478,-11.086752 9.916753,-12.484666 15.946619,-17.8605 5.171653,1.210228 7.461614,3.144793 10.176073,7.550811 -5.574625,8.638889 -9.088159,10.653142 -17.119996,18.472961"
+       id="path872"
+       sodipodi:nodetypes="cccc" /></g><g
+     id="g930"
+     transform="matrix(1.4474381,0,0,1.4474381,-11.767259,-16.212821)"
+     style="stroke-width:1.51213;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="m 30.476571,54.014516 -6.441172,-5.87452 3.59591,-3.939901 6.439839,5.873186 z"
+       fill="#ffe003"
+       id="path11"
+       style="stroke-width:1.51214;stroke-miterlimit:4;stroke-dasharray:none" /><path
+       style="fill:none;stroke:#332c00;stroke-width:1.38175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 27.631309,44.200095 -3.59591,3.939901 6.441172,5.87452 3.594577,-3.941235"
+       id="path867" /></g><g
+     id="g925"
+     transform="matrix(1.4474381,0,0,1.4474381,-11.767259,-16.212821)"
+     style="stroke-width:1.51213;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="m 15.810271,40.681916 -6.4411723,-5.87452 3.5959103,-3.939901 6.439839,5.873186 z"
+       fill="#ffe003"
+       id="path15"
+       style="stroke-width:1.51214;stroke-miterlimit:4;stroke-dasharray:none" /><path
+       style="fill:none;stroke:#332d00;stroke-width:1.38175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12.965009,30.867495 -3.5959103,3.939901 6.4411723,5.87452 3.594577,-3.941235"
+       id="path865" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/manage.svg b/app/bin/bitmaps/SVG/manage.svg
new file mode 100644
index 0000000..2791e15
--- /dev/null
+++ b/app/bin/bitmaps/SVG/manage.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg75"
+   sodipodi:docname="manage.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata79"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1532"
+     inkscape:window-height="913"
+     id="namedview77"
+     showgrid="false"
+     inkscape:zoom="5.3929307"
+     inkscape:cx="31.986319"
+     inkscape:cy="21.046071"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g73"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs5"><clipPath
+       id="clipPath4002"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     transform="matrix(2.2443875,0,0,-2.2010601,-22.872113,82.32556)"
+     id="g73"><g
+       transform="translate(12.5,35)"
+       id="g21" /><path
+       sodipodi:type="star"
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:4.30787;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3469"
+       inkscape:flatsided="false"
+       sodipodi:sides="8"
+       sodipodi:cx="3.0788169"
+       sodipodi:cy="2.956532"
+       sodipodi:r1="42.981846"
+       sodipodi:r2="30.087292"
+       sodipodi:arg1="0.76729149"
+       sodipodi:arg2="1.1599906"
+       inkscape:rounded="0.7"
+       inkscape:randomized="0"
+       d="m 34.016871,32.794023 c -9.260139,9.601701 -6.693085,-7.580595 -18.92275,-2.253481 -12.2296636,5.327113 2.100246,15.149269 -11.2370884,15.39079 -13.337335,0.241521 0.6275641,-10.093016 -11.7869529,-14.973857 -12.4145157,-4.88084 -9.2270537,12.19725 -18.8287537,2.937111 -9.601701,-9.260139 7.580595,-6.693085 2.253481,-18.92275 -5.327113,-12.2296635 -15.14927,2.100246 -15.39079,-11.2370883 -0.241521,-13.337335 10.093016,0.6275641 14.973857,-11.7869529 4.88084,-12.4145158 -12.19725,-9.2270538 -2.937111,-18.8287538 9.260139,-9.601701 6.693085,7.580595 18.9227497,2.253481 12.2296637,-5.327113 -2.1002457,-15.149269 11.2370885,-15.39079 13.3373348,-0.241521 -0.6275641,10.093016 11.7869528,14.973857 12.414516,4.88084 9.227054,-12.19725 18.828754,-2.937111 9.601701,9.260139 -7.580595,6.693085 -2.253481,18.9227498 C 35.98994,3.1708915 45.812096,-11.159018 46.053617,2.1783163 46.295138,15.515651 35.960601,1.5507522 31.07976,13.965269 c -4.88084,12.414516 12.197249,9.227054 2.937111,18.828754 z"
+       transform="matrix(0.31028492,0,0,-0.31639281,23.493281,23.799663)" /><path
+       sodipodi:type="star"
+       style="opacity:1;fill:#e5e5e5;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.65588;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5664"
+       inkscape:flatsided="false"
+       sodipodi:sides="10"
+       sodipodi:cx="32.635319"
+       sodipodi:cy="31.522749"
+       sodipodi:r1="12.211524"
+       sodipodi:r2="12.211524"
+       sodipodi:arg1="0.73168643"
+       sodipodi:arg2="1.0458457"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="m 41.721287,39.681578 c -2.552644,2.842717 0.340241,0.493623 -2.965915,2.408397 -3.306157,1.914775 0.17105,0.574604 -3.564989,1.374004 -3.73604,0.7994 -0.01488,0.599338 -3.815097,0.205112 -3.800213,-0.394225 -0.199361,0.565405 -3.691756,-0.983855 -3.492395,-1.549261 -0.364323,0.476126 -3.20704,-2.076518 -2.842718,-2.552644 -0.493623,0.340241 -2.408397,-2.965916 -1.914775,-3.306157 -0.574604,0.17105 -1.374004,-3.564989 -0.7994,-3.73604 -0.599338,-0.01488 -0.205113,-3.815097 0.394225,-3.800213 -0.565405,-0.199361 0.983856,-3.691756 1.549261,-3.492395 -0.476126,-0.364323 2.076518,-3.20704 2.552644,-2.842717 -0.340241,-0.493623 2.965916,-2.408397 3.306157,-1.914775 -0.171051,-0.574604 3.564989,-1.374004 3.73604,-0.7994 0.01488,-0.599338 3.815097,-0.205113 3.800213,0.394226 0.19936,-0.565404 3.691755,0.983856 3.492396,1.549261 0.364323,-0.476126 3.207041,2.076518 2.842717,2.552644 0.493623,-0.340241 2.408397,2.965916 1.914774,3.306157 0.574603,-0.171051 1.374004,3.564989 0.7994,3.73604 0.599337,0.01488 0.205112,3.815097 -0.394225,3.800213 0.565405,0.19936 -0.983856,3.691756 -1.54926,3.492395 0.476127,0.364323 -2.076518,3.20704 z"
+       transform="matrix(0.36562159,0,0,-0.37281877,12.516414,34.61651)" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/map.svg b/app/bin/bitmaps/SVG/map.svg
new file mode 100644
index 0000000..69686be
--- /dev/null
+++ b/app/bin/bitmaps/SVG/map.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg75"
+   sodipodi:docname="map.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata79"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1532"
+     inkscape:window-height="913"
+     id="namedview77"
+     showgrid="false"
+     inkscape:zoom="8.1776315"
+     inkscape:cx="31.977474"
+     inkscape:cy="20.971843"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g73"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs5"><clipPath
+       id="clipPath4002"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     transform="matrix(2.2443875,0,0,-2.2010601,-22.872113,82.32556)"
+     id="g73"><g
+       transform="matrix(1.1604879,0,0,-1.2603903,11.985406,19.218785)"
+       id="g9"
+       inkscape:label="Blue"
+       style="stroke-width:1.39564;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 5.547,1.772 7.165,1.541 9.63,3.39 l 3.775,-2.388 1.696,-1.079 2.003,-2.85 4.622,4.083"
+         fill="none"
+         stroke="#0dc7f9"
+         stroke-miterlimit="10"
+         id="path7"
+         style="stroke-width:1.39564;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.0718729,0,0,1.0718729,19.14911,19.235271)"
+       id="g13"
+       inkscape:label="Yellow"
+       style="stroke-width:1.57472;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="m -7.2464661,7.5557829 4.4623989,1.683774 3.8630671,-2.483018 4.6657906,1.0624365 3.4740871,3.9357916 4.4085404,-2.4503968 1.053245,-4.7487168 2.235,-0.077"
+         fill="none"
+         stroke="#f79e0f"
+         stroke-miterlimit="10"
+         id="path11"
+         style="stroke-width:1.57472;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:nodetypes="cccccccc" /></g><g
+       transform="matrix(1.332436,0,0,1.0673884,12.044914,20.992887)"
+       id="g17"
+       inkscape:label="Magenta"
+       style="stroke-width:1.41534;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="m 0,0 c 2.157,1.079 4.227,1.31 4.227,1.31 h 1.254 l 3.137,2.544 3.39,-4.083 0.848,-2.621 1.771,-1.386 4.238,2.773"
+         fill="none"
+         stroke="#f411b4"
+         stroke-miterlimit="10"
+         id="path15"
+         style="stroke-width:1.41534;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="translate(12.5,35)"
+       id="g21" /><g
+       transform="matrix(1.0718729,0,0,1.0718729,20.304589,9.7384755)"
+       id="Map"
+       inkscape:label="Map"
+       style="stroke:#333333;stroke-opacity:1;stroke-width:1.04937774;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M -8.166,24.422 V 4.1442139"
+         fill="none"
+         stroke="#050001"
+         stroke-miterlimit="10"
+         id="path19"
+         style="stroke-width:1.04937774;stroke:#333333;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="m -0.154,20.031 v -20"
+         fill="none"
+         stroke="#050001"
+         stroke-miterlimit="10"
+         id="path27"
+         style="stroke:#333333;stroke-opacity:1;stroke-width:1.04937774;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="m 8.012,24.423 v -20"
+         fill="none"
+         stroke="#050001"
+         stroke-miterlimit="10"
+         id="path31"
+         style="stroke:#333333;stroke-opacity:1;stroke-width:1.04937774;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="m 15.87,20.186 v -20"
+         fill="none"
+         stroke="#050001"
+         stroke-miterlimit="10"
+         id="path35"
+         style="stroke:#333333;stroke-opacity:1;stroke-width:1.04937774;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="m -8.166,24.422 8.012,-4.391"
+         fill="none"
+         stroke="#050001"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path39"
+         style="stroke:#333333;stroke-opacity:1;stroke-width:1.04937774;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="m -0.154,20.031 8.166,4.392"
+         fill="none"
+         stroke="#050001"
+         stroke-miterlimit="10"
+         id="path43"
+         style="stroke:#333333;stroke-opacity:1;stroke-width:1.04937774;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="M 7.935,24.5 15.87,20.186"
+         fill="none"
+         stroke="#050001"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path47"
+         style="stroke:#333333;stroke-opacity:1;stroke-width:1.04937774;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="M 0,0 -8.166,4.1442139"
+         fill="none"
+         stroke="#050001"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path51"
+         style="stroke-width:1.04937774;stroke:#333333;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="M 8.09,4.623 -0.154,0.031"
+         fill="none"
+         stroke="#050001"
+         stroke-miterlimit="10"
+         id="path55"
+         style="stroke-width:1.04937774;stroke:#333333;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="M 15.907,0.366 7.895,4.68"
+         fill="none"
+         stroke="#050001"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path59"
+         style="stroke:#333333;stroke-opacity:1;stroke-width:1.04937774;stroke-miterlimit:4;stroke-dasharray:none" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/move.svg b/app/bin/bitmaps/SVG/move.svg
new file mode 100644
index 0000000..9c1e906
--- /dev/null
+++ b/app/bin/bitmaps/SVG/move.svg
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="move.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata57"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs55" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1250"
+   inkscape:window-height="856"
+   id="namedview53"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#CCCCCC;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#00FFFF;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#808080;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FB0000;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#808080;stroke-width:2;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FB0000;stroke-miterlimit:10;}
+	.st6{fill:none;stroke:#007CBF;stroke-miterlimit:10;}
+	.st7{fill:none;stroke:#007CBF;stroke-width:2;stroke-miterlimit:10;}
+	.st8{fill:none;stroke:#FF0B00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="44.622711"
+   y1="4.6662092"
+   x2="30.444595"
+   y2="4.6662092"
+   id="line4"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="44.622711"
+   y1="11.110806"
+   x2="30.444595"
+   y2="11.110806"
+   id="line6"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="44.622711"
+   y1="17.555403"
+   x2="30.444595"
+   y2="17.555403"
+   id="line8"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="44.622711"
+   y1="24"
+   x2="30.444595"
+   y2="24"
+   id="line10"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="44.622711"
+   y1="30.444595"
+   x2="30.444595"
+   y2="30.444595"
+   id="line12"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="44.622711"
+   y1="36.889191"
+   x2="30.444595"
+   y2="36.889191"
+   id="line14"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="44.622711"
+   y1="43.33379"
+   x2="30.444595"
+   y2="43.33379"
+   id="line16"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st1"
+   x1="17.555403"
+   y1="4.6662092"
+   x2="3.3772895"
+   y2="4.6662092"
+   id="line18"
+   style="stroke:#00cccc;stroke-opacity:1" />
+<line
+   class="st1"
+   x1="17.555403"
+   y1="11.110806"
+   x2="3.3772895"
+   y2="11.110806"
+   id="line20"
+   style="stroke:#00cccc;stroke-opacity:1" />
+<line
+   class="st1"
+   x1="17.555403"
+   y1="17.555403"
+   x2="3.3772895"
+   y2="17.555403"
+   id="line22"
+   style="stroke:#00cccc;stroke-opacity:1" />
+<line
+   class="st1"
+   x1="17.555403"
+   y1="24"
+   x2="3.3772895"
+   y2="24"
+   id="line24"
+   style="stroke:#00cccc;stroke-opacity:1" />
+<line
+   class="st1"
+   x1="17.555403"
+   y1="30.444595"
+   x2="3.3772895"
+   y2="30.444595"
+   id="line26"
+   style="stroke:#00cccc;stroke-opacity:1" />
+<line
+   class="st1"
+   x1="17.555403"
+   y1="36.889191"
+   x2="3.3772895"
+   y2="36.889191"
+   id="line28"
+   style="stroke:#00cccc;stroke-opacity:1" />
+<line
+   class="st1"
+   x1="17.555403"
+   y1="43.33379"
+   x2="3.3772895"
+   y2="43.33379"
+   id="line30"
+   style="stroke:#00cccc;stroke-opacity:1" />
+<line
+   class="st2"
+   x1="41.411499"
+   y1="2.0883698"
+   x2="41.411499"
+   y2="45.911629"
+   id="line32"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke:#666666;stroke-opacity:1" />
+<line
+   class="st2"
+   x1="33.655811"
+   y1="2.0883698"
+   x2="33.655811"
+   y2="45.911629"
+   id="line34"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke:#666666;stroke-opacity:1" />
+<path
+   class="st3"
+   d="M 41.271518,38.04922"
+   id="path36" />
+<path
+   class="st4"
+   d="M 38.822572,24.773351"
+   id="path38" />
+<path
+   class="st5"
+   d="M 24.902243,36.502517"
+   id="path40"
+   style="stroke-width:1.28891" />
+<line
+   class="st6"
+   x1="14.344203"
+   y1="2.0883698"
+   x2="14.344203"
+   y2="45.911629"
+   id="line42"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke:#006699;stroke-opacity:1" />
+<line
+   class="st6"
+   x1="6.5884933"
+   y1="2.0883698"
+   x2="6.5884933"
+   y2="45.911629"
+   id="line44"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke:#006699;stroke-opacity:1" />
+<path
+   class="st7"
+   d="M 11.755265,24.773351"
+   id="path46" />
+<line
+   class="st8"
+   x1="11.05998"
+   y1="24"
+   x2="35.821922"
+   y2="24"
+   id="line48"
+   style="stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1" />
+<polyline
+   class="st8"
+   points="30.5,18.7 34,23 30.5,27.2 "
+   id="polyline50"
+   transform="matrix(1.2889194,0,0,1.2889194,-6.9340656,-5.6451464)"
+   style="stroke:#cc0000;stroke-opacity:1;stroke-width:2.32753111;stroke-miterlimit:10;stroke-dasharray:none" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/new-car.svg b/app/bin/bitmaps/SVG/new-car.svg
new file mode 100644
index 0000000..6b0d579
--- /dev/null
+++ b/app/bin/bitmaps/SVG/new-car.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="new-car.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><path
+   class="st2"
+   d="m 38.526196,43.498826 c 0,1.548439 -1.204339,2.924827 -2.924825,2.924827 -1.720486,0 -2.924824,-1.20434 -2.924824,-2.924827 0,-1.720483 1.204338,-2.924823 2.924824,-2.924823 1.720486,0 2.924825,1.376388 2.924825,2.924823 z"
+   id="path43-6"
+   style="fill:#000401;stroke-width:1.72048" /><metadata
+   id="metadata50"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs48" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1572"
+   inkscape:window-height="965"
+   id="namedview46"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="23.9991"
+   inkscape:cy="26.235289"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#808080;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000401;stroke-miterlimit:10;}
+	.st2{fill:#000401;}
+	.st3{fill:url(#SVGID_1_);}
+	.st4{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st5{fill:#006837;}
+	.st6{fill:#FFE53F;}
+	.st7{font-family:'MyriadPro-Regular';}
+	.st8{font-size:6px;}
+</style>
+
+
+
+
+
+
+
+
+<path
+   class="st2"
+   d="m 45.2912,43.597656 c 0,1.548438 -1.204341,2.924826 -2.924824,2.924826 -1.720486,0 -2.924826,-1.20434 -2.924826,-2.924826 0,-1.720484 1.20434,-2.924824 2.924826,-2.924824 1.720483,0 2.924824,1.376389 2.924824,2.924824 z"
+   id="path20"
+   style="stroke-width:1.72048" />
+<path
+   class="st0"
+   d="M 24,38.962932"
+   id="path22" />
+<path
+   class="st0"
+   d="M 25.382386,39.617018"
+   id="path24" />
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="24.5506"
+   y1="21.5"
+   x2="30.4868"
+   y2="21.5"
+   gradientTransform="matrix(0,1.0571338,-1.0571338,0,51.676842,-1.8693808)">
+	<stop
+   offset="2.455360e-02"
+   style="stop-color:#006837"
+   id="stop26" />
+	<stop
+   offset="0.4355"
+   style="stop-color:#22B573"
+   id="stop28" />
+	<stop
+   offset="1"
+   style="stop-color:#006837"
+   id="stop30" />
+</linearGradient>
+
+
+<rect
+   x="0.73099327"
+   y="22.401167"
+   class="st5"
+   width="46.538013"
+   height="17.518068"
+   id="rect37"
+   style="fill:#682b00;fill-opacity:1;stroke-width:4.12121" />
+<path
+   class="st2"
+   d="m 8.5584483,43.498826 c 0,1.548439 -1.2043403,2.924827 -2.9248258,2.924827 -1.5484359,0 -2.924824,-1.20434 -2.924824,-2.924827 0,-1.720483 1.2043395,-2.924823 2.924824,-2.924823 1.7204855,0.172046 2.9248258,1.376387 2.9248258,2.924823 z"
+   id="path39"
+   style="stroke-width:1.72048" />
+
+<path
+   class="st2"
+   d="m 15.30658,43.498826 c 0,1.548439 -1.204339,2.924827 -2.924825,2.924827 -1.720486,0 -2.9248239,-1.20434 -2.9248239,-2.924827 0,-1.720483 1.2043379,-2.924823 2.9248239,-2.924823 1.720486,0 2.924825,1.376387 2.924825,2.924823 z"
+   id="path43"
+   style="stroke-width:1.72048" />
+<g
+   id="plus"
+   transform="matrix(1.2462413,0,0,1.2160392,-46.375085,-20.168954)"
+   inkscape:label="plus"><path
+     style="display:inline;fill:#005a20;fill-opacity:1;stroke:#00993d;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 46.809533,31.077554 v -4.700241 h 4.630089 v -3.086726 l -4.559936,0.07015 -0.07015,-4.559936 h -3.016572 l 0.140305,4.559936 -4.840547,0.07015 0.07015,3.086726 4.489783,-0.07015 0.140306,4.630088 z"
+     id="path1718" /><path
+     style="fill:none;fill-opacity:1;stroke:#00e552;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 45.350068,18.723791 V 31.070694"
+     id="path1702" /><path
+     style="fill:none;fill-opacity:1;stroke:#00e552;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 51.516636,24.897242 H 39.169733"
+     id="path1708" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/ok.svg b/app/bin/bitmaps/SVG/ok.svg
new file mode 100644
index 0000000..21e0640
--- /dev/null
+++ b/app/bin/bitmaps/SVG/ok.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   sodipodi:docname="ok.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   width="48"
+   height="48"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1401"
+   inkscape:window-height="811"
+   id="namedview7"
+   showgrid="false"
+   inkscape:zoom="9.7408644"
+   inkscape:cx="22.174623"
+   inkscape:cy="23.355217"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#097F00;stroke-width:2;stroke-miterlimit:10;}
+</style>
+
+<path
+   style="fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:1.30233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 3.0826295,28.723525 10.666902,43.233332 C 22.340221,30.869786 34.794469,17.623547 44.780402,6.3860722 L 42.743187,4.5399005 11.781047,33.436651 5.2533982,26.115272 Z"
+   id="path831"
+   sodipodi:nodetypes="ccccccc" /></svg>
diff --git a/app/bin/bitmaps/SVG/pan-zoom.svg b/app/bin/bitmaps/SVG/pan-zoom.svg
new file mode 100644
index 0000000..7597072
--- /dev/null
+++ b/app/bin/bitmaps/SVG/pan-zoom.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="pan-zoom.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata21"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs19" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1716"
+   inkscape:window-height="966"
+   id="namedview17"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#FC0000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#FC0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="24.187614"
+   y1="4.7648048"
+   x2="24.333876"
+   y2="43.122051"
+   id="line4"
+   style="stroke-width:3.48405;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1" />
+<polyline
+   class="st1"
+   points="19.1,13.9 24,11 29,13.9 "
+   id="polyline6"
+   style="stroke-width:2.40355;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1"
+   transform="matrix(1.4625985,0,0,1.4497843,-10.91475,-11.182822)" />
+<polyline
+   class="st1"
+   points="29,34.4 24.1,37.7 19.1,34 "
+   id="polyline8"
+   style="stroke-width:2.40355;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1"
+   transform="matrix(1.4625985,0,0,1.4497843,-10.914749,-11.534816)" />
+<line
+   class="st0"
+   x1="43.640171"
+   y1="23.26"
+   x2="4.2990675"
+   y2="23.26"
+   id="line10"
+   style="stroke-width:3.49339;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1" />
+<polyline
+   class="st1"
+   points="33.8,18.9 37.3,24 33.8,28.7 "
+   id="polyline12"
+   style="stroke-width:2.40355;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1"
+   transform="matrix(1.4625985,0,0,1.4497843,-10.914754,-11.534822)" />
+<polyline
+   class="st1"
+   points="13.2,28.7 10,24 13.2,18.9 "
+   id="polyline14"
+   style="stroke-width:2.40355;stroke-miterlimit:10;stroke-dasharray:none;stroke:#cc0000;stroke-opacity:1"
+   transform="matrix(1.4625985,0,0,1.4497843,-10.326917,-11.534822)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/parallel-line.svg b/app/bin/bitmaps/SVG/parallel-line.svg
new file mode 100644
index 0000000..ad96c16
--- /dev/null
+++ b/app/bin/bitmaps/SVG/parallel-line.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg984"
+   sodipodi:docname="parallel-line.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><defs
+     id="defs988" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1370"
+     inkscape:window-height="912"
+     id="namedview986"
+     showgrid="false"
+     inkscape:zoom="10.067426"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg984"
+     inkscape:document-rotation="0"
+     inkscape:snap-nodes="true" /><metadata
+     id="metadata932"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><g
+     transform="matrix(1.6925211,0,0,-1.6925211,6.6484707,37.41986)"
+     id="g936"
+     style="stroke:#d98b0d;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path934"
+       style="stroke:#d98b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,15.111076,37.41986)"
+     id="g940"
+     style="stroke:#d98b0d;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path938"
+       style="stroke:#d98b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,23.573681,37.41986)"
+     id="g944"
+     style="stroke:#d98b0d;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path942"
+       style="stroke:#d98b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,32.036287,37.41986)"
+     id="g948"
+     style="stroke:#d98b0d;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path946"
+       style="stroke:#d98b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,40.498892,37.41986)"
+     id="g952"
+     style="stroke:#d98b0d;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path950"
+       style="stroke:#d98b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,48.961496,37.41986)"
+     id="g956"
+     style="stroke:#d98b0d;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path954"
+       style="stroke:#d98b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,57.424102,37.41986)"
+     id="g960"
+     style="stroke:#d98b0d;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path958"
+       style="stroke:#d98b0d;stroke-opacity:1" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,3.2634283,40.967375)"
+     id="g964"
+     style="stroke-width:1.47709;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="M 0,0 H 34"
+       fill="none"
+       stroke="#000000"
+       stroke-miterlimit="10"
+       id="path962"
+       style="stroke-width:1.47709;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,3.2634283,52.490076)"
+     id="g968"
+     style="stroke-width:1.47709;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="M 0,0 H 34"
+       fill="none"
+       stroke="#000000"
+       stroke-miterlimit="10"
+       id="path966"
+       style="stroke-width:1.47709;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+     transform="matrix(1.7072491,0,0,-1.6925211,2.9767653,9.2070031)"
+     id="g972"
+     style="stroke-width:1.4707;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="M 0,0 H 34"
+       fill="none"
+       stroke="#666666"
+       stroke-miterlimit="10"
+       id="path970"
+       style="stroke-width:1.4707;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+     transform="matrix(1.6925211,0,0,-1.6925211,32.462802,31.754138)"
+     id="g980"
+     style="stroke:#cc0000;stroke-width:1.7725;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"><path
+       d="m -3.748,6.996 3.589,3.031 3.907,-3.031"
+       fill="none"
+       stroke="#666666"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path974"
+       style="stroke:#cc0000;stroke-width:1.7725;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="M -0.11709878,-1.600565 -0.159,10.027"
+       fill="none"
+       stroke="#666666"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path978"
+       style="stroke:#cc0000;stroke-width:1.7725;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/parallel.svg b/app/bin/bitmaps/SVG/parallel.svg
new file mode 100644
index 0000000..9ff2898
--- /dev/null
+++ b/app/bin/bitmaps/SVG/parallel.svg
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="parallel.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata49"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs47" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1377"
+   inkscape:window-height="908"
+   id="namedview45"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#B3B3B3;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#666666;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#666666;stroke-width:2;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+<g
+   id="g3886"
+   inkscape:label="ties"
+   transform="matrix(1.3222423,0,0,1.3222423,-6.4115729,-7.7338152)"><line
+     class="st0"
+     x1="8"
+     y1="30"
+     x2="8"
+     y2="41"
+     id="line4"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="13"
+     y1="30"
+     x2="13"
+     y2="41"
+     id="line6"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="18"
+     y1="30"
+     x2="18"
+     y2="41"
+     id="line8"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="23"
+     y1="30"
+     x2="23"
+     y2="41"
+     id="line10"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="28"
+     y1="30"
+     x2="28"
+     y2="41"
+     id="line12"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="33"
+     y1="30"
+     x2="33"
+     y2="41"
+     id="line14"
+     style="stroke:#d98b0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="38"
+     y1="30"
+     x2="38"
+     y2="41"
+     id="line16"
+     style="stroke:#d98b0d;stroke-opacity:1" /></g>
+
+
+
+
+
+
+<g
+   id="g3877"
+   inkscape:label="newties"
+   transform="matrix(1.3222423,0,0,1.3222423,-6.4115729,-7.7338152)"><line
+     class="st1"
+     x1="8"
+     y1="7"
+     x2="8"
+     y2="18"
+     id="line18" /><line
+     class="st1"
+     x1="13"
+     y1="7"
+     x2="13"
+     y2="18"
+     id="line20" /><line
+     class="st1"
+     x1="18"
+     y1="7"
+     x2="18"
+     y2="18"
+     id="line22" /><line
+     class="st1"
+     x1="23"
+     y1="7"
+     x2="23"
+     y2="18"
+     id="line24" /><line
+     class="st1"
+     x1="28"
+     y1="7"
+     x2="28"
+     y2="18"
+     id="line26" /><line
+     class="st1"
+     x1="33"
+     y1="7"
+     x2="33"
+     y2="18"
+     id="line28" /><line
+     class="st1"
+     x1="38"
+     y1="7"
+     x2="38"
+     y2="18"
+     id="line30" /></g>
+
+<g
+   id="g3868"
+   inkscape:label="rails"
+   style="stroke-width:1.51258207;stroke-miterlimit:4;stroke-dasharray:none"
+   transform="matrix(1.3222423,0,0,1.3222423,-6.4115729,-7.7338152)"><line
+     class="st2"
+     x1="6"
+     y1="32.096252"
+     x2="40"
+     y2="32.096252"
+     id="line32"
+     style="stroke-width:1.51258207;stroke-miterlimit:4;stroke-dasharray:none" /><line
+     class="st2"
+     x1="6"
+     y1="38.903748"
+     x2="40"
+     y2="38.903748"
+     id="line34"
+     style="stroke-width:1.51258207;stroke-miterlimit:4;stroke-dasharray:none" /></g>
+
+<g
+   id="g3864"
+   inkscape:label="newrails"
+   style="stroke-width:1.51258207;stroke-miterlimit:4;stroke-dasharray:none"
+   transform="matrix(1.3222423,0,0,1.3222423,-6.4115729,-7.7338152)"><line
+     class="st3"
+     x1="6"
+     y1="9.0962601"
+     x2="40"
+     y2="9.0962601"
+     id="line36"
+     style="stroke-width:1.51258207;stroke-miterlimit:4;stroke-dasharray:none" /><line
+     class="st3"
+     x1="6"
+     y1="15.903746"
+     x2="40"
+     y2="15.903746"
+     id="line38"
+     style="stroke-width:1.51258207;stroke-miterlimit:4;stroke-dasharray:none" /></g>
+
+<g
+   id="g3860"
+   inkscape:label="arrow"
+   transform="matrix(1.3222423,0,0,1.2064572,-9.2563108,-4.2091511)"
+   style="stroke-width:2.37525243;stroke-miterlimit:4;stroke-dasharray:none"><polyline
+     class="st4"
+     points="21.5,22 25.1,19 29,22 "
+     id="polyline40"
+     style="stroke:#cc0000;stroke-width:2.37525243;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><line
+     class="st5"
+     x1="25.18976"
+     y1="28.910158"
+     x2="25.210243"
+     y2="19.008156"
+     id="line42"
+     style="stroke:#cc0000;stroke-width:2.37525243;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/parameter.svg b/app/bin/bitmaps/SVG/parameter.svg
new file mode 100644
index 0000000..b686804
--- /dev/null
+++ b/app/bin/bitmaps/SVG/parameter.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="parameter.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1583"
+     inkscape:window-height="943"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="8.1826993"
+     inkscape:cx="26.519366"
+     inkscape:cy="32.446506"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layout"
+     inkscape:document-rotation="0"
+     inkscape:snap-nodes="false"
+     inkscape:pagecheckerboard="0" /><g
+     id="Layout"
+     inkscape:label="#layout"
+     transform="translate(-0.22803691,0.91214765)"
+     style="opacity:1"><path
+       id="path898"
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="-0.1143859"
+       inkscape:transform-center-y="-4.2708698"
+       d="M 59.32533,61.337659 5.9038154,61.449698 5.7270967,0.60270433 46.825508,0.61736905 59.16559,16.95766 Z"
+       sodipodi:nodetypes="cccccc" /><g
+       id="turnout"
+       transform="matrix(2.1121492,0,0,2.2798074,-12.340801,-30.573867)"
+       style="stroke-width:1.59499;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1"><path
+         style="fill:none;stroke:#000000;stroke-width:1.59499;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 12.81557,34.039644 H 28.091703"
+         id="path845" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.59499;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 17.337306,33.917434 10.265561,4.399527"
+         id="path847" /></g><g
+       id="crossing"
+       transform="matrix(2.3270806,0,0,1.9276329,-15.980833,-17.606493)"
+       style="stroke-width:1.6525331;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1"><path
+         style="fill:none;stroke:#000000;stroke-width:1.6525331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 13.163424,23.712979 26.60642,30.312268"
+         id="path849" /><path
+         style="fill:none;stroke:#000000;stroke-width:1.6525331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 13.163424,30.312268 26.60642,23.712979"
+         id="path849-6" /></g><path
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.173579,8.3757435 H 46.722598"
+       id="path871" /><path
+       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14.812247,21.881628 c 4.935235,-0.244284 9.400841,0.209247 16.447704,-1.442779 6.721987,-1.517667 11.358856,-3.77303 15.004917,-6.059679"
+       id="path873"
+       sodipodi:nodetypes="ccc" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/paste.svg b/app/bin/bitmaps/SVG/paste.svg
new file mode 100644
index 0000000..7d089d6
--- /dev/null
+++ b/app/bin/bitmaps/SVG/paste.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1659"
+   sodipodi:docname="paste.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1665"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs1663" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1571"
+     inkscape:window-height="866"
+     id="namedview1661"
+     showgrid="false"
+     inkscape:zoom="9.4049726"
+     inkscape:cx="25.305762"
+     inkscape:cy="32.961287"
+     inkscape:window-x="18"
+     inkscape:window-y="57"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1659"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Export" /><g
+     id="g4827"
+     transform="translate(-2.6581678)"><rect
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect900"
+       width="53.616257"
+       height="49.753304"
+       x="6.1005993"
+       y="-54.885616"
+       transform="rotate(90)"
+       ry="4.0444236" /><path
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 21.602,5.9844217 4.044423,-4.5066434 10.399946,0.1155549 3.582205,4.3910885 -4.391089,2.4266544 h -9.128841 z"
+       id="path1105"
+       sodipodi:nodetypes="ccccccc" /></g><rect
+     style="fill:#f5f5f5;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect900-2"
+     width="46.623814"
+     height="43.264656"
+     x="15.452703"
+     y="-61.785542"
+     transform="rotate(90)" /></svg>
diff --git a/app/bin/bitmaps/SVG/polygon.svg b/app/bin/bitmaps/SVG/polygon.svg
new file mode 100644
index 0000000..f8aa925
--- /dev/null
+++ b/app/bin/bitmaps/SVG/polygon.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="polygon.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1240"
+   inkscape:window-height="757"
+   id="namedview9"
+   showgrid="false"
+   inkscape:zoom="10.17006"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<polygon
+   class="st0"
+   points="24.7,39.8 11.8,32.9 7.4,19.8 10.9,10 28.2,7.8 39.7,20.1 40,36.5 "
+   id="polygon4"
+   transform="matrix(1.3091076,0,0,1.3091076,-6.997444,-7.1557037)"
+   style="stroke-width:1.90969787;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st0"
+   d="M3.5,28.2"
+   id="path6" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/polyline.svg b/app/bin/bitmaps/SVG/polyline.svg
new file mode 100644
index 0000000..695bad9
--- /dev/null
+++ b/app/bin/bitmaps/SVG/polyline.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg872"
+   sodipodi:docname="polyline.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1429"
+     inkscape:window-height="896"
+     id="namedview874"
+     showgrid="false"
+     inkscape:zoom="8.7705101"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg872" /><metadata
+     id="metadata857"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs862"><clipPath
+       id="clipPath2763"><path
+         d="m0 48h48v-48h-48z"
+         id="path859" /></clipPath></defs><g
+     transform="matrix(1.8687667,0,0,-1.8687667,-15.81141,77.501638)"
+     id="g870"
+     style="stroke-width:1.60533682;stroke-miterlimit:4;stroke-dasharray:none"><g
+       clip-path="url(#clipPath2763)"
+       id="g868"
+       style="stroke-width:1.60533682;stroke-miterlimit:4;stroke-dasharray:none"><g
+         transform="translate(25.224,30.046)"
+         id="g866"
+         style="stroke-width:1.60533682;stroke-miterlimit:4;stroke-dasharray:none"><path
+           d="m 0,0 -14.638,5.47 2.619,-14.176 8.783,-10.554 12.481,2.003 c 0,0 6.626,11.402 6.24,12.943 C 15.1,-2.773 12.635,6.24 10.4,8.012"
+           fill="none"
+           stroke="#0c0cf2"
+           stroke-miterlimit="10"
+           id="path864"
+           style="stroke-width:1.60533682;stroke-miterlimit:4;stroke-dasharray:none" /></g></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/profile.svg b/app/bin/bitmaps/SVG/profile.svg
new file mode 100644
index 0000000..9f76546
--- /dev/null
+++ b/app/bin/bitmaps/SVG/profile.svg
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="profile.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata41"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs39" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1372"
+   inkscape:window-height="907"
+   id="namedview37"
+   showgrid="false"
+   inkscape:zoom="8.8544831"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:#0080FA;}
+	.st2{fill:none;stroke:#000402;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="5.0116086"
+   y1="37.121544"
+   x2="42.718517"
+   y2="37.121544"
+   id="line4"
+   style="stroke-width:2.25366;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st0"
+   x1="6.185358"
+   y1="37.208576"
+   x2="6.185358"
+   y2="8.1140652"
+   id="line6"
+   style="stroke-width:2.15515;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st0"
+   x1="41.571243"
+   y1="14.579512"
+   x2="41.571243"
+   y2="37.208576"
+   id="line8"
+   style="stroke-width:2.15515;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st0"
+   x1="46.507366"
+   y1="26.432833"
+   x2="46.507366"
+   y2="26.432833"
+   id="line10"
+   style="stroke-width:1.07757" />
+<polygon
+   class="st1"
+   points="12,10 9,12 9,38 40,38 40,18 30.3,16 20.7,21.2 14.4,10 "
+   id="polygon12"
+   style="fill:#80deff;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+   transform="matrix(1.1414801,0,0,1.1160593,-4.0879632,-5.2016771)" />
+<line
+   class="st2"
+   x1="17.673576"
+   y1="38.11208"
+   x2="17.673576"
+   y2="40.771732"
+   id="line14"
+   style="stroke-width:2.15515;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="24.50412"
+   y1="38.11208"
+   x2="24.50412"
+   y2="42.944588"
+   id="line16"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="31.31695"
+   y1="38.11208"
+   x2="31.31695"
+   y2="40.771732"
+   id="line18"
+   style="stroke-width:2.15515;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="37.538998"
+   y1="38.11208"
+   x2="37.538998"
+   y2="42.944588"
+   id="line20"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="10.599646"
+   y1="38.11208"
+   x2="10.599646"
+   y2="42.944588"
+   id="line22"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="5.6115265"
+   y1="23.738895"
+   x2="1.2658093"
+   y2="23.738895"
+   id="line24"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="5.6115265"
+   y1="15.848494"
+   x2="1.2658093"
+   y2="15.848494"
+   id="line26"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="5.6115265"
+   y1="31.281918"
+   x2="1.2658093"
+   y2="31.281918"
+   id="line28"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="41.919395"
+   y1="23.738895"
+   x2="46.734192"
+   y2="23.738895"
+   id="line30"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="41.919395"
+   y1="15.848494"
+   x2="46.734192"
+   y2="15.848494"
+   id="line32"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="41.919395"
+   y1="31.281918"
+   x2="46.734192"
+   y2="31.281918"
+   id="line34"
+   style="stroke-width:2.69394;stroke-miterlimit:10;stroke-dasharray:none" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/protractor.svg b/app/bin/bitmaps/SVG/protractor.svg
new file mode 100644
index 0000000..6e7d141
--- /dev/null
+++ b/app/bin/bitmaps/SVG/protractor.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg23"
+   sodipodi:docname="protractor.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+     id="metadata27"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1435"
+     inkscape:window-height="889"
+     id="namedview25"
+     showgrid="false"
+     inkscape:zoom="10.074671"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g21"
+     inkscape:document-rotation="0" /><defs
+     id="defs5"><clipPath
+       id="clipPath3087"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     transform="matrix(1.7785911,0,0,-1.6794204,-11.160353,74.070498)"
+     id="g21"
+     style="stroke-width:1.87505;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="m 23.226933,28.885907 c 3.173396,-4.144399 4.632596,-9.927034 3.505034,-15.812632"
+       fill="none"
+       stroke="#000202"
+       stroke-miterlimit="10"
+       id="path15"
+       style="stroke:#cc0000;stroke-width:1.96532;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       transform="matrix(1.1322171,0,0,1.1322171,9.0014797,17.025451)"
+       id="g13"
+       style="stroke-width:2.02512;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 24.037,21.417"
+         fill="none"
+         stroke="#000202"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path7"
+         style="stroke-width:2.02512;stroke-miterlimit:4;stroke-dasharray:none" /><path
+         d="M 0,0 26.965,-7.241"
+         fill="none"
+         stroke="#000202"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path11"
+         style="stroke-width:2.02512;stroke-miterlimit:4;stroke-dasharray:none" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/redo.svg b/app/bin/bitmaps/SVG/redo.svg
new file mode 100644
index 0000000..77c8cb8
--- /dev/null
+++ b/app/bin/bitmaps/SVG/redo.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="redo.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata1493"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1491" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1306"
+   inkscape:window-height="882"
+   id="namedview1489"
+   showgrid="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+<style
+   type="text/css"
+   id="style1484">
+	.st0{fill:#05FB08;stroke:#05B70D;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="m 8.2406449,43.164807 c -1.2578731,0.107338 -1.1320851,0.107338 -3.522044,0.107338 0,-12.343861 3.8994068,-31.55735 23.8995881,-31.879363 0.251575,-3.0054618 0.125788,-5.9035856 0.125788,-5.9035856 L 42.58058,14.290906 28.240827,24.273333 c 0,0 0.251575,-2.468773 0.251575,-6.010924 C 14.655799,18.155071 8.8695815,34.363097 8.2406449,43.164807 Z"
+   id="path1486"
+   style="stroke:#05610a;stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/reflect.svg b/app/bin/bitmaps/SVG/reflect.svg
new file mode 100644
index 0000000..837743c
--- /dev/null
+++ b/app/bin/bitmaps/SVG/reflect.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="reflect.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata17"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs15" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1482"
+   inkscape:window-height="919"
+   id="namedview13"
+   showgrid="false"
+   inkscape:zoom="13.407886"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:#009DFC;stroke:#00A2FF;stroke-miterlimit:10;}
+	.st2{fill:#000302;stroke:#000301;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="23.787764"
+   y1="4.1941996"
+   x2="23.787764"
+   y2="43.805801"
+   id="line4"
+   style="stroke-width:2.67646;stroke-miterlimit:10;stroke-dasharray:none" />
+<polygon
+   class="st1"
+   points="12.5,14.3 22.4,22.2 12.5,31.2 "
+   id="polygon6"
+   transform="matrix(1.7907987,0,0,1.6722454,-19.336302,-14.284334)"
+   style="fill:#80ddff;fill-opacity:1;stroke:#009ccc;stroke-width:1.23731;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+
+
+<polygon
+   class="st1"
+   points="12.5,31.2 12.5,14.3 22.4,22.2 "
+   id="polygon6-1"
+   transform="matrix(-1.8394632,0,0,1.6722454,67.929658,-14.366529)"
+   style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:1.2207342;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></svg>
diff --git a/app/bin/bitmaps/SVG/rotate.svg b/app/bin/bitmaps/SVG/rotate.svg
new file mode 100644
index 0000000..2c788f2
--- /dev/null
+++ b/app/bin/bitmaps/SVG/rotate.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="rotate.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata2761"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2759"><marker
+     style="overflow:visible"
+     id="Arrow1Lstart"
+     refX="0.0"
+     refY="0.0"
+     orient="auto"
+     inkscape:stockid="Arrow1Lstart"
+     inkscape:isstock="true"><path
+       transform="scale(0.8) translate(12.5,0)"
+       style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+       d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+       id="path3324" /></marker></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1233"
+   inkscape:window-height="778"
+   id="namedview2757"
+   showgrid="false"
+   inkscape:zoom="10.149695"
+   inkscape:cx="24"
+   inkscape:cy="24.868298"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2696">
+	.st0{fill:none;stroke:#00FFFF;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#B3B3B3;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#808080;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FB0000;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#808080;stroke-width:2;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FB0000;stroke-miterlimit:10;}
+	.st6{fill:none;stroke:#007CBF;stroke-miterlimit:10;}
+	.st7{fill:none;stroke:#007CBF;stroke-width:2;stroke-miterlimit:10;}
+	.st8{fill:none;stroke:#FF0B00;stroke-miterlimit:10;}
+	.st9{fill:none;stroke:#FF0B00;stroke-miterlimit:10;stroke-dasharray:3.0709,1.0236;}
+</style>
+
+
+<line
+   class="st1"
+   x1="9.1349277"
+   y1="33.106369"
+   x2="9.1349277"
+   y2="45.627636"
+   id="line2702" /><line
+   class="st1"
+   x1="14.82641"
+   y1="33.106369"
+   x2="14.82641"
+   y2="45.627636"
+   id="line2704" /><line
+   class="st0"
+   x1="14.82641"
+   y1="33.106369"
+   x2="2.3051486"
+   y2="33.106369"
+   id="line2698" /><line
+   class="st0"
+   x1="14.82641"
+   y1="38.797855"
+   x2="2.3051486"
+   y2="38.797855"
+   id="line2700" />
+
+<line
+   class="st1"
+   x1="20.517897"
+   y1="33.106369"
+   x2="20.517897"
+   y2="45.627636"
+   id="line2706" />
+<line
+   class="st1"
+   x1="26.209379"
+   y1="33.106369"
+   x2="26.209379"
+   y2="45.627636"
+   id="line2708" />
+<line
+   class="st1"
+   x1="31.90086"
+   y1="33.106369"
+   x2="31.90086"
+   y2="45.627636"
+   id="line2710" />
+<line
+   class="st1"
+   x1="37.592346"
+   y1="33.106369"
+   x2="37.592346"
+   y2="45.627636"
+   id="line2712" />
+<line
+   class="st1"
+   x1="43.283829"
+   y1="33.106369"
+   x2="43.283829"
+   y2="45.627636"
+   id="line2714" />
+<line
+   class="st0"
+   x1="14.82641"
+   y1="4.6489568"
+   x2="2.3051486"
+   y2="4.6489568"
+   id="line2716" />
+<line
+   class="st0"
+   x1="14.82641"
+   y1="10.340441"
+   x2="2.3051486"
+   y2="10.340441"
+   id="line2718" />
+<line
+   class="st0"
+   x1="14.82641"
+   y1="16.031925"
+   x2="2.3051486"
+   y2="16.031925"
+   id="line2720" />
+<line
+   class="st0"
+   x1="14.82641"
+   y1="21.723406"
+   x2="2.3051486"
+   y2="21.723406"
+   id="line2722" />
+<line
+   class="st0"
+   x1="14.82641"
+   y1="27.41489"
+   x2="2.3051486"
+   y2="27.41489"
+   id="line2724" />
+<line
+   class="st2"
+   x1="6.736856"
+   y1="35.694492"
+   x2="45.438927"
+   y2="35.694492"
+   id="line2726"
+   style="stroke-width:2.13106;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="6.736856"
+   y1="43.039513"
+   x2="45.438927"
+   y2="43.039513"
+   id="line2728"
+   style="stroke-width:2.13106;stroke-miterlimit:10;stroke-dasharray:none" />
+
+
+
+<line
+   class="st6"
+   x1="12.336152"
+   y1="2.3723636"
+   x2="12.336152"
+   y2="41.074448"
+   id="line2736"
+   style="stroke-width:2.13106;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st6"
+   x1="4.7954087"
+   y1="2.3723636"
+   x2="4.7954087"
+   y2="41.074448"
+   id="line2738"
+   style="stroke-width:2.13106;stroke-miterlimit:10;stroke-dasharray:none" />
+
+<polyline
+   class="st8"
+   points="41.5,29.4 38.7,32.7 35.5,30.3 "
+   id="polyline2742"
+   transform="matrix(1.8851067,0,0,1.8883999,-33.551788,-29.337542)"
+   style="stroke:#cc0b00;stroke-width:1.41186;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<g
+   id="g2752"
+   transform="matrix(1.1779068,0,0,1.1779068,5.2536547,-23.041577)"
+   style="stroke-width:1.80919;stroke-miterlimit:10;stroke-dasharray:none">
+	
+<path
+   style="fill:none;stroke:#cc0b00;stroke-width:1.80919;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:1.80919, 3.61838;stroke-dashoffset:0;stroke-opacity:1"
+   d="M 3.3893843,52.169989 21.828525,33.73085 Z"
+   id="path3594" /></g>
+<path
+   class="st8"
+   d="m 39.448981,32.460276 c 0,-13.400725 -10.544803,-24.1671205 -23.620358,-24.1671205"
+   id="path2754"
+   style="stroke:#cc0b00;stroke-width:2.57224;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/ruler.svg b/app/bin/bitmaps/SVG/ruler.svg
new file mode 100644
index 0000000..8cb140b
--- /dev/null
+++ b/app/bin/bitmaps/SVG/ruler.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg23"
+   sodipodi:docname="ruler.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+     id="metadata27"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1418"
+     inkscape:window-height="889"
+     id="namedview25"
+     showgrid="false"
+     inkscape:zoom="5.3929307"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g21"
+     inkscape:document-rotation="0" /><defs
+     id="defs5"><clipPath
+       id="clipPath3087"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     transform="matrix(1.7785911,0,0,-1.6794204,-11.160353,74.070498)"
+     id="g21"
+     style="stroke-width:1.87505;stroke-miterlimit:10;stroke-dasharray:none"><g
+       transform="matrix(1.0365883,0,0,1.0433909,8.8192947,19.603103)"
+       id="g13"
+       style="stroke:#000000;stroke-width:1.73582;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"><path
+         d="M 0,0 26.965,-7.241"
+         fill="none"
+         stroke="#000202"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path11"
+         style="stroke:#000000;stroke-width:1.73582;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><path
+       style="fill:none;stroke:#000000;stroke-width:2.02245;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8.8192947,19.603103 11.884169,31.716802"
+       id="path839" /><path
+       style="fill:none;stroke:#000000;stroke-width:1.3483;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 16.074124,18.233402 1.816694,7.180356"
+       id="path843" /><path
+       style="fill:none;stroke:#000000;stroke-width:1.3483;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 23.140586,16.315597 1.816694,7.180357"
+       id="path843-1" /><path
+       style="fill:none;stroke:#000000;stroke-width:1.3483;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 30.106721,14.643225 1.816694,7.180355"
+       id="path843-3" /><path
+       style="fill:none;stroke:#000000;stroke-width:2.02245;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 36.770897,12.047909 3.064874,12.113699"
+       id="path839-0" /><text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.3819px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial Bold';stroke-width:1.26406"
+       x="34.666809"
+       y="-27.718275"
+       id="text905"
+       transform="scale(0.97172116,-1.0291018)"><tspan
+         sodipodi:role="line"
+         id="tspan903"
+         x="34.666809"
+         y="-27.718275"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.3819px;font-family:Arial;-inkscape-font-specification:'Arial Bold';stroke-width:1.26406">1</tspan></text></g></svg>
diff --git a/app/bin/bitmaps/SVG/select.svg b/app/bin/bitmaps/SVG/select.svg
new file mode 100644
index 0000000..bb81e69
--- /dev/null
+++ b/app/bin/bitmaps/SVG/select.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="select.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata33"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs31" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1386"
+   inkscape:window-height="955"
+   id="namedview29"
+   showgrid="false"
+   inkscape:zoom="10.17006"
+   inkscape:cx="24.041157"
+   inkscape:cy="24.82778"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#FB0000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#FB0000;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#FB0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="3.8428819"
+   y1="9.4009237"
+   x2="3.8428819"
+   y2="24.094875"
+   id="line4"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="10.521953"
+   y1="9.4009237"
+   x2="10.521953"
+   y2="24.094875"
+   id="line6"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="17.201021"
+   y1="9.4009237"
+   x2="17.201021"
+   y2="24.094875"
+   id="line8"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="23.880093"
+   y1="9.4009237"
+   x2="23.880093"
+   y2="15.831297"
+   id="line10"
+   style="stroke:#d98a0d;stroke-width:2.67163;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="30.55916"
+   y1="9.4009237"
+   x2="30.55916"
+   y2="15.930859"
+   id="line12"
+   style="stroke:#d98a0d;stroke-width:2.67163;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="37.238239"
+   y1="9.4009237"
+   x2="37.238239"
+   y2="24.094875"
+   id="line14"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="43.917309"
+   y1="9.4009237"
+   x2="43.917309"
+   y2="24.094875"
+   id="line16"
+   style="stroke:#d98a0d;stroke-opacity:1" />
+<line
+   class="st1"
+   x1="1.1712544"
+   y1="12.300144"
+   x2="46.588936"
+   y2="12.300144"
+   id="line18"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="1.1712544"
+   y1="21.195667"
+   x2="19.110044"
+   y2="21.195667"
+   id="line20"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+
+<path
+   class="st3"
+   d="M 26.150977,30.3732"
+   id="path24"
+   style="stroke-width:1.33581" />
+<g
+   id="g837"
+   style="stroke-width:3.5;stroke-miterlimit:10;stroke-dasharray:none"><line
+     class="st2"
+     x1="22.168528"
+     y1="19.00256"
+     x2="41.137093"
+     y2="37.436787"
+     id="line22"
+     style="stroke:#cc0000;stroke-width:3.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><polyline
+     class="st4"
+     points="25,27 25,21 31,21 "
+     id="polyline26"
+     transform="matrix(1.6296104,0,0,1.6296104,-18.571732,-15.219259)"
+     style="stroke:#cc0000;stroke-width:2.14775262;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g>
+<line
+   class="st1"
+   x1="34.266258"
+   y1="21.381462"
+   x2="46.828747"
+   y2="21.381462"
+   id="line20-0"
+   style="fill:none;stroke:#000000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" /></svg>
diff --git a/app/bin/bitmaps/SVG/sensor.svg b/app/bin/bitmaps/SVG/sensor.svg
new file mode 100644
index 0000000..4188f0e
--- /dev/null
+++ b/app/bin/bitmaps/SVG/sensor.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg23"
+   sodipodi:docname="sensor.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata27"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1373"
+     inkscape:window-height="946"
+     id="namedview25"
+     showgrid="false"
+     inkscape:zoom="8.1826993"
+     inkscape:cx="32.018774"
+     inkscape:cy="32.018774"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg23"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs5"><clipPath
+       id="clipPath3145"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     id="g871"
+     transform="matrix(1.8592806,0,0,1.8552804,-25.548253,-31.252843)"
+     style="stroke-width:2.02496;stroke-miterlimit:4;stroke-dasharray:none"><g
+       transform="matrix(1.3333,0,0,-1.3333,46.462838,34.094081)"
+       id="g9"
+       style="stroke:#689b90;stroke-width:1.51876;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path
+         d="m 0,0 c 0,6.425 -5.208,11.634 -11.633,11.634 -6.425,0 -11.634,-5.209 -11.634,-11.634 0,-6.425 5.209,-11.633 11.634,-11.633 C -5.208,-11.633 0,-6.425 0,0"
+         fill="#11f2e7"
+         id="path7"
+         style="fill:#0ac1b8;fill-opacity:1;stroke:#527a70;stroke-width:1.51876;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       transform="matrix(1.1442058,0,0,-1.4775492,20.568595,23.358673)"
+       id="g13"
+       style="stroke-width:1.55738;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 18.259,-14.407"
+         fill="none"
+         stroke="#ffffff"
+         stroke-miterlimit="10"
+         id="path11"
+         style="stroke-width:1.55738;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.3611188,0,0,-1.2178976,20.89688,45.032578)"
+       id="g17"
+       style="stroke-width:1.57277;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 14.946,17.951"
+         fill="none"
+         stroke="#ffffff"
+         stroke-miterlimit="10"
+         id="path15"
+         style="stroke-width:1.57277;stroke-miterlimit:4;stroke-dasharray:none" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/signal.svg b/app/bin/bitmaps/SVG/signal.svg
new file mode 100644
index 0000000..ad01427
--- /dev/null
+++ b/app/bin/bitmaps/SVG/signal.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg27"
+   sodipodi:docname="signal.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata31"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1380"
+     inkscape:window-height="872"
+     id="namedview29"
+     showgrid="false"
+     inkscape:zoom="9.3956422"
+     inkscape:cx="31.982912"
+     inkscape:cy="35.016233"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g874"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs5"><clipPath
+       id="clipPath3381"><path
+         d="m0 48h48v-48h-48z"
+         id="path2" /></clipPath></defs><g
+     id="g874"
+     transform="matrix(1.7022641,0,0,1.5657944,-23.33414,-16.680089)"><g
+       transform="matrix(1.4338911,0,0,-1.6744946,21.752018,49.515943)"
+       id="g9"
+       style="stroke-width:1.50004;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M 0,0 H 15"
+         fill="none"
+         stroke="#020000"
+         stroke-miterlimit="10"
+         id="path7"
+         style="stroke-width:1.50004;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       transform="matrix(1.6744946,0,0,-1.486785,32.699606,21.389291)"
+       id="g13"
+       style="stroke-width:1.50004;stroke-miterlimit:4;stroke-dasharray:none"><path
+         d="M -0.14054799,-2.5566826 -0.09045201,-19.03"
+         fill="none"
+         stroke="#020000"
+         stroke-miterlimit="10"
+         id="path11"
+         style="stroke-width:1.47008;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+       clip-path="url(#clipPath3381)"
+       id="g23"
+       transform="matrix(2.1918574,0,0,-2.4227971,-21.664458,94.940764)"><g
+         transform="translate(27.604,31.282)"
+         id="g17"><path
+           d="m 0,0 c 0,-1.489 -1.294,-2.697 -2.89,-2.697 -1.595,0 -2.889,1.208 -2.889,2.697 0,1.489 1.294,2.696 2.889,2.696 C -1.294,2.696 0,1.489 0,0"
+           fill="#f40f3b"
+           id="path15" /></g><g
+         transform="translate(27.604,31.282)"
+         id="g21"><path
+           d="m 0,0 c 0,-1.489 -1.294,-2.697 -2.89,-2.697 -1.595,0 -2.889,1.208 -2.889,2.697 0,1.489 1.294,2.696 2.889,2.696 C -1.294,2.696 0,1.489 0,0 Z"
+           fill="none"
+           stroke="#020000"
+           stroke-miterlimit="10"
+           id="path19" /></g></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/snap-curs.svg b/app/bin/bitmaps/SVG/snap-curs.svg
new file mode 100644
index 0000000..fa700ce
--- /dev/null
+++ b/app/bin/bitmaps/SVG/snap-curs.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="snap-curs.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata73"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs71" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1525"
+   inkscape:window-height="969"
+   id="namedview69"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="23.969375"
+   inkscape:cy="24.012177"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:snap-nodes="true"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFFFFF;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:none;}
+	.st2{fill:#231F20;}
+</style>
+<path
+   class="st0"
+   d="m 28.485161,24.116161 c 0,2.446994 -1.922639,4.544418 -4.54442,4.544418 -2.446995,0 -4.544418,-1.922639 -4.544418,-4.544418 0,-2.446995 1.922639,-4.544418 4.544418,-4.544418 2.446995,0.174783 4.54442,2.097423 4.54442,4.544418 z"
+   id="path1012"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+
+
+
+
+
+
+
+
+
+
+
+
+<path
+   class="st0"
+   d="m 11.125143,40.945382 c 0,2.446995 -1.9226384,4.544418 -4.5444195,4.544418 -2.4469957,0 -4.544418,-1.922638 -4.544418,-4.544418 0,-2.446994 1.9226384,-4.544418 4.544418,-4.544418 2.4469944,0.174784 4.5444195,2.097424 4.5444195,4.544418 z"
+   id="path30"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st0"
+   d="m 28.603676,40.945382 c 0,2.446995 -1.922638,4.544418 -4.544419,4.544418 -2.446996,0 -4.544418,-1.922638 -4.544418,-4.544418 0,-2.446994 1.922638,-4.544418 4.544418,-4.544418 2.446994,0.174784 4.544419,2.097424 4.544419,4.544418 z"
+   id="path32"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st0"
+   d="m 46.08221,40.945382 c 0,2.446995 -1.922638,4.544418 -4.544419,4.544418 -2.446996,0 -4.544418,-1.922638 -4.544418,-4.544418 0,-2.446994 1.922638,-4.544418 4.544418,-4.544418 2.446994,0.174784 4.544419,2.097424 4.544419,4.544418 z"
+   id="path34"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+
+
+
+
+
+
+
+
+
+<path
+   class="st0"
+   d="m 11.125143,7.054619 c 0,2.4469958 -1.9226384,4.544419 -4.5444195,4.544419 -2.4469957,0 -4.544418,-1.9226393 -4.544418,-4.544419 0,-2.4469943 1.9226384,-4.5444194 4.544418,-4.5444194 2.4469944,0.1747867 4.5444195,2.0974251 4.5444195,4.5444194 z"
+   id="path54"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st0"
+   d="m 28.603676,7.054619 c 0,2.4469958 -1.922638,4.544419 -4.544419,4.544419 -2.446996,0 -4.544418,-1.9226393 -4.544418,-4.544419 0,-2.4469943 1.922638,-4.5444194 4.544418,-4.5444194 2.446994,0.1747867 4.544419,2.0974251 4.544419,4.5444194 z"
+   id="path56"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<path
+   class="st0"
+   d="m 46.08221,7.054619 c 0,2.4469958 -1.922638,4.544419 -4.544419,4.544419 -2.446996,0 -4.544418,-1.9226393 -4.544418,-4.544419 0,-2.4469943 1.922638,-4.5444194 4.544418,-4.5444194 2.446994,0.1747867 4.544419,2.0974251 4.544419,4.5444194 z"
+   id="path58"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+
+<path
+   class="st0"
+   d="m 11.006627,24.17424 c 0,2.446994 -1.9226382,4.544418 -4.5444192,4.544418 -2.4469957,0 -4.5444181,-1.922639 -4.5444181,-4.544418 0,-2.446995 1.9226384,-4.544418 4.5444181,-4.544418 2.4469943,0.174783 4.5444192,2.097423 4.5444192,4.544418 z"
+   id="path1010"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><path
+   class="st0"
+   d="m 45.963694,24.17424 c 0,2.446994 -1.922638,4.544418 -4.544419,4.544418 -2.446996,0 -4.544418,-1.922639 -4.544418,-4.544418 0,-2.446995 1.922638,-4.544418 4.544418,-4.544418 2.446994,0.174783 4.544419,2.097423 4.544419,4.544418 z"
+   id="path1014"
+   style="fill:none;fill-opacity:1;stroke:#00cc10;stroke-width:2.07667;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><g
+   id="g66"
+   transform="matrix(1.3844491,0,0,1.3844491,-0.84053536,-0.98876425)">
+	
+	
+<g
+   id="g64"
+   transform="translate(-5.5643192,-5.3931099)">
+		<polygon
+   class="st2"
+   points="25.6,11.7 10.7,10.9 13.2,25.5 18.2,20 34.2,34.2 36.6,31.5 20.6,17.2 "
+   id="polygon62"
+   transform="matrix(0.90211734,0,0,0.90211734,1.0473445,1.066921)" />
+	</g></g></svg>
diff --git a/app/bin/bitmaps/SVG/snap-grid.svg b/app/bin/bitmaps/SVG/snap-grid.svg
new file mode 100644
index 0000000..f6650a7
--- /dev/null
+++ b/app/bin/bitmaps/SVG/snap-grid.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="snap-grid.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata73"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs71" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1524"
+   inkscape:window-height="969"
+   id="namedview69"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="23.9991"
+   inkscape:cy="23.9991"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="g66"
+   inkscape:snap-nodes="false"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFFFFF;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:none;}
+	.st2{fill:#231F20;}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<g
+   id="g66"><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 45.964794,34.798093 H 1.7605429"
+   id="path906-0"
+   sodipodi:nodetypes="cc" />
+	
+	<g
+   id="g64">
+		
+	</g>
+<path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 13.170988,1.9818299 V 45.377465"
+   id="path900"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 23.997436,1.9818299 V 45.826697"
+   id="path904"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 34.823883,1.9818299 V 46.18608"
+   id="path906"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 46.05464,13.279968 H 1.7605429"
+   id="path902-1"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 46.144486,24.039031 H 1.7605429"
+   id="path904-7"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 45.650331,1.9818299 V 46.186079"
+   id="path906-06"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 2.3445413,1.9818299 V 46.18608"
+   id="path906-01"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 46.703533,2.6007706 1.2813595,2.5209067"
+   id="path900-5-5"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;stroke:#00cc0d;stroke-width:2.24998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 46.703534,45.557158 H 1.3612234"
+   id="path900-5-8"
+   sodipodi:nodetypes="cc" /></g>
+</svg>
diff --git a/app/bin/bitmaps/SVG/split-draw.svg b/app/bin/bitmaps/SVG/split-draw.svg
new file mode 100644
index 0000000..d74ee25
--- /dev/null
+++ b/app/bin/bitmaps/SVG/split-draw.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="split-draw.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata41"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs39" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1420"
+   inkscape:window-height="920"
+   id="namedview37"
+   showgrid="false"
+   inkscape:zoom="14.378038"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#B3B3B3;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#808080;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+
+
+
+
+<path
+   class="st1"
+   d="M 31.116412,30.780019"
+   id="path12" />
+<path
+   class="st1"
+   d="M 20.670772,20.837783"
+   id="path14" />
+
+
+
+
+<line
+   class="st2"
+   x1="25.950863"
+   y1="21.986561"
+   x2="43.444164"
+   y2="3.4864542"
+   id="line24"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="4.5561771"
+   y1="44.513905"
+   x2="21.797777"
+   y2="26.265497"
+   id="line26"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+
+
+<polyline
+   class="st3"
+   points="13.4,23.5 20.2,23.1 20.3,16.4 "
+   id="polyline32"
+   transform="matrix(1.2585109,0,0,1.2585109,-4.4171454,-7.6481128)"
+   style="stroke:#cc0000;stroke-width:2.38377;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st3"
+   points="33.7,28.5 26.8,28.9 26.8,35.6 "
+   id="polyline34"
+   transform="matrix(1.2585109,0,0,1.2585109,-6.955518,-9.5737753)"
+   style="stroke:#cc0000;stroke-width:2.38377;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/split.svg b/app/bin/bitmaps/SVG/split.svg
new file mode 100644
index 0000000..2bc28cb
--- /dev/null
+++ b/app/bin/bitmaps/SVG/split.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="split.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata1566"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1564" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1468"
+   inkscape:window-height="951"
+   id="namedview1562"
+   showgrid="false"
+   inkscape:zoom="14.378038"
+   inkscape:cx="24"
+   inkscape:cy="23.74054"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style1527">
+	.st0{fill:none;stroke:#B3B3B3;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#808080;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="3.8516407"
+   y1="35.657555"
+   x2="13.378208"
+   y2="44.725014"
+   id="line1529" />
+<line
+   class="st0"
+   x1="7.6393127"
+   y1="31.640329"
+   x2="17.051104"
+   y2="40.707787"
+   id="line1531" />
+<line
+   class="st0"
+   x1="11.426984"
+   y1="27.623102"
+   x2="20.953552"
+   y2="36.690559"
+   id="line1533" />
+<line
+   class="st0"
+   x1="15.214656"
+   y1="23.605873"
+   x2="24.626448"
+   y2="32.673332"
+   id="line1535" />
+
+
+<line
+   class="st0"
+   x1="22.789999"
+   y1="15.57142"
+   x2="32.20179"
+   y2="24.638878"
+   id="line1541" />
+<line
+   class="st0"
+   x1="26.577673"
+   y1="11.439415"
+   x2="36.10424"
+   y2="20.621649"
+   id="line1543" />
+<line
+   class="st0"
+   x1="30.365345"
+   y1="7.4221864"
+   x2="39.777134"
+   y2="16.604422"
+   id="line1545" />
+<line
+   class="st0"
+   x1="34.153015"
+   y1="3.404959"
+   x2="43.679581"
+   y2="12.587194"
+   id="line1547" />
+<line
+   class="st2"
+   x1="23.084372"
+   y1="19.683172"
+   x2="39.038502"
+   y2="2.8108137"
+   id="line1549"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke:#666666;stroke-opacity:1" />
+<line
+   class="st2"
+   x1="3.7665691"
+   y1="40.163593"
+   x2="19.491148"
+   y2="23.520805"
+   id="line1551"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke:#666666;stroke-opacity:1" />
+<line
+   class="st2"
+   x1="28.054932"
+   y1="24.509245"
+   x2="44.238625"
+   y2="7.6368885"
+   id="line1553"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke:#666666;stroke-opacity:1" />
+<line
+   class="st2"
+   x1="8.5575352"
+   y1="45.184124"
+   x2="24.626448"
+   y2="28.426548"
+   id="line1555"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke:#666666;stroke-opacity:1" />
+<polyline
+   class="st3"
+   points="13.4,23.5 20.2,23.1 20.3,16.4 "
+   id="polyline1557"
+   style="stroke:#cc0000;stroke-width:2.10972;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.3866205,0,0,1.4582594,-8.7657785,-14.110431)" />
+<polyline
+   class="st3"
+   points="33.7,28.5 26.8,28.9 26.8,35.6 "
+   id="polyline1559"
+   style="stroke:#cc0000;stroke-width:2.19817;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.4082952,0,0,1.32259,-9.2134144,-9.5667462)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/sticky-doc.svg b/app/bin/bitmaps/SVG/sticky-doc.svg
new file mode 100644
index 0000000..20ea76f
--- /dev/null
+++ b/app/bin/bitmaps/SVG/sticky-doc.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1556"
+   sodipodi:docname="sticky-doc.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1560"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="931"
+     id="namedview1558"
+     showgrid="false"
+     inkscape:zoom="10.803477"
+     inkscape:cx="31.980445"
+     inkscape:cy="33.461449"
+     inkscape:window-x="6"
+     inkscape:window-y="3"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1556"
+     inkscape:document-rotation="0"
+     inkscape:snap-nodes="false"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs1538"><clipPath
+       id="clipPath4490"><path
+         d="m0 48h48v-48h-48z"
+         id="path1535" /></clipPath><clipPath
+       id="clipPath4424"><path
+         d="M 0,48 H 48 V 0 H 0 Z"
+         id="path920" /></clipPath></defs><path
+     style="fill:#a0592c;fill-opacity:1;stroke:#a0592c;stroke-width:1.1707px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.7671622,8.6432915 44.7300768,0.04069 13.734325,9.8289935 0.0034,36.843687 -58.5931253,-0.05776 z"
+     id="path2772"
+     sodipodi:nodetypes="cccccc"
+     inkscape:label="outline" /><g
+     transform="matrix(2.2387733,0,0,-2.564431,-15.300851,92.664659)"
+     id="g1554"><path
+       d="M 8.6186891,32.247551 8.6032755,15.12224 33.479571,15.100555 33.473002,28.64877 27.806013,32.19633 Z"
+       fill="#ffce00"
+       id="path1540"
+       sodipodi:nodetypes="cccccc"
+       style="stroke-width:0.987122" /><path
+       d="m 27.904611,32.195585 0.0194,-3.615578 5.713343,0.01661 z"
+       fill="#c19d05"
+       id="path1544"
+       sodipodi:nodetypes="cccc"
+       style="stroke-width:1.12315" /></g><path
+     d="m 36.567695,32.072291 c 0,0 -12.08789,-10.690569 -15.998423,-13.665449 C 16.656547,15.435575 9.6075626,22.76642 14.383329,26.263145 19.159803,29.762777 32.203378,41.2321 37.617602,44.33056 44.866707,49.927132 54.702434,40.109053 49.998452,33.279763 43.565297,28.002312 30.39473,16.563864 30.39473,16.563864"
+     fill="none"
+     stroke="#0679bf"
+     stroke-miterlimit="10"
+     id="path1548"
+     inkscape:label="clippy"
+     style="stroke:#1566b7;stroke-width:4.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:nodetypes="cccccc" /></svg>
diff --git a/app/bin/bitmaps/SVG/sticky-link.svg b/app/bin/bitmaps/SVG/sticky-link.svg
new file mode 100644
index 0000000..f403661
--- /dev/null
+++ b/app/bin/bitmaps/SVG/sticky-link.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1556"
+   sodipodi:docname="sticky-link.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1560"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1675"
+     inkscape:window-height="931"
+     id="namedview1558"
+     showgrid="false"
+     inkscape:zoom="10.803477"
+     inkscape:cx="32.026726"
+     inkscape:cy="31.980445"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1556"
+     inkscape:document-rotation="0"
+     inkscape:snap-nodes="true"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs1538"><clipPath
+       id="clipPath4490"><path
+         d="m0 48h48v-48h-48z"
+         id="path1535" /></clipPath><clipPath
+       id="clipPath4424"><path
+         d="M 0,48 H 48 V 0 H 0 Z"
+         id="path920" /></clipPath></defs><path
+     style="fill:#a0592c;fill-opacity:1;stroke:#a0592c;stroke-width:1.1707px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.8295204,8.6432918 44.7300766,0.04069 13.734325,9.8289932 0.0034,36.843687 -58.5931251,-0.05776 z"
+     id="path2772"
+     sodipodi:nodetypes="cccccc"
+     inkscape:label="outline" /><g
+     transform="matrix(2.2387733,0,0,-2.564431,-15.238493,92.664659)"
+     id="g1554"><path
+       d="M 8.6186891,32.247551 8.6032755,15.12224 33.479571,15.100555 33.473002,28.64877 27.806013,32.19633 Z"
+       fill="#ffce00"
+       id="path1540"
+       sodipodi:nodetypes="cccccc"
+       style="stroke-width:0.987122" /><path
+       d="m 27.904611,32.195585 0.0194,-3.615578 5.713343,0.01661 z"
+       fill="#c19d05"
+       id="path1544"
+       sodipodi:nodetypes="cccc"
+       style="stroke-width:1.12315" /></g><g
+     clip-path="url(#clipPath4424)"
+     id="g937"
+     transform="matrix(2.1657938,0,0,-2.4808357,-13.543802,95.073373)"
+     style="stroke-width:1.72565;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="M 13.494482,28.880566 C 9.7704502,28.323132 9.8028707,22.521573 13.526902,21.948 c 4.856167,-0.500202 10.724216,7.551068 14.825918,6.906165 3.753827,-0.544879 4.139651,-6.106432 0.186631,-6.911199 -4.922663,-0.559203 -10.533859,7.730685 -15.044964,6.9376 z"
+       fill="none"
+       stroke="#0679bf"
+       stroke-miterlimit="10"
+       id="path933"
+       sodipodi:nodetypes="cccccc"
+       style="stroke:#1467b8;stroke-width:1.72565;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:label="link" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/sticky-note.svg b/app/bin/bitmaps/SVG/sticky-note.svg
new file mode 100644
index 0000000..1fe3d30
--- /dev/null
+++ b/app/bin/bitmaps/SVG/sticky-note.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1556"
+   sodipodi:docname="sticky-note.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1560"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1669"
+     inkscape:window-height="931"
+     id="namedview1558"
+     showgrid="false"
+     inkscape:zoom="10.803477"
+     inkscape:cx="31.887882"
+     inkscape:cy="31.980445"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1556"
+     inkscape:document-rotation="0"
+     inkscape:snap-nodes="false"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs1538"><clipPath
+       id="clipPath4490"><path
+         d="m0 48h48v-48h-48z"
+         id="path1535" /></clipPath></defs><path
+     style="fill:#a0592c;fill-opacity:1;stroke:#a0592c;stroke-width:1.1707px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.8295202,8.6432916 44.7300768,0.04069 13.734325,9.8289934 0.0034,36.843687 -58.5931248,-0.05776 z"
+     id="path2772"
+     sodipodi:nodetypes="cccccc"
+     inkscape:label="outline" /><g
+     transform="matrix(2.2387733,0,0,-2.564431,-15.238493,92.664659)"
+     id="g1554"><path
+       d="M 8.6186891,32.247551 8.6032755,15.12224 33.479571,15.100555 33.473002,28.64877 27.806013,32.19633 Z"
+       fill="#ffce00"
+       id="path1540"
+       sodipodi:nodetypes="cccccc"
+       style="stroke-width:0.987122" /><path
+       d="m 27.904611,32.195585 0.0194,-3.615578 5.713343,0.01661 z"
+       fill="#c19d05"
+       id="path1544"
+       sodipodi:nodetypes="cccc"
+       style="stroke-width:1.12315" /></g><g
+     id="g2121"
+     inkscape:label="note"
+     transform="translate(-1.0226106,2.4522374)"><path
+       d="M 8.5459993,43.73594 H 56.888648"
+       fill="none"
+       stroke="#0679bf"
+       stroke-miterlimit="10"
+       id="path875"
+       style="stroke:#1467b8;stroke-width:4.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="M 8.4899312,34.31052 H 50.299766"
+       fill="none"
+       stroke="#0679bf"
+       stroke-miterlimit="10"
+       id="path879"
+       style="stroke:#1467b8;stroke-width:4.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="M 8.638554,24.945673 H 53.463813"
+       fill="none"
+       stroke="#0679bf"
+       stroke-miterlimit="10"
+       id="path1812"
+       style="stroke:#1467b8;stroke-width:4.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="M 8.582494,15.765913 H 45.4865"
+       fill="none"
+       stroke="#0679bf"
+       stroke-miterlimit="10"
+       id="path871"
+       style="stroke:#1467b8;stroke-width:4.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/stop.svg b/app/bin/bitmaps/SVG/stop.svg
new file mode 100644
index 0000000..4bd5fa0
--- /dev/null
+++ b/app/bin/bitmaps/SVG/stop.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="stop.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata42"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs40"><radialGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_1_"
+     id="radialGradient867"
+     cx="23.599313"
+     cy="23.299802"
+     fx="23.599313"
+     fy="23.299802"
+     r="18.802058"
+     gradientTransform="matrix(1,0,0,1.1475892,0,-3.4387987)"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1528"
+   inkscape:window-height="918"
+   id="namedview38"
+   showgrid="false"
+   inkscape:zoom="14.378038"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:url(#SVGID_1_);stroke:#000000;stroke-miterlimit:10;}
+</style>
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="2.3596"
+   y1="25.2837"
+   x2="44.5404"
+   y2="25.2837"
+   gradientTransform="matrix(5.000000e-03 1 -1 5.000000e-03 48.7725 -0.2285)">
+	
+	
+	
+	
+	
+	
+	
+	
+	<stop
+   offset="0.08821"
+   style="stop-color:#e4a9a5;stop-opacity:1"
+   id="stop20" />
+	<stop
+   offset="0.3086791"
+   style="stop-color:#db9b94;stop-opacity:1"
+   id="stop22" />
+	<stop
+   offset="0.54394364"
+   style="stop-color:#cb7167;stop-opacity:1"
+   id="stop24" />
+	<stop
+   offset="0.75441277"
+   style="stop-color:#c84337;stop-opacity:1"
+   id="stop26" />
+	
+	<stop
+   offset="0.9501"
+   style="stop-color:#b21506;stop-opacity:1"
+   id="stop30" />
+	<stop
+   offset="0.9992"
+   style="stop-color:#a80e00;stop-opacity:1"
+   id="stop32" />
+</linearGradient>
+<polygon
+   class="st0"
+   points="23.5,44.3 5.3,33.7 5.5,12.7 23.7,2.3 41.9,12.9 41.8,33.9 "
+   id="polygon35"
+   style="fill-opacity:1;fill:url(#radialGradient867)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/straight-line.svg b/app/bin/bitmaps/SVG/straight-line.svg
new file mode 100644
index 0000000..32a01a3
--- /dev/null
+++ b/app/bin/bitmaps/SVG/straight-line.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="straight-line.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata923"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs921" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1418"
+   inkscape:window-height="1008"
+   id="namedview919"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="24"
+   inkscape:cy="26.258824"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style884">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st3{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="M 6.6931374,34.732799"
+   id="path886" />
+<path
+   class="st0"
+   d="M 9.9931374,31.232799"
+   id="path888" />
+<path
+   class="st0"
+   d="M 13.293137,27.732799"
+   id="path890" />
+<path
+   class="st0"
+   d="M 16.593137,24.232799"
+   id="path892" />
+<path
+   class="st0"
+   d="M 19.893137,20.732799"
+   id="path894" />
+<path
+   class="st0"
+   d="M 23.193137,17.232799"
+   id="path896" />
+<path
+   class="st0"
+   d="M 26.493137,13.632799"
+   id="path898" />
+<path
+   class="st0"
+   d="M 37.993137,18.132799"
+   id="path900" />
+<path
+   class="st0"
+   d="M 29.793137,10.132799"
+   id="path902" />
+<path
+   class="st0"
+   d="M 41.393137,14.632799"
+   id="path904" />
+<path
+   class="st0"
+   d="M 33.093137,6.6327991"
+   id="path906" />
+<path
+   class="st1"
+   d="M 37.293137,5.8327991"
+   id="path908" />
+<path
+   class="st1"
+   d="M 6.3931374,38.432799"
+   id="path910" />
+<line
+   class="st2"
+   x1="4.237493"
+   y1="43.630077"
+   x2="28.515442"
+   y2="19.529856"
+   id="line912"
+   style="stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st3"
+   x1="28.515442"
+   y1="19.529856"
+   x2="43.04525"
+   y2="4.5849099"
+   id="line914"
+   style="stroke:#cc0e00;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st4"
+   points="42.6,12.6 42.1,5.8 35.5,5.8 "
+   id="polyline916"
+   style="stroke:#cc0e00;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="translate(0.79313743,-1.0672009)" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/straight.svg b/app/bin/bitmaps/SVG/straight.svg
new file mode 100644
index 0000000..6c5f37b
--- /dev/null
+++ b/app/bin/bitmaps/SVG/straight.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="straight.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata926"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs924" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1413"
+   inkscape:window-height="937"
+   id="namedview922"
+   showgrid="false"
+   inkscape:zoom="14.378038"
+   inkscape:cx="19.826969"
+   inkscape:cy="24.347753"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style893">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{stroke:#F80E00;stroke-width:2;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#F80E00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="2.9930582"
+   y1="36.148373"
+   x2="12.837148"
+   y2="45.518051"
+   id="line895"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="6.9069719"
+   y1="31.997252"
+   x2="16.632456"
+   y2="41.366932"
+   id="line897"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="10.820889"
+   y1="27.846128"
+   x2="20.664972"
+   y2="37.215809"
+   id="line899"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="14.734805"
+   y1="23.695007"
+   x2="24.460285"
+   y2="33.064686"
+   id="line901"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="18.648714"
+   y1="19.543886"
+   x2="28.492802"
+   y2="28.913563"
+   id="line903"
+   style="stroke:#d98b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="22.562628"
+   y1="15.392764"
+   x2="32.288116"
+   y2="24.762442"
+   id="line905"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="26.476543"
+   y1="11.123041"
+   x2="36.320637"
+   y2="20.611319"
+   id="line907"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="30.390459"
+   y1="6.9719186"
+   x2="40.115948"
+   y2="16.460197"
+   id="line909"
+   style="stroke:#b2b2b2;stroke-opacity:1" />
+
+<line
+   class="st1"
+   x1="2.9146755"
+   y1="40.860981"
+   x2="22.544384"
+   y2="19.917923"
+   id="line913"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="7.8975964"
+   y1="46.260185"
+   x2="28.092888"
+   y2="24.918444"
+   id="line915"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="25.125404"
+   y1="22.338005"
+   x2="43.922752"
+   y2="2.8828921"
+   id="line917"
+   style="stroke:#cc0000;stroke-width:2.5;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+<polyline
+   class="st3"
+   points="42.6,12.6 42.1,5.8 35.5,5.8 "
+   id="polyline919"
+   style="stroke:#cc0000;stroke-width:2.21487;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   transform="matrix(1.1287352,0,0,1.1287352,-3.6377413,-3.6244135)" />
+<line
+   class="st1"
+   x1="22.544384"
+   y1="19.917923"
+   x2="35.261513"
+   y2="6.3368797"
+   id="line842"
+   style="stroke:#666666;stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><line
+   class="st1"
+   x1="28.092888"
+   y1="24.918444"
+   x2="40.843689"
+   y2="11.432371"
+   id="line844"
+   style="stroke:#666666;stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></svg>
diff --git a/app/bin/bitmaps/SVG/switch-ai.svg b/app/bin/bitmaps/SVG/switch-ai.svg
new file mode 100644
index 0000000..9c842e3
--- /dev/null
+++ b/app/bin/bitmaps/SVG/switch-ai.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg1549"
+   sodipodi:docname="switch-ai.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata1553"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1458"
+     inkscape:window-height="878"
+     id="namedview1551"
+     showgrid="false"
+     inkscape:zoom="8.1826993"
+     inkscape:cx="31.95767"
+     inkscape:cy="31.774356"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1547"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0" /><defs
+     id="defs1519"><clipPath
+       id="clipPath3486"><path
+         d="m0 48h48v-48h-48z"
+         id="path1516" /></clipPath></defs><g
+     transform="matrix(1.8360071,0,0,-1.8360071,-16.771693,72.460272)"
+     id="g1547"><g
+       transform="matrix(1.1130994,0,0,1.1130994,19.813412,26.914954)"
+       id="g1523"><path
+         d="M 0.4671437,0.44608624 17.714856,-18.551086"
+         fill="none"
+         stroke="#000200"
+         stroke-miterlimit="10"
+         id="path1521"
+         style="stroke-width:2.17864;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+       transform="matrix(1.1119872,-0.04974395,0.04974395,1.1119872,10.086494,37.386378)"
+       id="g1527"><path
+         d="m 12.853899,-8.0334513 c 0,-2.1766187 -1.763768,-3.9391237 -3.9391231,-3.9391237 -2.1766184,0 -3.9403864,1.762505 -3.9403864,3.9391237 0,2.1753559 1.763768,3.939124 3.9403864,3.939124 2.1753551,0 3.9391231,-1.7637681 3.9391231,-3.939124"
+         fill="#f70f31"
+         id="path1529"
+         style="fill:#c40808;fill-opacity:1;stroke-width:1.26254" /><path
+         d="M 0.95477497,0.17808758 8.273775,-7.2949125"
+         fill="none"
+         stroke="#f70f31"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path1525"
+         style="stroke:#c40808;stroke-width:2.17864;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       clip-path="url(#clipPath3486)"
+       id="g1545"
+       transform="matrix(1.1130994,0,0,1.1130994,-1.6562092,-3.8556612)"><path
+         d="m 27.768603,8.8691045 c 0,5.3601645 4.49539,9.6982505 10.051937,9.6982505"
+         fill="none"
+         stroke="#000700"
+         stroke-miterlimit="10"
+         id="path1533"
+         style="stroke-width:1.92381;stroke-miterlimit:10;stroke-dasharray:none" /><path
+         d="M 36.880028,18.752028 37.003,9.093"
+         fill="none"
+         stroke="#000700"
+         stroke-miterlimit="10"
+         id="path1537"
+         style="stroke-width:1.90631;stroke-miterlimit:10;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" /><path
+         d="M 25.664478,9.257914 39.456307,9.238486"
+         fill="none"
+         stroke="#020000"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         id="path1541"
+         style="stroke-width:1.90631;stroke-miterlimit:10;stroke-dasharray:none" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/table-edge.svg b/app/bin/bitmaps/SVG/table-edge.svg
new file mode 100644
index 0000000..e2663ac
--- /dev/null
+++ b/app/bin/bitmaps/SVG/table-edge.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="table-edge.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata23"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs21" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1349"
+   inkscape:window-height="949"
+   id="namedview19"
+   showgrid="false"
+   inkscape:snap-nodes="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="22.553895"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FF8200;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:#FF8200;}
+	.st2{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:10;}
+</style>
+<rect
+   x="2.4431601"
+   y="25.12504"
+   class="st0"
+   width="23.912262"
+   height="17.330696"
+   id="rect4"
+   style="fill:#afaeac;fill-opacity:1;stroke:none;stroke-width:1.48566;stroke-miterlimit:10;stroke-dasharray:none" />
+
+
+
+
+
+
+<path
+   style="fill:none;stroke:#000000;stroke-width:1.46954px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 26.464217,25.078666 2.3930621,25.147382"
+   id="path838" /><path
+   id="path842"
+   style="fill:#42b743;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none"
+   d="M 26.210618,24.581025 2.3201056,24.49001 2.4322676,5.1036417 H 45.510328 Z"
+   sodipodi:nodetypes="ccccc" /><path
+   id="path845"
+   style="fill:#898785;fill-opacity:1;stroke:#000000;stroke-width:1.46954;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none"
+   d="M 44.945132,22.315034 26.491789,42.39923 26.63883,25.321877 44.873396,5.7958747 Z"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:none;stroke:#000000;stroke-width:1.46954px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 26.571012,42.088198 2.4998566,42.156916"
+   id="path838-1" /></svg>
diff --git a/app/bin/bitmaps/SVG/text.svg b/app/bin/bitmaps/SVG/text.svg
new file mode 100644
index 0000000..c5e5c32
--- /dev/null
+++ b/app/bin/bitmaps/SVG/text.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="text.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata3660"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs3658" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1516"
+   inkscape:window-height="799"
+   id="namedview3656"
+   showgrid="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="23.995614"
+   inkscape:cy="22.986238"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style3651">
+	.st0{font-family:'MyriadPro-Regular';}
+	.st1{font-size:48px;}
+</style>
+<text
+   class="st0 st1"
+   id="text3653"
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:64px;font-family:Arial;-inkscape-font-specification:'Arial Bold';stroke-width:1.12882"
+   x="0.54810065"
+   y="47.383064"
+   transform="scale(1.0198672,0.98051982)">A</text>
+</svg>
diff --git a/app/bin/bitmaps/SVG/top.svg b/app/bin/bitmaps/SVG/top.svg
new file mode 100644
index 0000000..ccf60ad
--- /dev/null
+++ b/app/bin/bitmaps/SVG/top.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="top.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata862"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs860" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1396"
+   inkscape:window-height="976"
+   id="namedview858"
+   showgrid="false"
+   inkscape:zoom="13.417014"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style851">
+	.st0{fill:#808080;}
+	.st1{fill:#FF0603;}
+</style>
+<rect
+   x="17.38179"
+   y="8.2811852"
+   class="st0"
+   width="28.549133"
+   height="31.43763"
+   id="rect853"
+   style="stroke:#000000;stroke-width:1.27743;stroke-opacity:1" />
+<path
+   class="st1"
+   d="m 29.060985,24.251499 c 0,7.29353 -6.099134,13.078054 -13.495954,13.078054 -7.5265895,0 -13.4959548,-5.910275 -13.4959548,-13.078054 0,-7.293529 6.0991333,-13.078052 13.4959548,-13.078052 7.39682,-0.125751 13.495954,5.784523 13.495954,13.078052 z"
+   id="path855"
+   style="stroke:#990000;stroke-width:1.27743;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/train.svg b/app/bin/bitmaps/SVG/train.svg
new file mode 100644
index 0000000..e2d2a71
--- /dev/null
+++ b/app/bin/bitmaps/SVG/train.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="train.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata50"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs48" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1575"
+   inkscape:window-height="965"
+   id="namedview46"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="24"
+   inkscape:cy="21.577618"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#808080;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000401;stroke-miterlimit:10;}
+	.st2{fill:#000401;}
+	.st3{fill:url(#SVGID_1_);}
+	.st4{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st5{fill:#006837;}
+	.st6{fill:#FFE53F;}
+	.st7{font-family:'MyriadPro-Regular';}
+	.st8{font-size:6px;}
+</style>
+<path
+   class="st0"
+   d="M 37.515004,20.476714 C 37.180948,16.574746 38.079405,5.8084729 27.166937,4.1938653 18.481504,2.8483593 3.0440743,4.6124338 2.9428781,8.7564972 c 0.099158,3.8779088 8.7130179,6.4619188 15.6168239,6.1754338 7.341985,-1.130253 13.06101,-4.35213 17.552741,-3.288219"
+   id="path4"
+   sodipodi:nodetypes="ccccc"
+   style="fill:#808080;fill-opacity:1;stroke-width:3.14825;stroke-miterlimit:10;stroke-dasharray:none" />
+
+<line
+   class="st1"
+   x1="13.017804"
+   y1="20.804539"
+   x2="13.276731"
+   y2="27.45532"
+   id="line8"
+   style="stroke-width:2.44934;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st1"
+   x1="3.5502384"
+   y1="21.384453"
+   x2="14.173705"
+   y2="21.356592"
+   id="line10"
+   style="stroke-width:1.837;stroke-miterlimit:10;stroke-dasharray:none" />
+<path
+   class="st2"
+   d="m 27.647211,28.620494 h -3.883914 c 0,0 -0.388392,-1.941957 0,-3.883914 0.906246,-2.07142 2.718739,-1.941956 3.883914,0 0.129462,2.977667 0,3.883914 0,3.883914 z"
+   id="path12"
+   style="stroke-width:1.29463" />
+
+
+
+<path
+   class="st2"
+   d="m 41.836717,43.209271 c 0,1.165174 -0.906246,2.200883 -2.200884,2.200883 -1.294638,0 -2.200884,-0.906246 -2.200884,-2.200883 0,-1.294638 0.906246,-2.200884 2.200884,-2.200884 1.294638,0 2.200884,1.03571 2.200884,2.200884 z"
+   id="path20"
+   style="stroke-width:1.29463" />
+<path
+   class="st0"
+   d="M 14.57137,35.223145"
+   id="path22" />
+<path
+   class="st0"
+   d="M 24.022224,35.870465"
+   id="path24" />
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="24.5506"
+   y1="21.5"
+   x2="30.4868"
+   y2="21.5"
+   gradientTransform="matrix(0,2.0281882,-1.2946377,0,55.481923,-22.363742)">
+	<stop
+   offset="2.455360e-02"
+   style="stop-color:#000000;stop-opacity:1"
+   id="stop26" />
+	<stop
+   offset="0.4355"
+   style="stop-color:#22B573"
+   id="stop28" />
+	<stop
+   offset="1"
+   style="stop-color:#000201;stop-opacity:1"
+   id="stop30" />
+</linearGradient>
+<rect
+   x="13.406194"
+   y="27.325857"
+   class="st3"
+   width="28.482027"
+   height="12.169129"
+   id="rect33"
+   style="fill:url(#SVGID_1_);stroke-width:1.62042" /><path
+   class="st2"
+   d="m 35.3229,41.816826 c 0,2.200884 -1.812492,4.013376 -4.013377,4.013376 -2.200884,0 -4.013376,-1.812492 -4.013376,-4.013376 0,-2.200885 1.812492,-4.013377 4.013376,-4.013377 2.200885,0 4.013377,1.812492 4.013377,4.013377 z"
+   id="path14"
+   style="stroke-width:1.29463" />
+<line
+   class="st4"
+   x1="41.013638"
+   y1="38.614727"
+   x2="46.192184"
+   y2="43.404884"
+   id="line35"
+   style="stroke-width:1.29463" />
+<rect
+   x="3.0490949"
+   y="27.325857"
+   class="st5"
+   width="10.3571"
+   height="12.169129"
+   id="rect37"
+   style="stroke-width:1.62042" /><path
+   class="st2"
+   d="m 26.260436,41.816826 c 0,2.200884 -1.812493,4.013376 -4.013377,4.013376 -2.200883,0 -4.013376,-1.812492 -4.013376,-4.013376 0,-2.200885 1.812493,-4.013377 4.013376,-4.013377 2.200884,0 4.013377,1.812492 4.013377,4.013377 z"
+   id="path16"
+   style="stroke-width:1.29463" />
+<path
+   class="st2"
+   d="m 7.6176546,43.111463 c 0,1.165175 -0.906246,2.200885 -2.2008849,2.200885 -1.165173,0 -2.2008831,-0.906246 -2.2008831,-2.200885 0,-1.294637 0.9062464,-2.200883 2.2008831,-2.200883 1.2946389,0.129463 2.2008849,1.03571 2.2008849,2.200883 z"
+   id="path39"
+   style="stroke-width:1.29463" />
+<path
+   class="st2"
+   d="m 17.197973,41.816826 c 0,2.200884 -1.812492,4.013376 -4.013376,4.013376 -2.200885,0 -4.0133769,-1.812492 -4.0133769,-4.013376 0,-2.200885 1.8124919,-4.013377 4.0133769,-4.013377 2.200884,0 4.013376,1.812492 4.013376,4.013377 z"
+   id="path18"
+   style="stroke-width:1.29463" />
+
+<rect
+   style="opacity:1;fill:#000201;fill-opacity:1;stroke:none;stroke-width:3.3644;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+   id="rect858"
+   width="4.7189298"
+   height="7.1085119"
+   x="35.176659"
+   y="20.289568" /><path
+   style="fill:none;stroke:#fffd46;stroke-width:2.44934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="m 8.4060186,29.235334 v 8.072492"
+   id="path862" /></svg>
diff --git a/app/bin/bitmaps/SVG/trim.svg b/app/bin/bitmaps/SVG/trim.svg
new file mode 100644
index 0000000..553d08f
--- /dev/null
+++ b/app/bin/bitmaps/SVG/trim.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   id="svg2766"
+   sodipodi:docname="trim.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"
+   width="48"
+   height="48"><defs
+     id="defs2770" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1416"
+     inkscape:window-height="920"
+     id="namedview2768"
+     showgrid="false"
+     inkscape:zoom="9.3994533"
+     inkscape:cx="26.121774"
+     inkscape:cy="28.182354"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g2764"
+     inkscape:document-rotation="0"
+     units="mm" /><metadata
+     id="metadata2742"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><g
+     transform="matrix(1.3333,0,0,-1.3333,0,64)"
+     id="g2764"><g
+       transform="matrix(0.96624008,0,0,0.96624008,3.1679953,14.357371)"
+       id="g2746"><path
+         d="M 0.23938161,0.55855709 15.141382,16.484557"
+         fill="none"
+         stroke="#020202"
+         stroke-miterlimit="10"
+         id="path2744"
+         style="stroke-width:2.25006;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+       transform="matrix(0.95746776,0,0,0.95746776,19.792787,32.050838)"
+       id="g2750"
+       style="stroke-width:2.25006;stroke-miterlimit:10;stroke-dasharray:none"><path
+         d="M 0,0 13.405,13.62"
+         fill="none"
+         stroke="#808080"
+         stroke-miterlimit="10"
+         id="path2748"
+         style="stroke-width:2.25006;stroke-miterlimit:10;stroke-dasharray:none" /></g><g
+       transform="translate(8.3968901,31.726403)"
+       id="g2754"
+       style="stroke-width:2.25006;stroke-miterlimit:10;stroke-dasharray:none"><path
+         d="m -0.23938161,0.07979387 6.84200001,0.454 0.008,6.64600003"
+         fill="none"
+         stroke="#f80e00"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         stroke-width="2"
+         id="path2752"
+         style="stroke:#cc0e00;stroke-width:2.25006;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       transform="translate(26.65689,28.801403)"
+       id="g2758"
+       style="stroke-width:2.25006;stroke-miterlimit:10;stroke-dasharray:none"><path
+         d="m -0.15958774,-0.47876322 -6.84199996,-0.453 -0.008,-6.64799998"
+         fill="none"
+         stroke="#f80e00"
+         stroke-linecap="round"
+         stroke-miterlimit="10"
+         stroke-width="2"
+         id="path2756"
+         style="stroke:#cc0e00;stroke-width:2.25006;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       transform="matrix(0.93151426,0,0,0.93151426,8.2375086,35.706608)"
+       id="g2762"><path
+         d="M -4.9635328,7.7479537 26.126467,-21.199046"
+         fill="none"
+         stroke="#f6130b"
+         stroke-miterlimit="10"
+         id="path2760"
+         style="stroke:#cc0e00;stroke-width:2.25006;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></g></svg>
diff --git a/app/bin/bitmaps/SVG/tunnel.svg b/app/bin/bitmaps/SVG/tunnel.svg
new file mode 100644
index 0000000..c31fabe
--- /dev/null
+++ b/app/bin/bitmaps/SVG/tunnel.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   xml:space="preserve"
+   id="svg60"
+   sodipodi:docname="tunnel.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata66"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs64" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1435"
+     inkscape:window-height="846"
+     id="namedview62"
+     showgrid="false"
+     inkscape:zoom="9.96875"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g24"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:snap-global="false" /><g
+     transform="matrix(1.7658994,0,0,-1.7658994,5.511509,22.161291)"
+     id="g4"
+     style="stroke:#c67206;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path2"
+       style="stroke:#c67206;stroke-opacity:1" /></g><g
+     transform="matrix(1.7658994,0,0,-1.7658994,14.341007,22.161291)"
+     id="g8"
+     style="stroke:#c67206;stroke-opacity:1"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#fbb03b"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path6"
+       style="stroke:#c67206;stroke-opacity:1" /></g><g
+     transform="matrix(1.7658994,0,0,-1.7658994,49.658995,22.161291)"
+     id="g24"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#919090"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path22"
+       style="stroke:#a6a6a6;stroke-opacity:1" /></g><g
+     transform="matrix(1.7658994,0,0,-1.7658994,40.598556,22.287553)"
+     id="g24-9"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#919090"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path22-6"
+       style="stroke:#a6a6a6;stroke-opacity:1" /></g><g
+     transform="matrix(1.7658994,0,0,-1.7658994,31.671763,22.203885)"
+     id="g24-9-8"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#919090"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path22-6-4"
+       style="stroke:#a6a6a6;stroke-opacity:1" /></g><g
+     transform="matrix(1.7658994,0,0,-1.7658994,58.488492,22.161291)"
+     id="g28"><path
+       d="M 0,0 V -11"
+       fill="none"
+       stroke="#8e8e8e"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path26"
+       style="stroke:#a6a6a6;stroke-opacity:1" /></g><g
+     transform="matrix(1.7658994,0,0,-1.7658994,40.829497,26.174233)"
+     id="g32"
+     style="stroke-width:1.41571;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="M -9.556208,0 H 12"
+       fill="none"
+       stroke="#706f6e"
+       stroke-miterlimit="10"
+       id="path30"
+       style="stroke-width:1.41571;stroke-miterlimit:10;stroke-dasharray:none"
+       sodipodi:nodetypes="cc" /></g><g
+     transform="matrix(1.7658994,0,0,-1.7658994,1.9797102,26.174233)"
+     id="g36"
+     style="stroke-width:1.41571;stroke-miterlimit:10;stroke-dasharray:none" /><g
+     transform="matrix(1.7658994,0,0,-1.7658994,40.829497,37.573244)"
+     id="g40"
+     style="stroke-width:1.41571;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="M -9.8331995,0 H 12"
+       fill="none"
+       stroke="#6d6d6d"
+       stroke-miterlimit="10"
+       id="path38"
+       style="stroke-width:1.41571;stroke-miterlimit:10;stroke-dasharray:none"
+       sodipodi:nodetypes="cc" /></g><g
+     transform="matrix(1.7658994,0,0,-1.7658994,1.9797102,37.573244)"
+     id="g44"
+     style="stroke-width:1.41571;stroke-miterlimit:10;stroke-dasharray:none"><path
+       d="M 0,0 H 12.236048"
+       fill="none"
+       stroke="#000000"
+       stroke-miterlimit="10"
+       id="path34"
+       style="stroke-width:1.41571;stroke-miterlimit:10;stroke-dasharray:none"
+       sodipodi:nodetypes="cc" /><path
+       d="M 0,6.448039 H 12.1668"
+       fill="none"
+       stroke="#000000"
+       stroke-miterlimit="10"
+       id="path42"
+       style="stroke-width:1.41571;stroke-miterlimit:10;stroke-dasharray:none"
+       sodipodi:nodetypes="cc" /></g><g
+     id="g863"
+     inkscape:label="portal"
+     transform="matrix(1.4321834,0,0,1.429365,-83.006246,-13.241149)"
+     style="stroke:#000000;stroke-width:2.09677;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"><path
+       d="m 74.171174,39.310722 v -15"
+       fill="none"
+       stroke="#f99108"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path46"
+       style="stroke:#000000;stroke-width:2.09677;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="m 69.307174,42.580722 4.864,-3.27"
+       fill="none"
+       stroke="#f99108"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path50"
+       style="stroke:#000000;stroke-width:2.09677;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /><path
+       d="m 74.171174,24.310722 -4.465,-3.589"
+       fill="none"
+       stroke="#f99108"
+       stroke-linecap="round"
+       stroke-miterlimit="10"
+       stroke-width="2"
+       id="path54"
+       style="stroke:#000000;stroke-width:2.09677;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/turnout-designer.svg b/app/bin/bitmaps/SVG/turnout-designer.svg
new file mode 100644
index 0000000..f11cbf6
--- /dev/null
+++ b/app/bin/bitmaps/SVG/turnout-designer.svg
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="turnout-designer.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata992"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs990" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1491"
+   inkscape:window-height="1008"
+   id="namedview988"
+   showgrid="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="24.041495"
+   inkscape:cy="16.70058"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style937">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st2{stroke:#FFFFFF;stroke-miterlimit:10;}
+</style>
+
+
+
+
+
+
+
+
+
+<g
+   id="ties"
+   inkscape:label="ties"
+   transform="matrix(1.1169958,0,0,1.1169958,-1.7103261,3.8486509)"><line
+     class="st0"
+     x1="5"
+     y1="22"
+     x2="5"
+     y2="33"
+     id="line939"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="10"
+     y1="22"
+     x2="10"
+     y2="33"
+     id="line941"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="15"
+     y1="21"
+     x2="15"
+     y2="33"
+     id="line943"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="20"
+     y1="19"
+     x2="20"
+     y2="33"
+     id="line945"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="25.299999"
+     y1="17.200001"
+     x2="25.5"
+     y2="33"
+     id="line947"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="30"
+     y1="15"
+     x2="30"
+     y2="33"
+     id="line949"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="35.299999"
+     y1="23.5"
+     x2="35.5"
+     y2="33"
+     id="line951"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="40.410748"
+     y1="22"
+     x2="40.410748"
+     y2="33"
+     id="line953"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="36.321495"
+     y1="12.471398"
+     x2="41.321495"
+     y2="21.971401"
+     id="line955"
+     style="stroke:#d98a0d;stroke-opacity:1" /><line
+     class="st0"
+     x1="36.696541"
+     y1="23.907103"
+     x2="31.896542"
+     y2="14.507097"
+     id="line957"
+     style="stroke:#d98a0d;stroke-opacity:1" /></g>
+
+
+
+<g
+   id="rail"
+   inkscape:label="rail"
+   transform="matrix(1.1169958,0,0,1.1169958,-1.7103261,3.8486509)"
+   style="stroke-width:1.79052;stroke-miterlimit:4;stroke-dasharray:none"><line
+     class="st1"
+     x1="3"
+     y1="24.234085"
+     x2="43"
+     y2="24.234085"
+     id="line959"
+     style="stroke-width:1.79052;stroke-miterlimit:4;stroke-dasharray:none" /><line
+     class="st1"
+     x1="3"
+     y1="30.765915"
+     x2="43"
+     y2="30.765915"
+     id="line961"
+     style="stroke-width:1.79052;stroke-miterlimit:4;stroke-dasharray:none" /><path
+     class="st1"
+     d="m 39.693798,13.304091 -3.512035,1.835613 c 0,0 -20.452437,9.076091 -24.584243,9.076091"
+     id="path963"
+     style="stroke-width:1.79052;stroke-miterlimit:4;stroke-dasharray:none" /><path
+     class="st1"
+     d="m 42.6,19.265912 -3.6,2 c -5,2.8 -23.1,9.5 -27.4,9.5"
+     id="path965"
+     style="stroke-width:1.79052;stroke-miterlimit:4;stroke-dasharray:none" /></g>
+
+
+
+
+
+
+
+
+
+<polygon
+   class="st2"
+   points="24.8,29.5 24.9,39.5 21.5,39.5 21.5,29.5 17,29.5 18.5,25.5 28.5,25.5 28.5,29.5 "
+   id="polygon985"
+   transform="matrix(2.1634384,0,0,1.7702694,-25.884336,-36.87808)"
+   style="stroke:#cccccc;stroke-width:1.12617;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/turnout.svg b/app/bin/bitmaps/SVG/turnout.svg
new file mode 100644
index 0000000..35b8260
--- /dev/null
+++ b/app/bin/bitmaps/SVG/turnout.svg
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="turnout.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata55"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs53" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1545"
+   inkscape:window-height="884"
+   id="namedview51"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="4.0856333"
+   y1="23.468363"
+   x2="4.0856333"
+   y2="35.572159"
+   id="line4"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="9.5873594"
+   y1="23.468363"
+   x2="9.5873594"
+   y2="35.572159"
+   id="line6"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="15.089085"
+   y1="22.368017"
+   x2="15.089085"
+   y2="35.572159"
+   id="line8"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="20.590809"
+   y1="20.167328"
+   x2="20.590809"
+   y2="35.572159"
+   id="line10"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="26.080217"
+   y1="18.186707"
+   x2="26.300287"
+   y2="35.572159"
+   id="line12"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="31.594261"
+   y1="15.765947"
+   x2="31.594261"
+   y2="35.572159"
+   id="line14"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="37.42609"
+   y1="25.118881"
+   x2="37.64616"
+   y2="35.572159"
+   id="line16"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="43.282558"
+   y1="23.468363"
+   x2="43.282558"
+   y2="35.572159"
+   id="line18"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+
+
+<line
+   class="st0"
+   x1="38.844639"
+   y1="12.917164"
+   x2="44.346363"
+   y2="23.370438"
+   id="line24"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+
+
+
+
+
+
+
+<line
+   class="st0"
+   x1="39.406921"
+   y1="25.302202"
+   x2="34.125263"
+   y2="14.958961"
+   id="line40"
+   style="stroke:#db8a0b;stroke-opacity:1" />
+
+
+
+
+<g
+   id="g5462"
+   inkscape:label="rails"
+   style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none"
+   transform="translate(0.66936163,-0.63009306)"><line
+     class="st1"
+     x1="0.94624782"
+     y1="26.433819"
+     x2="45.229389"
+     y2="26.433819"
+     id="line42"
+     style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" /><line
+     class="st1"
+     x1="0.94624782"
+     y1="33.86689"
+     x2="45.229389"
+     y2="33.86689"
+     id="line44"
+     style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" /><path
+     class="st1"
+     d="m 45.229386,20.882821 -3.961242,2.20069 C 35.656383,26.274512 15.630102,33.866893 10.678549,33.866893"
+     id="path46"
+     style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" /><path
+     class="st1"
+     d="m 41.048075,14.550085 -3.741174,1.980621 c 0,0 -22.116937,9.903106 -26.628352,9.903106"
+     id="path48"
+     style="stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/turntable.svg b/app/bin/bitmaps/SVG/turntable.svg
new file mode 100644
index 0000000..8dbb510
--- /dev/null
+++ b/app/bin/bitmaps/SVG/turntable.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="turntable.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata39"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs37" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1480"
+   inkscape:window-height="963"
+   id="namedview35"
+   showgrid="false"
+   inkscape:zoom="12.521303"
+   inkscape:cx="23.9991"
+   inkscape:cy="24.398419"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#FBB03B;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:#E6E6E6;stroke:#000000;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-miterlimit:10;}
+</style>
+<line
+   class="st0"
+   x1="6.7533612"
+   y1="38.311905"
+   x2="15.04305"
+   y2="46.830223"
+   id="line4"
+   style="stroke:#d88b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="8.178153"
+   y1="18.746393"
+   x2="8.178153"
+   y2="30.725275"
+   id="line6"
+   style="stroke:#d88b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="2.9970963"
+   y1="18.746393"
+   x2="2.9970963"
+   y2="30.725275"
+   id="line8"
+   style="stroke:#d88b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="19.582573"
+   y1="4.7600694"
+   x2="10.904302"
+   y2="12.745992"
+   id="line10"
+   style="stroke:#d88b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="16.45108"
+   y1="1.2180778"
+   x2="7.7728114"
+   y2="9.2040005"
+   id="line12"
+   style="stroke:#d88b0d;stroke-opacity:1" />
+<line
+   class="st0"
+   x1="10.380101"
+   y1="34.58514"
+   x2="18.669794"
+   y2="43.103458"
+   id="line14"
+   style="stroke:#d88b0d;stroke-opacity:1" />
+<path
+   class="st1"
+   d="m 46.517967,24.203441 c 0,9.982403 -7.90111,18.500721 -18.004169,18.500721 -9.973534,0 -18.00417,-8.252121 -18.00417,-18.500721 0,-10.248599 8.030636,-18.5007199 18.00417,-18.5007199 9.973532,0.1330987 18.004169,8.3852179 18.004169,18.5007199 z"
+   id="path16"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="10.768679"
+   y1="21.344675"
+   x2="0.40656796"
+   y2="21.344675"
+   id="line18"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="10.940621"
+   y1="28.126999"
+   x2="0.5785107"
+   y2="28.126999"
+   id="line20"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="19.363255"
+   y1="8.8333969"
+   x2="12.627881"
+   y2="1.1136714"
+   id="line22"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="14.652196"
+   y1="12.867775"
+   x2="7.9168205"
+   y2="5.1480484"
+   id="line24"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="13.745509"
+   y1="35.100971"
+   x2="6.6215572"
+   y2="42.288296"
+   id="line26"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="18.067993"
+   y1="39.831398"
+   x2="11.203092"
+   y2="46.885635"
+   id="line28"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+<rect
+   style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.703957;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+   id="rect859"
+   width="9.630374"
+   height="35.045143"
+   x="23.639217"
+   y="6.6410065"
+   ry="0.080878146" /><line
+   class="st2"
+   x1="23.63274"
+   y1="6.7675104"
+   x2="23.63274"
+   y2="41.373177"
+   id="line30"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+<line
+   class="st2"
+   x1="33.276073"
+   y1="6.7675104"
+   x2="33.276073"
+   y2="41.373177"
+   id="line32"
+   style="stroke-width:2.15294;stroke-miterlimit:10;stroke-dasharray:none" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/undo.svg b/app/bin/bitmaps/SVG/undo.svg
new file mode 100644
index 0000000..290e251
--- /dev/null
+++ b/app/bin/bitmaps/SVG/undo.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="undo.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1460"
+   inkscape:window-height="1008"
+   id="namedview7"
+   showgrid="false"
+   inkscape:zoom="11.681573"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFFB08;stroke:#FFB70D;stroke-miterlimit:10;}
+</style>
+<path
+   class="st0"
+   d="m 39.482834,43.517164 c 1.173815,0.108926 1.027088,0.108926 3.374724,0.108926 0,-12.526448 -3.814907,-32.024137 -23.329622,-32.350913 C 19.234483,8.1163325 19.381208,5.2842659 19.381208,5.2842659 L 5.8823095,14.216167 19.821391,24.346253 c 0,0 -0.293455,-2.50529 -0.293455,-6.099836 13.792355,-0.108926 19.367988,16.338846 19.954898,25.270747 z"
+   id="path4"
+   style="fill:#ffd000;fill-opacity:1;stroke:#a5690d;stroke-width:1.963;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/zoom-choose.svg b/app/bin/bitmaps/SVG/zoom-choose.svg
new file mode 100644
index 0000000..1f41ba8
--- /dev/null
+++ b/app/bin/bitmaps/SVG/zoom-choose.svg
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="zoom-choose.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata1134"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1132">
+	
+	<defs
+   id="defs999">
+		<filter
+   id="Adobe_OpacityMaskFilter"
+   filterUnits="userSpaceOnUse"
+   x="24.3"
+   y="25"
+   width="17.5"
+   height="19.2">
+			<feFlood
+   style="flood-color:white;flood-opacity:1"
+   result="back"
+   id="feFlood994" />
+			<feBlend
+   in="SourceGraphic"
+   in2="back"
+   mode="normal"
+   id="feBlend996" />
+		</filter>
+	</defs>
+	<mask
+   maskUnits="userSpaceOnUse"
+   x="24.3"
+   y="25"
+   width="17.5"
+   height="19.2"
+   id="SVGID_1_">
+		<g
+   class="st2"
+   id="g1003">
+			
+				<image
+   style="overflow:visible;"
+   width="22"
+   height="25"
+   xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAGKAAABqwAAAe7/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIABkAFgMBIgACEQEDEQH/ xAB3AAEAAwEBAAAAAAAAAAAAAAAAAwQFAgYBAQAAAAAAAAAAAAAAAAAAAAAQAAICAwEBAAAAAAAA AAAAAAMEAQIAIBEQFBEBAAEDAwQDAAAAAAAAAAAAAQIAITEQEVEgQTIDEiIEEgEAAAAAAAAAAAAA AAAAAAAg/9oADAMBAAIRAxEAAADw8HegZYE8Asqw/9oACAECAAEFANP/2gAIAQMAAQUA0//aAAgB AQABBQBZSWK2rNbYA1wEbCJsPJ7ijNlySwL6/f/aAAgBAgIGPwAf/9oACAEDAgY/AB//2gAIAQEB Bj8AkxlsmCmMjZLOhOLjJyUfo9F5nkFbd+NPlmL5FHuI/QunNuj/2Q=="
+   transform="matrix(1 0 0 1 22 22)"
+   id="image1001">
+			</image>
+		</g>
+	</mask>
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1518"
+   inkscape:window-height="932"
+   id="namedview1130"
+   showgrid="false"
+   inkscape:zoom="10.897825"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style986">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;stroke:#945F00;stroke-width:5;stroke-miterlimit:10;}
+	.st2{filter:url(#Adobe_OpacityMaskFilter);}
+	.st3{opacity:0.8;mask:url(#SVGID_1_);}
+	.st4{fill:none;stroke:#FFFFFF;stroke-width:5;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_2_);stroke:#000000;stroke-miterlimit:10;}
+	.st6{fill:url(#SVGID_3_);stroke:#000000;stroke-miterlimit:10;}
+	.st7{fill:url(#SVGID_4_);stroke:#000000;stroke-miterlimit:10;}
+	.st8{fill:url(#SVGID_5_);stroke:#000000;stroke-miterlimit:10;}
+	.st9{fill:url(#SVGID_6_);stroke:#000000;stroke-miterlimit:10;}
+</style>
+<path
+   style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:2.07382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 30.469189,26.52856 C 43.087232,41.302187 43.087232,41.302187 43.087232,41.302187 L 39.30182,44.456699 26.788926,29.735647 Z"
+   id="path1710" />
+<linearGradient
+   id="SVGID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="6.6809001"
+   y1="17.7167"
+   x2="30.5739"
+   y2="17.7167"
+   gradientTransform="matrix(1.0390529,-0.51836526,0.51836526,1.0390529,-8.1831443,10.762406)"
+   xlink:href="#SVGID_3_">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#52bdea;stop-opacity:1"
+   id="stop1014" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#51c3f0;stop-opacity:1"
+   id="stop1016" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#75cbf0;stop-opacity:1"
+   id="stop1018" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#9fdbf4;stop-opacity:1"
+   id="stop1020" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop1022" />
+	
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1026" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1028" />
+	<stop
+   offset="0.84"
+   style="stop-color:#1fbdff;stop-opacity:1"
+   id="stop1030" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#007dd1;stop-opacity:1"
+   id="stop1032" />
+</linearGradient>
+<path
+   class="st5"
+   d="m 31.915477,11.108565 c 1.92652,3.85304 1.92652,8.308118 0.48163,12.04075 -1.324482,3.130595 -3.612225,5.779559 -6.983635,7.465265 C 18.189022,34.226804 9.5196818,31.337024 6.0278649,24.112575 2.4156399,16.888125 5.3054199,8.218786 12.529871,4.6065612 19.633912,1.1147437 28.423659,4.0045236 31.915477,11.108565 Z"
+   id="path1035"
+   style="fill:#b3edff;fill-opacity:1;stroke-width:2.07382;stroke-miterlimit:10;stroke-dasharray:none" />
+<linearGradient
+   id="SVGID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="7.7722"
+   y1="22.7895"
+   x2="28.6004"
+   y2="12.3985">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop1037" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop1039" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop1041" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop1043" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop1045" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop1047" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1049" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1051" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1053" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1055" />
+</linearGradient>
+
+<linearGradient
+   id="SVGID_4_"
+   gradientUnits="userSpaceOnUse"
+   x1="13.1204"
+   y1="13.1883"
+   x2="15.8946"
+   y2="11.8043">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop1060" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop1062" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop1064" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop1066" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop1068" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop1070" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1072" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1074" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1076" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1078" />
+</linearGradient>
+
+<linearGradient
+   id="SVGID_5_"
+   gradientUnits="userSpaceOnUse"
+   x1="11.7347"
+   y1="13.8796"
+   x2="17.2953"
+   y2="11.1054"
+   xlink:href="#SVGID_4_">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop1083" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop1085" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop1087" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop1089" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop1091" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop1093" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1095" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1097" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1099" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1101" />
+</linearGradient>
+
+<linearGradient
+   id="SVGID_6_"
+   gradientUnits="userSpaceOnUse"
+   x1="19.6297"
+   y1="23.6825"
+   x2="24.396"
+   y2="21.3047">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop1106" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop1108" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop1110" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop1112" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop1114" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop1116" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1118" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1120" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1122" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1124" />
+</linearGradient>
+
+<path
+   style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="m 10.600075,13.283643 16.841287,-0.09515 -8.322107,11.700035 -8.51918,-11.604886"
+   id="path2931"
+   sodipodi:nodetypes="cccc" /></svg>
diff --git a/app/bin/bitmaps/SVG/zoom-extent.svg b/app/bin/bitmaps/SVG/zoom-extent.svg
new file mode 100644
index 0000000..9ee2521
--- /dev/null
+++ b/app/bin/bitmaps/SVG/zoom-extent.svg
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="zoom-extent.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><g
+   id="Arrow"
+   transform="translate(1.5215336,-2.0964614)"
+   style="stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none"><path
+     style="fill:none;stroke:#ca0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     d="m 33.382137,5.0600292 h 9.979502 v 9.9795018"
+     id="path1844" /><path
+     style="fill:none;stroke:#ca0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     d="M 43.361639,5.0600292 32.011712,16.409956"
+     id="path1846" /></g><metadata
+   id="metadata1039"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1037" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1438"
+   inkscape:window-height="939"
+   id="namedview1035"
+   showgrid="false"
+   inkscape:zoom="10.785861"
+   inkscape:cx="23.966561"
+   inkscape:cy="23.966561"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0"
+   inkscape:pagecheckerboard="0" />
+<style
+   type="text/css"
+   id="style937">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;stroke:#945F00;stroke-width:5;stroke-miterlimit:10;}
+	.st2{filter:url(#Adobe_OpacityMaskFilter);}
+	.st3{opacity:0.8;mask:url(#SVGID_1_);}
+	.st4{fill:none;stroke:#FFFFFF;stroke-width:5;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_2_);stroke:#000000;stroke-miterlimit:10;}
+	.st6{fill:url(#SVGID_3_);stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st7{fill:url(#SVGID_4_);stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<path
+   style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:1.38314;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="m 26.807491,30.152391 3.639939,9.748731 -2.389668,0.880794 -3.660943,-9.793294 z"
+   id="path2383"
+   inkscape:transform-center-x="0.27963193"
+   inkscape:transform-center-y="0.33444225" />
+<linearGradient
+   id="SVGID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="6.6809"
+   y1="17.7167"
+   x2="30.5739"
+   y2="17.7167"
+   gradientTransform="matrix(0.35443348,-0.50978148,0.50978148,0.35443348,8.5305438,27.058238)">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop965" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop967" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop969" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop971" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop973" />
+	
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop977" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop979" />
+	<stop
+   offset="0.84"
+   style="stop-color:#3db3ff;stop-opacity:1"
+   id="stop981" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#006bb2;stop-opacity:1"
+   id="stop983" />
+</linearGradient>
+<path
+   class="st5"
+   d="m 27.200894,16.579117 c 1.875189,1.301268 3.007906,3.372217 3.285275,5.474703 0.180276,1.792015 -0.20968,3.605055 -1.34829,5.245847 -2.43988,3.515982 -7.204566,4.376865 -10.664579,1.906373 -3.515982,-2.43988 -4.376864,-7.204569 -1.936984,-10.720551 2.414522,-3.429398 7.235182,-4.320893 10.664578,-1.906372 z"
+   id="path986"
+   style="fill:#b3edff;fill-opacity:1;stroke-width:1.23298;stroke-miterlimit:10;stroke-dasharray:none" />
+<linearGradient
+   id="SVGID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="14.8466"
+   y1="18.5732"
+   x2="21.1876"
+   y2="15.4097">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop988" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop990" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop992" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop994" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop996" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop998" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1000" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1002" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1004" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1006" />
+</linearGradient>
+
+<linearGradient
+   id="SVGID_4_"
+   gradientUnits="userSpaceOnUse"
+   x1="11.6793"
+   y1="20.1534"
+   x2="24.3893"
+   y2="13.8124">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop1011" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop1013" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop1015" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop1017" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop1019" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop1021" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1023" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1025" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1027" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1029" />
+</linearGradient>
+
+<g
+   id="Arrow-9"
+   transform="matrix(-1,0,0,1,46.70979,-1.957852)"
+   style="stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none"><path
+     style="fill:none;stroke:#ca0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     d="m 33.382137,5.0600292 h 9.979502 v 9.9795018"
+     id="path1844-3" /><path
+     style="fill:none;stroke:#ca0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     d="M 43.361639,5.0600292 32.011712,16.409956"
+     id="path1846-2" /></g><g
+   id="Arrow-9-0"
+   transform="rotate(180,23.135813,25.105294)"
+   style="stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none"><path
+     style="fill:none;stroke:#ca0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     d="m 33.382137,5.0600292 h 9.979502 v 9.9795018"
+     id="path1844-3-1" /><path
+     style="fill:none;stroke:#ca0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     d="M 43.361639,5.0600292 32.011712,16.409956"
+     id="path1846-2-6" /></g><g
+   id="Arrow-9-9"
+   transform="matrix(1,0,0,-1,1.7537799,50.14328)"
+   style="stroke-width:3;stroke-miterlimit:10;stroke-dasharray:none"><path
+     style="fill:none;stroke:#ca0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     d="m 33.382137,5.0600292 h 9.979502 v 9.9795018"
+     id="path1844-3-9" /><path
+     style="fill:none;stroke:#ca0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     d="M 43.361639,5.0600292 32.011712,16.409956"
+     id="path1846-2-9" /></g></svg>
diff --git a/app/bin/bitmaps/SVG/zoom-in.svg b/app/bin/bitmaps/SVG/zoom-in.svg
new file mode 100644
index 0000000..8c9a883
--- /dev/null
+++ b/app/bin/bitmaps/SVG/zoom-in.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="zoom-in.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata1039"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1037" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="939"
+   id="namedview1035"
+   showgrid="false"
+   inkscape:zoom="14.229167"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style937">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;stroke:#945F00;stroke-width:5;stroke-miterlimit:10;}
+	.st2{filter:url(#Adobe_OpacityMaskFilter);}
+	.st3{opacity:0.8;mask:url(#SVGID_1_);}
+	.st4{fill:none;stroke:#FFFFFF;stroke-width:5;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_2_);stroke:#000000;stroke-miterlimit:10;}
+	.st6{fill:url(#SVGID_3_);stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st7{fill:url(#SVGID_4_);stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<path
+   style="fill:#666666;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
+   d="M 30.073634,26.309814 43.199281,41.81576 39.390804,45.01216 26.197147,29.438204 Z"
+   id="path2383" />
+<linearGradient
+   id="SVGID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="6.6809"
+   y1="17.7167"
+   x2="30.5739"
+   y2="17.7167"
+   gradientTransform="matrix(0.8948 -0.4464 0.4464 0.8948 -6.2541 9.9583)">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop965" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop967" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop969" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop971" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop973" />
+	
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop977" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop979" />
+	<stop
+   offset="0.84"
+   style="stop-color:#3db3ff;stop-opacity:1"
+   id="stop981" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#006bb2;stop-opacity:1"
+   id="stop983" />
+</linearGradient>
+<path
+   class="st5"
+   d="m 31.708262,10.530367 c 1.91834,3.836679 1.91834,8.27284 0.479585,11.989623 -1.318858,3.117302 -3.596887,5.755019 -6.953981,7.433566 C 18.040093,33.550442 9.4075646,30.672933 5.9305742,23.47916 2.3336874,16.285386 5.2111968,7.652858 12.40497,4.0559712 19.478848,0.57898069 28.231272,3.4564902 31.708262,10.530367 Z"
+   id="path986"
+   style="fill:#b3edff;stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;fill-opacity:1" />
+<linearGradient
+   id="SVGID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="14.8466"
+   y1="18.5732"
+   x2="21.1876"
+   y2="15.4097">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop988" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop990" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop992" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop994" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop996" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop998" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1000" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1002" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1004" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1006" />
+</linearGradient>
+<line
+   class="st6"
+   x1="19.011627"
+   y1="7.305531"
+   x2="19.011627"
+   y2="26.488928"
+   id="line1009"
+   style="fill:url(#SVGID_3_);stroke-width:4.532;stroke-miterlimit:10;stroke-dasharray:none" />
+<linearGradient
+   id="SVGID_4_"
+   gradientUnits="userSpaceOnUse"
+   x1="11.6793"
+   y1="20.1534"
+   x2="24.3893"
+   y2="13.8124">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop1011" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop1013" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop1015" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop1017" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop1019" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop1021" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1023" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1025" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1027" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1029" />
+</linearGradient>
+<line
+   class="st7"
+   x1="9.4199266"
+   y1="17.192142"
+   x2="28.603325"
+   y2="17.192142"
+   id="line1032"
+   style="fill:url(#SVGID_4_);stroke-width:4.53151;stroke-miterlimit:10;stroke-dasharray:none" />
+</svg>
diff --git a/app/bin/bitmaps/SVG/zoom-out.svg b/app/bin/bitmaps/SVG/zoom-out.svg
new file mode 100644
index 0000000..a476985
--- /dev/null
+++ b/app/bin/bitmaps/SVG/zoom-out.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   style="enable-background:new 0 0 48 48;"
+   xml:space="preserve"
+   sodipodi:docname="zoom-out.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata1039"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs1037" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1443"
+   inkscape:window-height="939"
+   id="namedview1035"
+   showgrid="false"
+   inkscape:zoom="14.229167"
+   inkscape:cx="24"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style937">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;stroke:#945F00;stroke-width:5;stroke-miterlimit:10;}
+	.st2{filter:url(#Adobe_OpacityMaskFilter);}
+	.st3{opacity:0.8;mask:url(#SVGID_1_);}
+	.st4{fill:none;stroke:#FFFFFF;stroke-width:5;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_2_);stroke:#000000;stroke-miterlimit:10;}
+	.st6{fill:url(#SVGID_3_);stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st7{fill:url(#SVGID_4_);stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<path
+   style="fill:#666666;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
+   d="M 30.073634,26.309814 43.199281,41.81576 39.390804,45.01216 26.197147,29.438204 Z"
+   id="path2383" />
+<linearGradient
+   id="SVGID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="6.6809"
+   y1="17.7167"
+   x2="30.5739"
+   y2="17.7167"
+   gradientTransform="matrix(0.8948 -0.4464 0.4464 0.8948 -6.2541 9.9583)">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop965" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop967" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop969" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop971" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop973" />
+	
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop977" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop979" />
+	<stop
+   offset="0.84"
+   style="stop-color:#3db3ff;stop-opacity:1"
+   id="stop981" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#006bb2;stop-opacity:1"
+   id="stop983" />
+</linearGradient>
+<path
+   class="st5"
+   d="m 31.708262,10.530367 c 1.91834,3.836679 1.91834,8.27284 0.479585,11.989623 -1.318858,3.117302 -3.596887,5.755019 -6.953981,7.433566 C 18.040093,33.550442 9.4075646,30.672933 5.9305742,23.47916 2.3336874,16.285386 5.2111968,7.652858 12.40497,4.0559712 19.478848,0.57898069 28.231272,3.4564902 31.708262,10.530367 Z"
+   id="path986"
+   style="fill:#b3edff;stroke-width:2;stroke-miterlimit:10;stroke-dasharray:none;fill-opacity:1" />
+<linearGradient
+   id="SVGID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="14.8466"
+   y1="18.5732"
+   x2="21.1876"
+   y2="15.4097">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop988" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop990" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop992" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop994" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop996" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop998" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1000" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1002" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1004" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1006" />
+</linearGradient>
+
+<linearGradient
+   id="SVGID_4_"
+   gradientUnits="userSpaceOnUse"
+   x1="11.6793"
+   y1="20.1534"
+   x2="24.3893"
+   y2="13.8124">
+	<stop
+   offset="1.572120e-02"
+   style="stop-color:#29ABE2"
+   id="stop1011" />
+	<stop
+   offset="4.911487e-02"
+   style="stop-color:#32AFE3"
+   id="stop1013" />
+	<stop
+   offset="0.1047"
+   style="stop-color:#4CB9E7"
+   id="stop1015" />
+	<stop
+   offset="0.1756"
+   style="stop-color:#75C9EC"
+   id="stop1017" />
+	<stop
+   offset="0.259"
+   style="stop-color:#AFE0F4"
+   id="stop1019" />
+	<stop
+   offset="0.352"
+   style="stop-color:#F8FCFE"
+   id="stop1021" />
+	<stop
+   offset="0.3609"
+   style="stop-color:#FFFFFF"
+   id="stop1023" />
+	<stop
+   offset="0.5079"
+   style="stop-color:#FFFFFF"
+   id="stop1025" />
+	<stop
+   offset="0.84"
+   style="stop-color:#0075BE"
+   id="stop1027" />
+	<stop
+   offset="0.9944"
+   style="stop-color:#005B97"
+   id="stop1029" />
+</linearGradient>
+<line
+   class="st7"
+   x1="9.4199266"
+   y1="17.192142"
+   x2="28.603325"
+   y2="17.192142"
+   id="line1032"
+   style="fill:url(#SVGID_4_);stroke-width:4.53151;stroke-miterlimit:10;stroke-dasharray:none" />
+</svg>
diff --git a/app/bin/bitmaps/above.xpm b/app/bin/bitmaps/above.xpm
deleted file mode 100644
index 07f5daf..0000000
--- a/app/bin/bitmaps/above.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * above_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"      ..........",
-"   ..... . . . .",
-" ..XXX... . . ..",
-" .XXXXXX.. . . .",
-".XXXXXXX. . . ..",
-".XXXXXXXX. . . .",
-".XXXXXXXX.. . ..",
-".XXXXXXXX. . . .",
-".XXXXXXX. . . ..",
-" .XXXXXX.. . . .",
-" ..XXX... . . ..",
-"   ..... . . . .",
-"      ..........",
-"                ",
-"                "};
diff --git a/app/bin/bitmaps/background.xpm b/app/bin/bitmaps/background.xpm
index 4859734..2e8a141 100644
--- a/app/bin/bitmaps/background.xpm
+++ b/app/bin/bitmaps/background.xpm
@@ -1,155 +1,157 @@
-/* XPM */
-static char *background[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 133 2 ",
-"   c #0B2B2B",
-".  c #183A3A",
-"X  c #789757",
-"o  c #799358",
-"O  c #7E9068",
-"+  c #86A068",
-"@  c #9BA77A",
-"#  c #99B073",
-"$  c #9DB777",
-"%  c #98B67E",
-"&  c #A6BD7F",
-"*  c #A4BE7E",
-"=  c #77AAA8",
-"-  c #5FA7D7",
-";  c #58A1DB",
-":  c #59A2DB",
-">  c #5AA3DA",
-",  c #5BA4DB",
-"<  c #5CA4D9",
-"1  c #5DA5DB",
-"2  c #66ACD3",
-"3  c #62A9D5",
-"4  c #69AED1",
-"5  c #60A9DB",
-"6  c #63ACDB",
-"7  c #64ACDA",
-"8  c #66AFDB",
-"9  c #62ACDE",
-"0  c #67B0DC",
-"q  c #67B0DE",
-"w  c #68B1DB",
-"e  c #6BB4DB",
-"r  c #6EB7DB",
-"t  c #6FBADF",
-"y  c #71B9DB",
-"u  c #71BADB",
-"i  c #74BEDE",
-"p  c #6FBAE0",
-"a  c #6EB9E3",
-"s  c #73BEE3",
-"d  c #74BEE0",
-"f  c #72BEE4",
-"g  c #70BCE7",
-"h  c #6BBFFF",
-"j  c #7CC9E9",
-"k  c #7CCAEC",
-"l  c #6EC2FF",
-"z  c #6FC4FF",
-"x  c #73C8FF",
-"c  c #74C9FF",
-"v  c #78CDFF",
-"b  c #79CEFF",
-"n  c #7DD2FF",
-"m  c #7ED3FF",
-"M  c #809786",
-"N  c #84AC98",
-"B  c #93A492",
-"V  c #A1AD8E",
-"C  c #A3B587",
-"Z  c #A7B787",
-"A  c #ABB584",
-"S  c #A2B389",
-"D  c #A3B988",
-"F  c #A8BA94",
-"G  c #ACBD97",
-"H  c #B5BC90",
-"J  c #8EA8A8",
-"K  c #97BEAB",
-"L  c #8BADB7",
-"P  c #80B2B8",
-"I  c #91B5B6",
-"U  c #AFBFA9",
-"Y  c #A4C182",
-"T  c #B5C987",
-"R  c #B2C088",
-"E  c #BAD08E",
-"W  c #AFC491",
-"Q  c #B6CB97",
-"!  c #BED190",
-"~  c #AFCEAA",
-"^  c #BBCAA0",
-"/  c #BECFA1",
-"(  c #BDCEA7",
-")  c #B5C7A9",
-"_  c #BFD0AE",
-"`  c #BFD1AF",
-"'  c #A8CDBF",
-"]  c #C2CC95",
-"[  c #C7D798",
-"{  c #C3D19D",
-"}  c #C6D898",
-"|  c #CDD8A6",
-" . c #D0DDA6",
-".. c #C4DCB6",
-"X. c #D3E0A2",
-"o. c #D0E4B9",
-"O. c #DBE5B9",
-"+. c #D9E5BD",
-"@. c #E2ECB3",
-"#. c #E4EDB0",
-"$. c #87B8C5",
-"%. c #96CFDB",
-"&. c #9CD1D5",
-"*. c #98D1DF",
-"=. c #A4CDC4",
-"-. c #ADD7D0",
-";. c #B0D1D5",
-":. c #82D6FF",
-">. c #83D7FF",
-",. c #83D8FF",
-"<. c #8CDEFF",
-"1. c #95DEFC",
-"2. c #99E1F6",
-"3. c #A8E4ED",
-"4. c #B6E6E2",
-"5. c #BDEAE6",
-"6. c #ADE7F8",
-"7. c #E2EBCA",
-"8. c #E2F3F3",
-"9. c #E4F4F4",
-"0. c #E6F5F5",
-"q. c #E9F6F6",
-"w. c #EBF7F7",
-"e. c #E9F9F9",
-"r. c #EEF8F8",
-"t. c #F1F9F9",
-"y. c #F4FBFB",
-"u. c #F7FCFC",
-"i. c #F9FDFD",
-"p. c #FCFEFE",
-"a. c #FEFFFF",
-"s. c #FFFFFF",
-"d. c None",
-/* pixels */
-"d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.",
-"d.s.s.s.s.s.s.s.s.s.s.s.s.s.d.d.",
-"d.s.; ; , < 5 6 7 w e r r s.d.d.",
-"d.s.; l l 9 x v a m ,.1.k s.d.d.",
-"d.i.< z x q b m j ,.3.5.-.i.d.d.",
-"d.u.- 7 q g p s %.*.%.=.{ u.d.d.",
-"d.y.3 b m t :.5.| @.o...K u.d.d.",
-"d.t.2 m :.i 2.#._  .} ! = t.d.d.",
-"d.w.4 u i k ' ] / W * $ = w.d.d.",
-"d.q.$.<.6.;.7.+.^ ~ D % N q.d.d.",
-"d.w.H O. .R T * D _ ) F I q.d.d.",
-"d.q.A [ ! # Q ( F F ) V L 0.d.d.",
-"d.0.@ Z C S + X o O B M J 0.d.d.",
-". e.8.8.8.8.8.8.8.8.8.8.8.e.. d.",
-"d.                          d.d.",
-"d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d."
-};
+static char *background_x16[] = {
+	"16 16 23 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#336666",
+	"5	c	#336699",
+	"6	c	#339933",
+	"7	c	#339966",
+	"8	c	#33CC33",
+	"9	c	#669966",
+	"A	c	#66CC66",
+	"B	c	#66CCFF",
+	"C	c	#999966",
+	"D	c	#999999",
+	"E	c	#99CC66",
+	"F	c	#99CC99",
+	"G	c	#99CCCC",
+	"H	c	#CC9999",
+	"I	c	#CCCC99",
+	"J	c	#FFCC99",
+	"K	c	#FFCCCC",
+	"L	c	#C0C0C0",
+	"3333333333333333",
+	"5BBBBBBBBDCCCCC0",
+	"5BBBBBBBBHC69HH0",
+	"5BBBBBBBBH966CH0",
+	"5BBBBBBBFED99HH0",
+	"5BBBBBGD88AHHHH0",
+	"5BBGLHHD88AIHHH0",
+	"5BGDCHHHIEIIIIH0",
+	"4GH77CHIIIIIIII0",
+	"2HH77CIIIJKKIII0",
+	"2HHDCFIIKKKKIIH0",
+	"2HHHE88EKKKJIIH0",
+	"2C9CE88EIKJIIIH0",
+	"2666CAAIIIIIIHH0",
+	"2969HHHHIIIHHHH0",
+	"2011000000000000"};
+
+static char *background_x24[] = {
+	"24 24 23 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333333",
+	"3	c	#339933",
+	"4	c	#339966",
+	"5	c	#33CC33",
+	"6	c	#666666",
+	"7	c	#669966",
+	"8	c	#6699CC",
+	"9	c	#66CC66",
+	"A	c	#66CCFF",
+	"B	c	#996666",
+	"C	c	#999966",
+	"D	c	#999999",
+	"E	c	#99CC66",
+	"F	c	#99CC99",
+	"G	c	#99CCCC",
+	"H	c	#CC9999",
+	"I	c	#CCCC99",
+	"J	c	#FFCC99",
+	"K	c	#FFCCCC",
+	"L	c	#C0C0C0",
+	" 0000000000000000000000 ",
+	"28888888888888BBBBBBBB62",
+	"2AAAAAAAAAAAAAHHHHCHHHC2",
+	"2AAAAAAAAAAAAGHH733CHHC2",
+	"2AAAAAAAAAAAALH73337HHC2",
+	"2AAAAAAAAAAAAHHC3333HHC2",
+	"2AAAAAAAAAAAFDEH733CHHC2",
+	"2AAAAAAAAAGH9559HDHHHHC2",
+	"2AAAAAAAAGHE5555HHHHHHC2",
+	"2AAAAAGHHHHE5555IIHHHHC2",
+	"2AAAGHHHHHHHE55IIIIIHHC2",
+	"2AAGH77HHHHIIIIIIIIIIHC2",
+	"2AGH7444HHIIIIIIIIIIIIC2",
+	"2CHH7444HHIIIIIKKKIIIIC2",
+	"2CHHC447HIIIIJKKKKIIIIC2",
+	"2CHHHCCCHIIIJKKKKKIIIIC2",
+	"2CHHHHHE55EIKKKKKJIIIHC2",
+	"2CHHHHE5555IKKKKKIIIIHC2",
+	"2CC73HH5555IIKKKIIIIHHC2",
+	"2C3333C9559IIIIIIIIIHHC2",
+	"2C3333CH9EIIIIIIIIIHHHC2",
+	"2C3337DHHHHIIIIIIHHHHHC2",
+	"2BC77CCCCCCCCCCCCCCCCCC2",
+	"122222222222222222222222"};
+
+static char *background_x32[] = {
+	"32 32 28 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#336666",
+	"3	c	#339933",
+	"4	c	#339966",
+	"5	c	#33CC33",
+	"6	c	#33CC66",
+	"7	c	#663333",
+	"8	c	#666633",
+	"9	c	#666666",
+	"A	c	#666699",
+	"B	c	#669966",
+	"C	c	#6699CC",
+	"D	c	#66CC66",
+	"E	c	#66CCFF",
+	"F	c	#996666",
+	"G	c	#999966",
+	"H	c	#999999",
+	"I	c	#99CC66",
+	"J	c	#99CC99",
+	"K	c	#99CCCC",
+	"L	c	#CC9999",
+	"M	c	#CCCC99",
+	"N	c	#FFCC99",
+	"O	c	#FFCCCC",
+	"P	c	#C0C0C0",
+	"Q	c	#808080",
+	"                                ",
+	"02AAAAAAAAAAAAAAAA97777777777710",
+	"0CEEEEEEEEEEEEEEEEKLLLLLLLLLLLF0",
+	"0CEEEEEEEEEEEEEEEELLLLGGGLLLLLF0",
+	"0CEEEEEEEEEEEEEEEELLLG333GLLLLF0",
+	"0CEEEEEEEEEEEEEEEELLG33333GLLLF0",
+	"0CEEEEEEEEEEEEEEEKLLG33333GLLLF0",
+	"0CEEEEEEEEEEEEEEELLLG33333BLLLF0",
+	"0CEEEEEEEEEEEEEEJLLILB333BLLLLF0",
+	"0CEEEEEEEEEEEEELI555ILBGGGLLLLF0",
+	"0CEEEEEEEEEEEKLI55555ILLLLLLLLF0",
+	"0CEEEEEEEEEEPLLD55555ILLLLLLLLF0",
+	"0CEEEEEEKPLLLLLI55555DMMLLLLLLF0",
+	"0CEEEELLLLLLLLLID555DMMMMMLLLLF0",
+	"0CEEEKLLLLLLLLLLM6IIMMMMMMMLLLF0",
+	"0CEEKLG44BLLLLLMMMMMMMMMMMMMMLF0",
+	"0CEKLHB4444LLLMMMMMMMMMMMMMMMLF0",
+	"0QLLLG4444BLLMMMMMMMNOOMMMMMMLF0",
+	"09LLLH44444LMMMMMMMOOOOOMMMMMLF0",
+	"09LLLLB444GLMMMMMMOOOOOOMMMMMLF0",
+	"09LLLLL4BBLMMMMMMOOOOOOOMMMMMLF0",
+	"09LLLLLLLLDD5IMMOOOOOOONMMMMLLF0",
+	"09LLLLLLLI5555IMOOOOOOOMMMMMLLF0",
+	"09LLLLLLL55555DMOOOOOONMMMMMLLF0",
+	"09LGBBBLLD5555DMMOOOOMMMMMMLLLF0",
+	"09H3333BH55555DMMMMMMMMMMMMLLLF0",
+	"09333333GHD555MMMMMMMMMMMMLLLLF0",
+	"09B33333GLHIMMMMMMMMMMMMMLLLLLF0",
+	"09B33333GLLLLLMMMMMMMMMLLLLLLLF0",
+	"09LG333GLLLLLLLLLLLLLLLLLLLLLLF0",
+	"07FFBFFFFFFFFFFFFFFFFFFFFFFFFF80",
+	" 000000000000000000000000000000 "};
+
+static char **background_xpm[3] = { background_x16, background_x24, background_x32 };
+
diff --git a/app/bin/bitmaps/below.xpm b/app/bin/bitmaps/below.xpm
deleted file mode 100644
index 43bc22a..0000000
--- a/app/bin/bitmaps/below.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * below_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"     ...........",
-"   ... . . . . .",
-" ..XX.. . . . ..",
-" .XXX. . . . . .",
-".XXXX.. . . . ..",
-".XXXX. . . . . .",
-".XXXX.. . . . ..",
-".XXXX. . . . . .",
-".XXXX.. . . . ..",
-" .XXX. . . . . .",
-" ..XX.. . . . ..",
-"   ... . . . . .",
-"     ...........",
-"                ",
-"                "};
diff --git a/app/bin/bitmaps/benchwork.xpm b/app/bin/bitmaps/benchwork.xpm
new file mode 100644
index 0000000..a94b1fa
--- /dev/null
+++ b/app/bin/bitmaps/benchwork.xpm
@@ -0,0 +1,112 @@
+static char *benchwork_x16[] = {
+	"16 16 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#663300",
+	"3	c	#993300",
+	"4	c	#996600",
+	"5	c	#CC6600",
+	"6	c	#FF6600",
+	"7	c	#FF9900",
+	"         2  3   ",
+	"       126743   ",
+	"      1476257   ",
+	"    026752677   ",
+	"   1366247777   ",
+	"  00001677777   ",
+	"  07772777777   ",
+	"  07772777777   ",
+	"  07772777777   ",
+	"  07772777777   ",
+	"  07772777775   ",
+	"  07772777742   ",
+	"  0777277622    ",
+	"  07772762      ",
+	"  0777252       ",
+	"  000012        "};
+
+static char *benchwork_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#993300",
+	"5	c	#996600",
+	"6	c	#CC6600",
+	"7	c	#FF6600",
+	"8	c	#FF9900",
+	"                        ",
+	"            03788843    ",
+	"           147887368    ",
+	"         02688863788    ",
+	"        147887358888    ",
+	"      01688863788888    ",
+	"     137887447888888    ",
+	"    0000003688888888    ",
+	"    0888807888888888    ",
+	"    0888808888888888    ",
+	"    0888808888888888    ",
+	"    0888808888888888    ",
+	"    0888808888888888    ",
+	"    0888808888888888    ",
+	"    0888808888888888    ",
+	"    0888808888888886    ",
+	"    0888808888888743    ",
+	"    088880888888733     ",
+	"    0888808888863       ",
+	"    088880888853        ",
+	"    08888088733         ",
+	"    088880873           ",
+	"    08888053            ",
+	"    0000001             "};
+
+static char *benchwork_x32[] = {
+	"32 32 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#993300",
+	"5	c	#996600",
+	"6	c	#CC6600",
+	"7	c	#FF6600",
+	"8	c	#FF9900",
+	"                                ",
+	"                 027888874      ",
+	"                3478888736      ",
+	"              026888885378      ",
+	"             1478888736888      ",
+	"            16888886378888      ",
+	"          1378888734888888      ",
+	"         16888886268888888      ",
+	"       0378888743788888888      ",
+	"      16888887368888888888      ",
+	"     000000001788888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888888      ",
+	"     088888884888888888873      ",
+	"     08888888488888888863       ",
+	"     0888888848888888863        ",
+	"     088888884888888743         ",
+	"     08888888488888733          ",
+	"     088888884888863            ",
+	"     08888888488853             ",
+	"     0888888848733              ",
+	"     08888888463                ",
+	"     0000000033                 ",
+	"             0                  "};
+
+static char **benchwork_xpm[3] = { benchwork_x16, benchwork_x24, benchwork_x32 };
+
diff --git a/app/bin/bitmaps/bezier-line.xpm b/app/bin/bitmaps/bezier-line.xpm
new file mode 100644
index 0000000..2aea754
--- /dev/null
+++ b/app/bin/bitmaps/bezier-line.xpm
@@ -0,0 +1,98 @@
+static char *bezier_line_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#800000",
+	"    2           ",
+	"   2222222222221",
+	"  22222222221111",
+	"   22      00   ",
+	"          00    ",
+	"          0     ",
+	"         0      ",
+	"        00      ",
+	"        0       ",
+	"       00       ",
+	"       0        ",
+	"      0         ",
+	"     00    2    ",
+	" 13331   2222   ",
+	"12222222222 2   ",
+	"          222   "};
+
+static char *bezier_line_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"                        ",
+	"     222                ",
+	"    22 2222222222222221 ",
+	"    2  2222222222221111 ",
+	"    2222          00    ",
+	"                 0      ",
+	"                0       ",
+	"               00       ",
+	"              00        ",
+	"              0         ",
+	"             00         ",
+	"             0          ",
+	"            00          ",
+	"            0           ",
+	"           0            ",
+	"          00            ",
+	"          0             ",
+	"         0              ",
+	"        0               ",
+	"      00       2222     ",
+	"    000       22  2     ",
+	" 222222222222222  2     ",
+	"               2222     ",
+	"                22      "};
+
+static char *bezier_line_x32[] = {
+	"32 32 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#660000",
+	"2	c	#990000",
+	"3	c	#CC0000",
+	"4	c	#800000",
+	"                                ",
+	"      33333                     ",
+	"     3333333                    ",
+	"     33   333333333333333333332 ",
+	"     33   333333333333333333334 ",
+	"     3333333            0000    ",
+	"      33333           0000      ",
+	"                      00        ",
+	"                     00         ",
+	"                    000         ",
+	"                   000          ",
+	"                   00           ",
+	"                  000           ",
+	"                  00            ",
+	"                 000            ",
+	"                 00             ",
+	"                00              ",
+	"               000              ",
+	"               00               ",
+	"              000               ",
+	"              00                ",
+	"             00                 ",
+	"            000                 ",
+	"           000                  ",
+	"          000                   ",
+	"         000         3333       ",
+	"       0000         333333      ",
+	"  24441142   33333333   33      ",
+	" 23333333333333333333   33      ",
+	"  233333           333 333      ",
+	"                    33333       ",
+	"                     333        "};
+
+static char **bezier_line_xpm[3] = { bezier_line_x16, bezier_line_x24, bezier_line_x32 };
+
diff --git a/app/bin/bitmaps/bezier-track.xpm b/app/bin/bitmaps/bezier-track.xpm
new file mode 100644
index 0000000..a8b7d92
--- /dev/null
+++ b/app/bin/bitmaps/bezier-track.xpm
@@ -0,0 +1,130 @@
+static char *bezier_track_x16[] = {
+	"16 16 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#996666",
+	"2	c	#999999",
+	"3	c	#CC0000",
+	"4	c	#CC6666",
+	"5	c	#CC9966",
+	"6	c	#FFCCCC",
+	"7	c	#808080",
+	"                ",
+	"   434       200",
+	"   3 33333333333",
+	"   434    07 5 5",
+	"         0 5 700",
+	"        05 602  ",
+	"       06 50    ",
+	"      06160     ",
+	"     05 60      ",
+	"    06 50       ",
+	"  206160        ",
+	"0075 60         ",
+	" 5 570   434    ",
+	"3333333333 3    ",
+	"002      434    ",
+	"                "};
+
+static char *bezier_track_x24[] = {
+	"24 24 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663333",
+	"5	c	#666633",
+	"6	c	#990000",
+	"7	c	#993300",
+	"8	c	#996633",
+	"9	c	#999933",
+	"A	c	#999966",
+	"B	c	#CC0000",
+	"C	c	#CC3300",
+	"D	c	#CC3333",
+	"E	c	#CC6633",
+	"F	c	#CC9966",
+	"G	c	#CCCC66",
+	"                        ",
+	"                     FF ",
+	"    BBBB         G 00000",
+	"   BB  BBBBBBBBBBD76BEEB",
+	"   BB  BBBBBBBBB66ECBEEB",
+	"    BBBB     GF0  FF0100",
+	"              4F  244 G ",
+	"             0 GF20FF   ",
+	"           G4   2F      ",
+	"           18G 00       ",
+	"           0  A5        ",
+	"         F48  0F        ",
+	"         05GG10         ",
+	"       F50  A5          ",
+	"       A5F  0 F         ",
+	"     F 0 GG20           ",
+	"     854  58G           ",
+	" G G808G 00             ",
+	" 9218   F0       BB     ",
+	"084 GF 02F      BBBB    ",
+	"BBBBBBBBBBBBBBBBB  B    ",
+	"083008          BBBB    ",
+	"088  FF         BBB     ",
+	" G                      "};
+
+static char *bezier_track_x32[] = {
+	"32 32 20 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663333",
+	"5	c	#666633",
+	"6	c	#990000",
+	"7	c	#993300",
+	"8	c	#996633",
+	"9	c	#999933",
+	"A	c	#999966",
+	"B	c	#CC0000",
+	"C	c	#CC3300",
+	"D	c	#CC3333",
+	"E	c	#CC6633",
+	"F	c	#CC9933",
+	"G	c	#CC9966",
+	"H	c	#CCCC66",
+	"I	c	#800000",
+	"                                ",
+	"                            HH  ",
+	"      BBB                   AG80",
+	"     BBBBBB            H 0002540",
+	"    BBB  BBBBBBBBBBBBBCE76BBEFE ",
+	"    BB   BBBBBBBBBBBBBBBBBBBBBBB",
+	"    BBB BBB       EDBI6CGGC EGE ",
+	"     BBBBB        HG2   GH800340",
+	"      BBB         G5GH   484 HH ",
+	"                  0GHHG00AH     ",
+	"               H 0   H95        ",
+	"               H88   35H        ",
+	"               85HH  0          ",
+	"               0 HHG3           ",
+	"            HH2   H5GH          ",
+	"            HA8H  02H           ",
+	"             2GHHG0             ",
+	"            0  HH8A             ",
+	"          H84   45HH            ",
+	"          88HH  0               ",
+	"          0 HHH10               ",
+	"       HG2   HG8H               ",
+	"     H 85GH   2GH               ",
+	"    HG20GHHH 0                  ",
+	" HG0448   HG2         BBB       ",
+	"00400GH   85GH       BBBBB      ",
+	" EFBBEFEB66DEEBBBBBBBBB BBB     ",
+	" BBBBBBBBBBBBBBBBBBBBB   BB     ",
+	" EG7III8E           BBB BBB     ",
+	"04520  HH            BBBBB      ",
+	" HH                    BB       ",
+	"                                "};
+
+static char **bezier_track_xpm[3] = { bezier_track_x16, bezier_track_x24, bezier_track_x32 };
+
diff --git a/app/bin/bitmaps/bezier.xpm b/app/bin/bitmaps/bezier.xpm
deleted file mode 100644
index 6c592ed..0000000
--- a/app/bin/bitmaps/bezier.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */ 
-static char * bezier_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"!	c #000000000000",
-"#	c #FFFF00000000",
-"$	c #808080000000",
-"     ###    !!!!",
-"     # #########",
-"     ###  !!   !",
-"        $!! $!!!",
-"       !!$$ !! !",
-"      !!  $!$  !",
-"  $$ !!  !!  $  ",
-"    !!!!!!!     ",
-"    !!  ! $$    ",
-"  $!!  !!       ",
-"!  !$$!!        ",
-"! !  $!         ",
-"!!!$ !!$        ",
-"!   !!  ###     ",
-"######### #     ",
-"!!!!    ###     "};
\ No newline at end of file
diff --git a/app/bin/bitmaps/block.xpm b/app/bin/bitmaps/block.xpm
index 232d859..e3a6937 100644
--- a/app/bin/bitmaps/block.xpm
+++ b/app/bin/bitmaps/block.xpm
@@ -1,24 +1,138 @@
-/* XPM */
-static char * block_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #2E3436",
-"+	c #00FFFF",
-"@	c #25E100",
-"#	c #EF2929",
-"..   .          ",
-"... ...         ",
-" .....++  @@@   ",
-"  ...+++ @@@@@  ",
-" ...+++  @@@@@  ",
-"...++++  @@@@@  ",
-" .++++++  @@@   ",
-"  ++  +++       ",
-"       +++   +  ",
-"   ###  +++ +++ ",
-"  #####  +++++..",
-"  #####   +++...",
-"  #####  +++... ",
-"   ###  +++.... ",
-"         +......",
-"          .. ..."};
+static char *block_x16[] = {
+	"16 16 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003333",
+	"3	c	#006600",
+	"4	c	#006666",
+	"5	c	#009900",
+	"6	c	#009999",
+	"7	c	#00CC00",
+	"8	c	#00FF00",
+	"9	c	#330000",
+	"A	c	#660000",
+	"B	c	#990000",
+	"C	c	#990033",
+	"D	c	#CC0033",
+	"E	c	#FF0033",
+	"F	c	#008000",
+	"G	c	#008080",
+	"                ",
+	" 0              ",
+	"  0      1111   ",
+	"   0  6 1577F1  ",
+	"    G6  088880  ",
+	"    66  188881  ",
+	"   6 66 178871  ",
+	"      66 1FF3   ",
+	"   099966 00    ",
+	"  0ADDB966  66  ",
+	"  9DEEE9 6666   ",
+	"  9EEEE9  66    ",
+	"  9CEED9 6640   ",
+	"   99A9  6   0  ",
+	"              0 ",
+	"               0"};
+
+static char *block_x24[] = {
+	"24 24 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#006600",
+	"3	c	#006666",
+	"4	c	#009900",
+	"5	c	#009999",
+	"6	c	#00CC00",
+	"7	c	#00FF00",
+	"8	c	#330000",
+	"9	c	#660000",
+	"A	c	#990000",
+	"B	c	#990033",
+	"C	c	#CC0033",
+	"D	c	#FF0033",
+	"E	c	#800000",
+	"F	c	#008000",
+	"G	c	#008080",
+	"                        ",
+	" 00                     ",
+	" 000                    ",
+	"  000          110      ",
+	"   000   5   1266421    ",
+	"    000 555  2777772    ",
+	"     03555  167777761   ",
+	"      555   177777761   ",
+	"     55555  177777761   ",
+	"    555 555 167777741   ",
+	"     5   555 2677761    ",
+	"          555 12F21     ",
+	"      080  555          ",
+	"     8BCC98 555         ",
+	"    8DDDDD9  555  55    ",
+	"   0BDDDDDC8  555555    ",
+	"   8CDDDDDC8   5555     ",
+	"   8CDDDDDC8   55G0     ",
+	"    9DDDDDA8  555000    ",
+	"    9ECDDB9   55  000   ",
+	"     08088         000  ",
+	"                    000 ",
+	"                     000",
+	"                      0 "};
+
+static char *block_x32[] = {
+	"32 32 19 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003333",
+	"3	c	#006600",
+	"4	c	#006666",
+	"5	c	#009900",
+	"6	c	#009999",
+	"7	c	#00CC00",
+	"8	c	#00FF00",
+	"9	c	#330000",
+	"A	c	#660000",
+	"B	c	#990000",
+	"C	c	#990033",
+	"D	c	#CC0033",
+	"E	c	#FF0033",
+	"F	c	#800000",
+	"G	c	#008000",
+	"H	c	#008080",
+	"                                ",
+	" 00                             ",
+	" 000                            ",
+	" 0000                           ",
+	"  0000               00         ",
+	"   0000     6      135531       ",
+	"    0000   666   137888871      ",
+	"     0000 6666   1888888871     ",
+	"      000H666   1588888888G     ",
+	"       26666    178888888850    ",
+	"       66666    178888888871    ",
+	"      6666666   178888888850    ",
+	"     6666 6666  05888888883     ",
+	"      66   6666  1788888851     ",
+	"            6666  17888851      ",
+	"             6666  103111       ",
+	"         00   6666              ",
+	"       99FBA9  6666             ",
+	"      9DEEEEDA  6666     6      ",
+	"     9DEEEEEED9  6666   666     ",
+	"     9EEEEEEEEB0  6666 666      ",
+	"    0FEEEEEEEED9   666666       ",
+	"    0FEEEEEEEED9    6666        ",
+	"     AEEEEEEEEC0    66640       ",
+	"     9DEEEEEEEA    6664000      ",
+	"      AEEEEEEB9   666  0000     ",
+	"       9DDDDA9     6    0000    ",
+	"        0999             0000   ",
+	"                          0000  ",
+	"                            000 ",
+	"                             00 ",
+	"                                "};
+
+static char **block_xpm[3] = { block_x16, block_x24, block_x32 };
+
diff --git a/app/bin/bitmaps/bottom.xpm b/app/bin/bitmaps/bottom.xpm
new file mode 100644
index 0000000..dd50a6c
--- /dev/null
+++ b/app/bin/bitmaps/bottom.xpm
@@ -0,0 +1,101 @@
+static char *bottom_x16[] = {
+	"16 16 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#FF0000",
+	"4	c	#808080",
+	"                ",
+	"                ",
+	"      000000000 ",
+	"    104444444440",
+	"  11204444444440",
+	" 123304444444440",
+	" 233304444444440",
+	"1233304444444440",
+	"1233304444444440",
+	"1233304444444440",
+	" 133304444444440",
+	"  13304444444440",
+	"   1104444444440",
+	"      0000000000",
+	"                ",
+	"                "};
+
+static char *bottom_x24[] = {
+	"24 24 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#FF0000",
+	"4	c	#808080",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"        000000000000000 ",
+	"     111044444444444440 ",
+	"    1223044444444444440 ",
+	"   13333044444444444440 ",
+	"  133333044444444444440 ",
+	" 1333333044444444444440 ",
+	" 1333333044444444444440 ",
+	" 1333333044444444444440 ",
+	" 2333333044444444444440 ",
+	" 1333333044444444444440 ",
+	" 1333333044444444444440 ",
+	" 1233333044444444444440 ",
+	"  123333044444444444440 ",
+	"   12333044444444444440 ",
+	"    1112044444444444440 ",
+	"        000000000000000 ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *bottom_x32[] = {
+	"32 32 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#FF0000",
+	"4	c	#808080",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"           00000000000000000000 ",
+	"           04444444444444444440 ",
+	"        11104444444444444444440 ",
+	"      1223304444444444444444440 ",
+	"    113333304444444444444444440 ",
+	"   1233333304444444444444444440 ",
+	"   2333333304444444444444444440 ",
+	"  13333333304444444444444444440 ",
+	" 123333333304444444444444444440 ",
+	" 123333333304444444444444444440 ",
+	" 133333333304444444444444444440 ",
+	" 133333333304444444444444444440 ",
+	" 133333333304444444444444444440 ",
+	" 123333333304444444444444444440 ",
+	" 123333333304444444444444444440 ",
+	"  13333333304444444444444444440 ",
+	"   1333333304444444444444444440 ",
+	"    133333304444444444444444440 ",
+	"     12333304444444444444444440 ",
+	"      1112204444444444444444440 ",
+	"         1104444444444444444440 ",
+	"           00000000000000000000 ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **bottom_xpm[3] = { bottom_x16, bottom_x24, bottom_x32 };
+
diff --git a/app/bin/bitmaps/box.xpm b/app/bin/bitmaps/box.xpm
new file mode 100644
index 0000000..610fb5a
--- /dev/null
+++ b/app/bin/bitmaps/box.xpm
@@ -0,0 +1,93 @@
+static char *box_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#CC0000",
+	"                ",
+	" 00000000000000 ",
+	" 0            0 ",
+	" 0        22220 ",
+	" 0         2220 ",
+	" 0        22 20 ",
+	" 0       22  20 ",
+	" 0      22    0 ",
+	" 0     22     0 ",
+	" 0    2       0 ",
+	" 0   2        0 ",
+	" 0  2         0 ",
+	" 0 2          0 ",
+	" 12           0 ",
+	" 00000000000000 ",
+	"                "};
+
+static char *box_x24[] = {
+	"24 24 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                        ",
+	"                        ",
+	"  000000000000000000000 ",
+	" 0                    0 ",
+	" 0            1111111 0 ",
+	" 0             111111 0 ",
+	" 0               1111 0 ",
+	" 0              11 11 0 ",
+	" 0             11  11 0 ",
+	" 0            11   11 0 ",
+	" 0           11       0 ",
+	" 0          11        0 ",
+	" 0         11         0 ",
+	" 0        1           0 ",
+	" 0       1            0 ",
+	" 0      1             0 ",
+	" 0     1              0 ",
+	" 0   11               0 ",
+	" 0  11                0 ",
+	" 0 11                 0 ",
+	" 0                    0 ",
+	" 0000000000000000000000 ",
+	"                        ",
+	"                        "};
+
+static char *box_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                                ",
+	"                                ",
+	"                                ",
+	"  0000000000000000000000000000  ",
+	"  0                          0  ",
+	"  0                 11111111 0  ",
+	"  0                111111111 0  ",
+	"  0                    11111 0  ",
+	"  0                   111111 0  ",
+	"  0                  1111111 0  ",
+	"  0                 1111  11 0  ",
+	"  0                1111   11 0  ",
+	"  0               1111    11 0  ",
+	"  0              1111     11 0  ",
+	"  0             1111         0  ",
+	"  0            111           0  ",
+	"  0           111            0  ",
+	"  0          111             0  ",
+	"  0         111              0  ",
+	"  0        111               0  ",
+	"  0       111                0  ",
+	"  0     1111                 0  ",
+	"  0    1111                  0  ",
+	"  0   1111                   0  ",
+	"  0  1111                    0  ",
+	"  0 1111                     0  ",
+	"  0 111                      0  ",
+	"  0                          0  ",
+	"  0000000000000000000000000000  ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **box_xpm[3] = { box_x16, box_x24, box_x32 };
+
diff --git a/app/bin/bitmaps/bridge.xbm b/app/bin/bitmaps/bridge.xbm
deleted file mode 100644
index fd5857b..0000000
--- a/app/bin/bitmaps/bridge.xbm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define bridge_width 16
-#define bridge_height 16
-// static unsigned char bridge_bits[] = {
-static char bridge_bits[] = {
-   0x01, 0x80, 0x01, 0x80, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x82, 0x20,
-   0xff, 0xff, 0x82, 0x20, 0x82, 0x20, 0xff, 0xff, 0x82, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0xfe, 0x7f, 0x01, 0x80, 0x01, 0x80};
diff --git a/app/bin/bitmaps/bridge.xpm b/app/bin/bitmaps/bridge.xpm
index 446f055..089542d 100644
--- a/app/bin/bitmaps/bridge.xpm
+++ b/app/bin/bitmaps/bridge.xpm
@@ -1,22 +1,105 @@
-/* XPM */
-static char * bridge_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #00FFFF",
-"+	c #000000",
-"..            ..",
-" ..          .. ",
-"  ............  ",
-"   ..........   ",
-"+   +    +    + ",
-"+++++++++++++++ ",
-"+   +    +    + ",
-"+   +    +    + ",
-"+   +    +    + ",
-"+++++++++++++++ ",
-"+   +    +    + ",
-"   ..........   ",
-"  ............  ",
-" ..          .. ",
-"..            ..",
-"                "};
+static char *bridge_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#333333",
+	"3	c	#CC6600",
+	"                ",
+	"                ",
+	"2             2 ",
+	"22           22 ",
+	" 2222222222222  ",
+	" 3 3 3 3 3 3 3  ",
+	"000000000000000 ",
+	" 3 3 3 3 3 3 3  ",
+	"010000000000000 ",
+	" 3 3 3 3 3 3 3  ",
+	" 2222222222222  ",
+	"22           22 ",
+	"2             2 ",
+	"                ",
+	"                ",
+	"                "};
+
+static char *bridge_x24[] = {
+	"24 24 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#663300",
+	"3	c	#996600",
+	"4	c	#996666",
+	"5	c	#CC6600",
+	"6	c	#CC9900",
+	"                        ",
+	"                        ",
+	"444                   44",
+	" 44                  44 ",
+	"  44                44  ",
+	"   444444444444444444   ",
+	"   444444444444444444   ",
+	"                        ",
+	" 6   6  6  66  6  66  6 ",
+	"032023003103300300320130",
+	"032023003103300300320130",
+	" 6   6  6  66  6  66  6 ",
+	" 6   6  6  66  6  66  6 ",
+	" 6   6  6  66  6  66  6 ",
+	"000000000000000000000000",
+	" 6   6  6  66  6  66  6 ",
+	"                        ",
+	"                        ",
+	"   444444444444444444   ",
+	"  44444444444444444444  ",
+	" 44                  44 ",
+	"444                  444",
+	" 4                    44",
+	"                        "};
+
+static char *bridge_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#996600",
+	"5	c	#996666",
+	"6	c	#CC6600",
+	"7	c	#CC9900",
+	"                                ",
+	"                                ",
+	" 55                           55",
+	" 55                          555",
+	" 555                        555 ",
+	"  555                      555  ",
+	"   55555555555555555555555555   ",
+	"    555555555555555555555555    ",
+	"    55555555555555555555555     ",
+	"                                ",
+	"                                ",
+	" 77   77  777  77   77  77   77 ",
+	"03320033002320033002330033101330",
+	"00000000000000000000000000000000",
+	" 77   77  777  77   77  77   77 ",
+	" 77   77  777  77   77  77   77 ",
+	" 77   77  777  77   77  77   77 ",
+	" 77   77  777  77   77  77   77 ",
+	" 4430044003430044003440044202440",
+	"00000000000000000000000000000000",
+	" 77   77  777  77   77  77   77 ",
+	"                                ",
+	"                                ",
+	"     5555555555555555555555     ",
+	"    555555555555555555555555    ",
+	"   55555555555555555555555555   ",
+	"  555                      555  ",
+	" 555                        555 ",
+	" 55                         5555",
+	"555                          555",
+	"                                ",
+	"                                "};
+
+static char **bridge_xpm[3] = { bridge_x16, bridge_x24, bridge_x32 };
+
diff --git a/app/bin/bitmaps/building.xpm b/app/bin/bitmaps/building.xpm
new file mode 100644
index 0000000..044e3f8
--- /dev/null
+++ b/app/bin/bitmaps/building.xpm
@@ -0,0 +1,125 @@
+static char *building_x16[] = {
+	"16 16 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#333333",
+	"3	c	#666600",
+	"4	c	#666633",
+	"5	c	#666666",
+	"6	c	#996666",
+	"7	c	#999966",
+	"8	c	#999999",
+	"9	c	#CCCCCC",
+	"A	c	#C0C0C0",
+	"B	c	#808080",
+	"                ",
+	"  011111111110  ",
+	"  137888888841  ",
+	"  448AAAAAA844  ",
+	"  4448AAAAA634  ",
+	"  4846AAAA84B4  ",
+	"  4884333334A4  ",
+	"  48B5AAAA8484  ",
+	"  4B4999999B44  ",
+	"  448999999944  ",
+	"  159999999981  ",
+	"0550000000000050",
+	"0999999999999992",
+	"0999999999999992",
+	"0555555555555550",
+	"                "};
+
+static char *building_x24[] = {
+	"24 24 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663333",
+	"5	c	#666600",
+	"6	c	#666633",
+	"7	c	#666666",
+	"8	c	#996666",
+	"9	c	#999966",
+	"A	c	#999999",
+	"B	c	#CCCCCC",
+	"C	c	#C0C0C0",
+	"D	c	#808080",
+	"                        ",
+	"                        ",
+	"    12222222222222220   ",
+	"   066777DAAAAAAAAD50   ",
+	"   156CCCCCCCCCCCCD62   ",
+	"   156DCCCCCCCCCCA652   ",
+	"   1686ACCCCCCCCCD662   ",
+	"   16A66CCCCCCCCA6982   ",
+	"   16CA6ACCCCCCCD6C82   ",
+	"   16CC66777777769B82   ",
+	"   16CC7377777774AB82   ",
+	"   16CA6BBBBBBBBA6B82   ",
+	"   16A6ABBBBBBBBB6D82   ",
+	"   1677BBBBBBBBBBC662   ",
+	"   156BBBBBBBBBBBB752   ",
+	"   06ABBBBBBBBBBBBB41   ",
+	"333000000000000000000333",
+	"3ACCBBBBBBBBBBBBBBBBCCC0",
+	"3BBBBBBBBBBBBBBBBBBBBBB0",
+	"3BBBBBBBBBBBBBBBBBBBBBB0",
+	"3BBBBBBBBBBBBBBBBBBBBBB0",
+	"3ACCCCCCCCCCCCCCCCCCCCC0",
+	"333333333333333333333333",
+	"                        "};
+
+static char *building_x32[] = {
+	"32 32 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#333333",
+	"3	c	#663333",
+	"4	c	#666600",
+	"5	c	#666633",
+	"6	c	#666666",
+	"7	c	#996666",
+	"8	c	#999966",
+	"9	c	#999999",
+	"A	c	#CCCCCC",
+	"B	c	#C0C0C0",
+	"C	c	#808080",
+	"                                ",
+	"                                ",
+	"                                ",
+	"     0111111111111111111110     ",
+	"     0456666C99999999999951     ",
+	"     358BBBBBBBBBBBBBBBB951     ",
+	"     5559BBBBBBBBBBBBBBB655     ",
+	"     5756BBBBBBBBBBBBBB9555     ",
+	"     59559BBBBBBBBBBBBB7595     ",
+	"     59955BBBBBBBBBBBB955A5     ",
+	"     59B649BBBBBBBBBBBC59A5     ",
+	"     59B9559BBBBBBBBB955AA5     ",
+	"     59BB956999999999659AA5     ",
+	"     59BB94111111111115AAA5     ",
+	"     59BBC5AAAAAAAAAAA59AA5     ",
+	"     59B959AAAAAAAAAAA95AA5     ",
+	"     59B56AAAAAAAAAAAAA2CA5     ",
+	"     59C5AAAAAAAAAAAAAA95B5     ",
+	"     5959AAAAAAAAAAAAAAA555     ",
+	"     556AAAAAAAAAAAAAAAAB55     ",
+	"     33AAAAAAAAAAAAAAAAAA65     ",
+	"     09AAAAAAAAAAAAAAAAAAB0     ",
+	"20006000000000000000000000062002",
+	"29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2",
+	"29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2",
+	"29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2",
+	"29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2",
+	"29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2",
+	"29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2",
+	"20000000000000000000000000000002",
+	"                                ",
+	"                                "};
+
+static char **building_xpm[3] = { building_x16, building_x24, building_x32 };
+
diff --git a/app/bin/bitmaps/car-inventory.xpm b/app/bin/bitmaps/car-inventory.xpm
new file mode 100644
index 0000000..45ceb2c
--- /dev/null
+++ b/app/bin/bitmaps/car-inventory.xpm
@@ -0,0 +1,103 @@
+static char *car_inventory_x16[] = {
+	"16 16 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003366",
+	"2	c	#006600",
+	"3	c	#663300",
+	"4	c	#999999",
+	"                ",
+	"  33333333      ",
+	"  33333333      ",
+	"  33333333      ",
+	"  4             ",
+	"  0411111111    ",
+	"    11111111    ",
+	"    11111111    ",
+	"    4           ",
+	"    0422222222  ",
+	"      22222222  ",
+	"      22222222  ",
+	"      4 4  4 4  ",
+	"      040  040  ",
+	"                ",
+	"                "};
+
+static char *car_inventory_x24[] = {
+	"24 24 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003366",
+	"2	c	#006600",
+	"3	c	#663300",
+	"4	c	#CCCCCC",
+	"44444444444444444       ",
+	"43333333333333334       ",
+	"43333333333333334       ",
+	"43333333333333334       ",
+	"43333333333333334       ",
+	"43333333333333334       ",
+	"44444444444444444       ",
+	" 00 4444444444444444    ",
+	" 00041111111111111114   ",
+	"  0 41111111111111114   ",
+	"    41111111111111114   ",
+	"    41111111111111114   ",
+	"    41111111111111114   ",
+	"    44444444444444444   ",
+	"     0044444444444444444",
+	"     0042222222222222224",
+	"     0042222222222222224",
+	"       42222222222222224",
+	"       42222222222222224",
+	"       42222222222222224",
+	"       44444444444444444",
+	"        00 00     00 00 ",
+	"        00000     00000 ",
+	"        00 00     00 00 "};
+
+static char *car_inventory_x32[] = {
+	"32 32 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003366",
+	"2	c	#006600",
+	"3	c	#663300",
+	"4	c	#999999",
+	"5	c	#CCCCCC",
+	"6	c	#C0C0C0",
+	" 555555555555555555555          ",
+	"53333333333333333333335         ",
+	"53333333333333333333335         ",
+	"53333333333333333333335         ",
+	"53333333333333333333335         ",
+	"53333333333333333333335         ",
+	"53333333333333333333335         ",
+	"53333333333333333333335         ",
+	"53333333333333333333335         ",
+	" 564555555555555555555          ",
+	"  0005555555555555555555555     ",
+	"  0005111111111111111111115     ",
+	"  00 5111111111111111111115     ",
+	"     5111111111111111111115     ",
+	"     5111111111111111111115     ",
+	"     5111111111111111111115     ",
+	"     5111111111111111111115     ",
+	"     5111111111111111111115     ",
+	"     5555555555555555555555     ",
+	"      000 5555555555555555555555",
+	"      00052222222222222222222225",
+	"      00052222222222222222222225",
+	"         52222222222222222222225",
+	"         52222222222222222222225",
+	"         52222222222222222222225",
+	"         52222222222222222222225",
+	"         52222222222222222222225",
+	"         55555555555555555555555",
+	"           00  00       000 00  ",
+	"          00000000      0000000 ",
+	"           0000000      0000000 ",
+	"            0  00        0  00  "};
+
+static char **car_inventory_xpm[3] = { car_inventory_x16, car_inventory_x24, car_inventory_x32 };
+
diff --git a/app/bin/bitmaps/change-grid.xpm b/app/bin/bitmaps/change-grid.xpm
new file mode 100644
index 0000000..0287f34
--- /dev/null
+++ b/app/bin/bitmaps/change-grid.xpm
@@ -0,0 +1,118 @@
+static char *change_grid_x16[] = {
+	"16 16 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CC00",
+	"2	c	#00CC33",
+	"3	c	#339933",
+	"4	c	#666666",
+	"5	c	#669933",
+	"6	c	#669966",
+	"7	c	#996666",
+	"8	c	#999966",
+	"9	c	#CC9966",
+	"A	c	#FFCC66",
+	"1111111111111111",
+	"1111111111111111",
+	"1   1  11  3   1",
+	"1   1  11 484  1",
+	"11111111159A8311",
+	"1   1  169A94  1",
+	"1   1  69A962  1",
+	"11111148A9411111",
+	"1111168794211111",
+	"1   14994  1   1",
+	"1   14462  1   1",
+	"1111111111111111",
+	"11 11  11  11 11",
+	"1   1  11  1   1",
+	"11 11  11  11 11",
+	"1111111111111111"};
+
+static char *change_grid_x24[] = {
+	"24 24 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CC00",
+	"2	c	#33CC33",
+	"3	c	#666666",
+	"4	c	#669933",
+	"5	c	#669966",
+	"6	c	#996666",
+	"7	c	#999966",
+	"8	c	#CC9966",
+	"9	c	#FF9966",
+	"A	c	#FFCC66",
+	" 1    1    11    1    1 ",
+	"111111111111111111111111",
+	"11    1    11    1    11",
+	"11    1    11    1    11",
+	"11    1    11   33    11",
+	"11    1    11  3796   11",
+	"1111111111111147AA932111",
+	"11    11   1157AAA83  11",
+	"11    1    147AAA83   11",
+	"11    1    47AAA85    11",
+	"11    1   37AAA831    11",
+	"11111111156AAA8511111111",
+	"111111114787A85111111111",
+	"11    1 39A863   1    11",
+	"11    1 39A83    1    11",
+	"11    1 33351    1    11",
+	"11    1    11    1    11",
+	"111111111111111111111111",
+	"11    1    11    1    11",
+	"11    1    11    1    11",
+	"11    1    11    1    11",
+	"11    1    11    1    11",
+	"111111111111111111111111",
+	"111111111111111111111111"};
+
+static char *change_grid_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CC00",
+	"2	c	#33CC33",
+	"3	c	#666666",
+	"4	c	#669933",
+	"5	c	#669966",
+	"6	c	#996666",
+	"7	c	#999966",
+	"8	c	#CC9966",
+	"9	c	#FFCC66",
+	"                                ",
+	"11111111111111111111111111111111",
+	"11111111111111111111111111111111",
+	" 1      11     11     11      11",
+	" 1      11     11     11      11",
+	" 1      11     11     44      11",
+	" 1      11     11    3775     11",
+	" 1      11     11   379973    11",
+	" 1111111111111111112799997411111",
+	" 1111111111111111127999997411111",
+	" 1      11     11379999973    11",
+	" 1      11     1279999975     11",
+	" 1      11     279999974      11",
+	" 1      11    3799999751      11",
+	" 1      11   37999997311      11",
+	" 1111111111123899998511111111111",
+	" 1111111111279789984111111111111",
+	" 1      11 39997883   11      11",
+	" 1      11 3999963    11      11",
+	" 1      11 399985     11      11",
+	" 1      11 333351     11      11",
+	" 1      11     11     11      11",
+	" 1111111111111111111111111111111",
+	" 1111111111111111111111111111111",
+	" 1      11     11     11      11",
+	" 1      11     11     11      11",
+	" 1      11     11     11      11",
+	" 1      11     11     11      11",
+	" 1      11     11     11      11",
+	"111     11     11     111    111",
+	"11111111111111111111111111111111",
+	"                                "};
+
+static char **change_grid_xpm[3] = { change_grid_x16, change_grid_x24, change_grid_x32 };
+
diff --git a/app/bin/bitmaps/circle-center.xpm b/app/bin/bitmaps/circle-center.xpm
new file mode 100644
index 0000000..e58036a
--- /dev/null
+++ b/app/bin/bitmaps/circle-center.xpm
@@ -0,0 +1,114 @@
+static char *circle_center_x16[] = {
+	"16 16 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#FF0000",
+	"4	c	#808080",
+	"     000000     ",
+	"   40 2  2 04   ",
+	"  0 2 0000 2 0  ",
+	" 4  00    00  4 ",
+	" 020        020 ",
+	"0  0        0  0",
+	"020          020",
+	"0 0          0 0",
+	"0 0     3    0 0",
+	"020      3   020",
+	"0         3 1  0",
+	" 020       31 0 ",
+	" 4  00    111 4 ",
+	"  0 2 0000   0  ",
+	"   40 2  2 04   ",
+	"     000000     "};
+
+static char *circle_center_x24[] = {
+	"24 24 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#666600",
+	"5	c	#990000",
+	"6	c	#993300",
+	"7	c	#996600",
+	"8	c	#CC0000",
+	"9	c	#CC3300",
+	"A	c	#CC6600",
+	"B	c	#CC9900",
+	"           B            ",
+	"          07700 B       ",
+	"      B7000770017       ",
+	"      07A  A7  B30 BB   ",
+	"   B30 B70033017  17    ",
+	"   33  077 BB A303B10   ",
+	"   0 A2       B  36 0   ",
+	"  00 0A         BA0 33B ",
+	" A2B00            23B30 ",
+	" 13B1B            B2 00 ",
+	" 0  0              00 0 ",
+	" 0 00              33A0 ",
+	"B3A77B      8     B77B1B",
+	" 2772        8     00 0 ",
+	" 00 0B        8   90 00 ",
+	"  1B37         8 A93B10 ",
+	" B37 0          8857A3B ",
+	"   0 33        8985 0   ",
+	"   02B307B    A856B00   ",
+	"    31  31077022  33    ",
+	"   B 007B 0770 B 00BB   ",
+	"       320 77 032       ",
+	"       B 0033007B       ",
+	"           BB           "};
+
+static char *circle_center_x32[] = {
+	"32 32 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#990000",
+	"5	c	#993300",
+	"6	c	#996600",
+	"7	c	#CC0000",
+	"8	c	#CC3300",
+	"9	c	#CC6600",
+	"A	c	#CC9900",
+	"               A                ",
+	"               AA               ",
+	"         A  00000000 A          ",
+	"         6100  AA  0220         ",
+	"        039    AA   A900  A     ",
+	"    A  0  A 00000001A   06A     ",
+	"    A60   6200 AA 0320   31     ",
+	"     2A  00A   A   A 00 A 00    ",
+	"    0  A10            336  0    ",
+	"   00  19             A60  00AA ",
+	"   0  00                00 A39  ",
+	" A66A 0                  29A20  ",
+	"  06A66                 A91  0  ",
+	"  0  09A                  0  0  ",
+	"  0  0                    0  00 ",
+	" 00  0          7         33 33 ",
+	"A63A93AA       777       A36A66A",
+	" 62 61          777       00 00 ",
+	"  0  0           777      0  0  ",
+	"  0  03A          777  7740  0  ",
+	"  00A93A           777 8756 00  ",
+	"  63A 00            777773AA36  ",
+	" AA20  06A           7777   2AA ",
+	"    0  636         777777  00   ",
+	"    00 A300 A      777789 00    ",
+	"     36   036  AA  620  A60     ",
+	"    AA10   9000320039   03A     ",
+	"       000AA   96   A 000 AA    ",
+	"         022   AA   520         ",
+	"         A900003200029          ",
+	"         A     96    A          ",
+	"               A                "};
+
+static char **circle_center_xpm[3] = { circle_center_x16, circle_center_x24, circle_center_x32 };
+
diff --git a/app/bin/bitmaps/circle-filled-center.xpm b/app/bin/bitmaps/circle-filled-center.xpm
new file mode 100644
index 0000000..91f7764
--- /dev/null
+++ b/app/bin/bitmaps/circle-filled-center.xpm
@@ -0,0 +1,145 @@
+static char *circle_filled_center_x16[] = {
+	"16 16 19 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#336699",
+	"6	c	#339999",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#66CCCC",
+	"A	c	#66CCFF",
+	"B	c	#9999CC",
+	"C	c	#99CCCC",
+	"D	c	#99CCFF",
+	"E	c	#99FFFF",
+	"F	c	#CC0000",
+	"G	c	#CC6666",
+	"H	c	#CC6699",
+	"       00       ",
+	"    11488413    ",
+	"   28AEEEEE93   ",
+	"  3AEEEEEEEEA3  ",
+	" 38EEEEEEEEEE93 ",
+	" 2AEEEEEEEEEEE4 ",
+	"05EEEEEEEEEEEE80",
+	"18EEEEEBDEEEEE92",
+	"18EEEEEDHDEEEE92",
+	"06EEEEEEDHDECE81",
+	" 4EEEEEEEDHDFE60",
+	" 29EEEEEEEDHGA2 ",
+	"  3AEEEEEBGFH4  ",
+	"  14AEEEEDDA43  ",
+	"    268AA973    ",
+	"     012210     "};
+
+static char *circle_filled_center_x24[] = {
+	"24 24 20 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#336699",
+	"6	c	#339999",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#66CCCC",
+	"A	c	#66CCFF",
+	"B	c	#9999CC",
+	"C	c	#99CCCC",
+	"D	c	#99CCFF",
+	"E	c	#99FFFF",
+	"F	c	#CC0000",
+	"G	c	#CC6666",
+	"H	c	#CC6699",
+	"I	c	#CC9999",
+	"                        ",
+	"        11044011        ",
+	"      238AEEEEA942      ",
+	"     26AEEEEEEEEE83     ",
+	"    29EEEEEEEEEEEEA4    ",
+	"   2AEEEEEEEEEEEEEEA3   ",
+	"  27EEEEEEEEEEEEEEEE93  ",
+	"  4AEEEEEEEEEEEEEEEEE50 ",
+	" 19EEEEEEEEEEEEEEEEEEA2 ",
+	" 1AEEEEEEEEEEEEEEEEEEE1 ",
+	" 3EEEEEEEEEEEEEEEEEEEE50",
+	" 4EEEEEEEEDIDEEEEEEEEE60",
+	" 4EEEEEEEEECIDEEEEEEEE60",
+	" 3EEEEEEEEEECIDEEEEEEE50",
+	" 1AEEEEEEEEEECIDEEHCEE4 ",
+	" 29EEEEEEEEEEECIDDFBEA1 ",
+	" 05EEEEEEEEEEEECIDFCE71 ",
+	"  39EEEEEEEEEEEECHFDA2  ",
+	"   2AEEEEEEEEDIGFFFD4   ",
+	"   04AEEEEEEEDHIBCC62   ",
+	"    139EEEEEEEEEEA42    ",
+	"      26AEEEEEEA82      ",
+	"       2146886411       ",
+	"          0000          "};
+
+static char *circle_filled_center_x32[] = {
+	"32 32 23 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003333",
+	"3	c	#333333",
+	"4	c	#333366",
+	"5	c	#336666",
+	"6	c	#336699",
+	"7	c	#339999",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#66CCCC",
+	"B	c	#66CCFF",
+	"C	c	#9999CC",
+	"D	c	#99CCCC",
+	"E	c	#99CCFF",
+	"F	c	#99FFFF",
+	"G	c	#CC0000",
+	"H	c	#CC3333",
+	"I	c	#CC3366",
+	"J	c	#CC6666",
+	"K	c	#CC6699",
+	"L	c	#CC9999",
+	"                                ",
+	"            00333300            ",
+	"          3169ABBA97230         ",
+	"        35AFFFFFFFFFFB63        ",
+	"       4AFFFFFFFFFFFFFFB52      ",
+	"      5BFFFFFFFFFFFFFFFFB64     ",
+	"     5BFFFFFFFFFFFFFFFFFFF62    ",
+	"    5BFFFFFFFFFFFFFFFFFFFFB5    ",
+	"   3AFFFFFFFFFFFFFFFFFFFFFFB3   ",
+	"   5FFFFFFFFFFFFFFFFFFFFFFFF82  ",
+	"  3AFFFFFFFFFFFFFFFFFFFFFFFFB2  ",
+	"  2FFFFFFFFFFFFFFFFFFFFFFFFFF5  ",
+	" 07FFFFFFFFFFFFFFFFFFFFFFFFFF92 ",
+	" 2AFFFFFFFFFFFFFFFFFFFFFFFFFFB3 ",
+	" 3AFFFFFFFFFFFFEFFFFFFFFFFFFFB2 ",
+	" 3BFFFFFFFFFFFDHLFFFFFFFFFFFFF0 ",
+	" 2BFFFFFFFFFFFDHGLFFFFFFFFFFFF0 ",
+	" 3BFFFFFFFFFFFFDHGLFFFFFFFFFFB2 ",
+	" 3AFFFFFFFFFFFFFDHGLFFFFEEFFFB3 ",
+	" 08FFFFFFFFFFFFFFDHGLFFFIHFFFA3 ",
+	"  4FFFFFFFFFFFFFFFDHGLFEGHFFF60 ",
+	"  2BFFFFFFFFFFFFFFFDHGLEGJFFB2  ",
+	"  28FFFFFFFFFFFFFFFFDHGKGLFF92  ",
+	"   3BFFFFFFFFFFFFFFFFDHGGCFB3   ",
+	"    6BFFFFFFFFFFFFEKJGGGGDF73   ",
+	"    47FFFFFFFFFFFFLGGGHKLE94    ",
+	"     57FFFFFFFFFFFEEEFFFF94     ",
+	"      36BFFFFFFFFFFFFFFB74      ",
+	"       239BFFFFFFFFFFFA33       ",
+	"         227ABFFFFBA723         ",
+	"           0330000230           ",
+	"                                "};
+
+static char **circle_filled_center_xpm[3] = { circle_filled_center_x16, circle_filled_center_x24, circle_filled_center_x32 };
+
diff --git a/app/bin/bitmaps/circle-filled-tangent.xpm b/app/bin/bitmaps/circle-filled-tangent.xpm
new file mode 100644
index 0000000..f20856e
--- /dev/null
+++ b/app/bin/bitmaps/circle-filled-tangent.xpm
@@ -0,0 +1,148 @@
+static char *circle_filled_tangent_x16[] = {
+	"16 16 20 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#336699",
+	"6	c	#339999",
+	"7	c	#666699",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#66CCCC",
+	"B	c	#66CCFF",
+	"C	c	#9999CC",
+	"D	c	#99CCFF",
+	"E	c	#99FFFF",
+	"F	c	#CC3333",
+	"G	c	#CC6699",
+	"H	c	#CC9999",
+	"I	c	#CC99CC",
+	"      0110      ",
+	"    3469A842    ",
+	"   3AEEEEEEA31  ",
+	"  2BEEEEEEEEB4  ",
+	" 3AEEEEEEEEEEB3 ",
+	" 4EEEEEEEEEEEE60",
+	"08EEEEEEEEEEEEA1",
+	"2AEEEEEDCIHEEEB2",
+	"2AEEEEECFCDEEEB1",
+	"09EEEEEHCGDEEEA2",
+	"05EEEEEHDDGDEE90",
+	" 3BEEEEEEEDGDB3 ",
+	"  4BEEEEEEEDG71 ",
+	"  34BEEEEEEB74  ",
+	"    39ABBB931   ",
+	"     021120     "};
+
+static char *circle_filled_tangent_x24[] = {
+	"24 24 22 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003333",
+	"3	c	#333333",
+	"4	c	#333366",
+	"5	c	#336666",
+	"6	c	#336699",
+	"7	c	#339999",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#66CCCC",
+	"B	c	#66CCFF",
+	"C	c	#9999CC",
+	"D	c	#99CCCC",
+	"E	c	#99CCFF",
+	"F	c	#99FFFF",
+	"G	c	#CC0000",
+	"H	c	#CC6666",
+	"I	c	#CC6699",
+	"J	c	#CC9999",
+	"K	c	#CC99CC",
+	"                        ",
+	"       0315555230       ",
+	"      46AFFFFFFB73      ",
+	"    03AFFFFFFFFFFA42    ",
+	"   05BFFFFFFFFFFFFB73   ",
+	"   3BFFFFFFFFFFFFFFB5   ",
+	"  4AFFFFFFFFFFFFFFFFB4  ",
+	" 26FFFFFFFFFFFFFFFFFF94 ",
+	" 3BFFFFFFFFFFFFFFFFFFB2 ",
+	" 2FFFFFFFFFFFFFFFFFFFF5 ",
+	" 5FFFFFFFFFFFFFEFFFFFF80",
+	"07FFFFFFFFFDIHGGCFFFFF92",
+	"08FFFFFFFFFIGJCDEFFFFFA2",
+	"06FFFFFFFFFHIIEFFFFFFF90",
+	" 5FFFFFFFFEGKEIEFFFFFF60",
+	" 2BFFFFFFFEGDFEIEFFFFB2 ",
+	" 29FFFFFFFFEEFFEIEFFFA3 ",
+	"  4BFFFFFFFFFFFFEIEFB4  ",
+	"   5BFFFFFFFFFFFFEIE72  ",
+	"   48FFFFFFFFFFFFFEC4   ",
+	"    35BFFFFFFFFFFB74    ",
+	"      3AFFFFFFFFA42     ",
+	"       3179AA9723       ",
+	"         003300         "};
+
+static char *circle_filled_tangent_x32[] = {
+	"32 32 23 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003333",
+	"3	c	#333333",
+	"4	c	#333366",
+	"5	c	#336666",
+	"6	c	#336699",
+	"7	c	#339999",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#66CCCC",
+	"B	c	#66CCFF",
+	"C	c	#9999CC",
+	"D	c	#99CCCC",
+	"E	c	#99CCFF",
+	"F	c	#99FFFF",
+	"G	c	#CC0000",
+	"H	c	#CC3333",
+	"I	c	#CC6666",
+	"J	c	#CC6699",
+	"K	c	#CC9999",
+	"L	c	#CC99CC",
+	"                                ",
+	"            233003320           ",
+	"         2259BBFFBB9622         ",
+	"        28BFFFFFFFFFFB920       ",
+	"      25BFFFFFFFFFFFFFFB63      ",
+	"     37BFFFFFFFFFFFFFFFFF84     ",
+	"    27FFFFFFFFFFFFFFFFFFFF94    ",
+	"    5BFFFFFFFFFFFFFFFFFFFFF74   ",
+	"   4BFFFFFFFFFFFFFFFFFFFFFFB3   ",
+	"  28FFFFFFFFFFFFFFFFFFFFFFFFA3  ",
+	"  2BFFFFFFFFFFFFFFFFFFFFFFFFF4  ",
+	"  5FFFFFFFFFFFFFFFFFFFFFFFFFF80 ",
+	" 29FFFFFFFFFFFFFFFFFFFFFFFFFFB3 ",
+	" 3BFFFFFFFFFFFFFFFFFFFFFFFFFFB1 ",
+	" 2BFFFFFFFFFFFFFFEEDCDFFFFFFFF2 ",
+	" 0FFFFFFFFFFFFFLHGGGGGEFFFFFFF5 ",
+	" 1FFFFFFFFFFFFFHGGJLCEFFFFFFFF5 ",
+	" 2BFFFFFFFFFFFEGGGIEFFFFFFFFFF4 ",
+	" 3BFFFFFFFFFFFEGIJGIEFFFFFFFFF0 ",
+	" 3AFFFFFFFFFFFDGKEJGHEFFFFFFFB3 ",
+	" 07FFFFFFFFFFFCGCFEJGHEFFFFFF92 ",
+	"  2FFFFFFFFFFFEJEFFEJGHEFFFFF5  ",
+	"  29FFFFFFFFFFFFFFFFEJGHEFFFB3  ",
+	"   4BFFFFFFFFFFFFFFFFEJGHEFF5   ",
+	"   27FFFFFFFFFFFFFFFFFEJGHEA4   ",
+	"    49FFFFFFFFFFFFFFFFFEJDB4    ",
+	"     4AFFFFFFFFFFFFFFFFFFB5     ",
+	"      49FFFFFFFFFFFFFFFFA4      ",
+	"       45AFFFFFFFFFFFFB54       ",
+	"         359BFFFFFFB953         ",
+	"           2305555022           ",
+	"                                "};
+
+static char **circle_filled_tangent_xpm[3] = { circle_filled_tangent_x16, circle_filled_tangent_x24, circle_filled_tangent_x32 };
+
diff --git a/app/bin/bitmaps/circle-line-center.xpm b/app/bin/bitmaps/circle-line-center.xpm
new file mode 100644
index 0000000..24a41f6
--- /dev/null
+++ b/app/bin/bitmaps/circle-line-center.xpm
@@ -0,0 +1,93 @@
+static char *circle_line_center_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"       00       ",
+	"    00000000    ",
+	"   00      00   ",
+	"  0          0  ",
+	" 00          00 ",
+	" 0            0 ",
+	"00            00",
+	"00            00",
+	"00      1     00",
+	"00       1    00",
+	" 0        1 1 00",
+	" 00        11 0 ",
+	"  0       1110  ",
+	"  00        00  ",
+	"    000  000    ",
+	"     000000     "};
+
+static char *circle_line_center_x24[] = {
+	"24 24 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                        ",
+	"        00000000        ",
+	"      000      000      ",
+	"     00          00     ",
+	"    00             0    ",
+	"   0                0   ",
+	"  00                00  ",
+	"  0                  0  ",
+	" 00                   0 ",
+	" 0                    0 ",
+	" 0                    0 ",
+	" 0         1          00",
+	" 0         11         00",
+	" 0          11        00",
+	" 0           11       0 ",
+	" 00           11  1   0 ",
+	" 00            11 1  00 ",
+	"  00            111  0  ",
+	"   0           1111 0   ",
+	"   00          1   00   ",
+	"    000           00    ",
+	"      00        00      ",
+	"       0000000000       ",
+	"           000          "};
+
+static char *circle_line_center_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"                                ",
+	"           0000000000           ",
+	"         00000000000000         ",
+	"       00000        00000       ",
+	"      0000            0000      ",
+	"     000                000     ",
+	"    000                  000    ",
+	"   000                    000   ",
+	"   00                      000  ",
+	"  000                       00  ",
+	"  00                        000 ",
+	" 000                         00 ",
+	" 00                          00 ",
+	" 00                          00 ",
+	" 00                          000",
+	" 00             2            000",
+	" 00            222           000",
+	" 00            2222          000",
+	" 00             2222         00 ",
+	" 00              2222        00 ",
+	" 000              2222  22   00 ",
+	"  00               2222 22  000 ",
+	"  00                222222  00  ",
+	"  000                22222 000  ",
+	"   000             2222222000   ",
+	"    000            2222221000   ",
+	"     000                0000    ",
+	"     0000              0000     ",
+	"       0000          00000      ",
+	"        0000000  0000000        ",
+	"          000000000000          ",
+	"              0000              "};
+
+static char **circle_line_center_xpm[3] = { circle_line_center_x16, circle_line_center_x24, circle_line_center_x32 };
+
diff --git a/app/bin/bitmaps/circle-line-tangent.xpm b/app/bin/bitmaps/circle-line-tangent.xpm
new file mode 100644
index 0000000..0a5a52d
--- /dev/null
+++ b/app/bin/bitmaps/circle-line-tangent.xpm
@@ -0,0 +1,93 @@
+static char *circle_line_tangent_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"       00       ",
+	"    00000000    ",
+	"   00      00   ",
+	"  00         0  ",
+	" 00          00 ",
+	" 0            0 ",
+	" 0            00",
+	"00     1111   00",
+	"00     11     00",
+	"00     1 1    00",
+	" 0     1  1   00",
+	" 00        1  0 ",
+	"  0         10  ",
+	"   00       00  ",
+	"    0000 000    ",
+	"      00000     "};
+
+static char *circle_line_tangent_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"                        ",
+	"        00000000        ",
+	"       000     000      ",
+	"     00          00     ",
+	"    00             0    ",
+	"   00               0   ",
+	"   0                00  ",
+	"  0                  0  ",
+	" 00                  00 ",
+	" 0                    0 ",
+	" 0          2222      0 ",
+	" 0         22222      00",
+	" 0         222        00",
+	" 0        22 22       0 ",
+	" 0        22  22      0 ",
+	" 00       22   22     0 ",
+	"  0             22   00 ",
+	"  00             22  0  ",
+	"   0              2 0   ",
+	"    0              00   ",
+	"    000           00    ",
+	"      00        00      ",
+	"       0000000000       ",
+	"           00           "};
+
+static char *circle_line_tangent_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                                ",
+	"            000000000           ",
+	"         00000000000000         ",
+	"       000000      000000       ",
+	"      0000            0000      ",
+	"     0000               000     ",
+	"    000                  000    ",
+	"   000                    000   ",
+	"   000                     00   ",
+	"  000                      000  ",
+	"  00                        00  ",
+	"  00                        000 ",
+	" 000                         00 ",
+	" 00                          00 ",
+	" 00            1111111       00 ",
+	" 00           1111111        000",
+	" 00           11111          000",
+	" 00           111111         00 ",
+	" 00           11 1111        00 ",
+	" 00           11  1111       00 ",
+	" 000          11   1111      00 ",
+	"  00                1111    000 ",
+	"  000                1111   00  ",
+	"   00                 1111 000  ",
+	"   000                 111000   ",
+	"    000                 1000    ",
+	"     000                0000    ",
+	"      000              0000     ",
+	"       0000          0000       ",
+	"        0000000000000000        ",
+	"          000000000000          ",
+	"               00               "};
+
+static char **circle_line_tangent_xpm[3] = { circle_line_tangent_x16, circle_line_tangent_x24, circle_line_tangent_x32 };
+
diff --git a/app/bin/bitmaps/circle-line.xpm b/app/bin/bitmaps/circle-line.xpm
new file mode 100644
index 0000000..1f6de11
--- /dev/null
+++ b/app/bin/bitmaps/circle-line.xpm
@@ -0,0 +1,95 @@
+static char *circle_line_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#800000",
+	"       00       ",
+	"    00000000    ",
+	"   00      00   ",
+	"  0  22  22  0  ",
+	" 00   2 222  00 ",
+	" 0    22222   0 ",
+	"00 2 222222 2 00",
+	"0022        2200",
+	"0322222222222210",
+	"0022        2 00",
+	" 0            00",
+	" 00           0 ",
+	"  0          0  ",
+	"  00        00  ",
+	"    000  000    ",
+	"     000000     "};
+
+static char *circle_line_x24[] = {
+	"24 24 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                        ",
+	"        00000000        ",
+	"      000      000      ",
+	"     00          00     ",
+	"    00             0    ",
+	"   00  1111  111    0   ",
+	"  00     11 11      00  ",
+	"  0      11 1111     0  ",
+	" 00       1111 11    00 ",
+	" 0     1111 1111      0 ",
+	" 0  1   11    1   11  0 ",
+	" 0 11              11 00",
+	" 0 111111111111111111 00",
+	" 0 11              11 0 ",
+	" 0  1             1   0 ",
+	" 00                   0 ",
+	"  0                  00 ",
+	"  00                 0  ",
+	"   0                0   ",
+	"    0              00   ",
+	"    000           00    ",
+	"      00        00      ",
+	"       0000000000       ",
+	"           00           "};
+
+static char *circle_line_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#CC0000",
+	"                                ",
+	"           0000000000           ",
+	"         00000000000000         ",
+	"       00000        00000       ",
+	"      0000            0000      ",
+	"     000                000     ",
+	"    000    222    222    000    ",
+	"   000    22222  22222    000   ",
+	"   00     2  22 22         000  ",
+	"  000       22  22222       00  ",
+	"  00        222 222 22      000 ",
+	" 000         22 22  22      000 ",
+	" 00   2   22222 222222       00 ",
+	" 00  222  2222   2222   222  00 ",
+	" 00 222                 2222 00 ",
+	" 0022222222222222222222222222000",
+	" 0022222222222222222222222222100",
+	" 00 222                  222 000",
+	" 00  222                222  00 ",
+	" 00  222                22   00 ",
+	" 000                         00 ",
+	"  00                        000 ",
+	"  00                        00  ",
+	"  000                      000  ",
+	"   000                    000   ",
+	"    000                   000   ",
+	"     000                0000    ",
+	"     0000              0000     ",
+	"       0000          00000      ",
+	"        0000000000000000        ",
+	"          000000000000          ",
+	"              0000              "};
+
+static char **circle_line_xpm[3] = { circle_line_x16, circle_line_x24, circle_line_x32 };
+
diff --git a/app/bin/bitmaps/circle-tangent.xpm b/app/bin/bitmaps/circle-tangent.xpm
new file mode 100644
index 0000000..4ae8c69
--- /dev/null
+++ b/app/bin/bitmaps/circle-tangent.xpm
@@ -0,0 +1,110 @@
+static char *circle_tangent_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#808080",
+	"     000000     ",
+	"   30 2  2 03   ",
+	"  0 2 0000 2 0  ",
+	" 3  00    00  3 ",
+	" 020        020 ",
+	"0  0        0  0",
+	"020          020",
+	"0 0          0 0",
+	"0 0     111  0 0",
+	"020     11   020",
+	"0  0    1 1    0",
+	" 020       1 20 ",
+	" 3  00      1 3 ",
+	"  0 2 0000 2 0  ",
+	"   30 2  2 03   ",
+	"     000000     "};
+
+static char *circle_tangent_x24[] = {
+	"24 24 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#990000",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC3300",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"           99           ",
+	"      9  00330059       ",
+	"       5000550023       ",
+	"     0059  85  93009    ",
+	"   930  80023025  25    ",
+	"   139 035 99 8305900   ",
+	"   0 920        335 0   ",
+	"  00 059        950 539 ",
+	" 83930            3591  ",
+	" 03938            90 00 ",
+	" 0  0              0  0 ",
+	" 0  0       6666   2551 ",
+	"928839     66666  955829",
+	" 15 0      6666    0  0 ",
+	" 00 05     66666   0 00 ",
+	" 01953     66 666983900 ",
+	" 839 0         66608939 ",
+	" 920  38        764 029 ",
+	"   0395029    9316800   ",
+	"    35  31053022  82    ",
+	"   9500 9 055059 0089   ",
+	"      025  99  520      ",
+	"       8100330038       ",
+	"           55   9       "};
+
+static char *circle_tangent_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#993300",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"9	c	#800000",
+	"               8                ",
+	"               75    8          ",
+	"         8 00003200018          ",
+	"         3200  88  0320         ",
+	"       0028    88   8 00  8     ",
+	"    8 00  88000100038   058     ",
+	"     52    300 78 032   830     ",
+	"    018  0058  8   8 0088 0     ",
+	"    0  830            23   0    ",
+	"   00  138            830  038  ",
+	" 850   0                0 8835  ",
+	" 8558 00                538 00  ",
+	"  058828                830  0  ",
+	"  0  028                  0  0  ",
+	"  0  00                   0  0  ",
+	" 00  0         6666666    07 25 ",
+	"85488378       666666    8278458",
+	" 52  25        6666       0  0  ",
+	"  0  00        66666      0  0  ",
+	"  0   18      6666666    00  0  ",
+	"  00 837      666 6666 8835 00  ",
+	"  3388 0       6   6666 138833  ",
+	" 881   018          66660   288 ",
+	"   00   35           6666  00   ",
+	"    0  8700 8      8 0967 00    ",
+	"     17   015  8   510  870     ",
+	"     71    8200320037    37     ",
+	"       00 88   75   8  00 8     ",
+	"        005    88   8500        ",
+	"         53000 55 0003          ",
+	"         88 00033000 8          ",
+	"               88               "};
+
+static char **circle_tangent_xpm[3] = { circle_tangent_x16, circle_tangent_x24, circle_tangent_x32 };
+
diff --git a/app/bin/bitmaps/circle.xpm b/app/bin/bitmaps/circle.xpm
new file mode 100644
index 0000000..0be3fe9
--- /dev/null
+++ b/app/bin/bitmaps/circle.xpm
@@ -0,0 +1,115 @@
+static char *circle_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#808080",
+	"     000000     ",
+	"   30 2  2 03   ",
+	"  0 2 0000 2 0  ",
+	" 3  00    00  3 ",
+	" 020        020 ",
+	"0  0        0  0",
+	"0    00 303    0",
+	"0 1   0 0 0  1 0",
+	"311110  0 011113",
+	"0 1  00 303  1 0",
+	"0              0",
+	" 020        020 ",
+	" 3  00    00  3 ",
+	"  0 2 0000 2 0  ",
+	"   30 2  2 03   ",
+	"     000000     "};
+
+static char *circle_x24[] = {
+	"24 24 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#660000",
+	"4	c	#663300",
+	"5	c	#990000",
+	"6	c	#996600",
+	"7	c	#CC0000",
+	"8	c	#CC3300",
+	"9	c	#CC6600",
+	"A	c	#CC9900",
+	"B	c	#800000",
+	"           AA           ",
+	"         004400 A       ",
+	"       6000660014       ",
+	"      06A  69  A600 A   ",
+	"   A40  60024006  24    ",
+	"   44A 066  A A601A40   ",
+	"   0 92          44 0   ",
+	"  00 09         AA0 64A ",
+	" A2A00            64A40 ",
+	" 14AB8  000  000  971 0 ",
+	" 00577  0 0000 00 777 0 ",
+	" 03777  000 00 007777816",
+	"A497787 000000 017887829",
+	" 26878    0000 00  77 0 ",
+	" 00 57  0000 000  773 0 ",
+	"  0A46            A4920 ",
+	" A49 0            04A49 ",
+	" A 0 24A        A60 00A ",
+	"   01A40 A    A 04A 0   ",
+	"    44  240660420 64    ",
+	"   A 00 A404404A 006A   ",
+	"       240 AA  620      ",
+	"       A40000004A       ",
+	"       A   AA   A       "};
+
+static char *circle_x32[] = {
+	"32 32 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#660000",
+	"4	c	#663300",
+	"5	c	#990000",
+	"6	c	#993300",
+	"7	c	#996600",
+	"8	c	#CC0000",
+	"9	c	#CC3300",
+	"A	c	#CC6600",
+	"B	c	#CC9900",
+	"C	c	#800000",
+	"               BB               ",
+	"               BB               ",
+	"         B 0000000000AB         ",
+	"         7100  BB  0240         ",
+	"        02B    BB   BB000 B     ",
+	"    B  0  BA00000000A   04B     ",
+	"     A1   4400 BB  420   72     ",
+	"     1B  00BB   B  BB00 B 00    ",
+	"    0  B10             47  00   ",
+	"   00  17B            BB0   0BB ",
+	" B 0  00                 0 B77  ",
+	" B77B 0                  47B 0  ",
+	"  07B799   0000   000   A93  0  ",
+	"  0  588  00000  00000  888C 00 ",
+	"  0 8888     00 00  00   888 00 ",
+	"  0 88888  0000 00  00 88888862 ",
+	"B74A88888  0000 00  00 888889A4B",
+	"BA2B9889     00000  00   888 00 ",
+	"  0  888  0  000 00 00  8885 00 ",
+	"  0  189  00000  0000   88C  00 ",
+	"  00 A4B               BB74  0  ",
+	"  74BB00                 2BB74  ",
+	" BB40  0 B              00  2AB ",
+	"    0  44A            B40  00   ",
+	"    00 B700 B      B  07B  0    ",
+	"     27   02A  BB  A40  BA0     ",
+	"     B20   A100440017    2A     ",
+	"    B  00 BB   77   B  00 BB    ",
+	"         044   BB   7700        ",
+	"          A00004700007          ",
+	"         BB   0470   BB         ",
+	"               BB               "};
+
+static char **circle_xpm[3] = { circle_x16, circle_x24, circle_x32 };
+
diff --git a/app/bin/bitmaps/circle1.xpm b/app/bin/bitmaps/circle1.xpm
deleted file mode 100644
index 03426f0..0000000
--- a/app/bin/bitmaps/circle1.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * circle1_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"o	c #FFFFFFFFFFFF",
-"     ......     ",
-"    .      .    ",
-"  ..  ....  ..  ",
-" .XXXXXXXXXXX . ",
-" .XoooooooooX . ",
-". XoXXXoXXXoX  .",
-". XoXoXoXoooX. .",
-". XoXXXoXXooX. .",
-". XoooXoooXoX. .",
-". XoooXoooXoX. .",
-". XoooXoXXooX  .",
-" .XoooooooooX . ",
-" .XXXXXXXXXXX . ",
-"  ..  ....  ..  ",
-"    .      .    ",
-"     ......     "};
diff --git a/app/bin/bitmaps/circle2.xpm b/app/bin/bitmaps/circle2.xpm
deleted file mode 100644
index 343f29b..0000000
--- a/app/bin/bitmaps/circle2.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * circle2_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"     ......     ",
-" .  .  .   .  . ",
-"  ..  ....  ..  ",
-" . ... .  ... . ",
-" . ..      .. . ",
-".  .        .  .",
-". .          . .",
-". .    XXXX ....",
-"....   XX    . .",
-". .    X X   . .",
-".  .   X  X .  .",
-" . ..      X. . ",
-" . ...  . ..X . ",
-"  ..  ....  .X  ",
-" .  .   .  .    ",
-"     ......     "};
diff --git a/app/bin/bitmaps/circle3.xpm b/app/bin/bitmaps/circle3.xpm
deleted file mode 100644
index 3a7c9ab..0000000
--- a/app/bin/bitmaps/circle3.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * circle3_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"     ......     ",
-" .  .  .   .  . ",
-"  ..  ....  ..  ",
-" . ... .  ... . ",
-" . ..      .. . ",
-".  .        .  .",
-". .          . .",
-". .    XX   ....",
-"....   XX    . .",
-". .      X  X. .",
-".  .      X X  .",
-" . ..      XX . ",
-" . ...  .XXXX . ",
-"  ..  ....  ..  ",
-" .  .   .  .  . ",
-"     ......     "};
diff --git a/app/bin/bitmaps/cnote.xpm b/app/bin/bitmaps/cnote.xpm
deleted file mode 100644
index c008c24..0000000
--- a/app/bin/bitmaps/cnote.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * cnote_xpm[] = {
-"16 16 3 1",
-".	c None",
-" 	c #000000000000",
-"X	c #FFFFFFFF0000",
-"          ......",
-" XXXXXXXX  .....",
-" XXXXXX X X ....",
-" XXXXXX X XX ...",
-" XXXXXX X XXX ..",
-" XXXXXX X      .",
-" XXXXXX XXXXXX .",
-" XXXXXX XXXXXX .",
-" XXXXXX XXXXXX .",
-" XXXXXX XXXXXX .",
-" XXXXXX XXXXXX .",
-" XXXXXXXXXXXXX .",
-" XXXXXX XXXXXX .",
-" XXXXXXXXXXXXX .",
-" XXXXXXXXXXXXX .",
-"               ."};
diff --git a/app/bin/bitmaps/connect.xpm b/app/bin/bitmaps/connect.xpm
new file mode 100644
index 0000000..3853635
--- /dev/null
+++ b/app/bin/bitmaps/connect.xpm
@@ -0,0 +1,116 @@
+static char *connect_x16[] = {
+	"16 16 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003399",
+	"2	c	#336699",
+	"3	c	#3366CC",
+	"4	c	#3366FF",
+	"5	c	#3399FF",
+	"6	c	#6699FF",
+	"7	c	#9966CC",
+	"8	c	#CC0000",
+	"9	c	#CC3366",
+	"A	c	#CC3399",
+	"                ",
+	"                ",
+	"                ",
+	" 5 4333  3435 5 ",
+	"1313121  1313131",
+	" 6 6 66   6 6 6 ",
+	" 313233  3313133",
+	"1313233  2313132",
+	" 6 6 9    A 6 6 ",
+	"     88  88     ",
+	"8888888888888888",
+	"      8  8      ",
+	"     8    8     ",
+	"                ",
+	"                ",
+	"                "};
+
+static char *connect_x24[] = {
+	"24 24 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003399",
+	"2	c	#336699",
+	"3	c	#3366CC",
+	"4	c	#3366FF",
+	"5	c	#3399FF",
+	"6	c	#6699FF",
+	"7	c	#CC0000",
+	"8	c	#CC3366",
+	"9	c	#CC6699",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"  6  6  6      6  6  6  ",
+	" 35  5  53    35  53 43 ",
+	"11311311311  11311311211",
+	"  6  6  6      6  6  66 ",
+	"  6  6  6      6  6  66 ",
+	"  6  6  6      6  6  66 ",
+	"11111111111  11111111111",
+	"  6  6  6      6  6  66 ",
+	"        8      8        ",
+	"        77    777       ",
+	"        777  777        ",
+	" 7777777777777777777777 ",
+	" 7777777777 77777777777 ",
+	"        777  777        ",
+	"       777    777       ",
+	"        7      7        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *connect_x32[] = {
+	"32 32 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003399",
+	"2	c	#336699",
+	"3	c	#3366CC",
+	"4	c	#3366FF",
+	"5	c	#3399FF",
+	"6	c	#6699FF",
+	"7	c	#CC0000",
+	"8	c	#CC3366",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"  66   6   6        6   6   66  ",
+	"  33  35   53      35   53  34  ",
+	" 1111113111311    1131113111121 ",
+	"  66   6   6        6   6   66  ",
+	"  66   6   6        6   6   66  ",
+	"  66   6   6        6   6   66  ",
+	"  66   6   6        6   6   66  ",
+	" 1331113111321    1131113211331 ",
+	" 1331113111321    1131113211331 ",
+	"  66   6   6        6   6   66  ",
+	"          78        87          ",
+	"          777      777          ",
+	"          7777    7777          ",
+	"           7777  7777           ",
+	" 77777777777777 777777777777777 ",
+	" 777777777777777777777777777777 ",
+	"           7777  7777           ",
+	"           777    777           ",
+	"          777      777          ",
+	"          77        77          ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **connect_xpm[3] = { connect_x16, connect_x24, connect_x32 };
+
diff --git a/app/bin/bitmaps/control.xpm b/app/bin/bitmaps/control.xpm
index bc73a57..45d1f9b 100644
--- a/app/bin/bitmaps/control.xpm
+++ b/app/bin/bitmaps/control.xpm
@@ -1,24 +1,129 @@
-/* XPM */
-static char * control_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #05FB0B",
-"+	c #000000",
-"@	c #EF2929",
-"#	c #25E100",
-".+            + ",
-"+++          +++",
-" +++        +++ ",
-"  +++ +++  +++  ",
-"   ++++++++++   ",
-"   +++@@@+++    ",
-"   ++@@@@@++    ",
-"  ++###@@@@++   ",
-"  ++####@@@++   ",
-"  ++#####@@++   ",
-"   ++####@++    ",
-"   +++###++++   ",
-"  ++++++++++++  ",
-" +++  +++   +++ ",
-"+++          +++",
-"++            ++"};
+static char *control_x16[] = {
+	"16 16 16 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#006600",
+	"3	c	#009900",
+	"4	c	#00CC00",
+	"5	c	#00FF00",
+	"6	c	#330000",
+	"7	c	#333300",
+	"8	c	#660000",
+	"9	c	#663300",
+	"A	c	#990000",
+	"B	c	#CC0000",
+	"C	c	#FF0000",
+	"D	c	#800000",
+	"E	c	#008000",
+	"                ",
+	" 0            00",
+	"  0          00 ",
+	"   0        00  ",
+	"    0 8ABD 00   ",
+	"    07CCCCA0    ",
+	"    E49CCCCD    ",
+	"    4549CCCB    ",
+	"    45549CCB0   ",
+	"    355549CA    ",
+	"    04555496    ",
+	"    01455420    ",
+	"   0   00   0   ",
+	"  0          0  ",
+	" 0            0 ",
+	"0              0"};
+
+static char *control_x24[] = {
+	"24 24 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006600",
+	"2	c	#009900",
+	"3	c	#00CC00",
+	"4	c	#00FF00",
+	"5	c	#330000",
+	"6	c	#339900",
+	"7	c	#660000",
+	"8	c	#663300",
+	"9	c	#990000",
+	"A	c	#CC0000",
+	"B	c	#FF0000",
+	"C	c	#800000",
+	"D	c	#008000",
+	"                        ",
+	" 00                  00 ",
+	" 000                000 ",
+	"  000              000  ",
+	"   000            000   ",
+	"    000          000    ",
+	"     000005CC700000     ",
+	"      007ABBBBA500      ",
+	"      018BBBBBBA50      ",
+	"      0338BBBBBBA0      ",
+	"     014438BBBBBB70     ",
+	"     0244438BBBBB90     ",
+	"     03444438BBBB90     ",
+	"     0D4444438BBB90     ",
+	"     0044444438BB5      ",
+	"      0D4444443890      ",
+	"      002444444600      ",
+	"     00001333310000     ",
+	"    000  000000  000    ",
+	"   000            000   ",
+	"  000              000  ",
+	" 000                000 ",
+	" 00                  000",
+	"                        "};
+
+static char *control_x32[] = {
+	"32 32 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#006600",
+	"3	c	#009900",
+	"4	c	#00CC00",
+	"5	c	#00FF00",
+	"6	c	#330000",
+	"7	c	#660000",
+	"8	c	#663300",
+	"9	c	#990000",
+	"A	c	#CC0000",
+	"B	c	#FF0000",
+	"C	c	#800000",
+	"D	c	#008000",
+	"                                ",
+	"  0                          0  ",
+	" 000                        000 ",
+	"  000                      0000 ",
+	"   000                    0000  ",
+	"    000                  0000   ",
+	"     000                0000    ",
+	"      000      00      0000     ",
+	"       000  00077000  0000      ",
+	"        0000CABBBBAC00000       ",
+	"         06ABBBBBBBB9000        ",
+	"        0038BBBBBBBBB90         ",
+	"        0D548BBBBBBBBB70        ",
+	"       0045548BBBBBBBBA0        ",
+	"       02555548BBBBBBBB60       ",
+	"       035555548BBBBBBBC0       ",
+	"       0355555548BBBBBBC0       ",
+	"       0D555555548BBBBB70       ",
+	"       005555555548BBBB00       ",
+	"        035555555548BB90        ",
+	"        0045555555548B60        ",
+	"         02455555555480         ",
+	"        000145555554D000        ",
+	"       00000024444200 000       ",
+	"      000   00000000   000      ",
+	"     000                000     ",
+	"    000                  000    ",
+	"   000                    000   ",
+	"  000                      000  ",
+	" 000                        000 ",
+	" 00                          00 ",
+	"                                "};
+
+static char **control_xpm[3] = { control_x16, control_x24, control_x32 };
+
diff --git a/app/bin/bitmaps/convert-from.xpm b/app/bin/bitmaps/convert-from.xpm
new file mode 100644
index 0000000..ed72d8a
--- /dev/null
+++ b/app/bin/bitmaps/convert-from.xpm
@@ -0,0 +1,99 @@
+static char *convert_from_x16[] = {
+	"16 16 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#999999",
+	"2	c	#CC0000",
+	"3	c	#CCCCCC",
+	"4	c	#FF0000",
+	"5	c	#FFFFFF",
+	"6	c	#808080",
+	" 363       363  ",
+	"5060      10601 ",
+	"36 1   6006   03",
+	"30   101    1 63",
+	" 10601      060 ",
+	"  363   2   363 ",
+	"        2       ",
+	"        2       ",
+	"      42224     ",
+	"       424      ",
+	"        4       ",
+	"      00000     ",
+	"      00        ",
+	"      0000      ",
+	"      00        ",
+	"      00        "};
+
+static char *convert_from_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC0033",
+	"                        ",
+	"   00            0000   ",
+	"  0000        00000 00  ",
+	" 00  00     0000   0 00 ",
+	" 0   00   000     00  0 ",
+	" 00 00   00       0   0 ",
+	"  0    000        0  00 ",
+	"  000000   22     0000  ",
+	"           22           ",
+	"           22           ",
+	"        2  22           ",
+	"         2 22 22        ",
+	"          2222          ",
+	"           22           ",
+	"            2           ",
+	"         000000         ",
+	"         00             ",
+	"         0              ",
+	"         00000          ",
+	"         00             ",
+	"         0              ",
+	"         0              ",
+	"         0              ",
+	"                        "};
+
+static char *convert_from_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC0033",
+	"                                ",
+	"                                ",
+	"   00000              0000000   ",
+	"  00   0           0000     00  ",
+	"  0    00        0000        0  ",
+	"  0    00      000      000  00 ",
+	"  0    0     000        0    00 ",
+	"  0  000    00         00    00 ",
+	"  00      00            0    0  ",
+	"   00  0000    22       00  00  ",
+	"    00000      22        0000   ",
+	"               22               ",
+	"               22               ",
+	"           2   22               ",
+	"           22  22  22           ",
+	"           222 22 222           ",
+	"            22222222            ",
+	"             222222             ",
+	"               222              ",
+	"                2               ",
+	"            00000000            ",
+	"            00                  ",
+	"            00                  ",
+	"            00                  ",
+	"            000000              ",
+	"            000000              ",
+	"            00                  ",
+	"            00                  ",
+	"            00                  ",
+	"            00                  ",
+	"                                ",
+	"                                "};
+
+static char **convert_from_xpm[3] = { convert_from_x16, convert_from_x24, convert_from_x32 };
+
diff --git a/app/bin/bitmaps/convert-to.xpm b/app/bin/bitmaps/convert-to.xpm
new file mode 100644
index 0000000..5f5c94e
--- /dev/null
+++ b/app/bin/bitmaps/convert-to.xpm
@@ -0,0 +1,99 @@
+static char *convert_to_x16[] = {
+	"16 16 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#999999",
+	"2	c	#CC0000",
+	"3	c	#CCCCCC",
+	"4	c	#FF0000",
+	"5	c	#FFFFFF",
+	"6	c	#808080",
+	"      00000     ",
+	"      00        ",
+	"      0000      ",
+	"      00        ",
+	"      00        ",
+	"        2       ",
+	"        2       ",
+	"        2       ",
+	"      42224     ",
+	"       424      ",
+	" 363    4  363  ",
+	"5060      10601 ",
+	"36 1   6006   03",
+	"30   101    1 63",
+	" 10601      060 ",
+	"  363       363 "};
+
+static char *convert_to_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC0033",
+	"                        ",
+	"         000000         ",
+	"         000000         ",
+	"         00             ",
+	"         00000          ",
+	"         00000          ",
+	"         00             ",
+	"         00             ",
+	"         00             ",
+	"            2           ",
+	"            2           ",
+	"            2           ",
+	"        22  2  2        ",
+	"         22 2 2         ",
+	"          2222          ",
+	"           22           ",
+	"  0000          00000   ",
+	" 00  0       0000    0  ",
+	" 0   00    0000   00 00 ",
+	" 0   0    00      0   0 ",
+	" 00 00  00       00   0 ",
+	"  00  000         0  0  ",
+	"   0000            000  ",
+	"                        "};
+
+static char *convert_to_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC0033",
+	"                                ",
+	"                                ",
+	"            00000000            ",
+	"             0                  ",
+	"             0                  ",
+	"             0                  ",
+	"             000000             ",
+	"             0                  ",
+	"             0                  ",
+	"             0                  ",
+	"             0                  ",
+	"             0                  ",
+	"               22               ",
+	"               22               ",
+	"               22               ",
+	"               22               ",
+	"           22  22  22           ",
+	"           222 22 222           ",
+	"            22222222            ",
+	"             222222             ",
+	"              2222              ",
+	"    000        22      00000    ",
+	"  000 00            00000 000   ",
+	"  0    0          0000      00  ",
+	" 00    00       000      00  0  ",
+	" 00    0      000       00   00 ",
+	" 00  000    000        00    00 ",
+	"  0        00          00    0  ",
+	"  00     00             0   00  ",
+	"   0000000              00000   ",
+	"                          00    ",
+	"                                "};
+
+static char **convert_to_xpm[3] = { convert_to_x16, convert_to_x24, convert_to_x32 };
+
diff --git a/app/bin/bitmaps/convertfr.xpm b/app/bin/bitmaps/convertfr.xpm
deleted file mode 100644
index 7f141c8..0000000
--- a/app/bin/bitmaps/convertfr.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */ 
-static char * convertfr_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"!	c #000000000000",
-"#	c #FFFF00000000",
-"$	c #808080000000",
-"  !!!      !!!! ",
-" !!     !!!   !!",
-" !!   !!     !! ",
-"  !!!!  #  !!!  ",
-"        #       ",
-"    ##  #  ##   ",
-"     #######    ",
-"       ###      ",
-"        #       ",
-"                ",
-"      !!!!!!    ",
-"      !!        ",
-"      !!!!      ",
-"      !!        ",
-"      !!        ",
-"                "};
\ No newline at end of file
diff --git a/app/bin/bitmaps/convertto.xpm b/app/bin/bitmaps/convertto.xpm
deleted file mode 100644
index f0fead2..0000000
--- a/app/bin/bitmaps/convertto.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */ 
-static char * convertto_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"!	c #000000000000",
-"#	c #FFFF00000000",
-"$	c #808080000000",
-"  !!!      !!!! ",
-" !!     !!!   !!",
-" !!   !!     !! ",
-"  !!!!  #  !!!  ",
-"       ###      ",
-"     #######    ",
-"    ##  #  ##   ",
-"        #       ",
-"        #       ",
-"                ",
-"      !!!!!!    ",
-"      !!        ",
-"      !!!!      ",
-"      !!        ",
-"      !!        ",
-"                "};
\ No newline at end of file
diff --git a/app/bin/bitmaps/copy.xpm b/app/bin/bitmaps/copy.xpm
new file mode 100644
index 0000000..1812343
--- /dev/null
+++ b/app/bin/bitmaps/copy.xpm
@@ -0,0 +1,95 @@
+static char *copy_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#FFFFFF",
+	"111111111111    ",
+	"1222222222221   ",
+	"1222222222221   ",
+	"1221111111111111",
+	"1221222222222221",
+	"1221222222222221",
+	"1221222222222221",
+	"1221222222222221",
+	"1221222222222221",
+	"1221222222222221",
+	"1221222222222221",
+	"1221222222222221",
+	"1111222222222221",
+	"   1222222222221",
+	"   1222222222221",
+	"   1111111111111"};
+
+static char *copy_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#FFFFFF",
+	" 11111111111111111      ",
+	"1222222222222222221     ",
+	"1222222222222222221     ",
+	"1222222222222222221     ",
+	"12222211111111111111111 ",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	"122221222222222222222221",
+	" 11111222222222222222221",
+	"     1222222222222222221",
+	"     1222222222222222221",
+	"     1222222222222222221",
+	"      11111111111111111 "};
+
+static char *copy_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#FFFFFF",
+	"                                ",
+	" 111111111111111111111111       ",
+	" 122222222222222222222221       ",
+	" 122222222222222222222221       ",
+	" 122222222222222222222221       ",
+	" 122222222222222222222221       ",
+	" 122222111111111111111111111111 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 122222122222222222222222222221 ",
+	" 111111122222222222222222222221 ",
+	"       122222222222222222222221 ",
+	"       122222222222222222222221 ",
+	"       122222222222222222222221 ",
+	"       122222222222222222222221 ",
+	"       111111111111111111111111 ",
+	"                                "};
+
+static char **copy_xpm[3] = { copy_x16, copy_x24, copy_x32 };
+
diff --git a/app/bin/bitmaps/cornu.xpm b/app/bin/bitmaps/cornu.xpm
index bd3a2ed..d1bffcb 100644
--- a/app/bin/bitmaps/cornu.xpm
+++ b/app/bin/bitmaps/cornu.xpm
@@ -1,23 +1,117 @@
-/* XPM */ 
-static char * cornu_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"!	c #000000000000",
-"#	c #FFFF00000000",
-"$	c #808080000000",
-"     !!$!!!!    ",
-"   !!  $    !!  ",
-"  !!   $!!!  $$$",
-"  $! !!$   $$ !!",
-" !! $!     !  !!",
-"!! !!     !! !! ",
-"!  !!    $###$  ",
-"$$$$     #   #  ",
-"!  !!     ###   ",
-"!  !!           ",
-"!  !$           ",
-"!!$$!           ",
-"!$  !!          ",
-"$!   $!!!$!!$###",
-" !! $    $  #  #",
-"   $!!!!!$!!$###"}; 
+static char *cornu_x16[] = {
+	"16 16 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#993300",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"       5        ",
+	"    5303022     ",
+	"  8307353733    ",
+	"  03523552566   ",
+	" 8233    84666  ",
+	" 0327      66   ",
+	"8353            ",
+	" 153            ",
+	" 253            ",
+	" 3518           ",
+	" 34528          ",
+	" 832538       6 ",
+	"   3552555753666",
+	"    232523335666",
+	"    85301331246 ",
+	"        7557    "};
+
+static char *cornu_x24[] = {
+	"24 24 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#666600",
+	"5	c	#990000",
+	"6	c	#996600",
+	"7	c	#CC0000",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"A	c	#800000",
+	"                        ",
+	"       9  66009         ",
+	"       300360320        ",
+	"    91069 99 99018      ",
+	"    36  6100023 915     ",
+	"    099038 9 8138777    ",
+	"  92  28      9657 7    ",
+	"  3392          5777    ",
+	"  00339          77     ",
+	" 91826                  ",
+	" 91928                  ",
+	"  0 0                   ",
+	" 61938                  ",
+	" 91963                  ",
+	"  00 19                 ",
+	"  03962                 ",
+	"  93  069               ",
+	"    0 9309           7  ",
+	"    33  3209 9   98A777 ",
+	"    93049 32032330377 7 ",
+	"       32099 8368 98777 ",
+	"       9002308166022A7  ",
+	"          90130160 9    ",
+	"             9  9       "};
+
+static char *cornu_x32[] = {
+	"32 32 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#990000",
+	"5	c	#993300",
+	"6	c	#996600",
+	"7	c	#CC0000",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"A	c	#800000",
+	"                                ",
+	"              9    9            ",
+	"         98000000038            ",
+	"         1300 9   6300          ",
+	"     9 00099  99  9  039        ",
+	"      61   9 033039   60        ",
+	"     029  021086062039 47       ",
+	"     0  80089 9  9 13577477     ",
+	"  9920  28         9917   7     ",
+	"   639 0              7  77     ",
+	"   00966               777      ",
+	"   0  08                        ",
+	"   0  0                         ",
+	" 9869839                        ",
+	"  00 62                         ",
+	"  00  0                         ",
+	"  00 629                        ",
+	" 9669928                        ",
+	"  60  00                        ",
+	"   0   19                       ",
+	"   019932                       ",
+	"   839  0 9                     ",
+	"   930   38                     ",
+	"     00 98009               7   ",
+	"      26   33  9     9 99 4777  ",
+	"     9920  93016 69  903317  77 ",
+	"        008   85010002008 7  77 ",
+	"         8300 9  99  9  997777  ",
+	"         9 00060 99  960220A7   ",
+	"             96000000020089     ",
+	"             9   99  99         ",
+	"                                "};
+
+static char **cornu_xpm[3] = { cornu_x16, cornu_x24, cornu_x32 };
+
diff --git a/app/bin/bitmaps/curve1.xpm b/app/bin/bitmaps/curve1.xpm
deleted file mode 100644
index dd1a295..0000000
--- a/app/bin/bitmaps/curve1.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * curve1_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #000000000000",
-"o	c #861782078617",
-"            .   ",
-"           ...  ",
-"          . . . ",
-"         .  .X .",
-"       X  XX.XX ",
-"       oXXX .X  ",
-"    X XXX XX.XX ",
-"     X  X.  .X .",
-"    XooX X. . . ",
-"   X  X    ...  ",
-" XoX X X    .   ",
-"  XoX           ",
-" X  XX          ",
-" X X            ",
-"XXXXX           ",
-" X X            "};
diff --git a/app/bin/bitmaps/curve2.xpm b/app/bin/bitmaps/curve2.xpm
deleted file mode 100644
index e1ff0c6..0000000
--- a/app/bin/bitmaps/curve2.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * curve2_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000000000",
-"X	c #861782078617",
-"o	c #FFFF00000000",
-"           .   X",
-"          ......",
-"      . .. .   .",
-"      ..  ..... ",
-"     . X.. .  ..",
-"  . .o ..     . ",
-"  X.  o  .      ",
-"  . X. o        ",
-"  . .X  o       ",
-" .  . X  o      ",
-" . .      o     ",
-".....      o   o",
-" . .        o  o",
-" . .         ooo",
-" .  .        ooo",
-"  ....     ooooo"};
diff --git a/app/bin/bitmaps/curve3.xpm b/app/bin/bitmaps/curve3.xpm
deleted file mode 100644
index 97c447b..0000000
--- a/app/bin/bitmaps/curve3.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * curve3_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000000000",
-"X	c #861782078617",
-"o	c #FFFF00000000",
-"           .   X",
-"          ......",
-"      . .. .   .",
-"      ..X ..... ",
-"     .  .. .  ..",
-"  . .ooooo    . ",
-"   .Xooo .      ",
-"  . .ooo        ",
-"  . .o. o       ",
-" .  .o   o      ",
-" . .      o     ",
-" . .       o    ",
-".....       o   ",
-" . .         o  ",
-" .  .         o ",
-"  ....         o"};
diff --git a/app/bin/bitmaps/curve4.xpm b/app/bin/bitmaps/curve4.xpm
deleted file mode 100644
index 0d26396..0000000
--- a/app/bin/bitmaps/curve4.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * curve4_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000000000",
-"X	c #861782078617",
-"o	c #FFFF00000000",
-"           .   X",
-"          ......",
-"      . .. .   .",
-"      ..X ..... ",
-"     .  .. .  ..",
-"  . .ooooo    . ",
-"   .Xooo .      ",
-"  . .ooo        ",
-"  . .o. o      o",
-" .  .o   o    o ",
-" . .      o  o  ",
-" . .       oo   ",
-".....      oo   ",
-" . .      o     ",
-" .  .    o      ",
-"  ....  o       "};
diff --git a/app/bin/bitmaps/curved-chord.xpm b/app/bin/bitmaps/curved-chord.xpm
new file mode 100644
index 0000000..b8c1d9d
--- /dev/null
+++ b/app/bin/bitmaps/curved-chord.xpm
@@ -0,0 +1,109 @@
+static char *curved_chord_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#FF6666",
+	"            2 2 ",
+	"         2 0000 ",
+	"       2 00 2 2 ",
+	"     2 00 2 000 ",
+	"      0 2 002 2 ",
+	"   2 0 2002     ",
+	"    0           ",
+	"  20 2 1111     ",
+	"   020 113      ",
+	" 20  0 1313     ",
+	"  0202 1 313  1 ",
+	" 0  0     31311 ",
+	"20202      311  ",
+	" 0 0       11   ",
+	"20202     11    ",
+	"                "};
+
+static char *curved_chord_x24[] = {
+	"24 24 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#993300",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC3300",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"                     9  ",
+	"                 9100300",
+	"                0130 89 ",
+	"             820089  99 ",
+	"            018   930200",
+	"         9500 99 013059 ",
+	"         135   500 9    ",
+	"      9900 9  039       ",
+	"       53   81  9       ",
+	"       099 019          ",
+	"    9 0  950            ",
+	"    938   39            ",
+	"    029990 766666       ",
+	"    0   38 666666       ",
+	"  953  00  6666         ",
+	"   19990   66 66        ",
+	"  00  559  66  66       ",
+	"  00  0    66   66    66",
+	" 929930          66  66 ",
+	" 3299559          6666  ",
+	" 00  0             66   ",
+	" 00  0            66    ",
+	"9459829          66     ",
+	" 25 539          6      "};
+
+static char *curved_chord_x32[] = {
+	"32 32 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#993300",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"                            8   ",
+	"                      88 000330 ",
+	"                      250000000 ",
+	"                 8  000020  88  ",
+	"                 85000058    8  ",
+	"                00010   8 00130 ",
+	"               00038    3200000 ",
+	"            87000  88 00022  8  ",
+	"            0000    5000088     ",
+	"           00078   003          ",
+	"         8500  88000088         ",
+	"         503    500             ",
+	"         0288  0037             ",
+	"        00 888100 8             ",
+	"     88000  8501                ",
+	"      405   0038                ",
+	"      00888 0076666666          ",
+	"     00   820  66666666         ",
+	"     00   0058 66666            ",
+	"   830    00   66666            ",
+	"    0388800    66 666           ",
+	"   00  8703    66  6666         ",
+	"   00   007    66   6666     66 ",
+	"   00   00     66    6666   6666",
+	" 8505  000      6     6666 6666 ",
+	"  1188831              6666666  ",
+	"  00  5038              66666   ",
+	"  00  000                666    ",
+	"  00  00                666     ",
+	" 503  00               666      ",
+	"850788318             666       ",
+	"  0   00               6        "};
+
+static char **curved_chord_xpm[3] = { curved_chord_x16, curved_chord_x24, curved_chord_x32 };
+
diff --git a/app/bin/bitmaps/curved-end.xpm b/app/bin/bitmaps/curved-end.xpm
new file mode 100644
index 0000000..6c91543
--- /dev/null
+++ b/app/bin/bitmaps/curved-end.xpm
@@ -0,0 +1,107 @@
+static char *curved_end_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#FF6666",
+	"           111  ",
+	"           11   ",
+	"         2 133  ",
+	"       2 0   1  ",
+	"     2 00 2  331",
+	"      0 2 00  11",
+	"   2 0 2002  111",
+	"    0  02       ",
+	"  20 20         ",
+	"   0202         ",
+	" 20  0          ",
+	"  0202          ",
+	" 0  0           ",
+	"20202           ",
+	" 0 0            ",
+	"20202           "};
+
+static char *curved_end_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#666600",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"                        ",
+	"                  66    ",
+	"                 66666  ",
+	"                 6 6    ",
+	"              8    6    ",
+	"              750  66   ",
+	"           85005   66   ",
+	"        8 0130 8    6   ",
+	"        730 88 530  6 6 ",
+	"        058  7015 66666 ",
+	"      70  87035 8  666  ",
+	"      18  532           ",
+	"   870  83078           ",
+	"    35  33              ",
+	"   008850               ",
+	" 881   38               ",
+	"  35880                 ",
+	"  0  53                 ",
+	" 71  05                 ",
+	" 55871                  ",
+	" 00 338                 ",
+	" 0  00                  ",
+	"837835                  ",
+	" 17 35                  "};
+
+static char *curved_end_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#996600",
+	"5	c	#CC0000",
+	"6	c	#CC6600",
+	"7	c	#CC9900",
+	"                                ",
+	"                        555     ",
+	"                       555555   ",
+	"                      55555555  ",
+	"                      55555 5   ",
+	"                      55 55     ",
+	"                   77    55     ",
+	"                   6400  555    ",
+	"               7700367    55    ",
+	"               420  77    55    ",
+	"           7700377  77    55  55",
+	"           743  77  64215 55555 ",
+	"           047   760046 5555555 ",
+	"        740  77  333 77  55555  ",
+	"        636  774037       5555  ",
+	"        1777  347               ",
+	"     7 0  777017                ",
+	"     734   734                  ",
+	"     3477  077                  ",
+	"     0 7772                     ",
+	"  7730   447                    ",
+	"   6377 007                     ",
+	"   047772                       ",
+	"   0   447                      ",
+	" 740   067                      ",
+	" 7447740                        ",
+	"  1677447                       ",
+	"  0   16                        ",
+	"  0   0                         ",
+	" 437 41                         ",
+	"76477637                        ",
+	" 00  42                         "};
+
+static char **curved_end_xpm[3] = { curved_end_x16, curved_end_x24, curved_end_x32 };
+
diff --git a/app/bin/bitmaps/curved-line-chord.xpm b/app/bin/bitmaps/curved-line-chord.xpm
new file mode 100644
index 0000000..779cc67
--- /dev/null
+++ b/app/bin/bitmaps/curved-line-chord.xpm
@@ -0,0 +1,92 @@
+static char *curved_line_chord_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                ",
+	"          0000  ",
+	"        0000    ",
+	"       00       ",
+	"      0         ",
+	"    00          ",
+	"    01111       ",
+	"   0 111        ",
+	"  00 1111       ",
+	"  0  1  11      ",
+	" 00      11   11",
+	" 0        11 11 ",
+	" 0         111  ",
+	" 0         11   ",
+	" 0        11    ",
+	"                "};
+
+static char *curved_line_chord_x24[] = {
+	"24 24 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                        ",
+	"                        ",
+	"                00000   ",
+	"             0000       ",
+	"           000          ",
+	"          00            ",
+	"         00             ",
+	"        0               ",
+	"       0                ",
+	"      0 11111           ",
+	"     00 111             ",
+	"    00  111             ",
+	"    0   1  11           ",
+	"   00   1   11          ",
+	"   0    1    11         ",
+	"  00          11      1 ",
+	"  0            11    1  ",
+	"  0             11  1   ",
+	" 00              111    ",
+	" 00               11    ",
+	" 00              11     ",
+	" 00             11      ",
+	"               11       ",
+	"                        "};
+
+static char *curved_line_chord_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                                ",
+	"                                ",
+	"                       00000    ",
+	"                    00000000    ",
+	"                  000000        ",
+	"                00000           ",
+	"              0000              ",
+	"             000                ",
+	"            000                 ",
+	"          0000                  ",
+	"         000                    ",
+	"        000                     ",
+	"        0011111111              ",
+	"       00011111111              ",
+	"      000  1111                 ",
+	"     000   11111                ",
+	"     00    11 111               ",
+	"    000    11  111              ",
+	"    00     11   111             ",
+	"   000     11    111            ",
+	"   00             111        1  ",
+	"   00              111      111 ",
+	"  000                11    111  ",
+	"  00                  111 111   ",
+	"  00                   11111    ",
+	"  00                    111     ",
+	"  00                   111      ",
+	"  00                  111       ",
+	"  00                 111        ",
+	"                     11         ",
+	"                                ",
+	"                                "};
+
+static char **curved_line_chord_xpm[3] = { curved_line_chord_x16, curved_line_chord_x24, curved_line_chord_x32 };
+
diff --git a/app/bin/bitmaps/curved-line-end.xpm b/app/bin/bitmaps/curved-line-end.xpm
new file mode 100644
index 0000000..0e967ab
--- /dev/null
+++ b/app/bin/bitmaps/curved-line-end.xpm
@@ -0,0 +1,94 @@
+static char *curved_line_end_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                ",
+	"            11  ",
+	"           1111 ",
+	"            11  ",
+	"         00011  ",
+	"       0000 11  ",
+	"     000   1111 ",
+	"    00      11  ",
+	"   00           ",
+	"  00            ",
+	"  0             ",
+	"  0             ",
+	" 00             ",
+	" 00             ",
+	" 00             ",
+	" 0              "};
+
+static char *curved_line_end_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#660000",
+	"2	c	#CC0000",
+	"                        ",
+	"                  2     ",
+	"                 2222   ",
+	"                222222  ",
+	"                  22    ",
+	"                  22    ",
+	"               00012    ",
+	"            00000  2    ",
+	"          000      2    ",
+	"        000      22222  ",
+	"       00         222   ",
+	"      00                ",
+	"     00                 ",
+	"    00                  ",
+	"    0                   ",
+	"   00                   ",
+	"   0                    ",
+	"   0                    ",
+	"  00                    ",
+	"  00                    ",
+	"  0                     ",
+	"  0                     ",
+	"  0                     ",
+	"  0                     "};
+
+static char *curved_line_end_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#660000",
+	"2	c	#CC0000",
+	"                                ",
+	"                                ",
+	"                        222     ",
+	"                       22222    ",
+	"                      2222222   ",
+	"                     22222 22   ",
+	"                        222     ",
+	"                        222     ",
+	"                    0000122     ",
+	"                 0000000 22     ",
+	"              000000     22     ",
+	"            00000        22 22  ",
+	"           0000       22222222  ",
+	"          000         2222222   ",
+	"        0000            2222    ",
+	"        000               2     ",
+	"       000                      ",
+	"      000                       ",
+	"     000                        ",
+	"     00                         ",
+	"    000                         ",
+	"    00                          ",
+	"    00                          ",
+	"   000                          ",
+	"   00                           ",
+	"   00                           ",
+	"   00                           ",
+	"   00                           ",
+	"  000                           ",
+	"  000                           ",
+	"  00                            ",
+	"                                "};
+
+static char **curved_line_end_xpm[3] = { curved_line_end_x16, curved_line_end_x24, curved_line_end_x32 };
+
diff --git a/app/bin/bitmaps/curved-line-middle.xpm b/app/bin/bitmaps/curved-line-middle.xpm
new file mode 100644
index 0000000..fceb7d6
--- /dev/null
+++ b/app/bin/bitmaps/curved-line-middle.xpm
@@ -0,0 +1,95 @@
+static char *curved_line_middle_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#800000",
+	"                ",
+	"           00000",
+	"         0000   ",
+	"       000      ",
+	"      00        ",
+	"     00         ",
+	"    02111       ",
+	"   00111        ",
+	"   0 1111       ",
+	"  00    11      ",
+	"  0      11     ",
+	" 00       11    ",
+	" 00        11   ",
+	" 0           1  ",
+	" 0              ",
+	" 0              "};
+
+static char *curved_line_middle_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#CC0000",
+	"                        ",
+	"                      0 ",
+	"                 000000 ",
+	"              0000      ",
+	"             00         ",
+	"           00           ",
+	"          00            ",
+	"         00             ",
+	"        0               ",
+	"       0                ",
+	"      0022222           ",
+	"     00 222             ",
+	"     0  22 2            ",
+	"    00  22  2           ",
+	"   00        22         ",
+	"   00         22        ",
+	"   0           22       ",
+	"  00            22      ",
+	"  00             22     ",
+	"  0               22    ",
+	"  0                 2   ",
+	"  0                     ",
+	"  0                     ",
+	"                        "};
+
+static char *curved_line_middle_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#800000",
+	"                                ",
+	"                                ",
+	"                        000000  ",
+	"                     000000000  ",
+	"                   000000       ",
+	"                 00000          ",
+	"               00000            ",
+	"              0000              ",
+	"             000                ",
+	"            000                 ",
+	"           000                  ",
+	"          000                   ",
+	"         002                    ",
+	"        000111111               ",
+	"       000 111111               ",
+	"       00  11111                ",
+	"      00   11 111               ",
+	"     000   11  111              ",
+	"     00    11   111             ",
+	"    000          111            ",
+	"    00            111           ",
+	"    00             111          ",
+	"   000              111         ",
+	"   00                111        ",
+	"   00                 1111      ",
+	"  000                   111     ",
+	"  00                     111    ",
+	"  00                      111   ",
+	"  00                       1    ",
+	"  00                            ",
+	"  00                            ",
+	"                                "};
+
+static char **curved_line_middle_xpm[3] = { curved_line_middle_x16, curved_line_middle_x24, curved_line_middle_x32 };
+
diff --git a/app/bin/bitmaps/curved-line-tangent.xpm b/app/bin/bitmaps/curved-line-tangent.xpm
new file mode 100644
index 0000000..e184d3a
--- /dev/null
+++ b/app/bin/bitmaps/curved-line-tangent.xpm
@@ -0,0 +1,98 @@
+static char *curved_line_tangent_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#CC0000",
+	"                ",
+	"           00000",
+	"         0000   ",
+	"       000      ",
+	"      00        ",
+	"     10         ",
+	"    022         ",
+	"   00 22        ",
+	"  00   22       ",
+	"  0     22      ",
+	" 00      22     ",
+	" 00       22  2 ",
+	" 0         22 2 ",
+	" 0          222 ",
+	"00         2222 ",
+	" 0              "};
+
+static char *curved_line_tangent_x24[] = {
+	"24 24 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#660000",
+	"3	c	#CC0000",
+	"                        ",
+	"                        ",
+	"                 000000 ",
+	"               0000     ",
+	"             000        ",
+	"           000          ",
+	"          00            ",
+	"        00              ",
+	"       01               ",
+	"       23               ",
+	"      0  3              ",
+	"     0    3             ",
+	"    00     3            ",
+	"    0       3           ",
+	"   0         33         ",
+	"   0          33        ",
+	"  00           33       ",
+	"  0             33   3  ",
+	" 00              33  3  ",
+	" 00               33 3  ",
+	" 00                333  ",
+	" 00              33333  ",
+	" 0                   3  ",
+	"                        "};
+
+static char *curved_line_tangent_x32[] = {
+	"32 32 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#990000",
+	"3	c	#CC0000",
+	"4	c	#800000",
+	"                                ",
+	"                                ",
+	"                         00000  ",
+	"                      00000000  ",
+	"                   0000000      ",
+	"                 00000          ",
+	"               00000            ",
+	"              0000              ",
+	"             000                ",
+	"            000                 ",
+	"          0000                  ",
+	"         001                    ",
+	"        0043                    ",
+	"        002333                  ",
+	"       00   333                 ",
+	"      000    333                ",
+	"     000      333               ",
+	"     00        333              ",
+	"    000         333             ",
+	"    00           333            ",
+	"   000            333           ",
+	"   00              333          ",
+	"   00               333     3   ",
+	"  00                 333    33  ",
+	"  00                  333   33  ",
+	"  00                   333  33  ",
+	"  00                    333333  ",
+	" 000                      3333  ",
+	" 000                  33333333  ",
+	" 00                   33333333  ",
+	"                                ",
+	"                                "};
+
+static char **curved_line_tangent_xpm[3] = { curved_line_tangent_x16, curved_line_tangent_x24, curved_line_tangent_x32 };
+
diff --git a/app/bin/bitmaps/curved-middle.xpm b/app/bin/bitmaps/curved-middle.xpm
new file mode 100644
index 0000000..70fc4de
--- /dev/null
+++ b/app/bin/bitmaps/curved-middle.xpm
@@ -0,0 +1,108 @@
+static char *curved_middle_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#FF6666",
+	"            2 2 ",
+	"         2 0000 ",
+	"       2 00 2 2 ",
+	"     2 00 2 000 ",
+	"      0 2 002 2 ",
+	"   2 0    2     ",
+	"    0 1111      ",
+	"  20  113       ",
+	"   02 1313      ",
+	" 20   1 313     ",
+	"  0202   313    ",
+	" 0  0     313   ",
+	"20202      313  ",
+	" 0 0        313 ",
+	"20202        31 ",
+	"                "};
+
+static char *curved_middle_x24[] = {
+	"24 24 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#996600",
+	"5	c	#CC0000",
+	"6	c	#CC6600",
+	"7	c	#CC9900",
+	"                     7  ",
+	"                 7   430",
+	"                 4300340",
+	"             7 0026  77 ",
+	"             320  730210",
+	"         7 00077 013037 ",
+	"          41   400 7  7 ",
+	"         037  037       ",
+	"       720  60  7       ",
+	"       167 027          ",
+	"      00 740 7          ",
+	"    743   37            ",
+	"     17740 655555       ",
+	"    00 736  55555       ",
+	"  742  00   555         ",
+	"   26760    5 55        ",
+	"   0  367   5  55       ",
+	"  00  0     5   55      ",
+	"7726720           5     ",
+	"  277277           5    ",
+	" 00  0              5   ",
+	" 00 00               5  ",
+	"7447447               5 ",
+	" 01 34                  "};
+
+static char *curved_middle_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#666600",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC3300",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"                                ",
+	"                            99  ",
+	"                       9  002300",
+	"                       5200038  ",
+	"                 99 00038    9  ",
+	"                  810   9    820",
+	"                 028    8500033 ",
+	"            99 000 99  005   99 ",
+	"             930    9200 99     ",
+	"             059   015          ",
+	"         99 0  9  00 99         ",
+	"         983    920             ",
+	"          399   08              ",
+	"         0 99950  9             ",
+	"     99 0   9938                ",
+	"      935    299                ",
+	"      02999 0 97666666          ",
+	"      0   953  66666666         ",
+	"     00   0299 6666666          ",
+	"  9991    0    666666           ",
+	"    3599 00    6666666          ",
+	"    0  9839    666 6666         ",
+	"   00   0399   666  6666        ",
+	"   00   0            6666       ",
+	" 9919  00              666      ",
+	"  5399928               666     ",
+	"  00  3299               666    ",
+	"  00  00                  666   ",
+	"  0   00                   666  ",
+	"99289 15                    666 ",
+	"990999199                    66 ",
+	"  0   0                         "};
+
+static char **curved_middle_xpm[3] = { curved_middle_x16, curved_middle_x24, curved_middle_x32 };
+
diff --git a/app/bin/bitmaps/curved-tangent.xpm b/app/bin/bitmaps/curved-tangent.xpm
new file mode 100644
index 0000000..6332785
--- /dev/null
+++ b/app/bin/bitmaps/curved-tangent.xpm
@@ -0,0 +1,116 @@
+static char *curved_tangent_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#FF6666",
+	"            2 2 ",
+	"         2 0000 ",
+	"       2 00 2 2 ",
+	"     2 00 2 000 ",
+	"      0 2 002 2 ",
+	"   2 0  002     ",
+	"    0 13        ",
+	"  20  313       ",
+	"   020 313      ",
+	" 20  0  313     ",
+	"  0202   313    ",
+	" 0  0     313 1 ",
+	"20202      3131 ",
+	" 0 0        311 ",
+	"20202      1111 ",
+	"                "};
+
+static char *curved_tangent_x24[] = {
+	"24 24 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#996600",
+	"5	c	#CC0000",
+	"6	c	#CC6600",
+	"7	c	#CC6666",
+	"8	c	#CC9900",
+	"9	c	#CCCCCC",
+	"A	c	#FFCCCC",
+	"B	c	#FFFFFF",
+	"                        ",
+	"                 8  440 ",
+	"                2400340 ",
+	"             830048  8  ",
+	"            014  88  8  ",
+	"         8600 88  80030 ",
+	"          34   80022 4  ",
+	"        00 8   33       ",
+	"       63   81048       ",
+	"       08BA 34          ",
+	"     60  95A0           ",
+	"     26  B755           ",
+	"    00 880B555          ",
+	"   60   43  555         ",
+	"   448  0    555        ",
+	"   0 8830     555       ",
+	"  00  438      555      ",
+	"  10  00        555   5 ",
+	" 828881          555 55 ",
+	"  0 8438          55555 ",
+	" 00  00            5555 ",
+	" 33  23           55555 ",
+	" 448836           55555 ",
+	" 0   0                  "};
+
+static char *curved_tangent_x32[] = {
+	"32 32 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#993300",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC3333",
+	"8	c	#CC6600",
+	"9	c	#CC6666",
+	"A	c	#CC9900",
+	"B	c	#CC9999",
+	"C	c	#FFCCCC",
+	"D	c	#FFFFFF",
+	"                                ",
+	"                           AA   ",
+	"                      AA 003200 ",
+	"                      320005A   ",
+	"                  A0000A    A   ",
+	"                  32   AA   A   ",
+	"                005A   AA   A3  ",
+	"             A 00  AA   A000010 ",
+	"             33     A 0023  A   ",
+	"            00AA    8200A       ",
+	"         A 00  A   018          ",
+	"          33    A500 A          ",
+	"         02AADD 53              ",
+	"        00  D9BD08              ",
+	"      A82  DC76BD               ",
+	"       1AA  DC766               ",
+	"      00 AA  0C666              ",
+	"      0    A3   666             ",
+	"    A1     05A   666            ",
+	"    54A   00      666           ",
+	"    0  AAA0        666          ",
+	"    0    55         666         ",
+	"   00    0           666        ",
+	"   0    00            666    6  ",
+	"  A3AAA 00             666  666 ",
+	"  00 AAA2A              6666666 ",
+	"  00   00                666666 ",
+	"  00   00                 66666 ",
+	"  0    00               6666666 ",
+	" A3AAAA38               6666666 ",
+	"  0    08                       ",
+	"                                "};
+
+static char **curved_tangent_xpm[3] = { curved_tangent_x16, curved_tangent_x24, curved_tangent_x32 };
+
diff --git a/app/bin/bitmaps/cut.xpm b/app/bin/bitmaps/cut.xpm
new file mode 100644
index 0000000..6dcae39
--- /dev/null
+++ b/app/bin/bitmaps/cut.xpm
@@ -0,0 +1,92 @@
+static char *cut_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"                ",
+	"                ",
+	"    1           ",
+	"  1111          ",
+	" 11  11         ",
+	"  1111          ",
+	"    11          ",
+	"     11  11111  ",
+	" 11111111111111 ",
+	" 11111 1111     ",
+	" 1  11  111     ",
+	"  111    111    ",
+	"          111   ",
+	"           111  ",
+	"                ",
+	"                "};
+
+static char *cut_x24[] = {
+	"24 24 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"    1111                ",
+	"   11  11               ",
+	"  111   11              ",
+	"   111  1               ",
+	"    1111                ",
+	"     1111               ",
+	"      1111              ",
+	"        1111  1111111   ",
+	"   11111111111111111111 ",
+	" 111111111111111111111  ",
+	" 1111111   111          ",
+	" 11   11    1111        ",
+	"  11 111     1111       ",
+	"   111        1111      ",
+	"               1111     ",
+	"                 1111   ",
+	"                  111   ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *cut_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"      11111                     ",
+	"     1111111                    ",
+	"    111   111                   ",
+	"   111     11                   ",
+	"   1111   111                   ",
+	"    111111111                   ",
+	"     1111111                    ",
+	"       1111                     ",
+	"        11111                   ",
+	"         11111                  ",
+	"          11111   1111111111    ",
+	"      111111111111111111111111  ",
+	"  1111111111111111111111111111  ",
+	" 111111111111111111             ",
+	" 111    111    1111             ",
+	"  11    111     1111            ",
+	"  111   111      11111          ",
+	"   1111111        11111         ",
+	"    11111           1111        ",
+	"                     1111       ",
+	"                      11111     ",
+	"                       11111    ",
+	"                         111    ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **cut_xpm[3] = { cut_x16, cut_x24, cut_x32 };
+
diff --git a/app/bin/bitmaps/dbench.xpm b/app/bin/bitmaps/dbench.xpm
deleted file mode 100644
index a880329..0000000
--- a/app/bin/bitmaps/dbench.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dbench_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF9A691861",
-"        .XXXX.XX",
-"       .XXXX.XXX",
-"     ..XXX..XXXX",
-"    .XXXX.XXXXXX",
-"   .XXXX.XXXXXXX",
-"  ......XXXXXXXX",
-"  .XXXX.XXXXXXXX",
-"  .XXXX.XXXXXXXX",
-"  .XXXX.XXXXXXX.",
-"  .XXXX.XXXXXX. ",
-"  .XXXX.XXXXX.  ",
-"  .XXXX.XXXX.   ",
-"  .XXXX.XX..    ",
-"  .XXXX.X.      ",
-"  .XXXX..       ",
-"  ......        "};
diff --git a/app/bin/bitmaps/dbezier.xpm b/app/bin/bitmaps/dbezier.xpm
deleted file mode 100644
index 1bf366f..0000000
--- a/app/bin/bitmaps/dbezier.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */ 
-static char * dbezier_xpm[] = {
-"16 16 3 1",
-" 	c None",
-"!	c #000000000000",
-"#	c #FFFF00000000",
-"      ###       ",
-"      # ########",
-"      ###   !!!!",
-"          !!!!  ",
-"        !!!!    ",
-"       !!!      ",
-"      !!!       ",
-"      !!        ",
-"     !!!        ",
-"     !!         ",
-"    !!!         ",
-"   !!!          ",
-"  !!!           ",
-"!!!!   ###      ",
-"######## #      ",
-"       ###      "};
\ No newline at end of file
diff --git a/app/bin/bitmaps/dbox.xpm b/app/bin/bitmaps/dbox.xpm
deleted file mode 100644
index 83dbeec..0000000
--- a/app/bin/bitmaps/dbox.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dbox_xpm[] = {
-"16 16 3 1",
-"X	c None",
-" 	c #000000000000",
-".	c #FFFF00000000",
-"           .....",
-"            XX..",
-"  XXXXXXXXXXX.X.",
-"  XXXXXXXXXX.XX.",
-"  XXXXXXXXX.XX .",
-"  XXXXXXXX.XXX  ",
-"  XXXXXXX.XXXX  ",
-"  XXXXXX.XXXXX  ",
-"  XXXXX.XXXXXX  ",
-"  XXXX.XXXXXXX  ",
-"  XXX.XXXXXXXX  ",
-"  XX.XXXXXXXXX  ",
-"  X.XXXXXXXXXX  ",
-"  .XXXXXXXXXXX  ",
-"..              ",
-"..              "};
diff --git a/app/bin/bitmaps/dcircle1.xpm b/app/bin/bitmaps/dcircle1.xpm
deleted file mode 100644
index a17a56a..0000000
--- a/app/bin/bitmaps/dcircle1.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dcircle1_xpm[] = {
-"16 16 3 1",
-" 	c #None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"     ......     ",
-"    ........    ",
-"  ...      ...  ",
-" .XXXXXXXXXXX.. ",
-" .X         X.. ",
-"..X XXX XXX X ..",
-". X X X X   X ..",
-". X XXX XX  X ..",
-". X   X   X X ..",
-". X   X   X X ..",
-"..X   X XX  X ..",
-" .X         X.. ",
-" .XXXXXXXXXXX.. ",
-"  ...      ...  ",
-"    ........    ",
-"     ......     "};
diff --git a/app/bin/bitmaps/dcircle2.xpm b/app/bin/bitmaps/dcircle2.xpm
deleted file mode 100644
index 36e4763..0000000
--- a/app/bin/bitmaps/dcircle2.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dcircle2_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"     ......     ",
-"    ........    ",
-"  ...      ...  ",
-" ...         .. ",
-" ..           . ",
-"..            ..",
-"..            ..",
-"..     XXXXX  ..",
-"..     XX     ..",
-"..     X X    ..",
-"..     X  X   ..",
-" ..    X   X  . ",
-" ...        X.. ",
-"  ...       .X  ",
-"    .........   ",
-"     ......     "};
diff --git a/app/bin/bitmaps/dcircle3.xpm b/app/bin/bitmaps/dcircle3.xpm
deleted file mode 100644
index ec0dc1f..0000000
--- a/app/bin/bitmaps/dcircle3.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dcircle3_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"     ......     ",
-"    ........    ",
-"  ...      ...  ",
-" ..          .. ",
-" ..           . ",
-"..            ..",
-"..            ..",
-"..     XX     ..",
-"..     XX   X ..",
-"..       X  X ..",
-"..        X X ..",
-" .         XX . ",
-" ..     XXXXX.. ",
-"  ...      ...  ",
-"    ........    ",
-"     ......     "};
diff --git a/app/bin/bitmaps/dcurve1.xpm b/app/bin/bitmaps/dcurve1.xpm
deleted file mode 100644
index 286e8bc..0000000
--- a/app/bin/bitmaps/dcurve1.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dcurve1_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #000000000000",
-"            .   ",
-"           ...  ",
-"          . . . ",
-"         .  .  .",
-"         XXX.X  ",
-"        XXXX.X  ",
-"      XXX   .   ",
-"     XXX .  .   ",
-"    XXX   . . . ",
-"   XXX     ...  ",
-"  XXX       .   ",
-"  XX            ",
-" XXX            ",
-" XX             ",
-" XX             ",
-" XX             "};
diff --git a/app/bin/bitmaps/dcurve2.xpm b/app/bin/bitmaps/dcurve2.xpm
deleted file mode 100644
index 2714d5e..0000000
--- a/app/bin/bitmaps/dcurve2.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dcurve2_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"          ..... ",
-"        ........",
-"      ....    ..",
-"     ...       .",
-"    .X.         ",
-"   ...X         ",
-"  ...  X        ",
-"  ..    X       ",
-" ...     X      ",
-" ..       X     ",
-" ..        X   X",
-" ..         X  X",
-" ..          X X",
-" ..           XX",
-"  ..       XXXXX"};
diff --git a/app/bin/bitmaps/dcurve3.xpm b/app/bin/bitmaps/dcurve3.xpm
deleted file mode 100644
index c452ffd..0000000
--- a/app/bin/bitmaps/dcurve3.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dcurve3_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"          ..... ",
-"        ........",
-"      ....     .",
-"     ...        ",
-"    .XXXXXX     ",
-"   ..XXX        ",
-"  .. XXX        ",
-"  .. X  X       ",
-" ... X   X      ",
-" ..  X    X     ",
-" ..        X    ",
-" ..         X   ",
-" ..          X  ",
-" ..           XX",
-"  ..          XX"};
diff --git a/app/bin/bitmaps/dcurve4.xpm b/app/bin/bitmaps/dcurve4.xpm
deleted file mode 100644
index 2474481..0000000
--- a/app/bin/bitmaps/dcurve4.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dcurve4_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"          ..... ",
-"        ........",
-"      ....    ..",
-"     ...        ",
-"    .XXXXXX     ",
-"   ..XXX        ",
-"  .. XXX        ",
-"  .. X  X      .",
-" ..  X   X    . ",
-" ..  X    X  .  ",
-" ..        X.   ",
-" ..        .X   ",
-" ..       .     ",
-" ..      .      ",
-"  ..    .       "};
diff --git a/app/bin/bitmaps/ddimlin.xpm b/app/bin/bitmaps/ddimlin.xpm
deleted file mode 100644
index 3980e44..0000000
--- a/app/bin/bitmaps/ddimlin.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * ddimlin_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #000000000000",
-"           .....",
-"              ..",
-"             . .",
-"            .  .",
-"           .   .",
-"      X  XXX    ",
-"     X X X      ",
-"      XX XX     ",
-"       X   X    ",
-"     XX  XX     ",
-"     .          ",
-".   .           ",
-".  .            ",
-". .             ",
-"..              ",
-".....           "};
diff --git a/app/bin/bitmaps/delete.xpm b/app/bin/bitmaps/delete.xpm
index 63b875a..9002046 100644
--- a/app/bin/bitmaps/delete.xpm
+++ b/app/bin/bitmaps/delete.xpm
@@ -1,22 +1,114 @@
-/* XPM */
-static char * delete_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FF0000",
-"+	c #000000",
-" ..          .. ",
-"  ..        ..  ",
-"   ..      ..   ",
-"    ..    ..    ",
-"  +  ..  ..  +  ",
-"++++++....++++++",
-"  +   +..+   +  ",
-"  +   +..+   +  ",
-"  +   ....   +  ",
-"+++++..++..+++++",
-"  + ..    .. +  ",
-"   ..      ..   ",
-"  ..        ..  ",
-" ..          .. ",
-"..            ..",
-"                "};
+static char *delete_x16[] = {
+	"16 16 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#990000",
+	"3	c	#CC0000",
+	"4	c	#CC3300",
+	"5	c	#CC6600",
+	"6	c	#CC9900",
+	"7	c	#800000",
+	"                ",
+	"                ",
+	"   33      33   ",
+	"    33    333   ",
+	"     33  333    ",
+	" 6 6 533534 6 6 ",
+	"0000007333100000",
+	" 6 6 663346 6 6 ",
+	" 6 6 663356 6 6 ",
+	"0000007332000000",
+	" 6 6 633435 6 6 ",
+	"     333 33     ",
+	"    333   33    ",
+	"    33    333   ",
+	"           3    ",
+	"                "};
+
+static char *delete_x24[] = {
+	"24 24 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#663300",
+	"3	c	#993300",
+	"4	c	#996600",
+	"5	c	#CC0000",
+	"6	c	#CC3300",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"9	c	#800000",
+	"                        ",
+	"                        ",
+	"                        ",
+	"     555        555     ",
+	"     5555       555     ",
+	"      5555     555      ",
+	"       5555   5555      ",
+	"        555  5555       ",
+	"  8  8  75557556  8  8  ",
+	"01200200295555520020021 ",
+	" 47  7  74555567  7  74 ",
+	"  8  8  8 555578  8  8  ",
+	"  8  8  8 5555 8  8  8  ",
+	" 47  7  74555537  7  74 ",
+	"012002002255555200200210",
+	"  8  8  85556557  8  8  ",
+	"        5555 555        ",
+	"        555   555       ",
+	"       555    5555      ",
+	"      555      5555     ",
+	"      555       555     ",
+	"       5         5      ",
+	"                        ",
+	"                        "};
+
+static char *delete_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#663300",
+	"3	c	#990000",
+	"4	c	#993300",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC3300",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"                                ",
+	"                                ",
+	"                                ",
+	"        6              6        ",
+	"       666            666       ",
+	"      66666          66666      ",
+	"       66666        66666       ",
+	"        66666       6666        ",
+	"         66666     6666         ",
+	"          66666   66666         ",
+	"           66666 66666          ",
+	"  99  99   9766686667   99  99  ",
+	" 055005510254666666651025500550 ",
+	" 055005510255366666751025500550 ",
+	"  99  99   99 6666699   99  99  ",
+	"  99  99   99 6666699   99  99  ",
+	"  99  99   99 6666699   99  99  ",
+	"  99  99   99 6666699   99  99  ",
+	" 055005510255666666551025500550 ",
+	" 055005510254666666751025500550 ",
+	"  99  99   9766686668   99  99  ",
+	"           66666 6666           ",
+	"           6666   6666          ",
+	"          6666    66666         ",
+	"         66666     66666        ",
+	"        66666       66666       ",
+	"        6666         66666      ",
+	"       6666           666       ",
+	"         66            6        ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **delete_xpm[3] = { delete_x16, delete_x24, delete_x32 };
+
diff --git a/app/bin/bitmaps/describe.xpm b/app/bin/bitmaps/describe.xpm
index e5506a5..1cbeb20 100644
--- a/app/bin/bitmaps/describe.xpm
+++ b/app/bin/bitmaps/describe.xpm
@@ -1,22 +1,111 @@
-/* XPM */
-static char * describe_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #000000000000",
-"    ......      ",
-"   ...  ...     ",
-"  ...    ...    ",
-"  ...     ...   ",
-"  ...     ...   ",
-" X   X    ... X ",
-"XXXXXXXX  ... XX",
-" X   X   ...  X ",
-" X     ....   X ",
-" X    ...     X ",
-"XXXX ...  XXXXXX",
-" X   ...  X   X ",
-"     ...        ",
-"                ",
-"     ...        ",
-"     ...        "};
+static char *describe_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#FF6666",
+	"                ",
+	"     331133     ",
+	"    31111113    ",
+	"    113  311    ",
+	"          11    ",
+	" 2 2 2  3113  2 ",
+	"000000 3113 0000",
+	" 2 2 2 113  2 2 ",
+	" 2 2 2 11 2 2 2 ",
+	"000000 11 000000",
+	" 2 2 2 11 2 2 2 ",
+	"                ",
+	"       11       ",
+	"       11       ",
+	"                ",
+	"                "};
+
+static char *describe_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#660000",
+	"3	c	#663300",
+	"4	c	#990000",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"                        ",
+	"                        ",
+	"                        ",
+	"        66666666        ",
+	"       6666666666       ",
+	"       66666666666      ",
+	"      6666    6666      ",
+	"       66     6666      ",
+	"              6666      ",
+	"  8  8  88  66666 8  88 ",
+	" 00000000046666620000000",
+	"  8  8  88666667  8  88 ",
+	"  8  8  886666 8  8  88 ",
+	"  8  8  886666 8  8  88 ",
+	" 1500510536664150051053 ",
+	" 1500510536664150051053 ",
+	"  8  8  8 6666 8  8  8  ",
+	"          666           ",
+	"           6            ",
+	"           66           ",
+	"          666           ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *describe_x32[] = {
+	"32 32 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#990000",
+	"5	c	#993300",
+	"6	c	#996600",
+	"7	c	#CC0000",
+	"8	c	#CC3300",
+	"9	c	#CC6600",
+	"A	c	#CC9900",
+	"B	c	#800000",
+	"                                ",
+	"                                ",
+	"                                ",
+	"              7777              ",
+	"           7777777777           ",
+	"          777777777777          ",
+	"         77777777777777         ",
+	"         77777    77777         ",
+	"         7777      77777        ",
+	"         7777      77777        ",
+	"          77       7777         ",
+	"                  77777         ",
+	"  AA  AA   AA    777777 AA  AA  ",
+	" 066006630266B77777777106600660 ",
+	" 066006630266B77777785006600660 ",
+	"  AA  AA   AA 777778AA  AA  AA  ",
+	"  AA  AA   AA 7777 AAA  AA  AA  ",
+	"  AA  AA   AA 7777 AAA  AA  AA  ",
+	"  AA  AA   AA 7777 AAA  AA  AA  ",
+	" 033003320133B77770232003300330 ",
+	"  99  696 39947777 696  99  99  ",
+	"  AA  AA   AA 7777 AAA  AA  AA  ",
+	"              7777              ",
+	"              7777              ",
+	"               7                ",
+	"               77               ",
+	"              7777              ",
+	"              7777              ",
+	"               77               ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **describe_xpm[3] = { describe_x16, describe_x24, describe_x32 };
+
diff --git a/app/bin/bitmaps/description.xpm b/app/bin/bitmaps/description.xpm
new file mode 100644
index 0000000..47941b0
--- /dev/null
+++ b/app/bin/bitmaps/description.xpm
@@ -0,0 +1,101 @@
+static char *description_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#0099FF",
+	"3	c	#FF0000",
+	"                ",
+	"00  000  00  00 ",
+	"0 0 0   0   0   ",
+	"0 0 00   0  0   ",
+	"0 0 0     0 0   ",
+	"00  000 00   00 ",
+	"       3        ",
+	"      333       ",
+	"     33333      ",
+	"       3        ",
+	" 2 2 2 3 2 2 2  ",
+	" 11111 3 11111  ",
+	" 2 2 2   2 2 2  ",
+	" 1111111111111  ",
+	" 2 2 2 2 2 2 2  ",
+	"                "};
+
+static char *description_x24[] = {
+	"24 24 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#0099FF",
+	"3	c	#FF0000",
+	"                        ",
+	"                        ",
+	"                        ",
+	"  000  0000  000  00    ",
+	"  0  0 0    0    0  0   ",
+	"  0  0 000   00  0      ",
+	"  0  0 0       0 0  0   ",
+	"  000  0000 000   00    ",
+	"                        ",
+	"           33           ",
+	"          3333          ",
+	"         333333         ",
+	"           33           ",
+	"           33           ",
+	"  2  2  2  33 2  2  2   ",
+	" 111111111 33 11111111  ",
+	"  2  2  2  33 2  2  2   ",
+	"  2  2  2  33 2  2  2   ",
+	"  2  2  2     2  2  2   ",
+	" 111111111111111111111  ",
+	"  2  2  2  2  2  2  2   ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *description_x32[] = {
+	"32 32 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0000CC",
+	"2	c	#0033CC",
+	"3	c	#0066CC",
+	"4	c	#0066FF",
+	"5	c	#0099FF",
+	"6	c	#CC0000",
+	"                                ",
+	"   0000    00000  000    000    ",
+	"   000000  00000 00000  00000   ",
+	"   00  000 00    00    00       ",
+	"   00   00 00000 0000  00       ",
+	"   00  000 00     0000 00       ",
+	"   00 000  00    0  00 000  0   ",
+	"   000000  00000 00000  00000   ",
+	"                                ",
+	"               66               ",
+	"              6666              ",
+	"             666666             ",
+	"            66666666            ",
+	"             6 66 66            ",
+	"               66               ",
+	"               66               ",
+	"               66               ",
+	"               66               ",
+	"               66               ",
+	"               66               ",
+	"                                ",
+	"  55   5   5   55   5   5   55  ",
+	"  55  35   53  55  35   53  45  ",
+	" 111111111111111111111111111111 ",
+	"  55  35   53  55  35   53  45  ",
+	"  55   5   5   55   5   5   55  ",
+	"  55   5   5   55   5   5   55  ",
+	"  55  35   53  55  35   53  45  ",
+	" 111111111111111111111111111111 ",
+	" 133112311133113311231113311331 ",
+	"  55   5   5   55   5   5   55  ",
+	"                                "};
+
+static char **description_xpm[3] = { description_x16, description_x24, description_x32 };
+
diff --git a/app/bin/bitmaps/dfilbox.xpm b/app/bin/bitmaps/dfilbox.xpm
deleted file mode 100644
index 4d78c26..0000000
--- a/app/bin/bitmaps/dfilbox.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dfilbox_xpm[] = {
-"16 16 4 1",
-"o	c None",
-" 	c #000000000000",
-".	c #FFFF00000000",
-"X	c #0000FFFFFFFF",
-"           .....",
-" XXXXXXXXXXXXX..",
-" XXXXXXXXXXXX.X.",
-" XXXXXXXXXXX.XX.",
-" XXXXXXXXXX.XXX.",
-" XXXXXXXXX.XXXX ",
-" XXXXXXXX.XXXXX ",
-" XXXXXXX.XXXXXX ",
-" XXXXXX.XXXXXXX ",
-" XXXXX.XXXXXXXX ",
-" XXXX.XXXXXXXXX ",
-" XXX.XXXXXXXXXX ",
-" XX.XXXXXXXXXXX ",
-" X.XXXXXXXXXXXX ",
-"..XXXXXXXXXXXXX ",
-"..              "};
diff --git a/app/bin/bitmaps/dfilpoly.xpm b/app/bin/bitmaps/dfilpoly.xpm
deleted file mode 100644
index 56a62ee..0000000
--- a/app/bin/bitmaps/dfilpoly.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dfilpoly_xpm[] = {
-"16 16 4 1",
-"X	c None",
-" 	c #FFFF00000000",
-".	c #000000000000",
-"o	c #0000FFFFFFFF",
-" ..... XXXXXXXXX",
-".oooooo..... XXX",
-".ooooooooo..XXXX",
-".oooooooo.XXXXXX",
-".oooooo..XXXXXXX",
-".ooooo.XXXXXXXXX",
-".oooo.XXXXXXXXXX",
-".oooo .XXXXXXXXX",
-".oooooo..... XXX",
-" oooooooooooo.. ",
-"X.oooooooooooo.X",
-"X.oooooooooo..XX",
-"XX.oooooooo.XXXX",
-"XXX.oooooo.XXXXX",
-"XXX.oooo..XXXXXX",
-"XXXX .. XXXXXXXX"};
diff --git a/app/bin/bitmaps/dflcrcl1.xpm b/app/bin/bitmaps/dflcrcl1.xpm
deleted file mode 100644
index 404660d..0000000
--- a/app/bin/bitmaps/dflcrcl1.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dflcrcl1_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"     ......     ",
-"    .. . . .    ",
-"  . . . . . ..  ",
-" .XXXXXXXXXXX.. ",
-" .X         X . ",
-". X XXX XXX X. .",
-"..X X X X   X ..",
-". X XXX XX  X. .",
-"..X   X   X X ..",
-". X   X   X X. .",
-"..X   X XX  X ..",
-". X         X.. ",
-" .XXXXXXXXXXX . ",
-"  .. . . . ...  ",
-"    . . . ..    ",
-"     ......     "};
diff --git a/app/bin/bitmaps/dflcrcl2.xpm b/app/bin/bitmaps/dflcrcl2.xpm
deleted file mode 100644
index c02d1ea..0000000
--- a/app/bin/bitmaps/dflcrcl2.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dflcrcl2_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000000000",
-"X	c #0000FFFFFFFF",
-"o	c #FFFF00000000",
-"     ......     ",
-"    .XXXXXX.    ",
-"  ..XXXXXXXX..  ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-".XXXXXXXXXXXXXX.",
-".XXXXXXXXXXXXXX.",
-".XXXXXXoooooXXX.",
-".XXXXXXooXXXXXX.",
-".XXXXXXoXoXXXXX.",
-".XXXXXXoXXoXXXX.",
-" .XXXXXoXXXoXX. ",
-" .XXXXXXXXXXoX. ",
-"  ..XXXXXXXXXo  ",
-"    .XXXXXX..   ",
-"     ......     "};
diff --git a/app/bin/bitmaps/dflcrcl3.xpm b/app/bin/bitmaps/dflcrcl3.xpm
deleted file mode 100644
index e1bd80a..0000000
--- a/app/bin/bitmaps/dflcrcl3.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dflcrcl3_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000000000",
-"X	c #0000FFFFFFFF",
-"o	c #FFFF00000000",
-"     ......     ",
-"    .XXXXXX.    ",
-"  ..XXXXXXXX..  ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-".XXXXXXXXXXXXXX.",
-".XXXXXXXXXXXXXX.",
-".XXXXXXooXXXXXX.",
-".XXXXXXooXXXoXX.",
-".XXXXXXXXoXXoXX.",
-".XXXXXXXXXoXoXX.",
-" .XXXXXXXXXooX. ",
-" .XXXXXXoooooX. ",
-"  ..XXXXXXXX..  ",
-"    .XXXXXX.    ",
-"     ......     "};
diff --git a/app/bin/bitmaps/dimension.xpm b/app/bin/bitmaps/dimension.xpm
new file mode 100644
index 0000000..faceac6
--- /dev/null
+++ b/app/bin/bitmaps/dimension.xpm
@@ -0,0 +1,94 @@
+static char *dimension_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#999999",
+	"            1111",
+	"             111",
+	"            1111",
+	"           111 1",
+	"           11   ",
+	"    002 200     ",
+	"      0 0       ",
+	"     02 002     ",
+	"      0 0 0     ",
+	"    002 202     ",
+	"                ",
+	"   11           ",
+	"1 111           ",
+	"1111            ",
+	"111             ",
+	"1111            "};
+
+static char *dimension_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"                        ",
+	"                 222222 ",
+	"                  22222 ",
+	"                   22222",
+	"                  222222",
+	"                 222  22",
+	"                222   2 ",
+	"                22      ",
+	"                2       ",
+	"       000  0000        ",
+	"       0 00 0  0        ",
+	"        00 0000         ",
+	"         0000 00        ",
+	"       0  0 0  0        ",
+	"       0000 0000        ",
+	"        0    0          ",
+	"      22                ",
+	" 22  222                ",
+	" 22 222                 ",
+	" 22222                  ",
+	" 2222                   ",
+	" 222222                 ",
+	" 222222                 ",
+	"                        "};
+
+static char *dimension_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                                ",
+	"                        1111111 ",
+	"                       11111111 ",
+	"                        1111111 ",
+	"                          11111 ",
+	"                         111111 ",
+	"                        1111 11 ",
+	"                       1111  11 ",
+	"                      1111   11 ",
+	"                     1111       ",
+	"                     111        ",
+	"                                ",
+	"         00000  00000           ",
+	"         00 00  00 00           ",
+	"            00 00               ",
+	"           000 000000           ",
+	"           000 00  00           ",
+	"             0000  00           ",
+	"         00  00 0  00           ",
+	"         00000  00000           ",
+	"           0     00             ",
+	"         11                     ",
+	"  1     111                     ",
+	" 111   1111                     ",
+	" 111  1111                      ",
+	" 111 1111                       ",
+	" 1111111                        ",
+	" 111111                         ",
+	" 11111111                       ",
+	"  11111111                      ",
+	"  11111111                      ",
+	"                                "};
+
+static char **dimension_xpm[3] = { dimension_x16, dimension_x24, dimension_x32 };
+
diff --git a/app/bin/bitmaps/dline.xpm b/app/bin/bitmaps/dline.xpm
deleted file mode 100644
index 2105dad..0000000
--- a/app/bin/bitmaps/dline.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dline_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #000000000000",
-"           .....",
-"              ..",
-"             . .",
-"            .  .",
-"           .   .",
-"          .     ",
-"        X.      ",
-"       XXX      ",
-"      XXX       ",
-"     XXX        ",
-"    XXX         ",
-"   XXX          ",
-"  XXX           ",
-" XXX            ",
-"XXX             ",
-"XX              "};
diff --git a/app/bin/bitmaps/doc-export-bmap.xpm b/app/bin/bitmaps/doc-export-bmap.xpm
new file mode 100644
index 0000000..543cc1a
--- /dev/null
+++ b/app/bin/bitmaps/doc-export-bmap.xpm
@@ -0,0 +1,162 @@
+static char *doc_export_bmap_x16[] = {
+	"16 16 23 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#333333",
+	"3	c	#336666",
+	"4	c	#336699",
+	"5	c	#3399CC",
+	"6	c	#663333",
+	"7	c	#666633",
+	"8	c	#666666",
+	"9	c	#669933",
+	"A	c	#6699CC",
+	"B	c	#996633",
+	"C	c	#996666",
+	"D	c	#999966",
+	"E	c	#999999",
+	"F	c	#CC0000",
+	"G	c	#CC9966",
+	"H	c	#CC9999",
+	"I	c	#CCCC99",
+	"J	c	#CCCCCC",
+	"K	c	#FFCCCC",
+	"L	c	#808080",
+	"2888888888872   ",
+	"8KH2788881JI2   ",
+	"8DIJKEJKKKHI2   ",
+	"8E99I8KKKKK82   ",
+	"8I99DHKKKKK22   ",
+	"8CII7JKKKKKHF   ",
+	"8J2K7JKKKKKKFF  ",
+	"8KKD2KKKIHHGFFFF",
+	"4LKK0KKKHHHGFFFF",
+	"4AAK2KKKKKKKFF  ",
+	"4AAH2KIHHHK8F   ",
+	"4AA32KCBBBI02   ",
+	"4AA4LKCBBBI62   ",
+	"4AAAKDIHHHKH2   ",
+	"4AAAKK88C2EI2   ",
+	"45558EEEEEED2   "};
+
+static char *doc_export_bmap_x24[] = {
+	"24 24 30 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003333",
+	"3	c	#330000",
+	"4	c	#333300",
+	"5	c	#333333",
+	"6	c	#336699",
+	"7	c	#339933",
+	"8	c	#3399CC",
+	"9	c	#663333",
+	"A	c	#666633",
+	"B	c	#666666",
+	"C	c	#666699",
+	"D	c	#669933",
+	"E	c	#6699CC",
+	"F	c	#996633",
+	"G	c	#996666",
+	"H	c	#999966",
+	"I	c	#999999",
+	"J	c	#CC0000",
+	"K	c	#CC3333",
+	"L	c	#CC6666",
+	"M	c	#CC9966",
+	"N	c	#CC9999",
+	"O	c	#CCCC99",
+	"P	c	#CCCCCC",
+	"Q	c	#FFCC99",
+	"R	c	#FFCCCC",
+	"S	c	#808080",
+	"3000000000000000005     ",
+	"5RRRROOOOOOOOPRRRP5     ",
+	"5RRN5SSNNNNNNB5IRP5     ",
+	"5RGNRRRRORRRRRROBP5     ",
+	"5OSOHOROBRRRRRRRGO5     ",
+	"5BR77DOBORRRRRRROI5     ",
+	"5AOD7DOBRRRRRRRROS5     ",
+	"5BRODHINRRRRRRRRP5      ",
+	"5OHRRRHNRRRRRRRRRP J    ",
+	"5RI9PRHNRRRRRRRRRRJJJ   ",
+	"5RRRAIGORRRRRRRRRR JJJJ ",
+	"5RRRRHBORRRRQLLLLKJJJJJJ",
+	"5SORRR0ORRRRQLLLLKJJJJJJ",
+	"5EEBRR4ORRRRRRRRRR JJJJ ",
+	"5EEECRBPRRRRRRRRRRJJJ   ",
+	"5EEE8RBPRRRRRRRRPG J    ",
+	"5EEEENGPRO9999FRR5      ",
+	"5EEEEHGPRNFMMMFPRB5     ",
+	"5EEEESONRNFMMMFPOH5     ",
+	"5EEEECR9RO9999FRIN5     ",
+	"5EEEE6RIBRRRRRRR4P5     ",
+	"5EEEE8RRO3BNNNB0PP5     ",
+	"5EEEEEIRRRROOOPRRP5     ",
+	"2111110BBBBBBBBBBB5     "};
+
+static char *doc_export_bmap_x32[] = {
+	"32 32 26 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#336666",
+	"4	c	#336699",
+	"5	c	#339933",
+	"6	c	#339999",
+	"7	c	#3399CC",
+	"8	c	#663333",
+	"9	c	#666633",
+	"A	c	#666666",
+	"B	c	#669933",
+	"C	c	#669966",
+	"D	c	#6699CC",
+	"E	c	#996633",
+	"F	c	#996666",
+	"G	c	#999966",
+	"H	c	#999999",
+	"I	c	#CC0000",
+	"J	c	#CC9966",
+	"K	c	#CC9999",
+	"L	c	#CCCC99",
+	"M	c	#CCCCCC",
+	"N	c	#FFCCCC",
+	"O	c	#808080",
+	"2000000000000000000000002       ",
+	"0NNNNNNNNNNNNNNNNNNNNNNN0       ",
+	"0NNNNMHFFFFFFFFFFOHLNNNN0       ",
+	"0NNNH2GKKKLLLLLLLKH9ALNN0       ",
+	"0NNFAMNNNNNMNNNNNNNNK2LN0       ",
+	"0NHANNLNNNLANNNNNNNNNHAN0       ",
+	"0N2LG5BLNNALNNNNNNNNNN2M0       ",
+	"0KANB55BMKHNNNNNNNNNNNAL0       ",
+	"0KOLB55BN9MNNNNNNNNNNNFK0       ",
+	"0LANLBBCL9NNNNNNNNNNNNFA2       ",
+	"0M2MNLMNKGNNNNNNNNNNNNKA        ",
+	"0NAHNNNNKGNNNNNNNNNNNNNN II     ",
+	"0NLAALNNKGNNNNNNNNNNNNN IIII    ",
+	"0NNNK2HNHHNNNNNNNNNNNNN  IIII   ",
+	"0NNNNMFAHHNNNNNNNNNNNNN   IIIII ",
+	"0NNNNNNGAHNNNNNNNIIIIIIIIIIIIIII",
+	"13LNNNNN2GNNNNNNNIIIIIIIIIIIIIII",
+	"1DD3KNNNAFNNNNNNNNNNNNN   IIIII ",
+	"1DDDDHNNGHNNNNNNNNNNNNN  IIII   ",
+	"1DDDDDKNHHNNNNNNNNNNNNN IIII    ",
+	"1DDDDDANHHNNNNNNNNNNNNM  II     ",
+	"1DDDDD4MHHNNNKKKKKKKNNH2        ",
+	"1DDDDD7LHHNNMEEEEEE8NNGF2       ",
+	"1DDDDDDLHGNNMEJJJJJ8NNGK0       ",
+	"1DDDDDDKL8NNMEJJJJJ8NNFK0       ",
+	"1DDDDDDHN2LNMEEEEEE8NNAL0       ",
+	"1DDDDDDANHANNKKKKKKLNL2M0       ",
+	"1DDDDDD3NNAFMNNNNNNNMAHN0       ",
+	"1DDDDDD6LNNH2FKLLLLH2ONN0       ",
+	"1DDDDDDDKNNNMKFAAAAGLNNN0       ",
+	"1DDDDDDD3NNNNNNNNNNNNNNN0       ",
+	"122222222AAAAAAAAAAAAAAA0       "};
+
+static char **doc_export_bmap_xpm[3] = { doc_export_bmap_x16, doc_export_bmap_x24, doc_export_bmap_x32 };
+
diff --git a/app/bin/bitmaps/doc-export-dxf.xpm b/app/bin/bitmaps/doc-export-dxf.xpm
new file mode 100644
index 0000000..7ac2c54
--- /dev/null
+++ b/app/bin/bitmaps/doc-export-dxf.xpm
@@ -0,0 +1,100 @@
+static char *doc_export_dxf_x16[] = {
+	"16 16 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#993333",
+	"3	c	#996666",
+	"4	c	#CC0000",
+	"5	c	#CC3333",
+	"1111111111111   ",
+	"11 11 11 11 1   ",
+	"1  1  1  1  1   ",
+	"1111111111111   ",
+	"11 11 11 11 1   ",
+	"1  1  1  1  2   ",
+	"11111111111144  ",
+	"11 11 112325 44 ",
+	"1  1  1 44444444",
+	"11111111111144  ",
+	"1  1  1  1  4   ",
+	"1  1  1  1  1   ",
+	"1111111111111   ",
+	"1  1  1  1  1   ",
+	"1  1  1  1  1   ",
+	"1111111111111   "};
+
+static char *doc_export_dxf_x24[] = {
+	"24 24 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#996666",
+	"3	c	#CC0000",
+	"11111111111111111111    ",
+	"11111111111111111111    ",
+	"11   1   11   1   11    ",
+	"11   1   11   1   11    ",
+	"11   1   11   1   11    ",
+	"11111111111111111111    ",
+	"11   1   11   1   11    ",
+	"11   1   11   1   1     ",
+	"11   1   11   1   33    ",
+	"111111111111111112333   ",
+	"11111111111111111  333  ",
+	"11   1   11 33333333333 ",
+	"11   1   11 33333333333 ",
+	"11   1   11   1    333  ",
+	"111111111111111112333   ",
+	"11   1   11   1   33    ",
+	"11   1   11   1   1     ",
+	"11   1   11   1   11    ",
+	"11111111111111111111    ",
+	"11   1   11   1   11    ",
+	"11   1   11   1   11    ",
+	"11   1   11   1   11    ",
+	"11   1   11   1   11    ",
+	"11111111111111111111    "};
+
+static char *doc_export_dxf_x32[] = {
+	"32 32 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#993333",
+	"3	c	#CC0000",
+	" 1    11    11    11    11      ",
+	"11111111111111111111111111      ",
+	" 1     1     1    11    11      ",
+	" 1     1     1    11    11      ",
+	" 1     1     1    11    11      ",
+	" 1     1     1    11    11      ",
+	" 1    11    11    11    11      ",
+	"11111111111111111111111111      ",
+	" 1     1     1    11    11      ",
+	" 1     1     1    11    11      ",
+	" 1     1     1    11            ",
+	" 1     1     1    11    33      ",
+	" 1    11    11    11    333     ",
+	"11111111111111111111111 33333   ",
+	" 1     1     1     1      3333  ",
+	" 1     1     1  333333333333333 ",
+	" 1     1     1  333333333333333 ",
+	" 1     1     1    32     33333  ",
+	" 1    11    11    11     3333   ",
+	"1111111111111111111111123333    ",
+	" 1     1     1     1    33      ",
+	" 1     1     1     1            ",
+	" 1     1     1     1    11      ",
+	" 1     1     1     1    11      ",
+	"11111111111111111111111111      ",
+	"11111111111111111111111111      ",
+	" 1     1     1     1    11      ",
+	" 1     1     1     1    11      ",
+	" 1     1     1     1    11      ",
+	" 1     1     1     1    11      ",
+	" 1111111111111111111111111      ",
+	" 1111111111111111111111111      "};
+
+static char **doc_export_dxf_xpm[3] = { doc_export_dxf_x16, doc_export_dxf_x24, doc_export_dxf_x32 };
+
diff --git a/app/bin/bitmaps/doc-export-svg.xpm b/app/bin/bitmaps/doc-export-svg.xpm
new file mode 100644
index 0000000..72c85d3
--- /dev/null
+++ b/app/bin/bitmaps/doc-export-svg.xpm
@@ -0,0 +1,114 @@
+static char *doc_export_svg_x16[] = {
+	"16 16 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003366",
+	"3	c	#003399",
+	"4	c	#006600",
+	"5	c	#0066CC",
+	"6	c	#0066FF",
+	"7	c	#CC0000",
+	"8	c	#008000",
+	"   888          ",
+	" 888888400000   ",
+	" 8    011       ",
+	"88  00 88       ",
+	"88 00  88       ",
+	"8800   88   7   ",
+	" 41    8    77  ",
+	" 048888 77777777",
+	" 0      77777777",
+	" 00  6       77 ",
+	" 00 666     7   ",
+	"  036 6         ",
+	"   300 6        ",
+	"  6  00230000   ",
+	" 66     32000   ",
+	" 666666666      "};
+
+static char *doc_export_svg_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003366",
+	"3	c	#003399",
+	"4	c	#006600",
+	"5	c	#0066CC",
+	"6	c	#0066FF",
+	"7	c	#CC0000",
+	"8	c	#008000",
+	"     888                ",
+	"   88888888             ",
+	"  888   88840000000     ",
+	" 888     0111           ",
+	" 88    000 88           ",
+	"88    00   88           ",
+	"88   00    88           ",
+	"88  0      88           ",
+	" 8800      88      7    ",
+	" 880      88      777   ",
+	"  448    888       7777 ",
+	"  048888888  77777777777",
+	"  0  8888    77777777777",
+	"  0                7777 ",
+	"  0    66         7777  ",
+	"  00   66          7    ",
+	"   0  6  6              ",
+	"    056  66             ",
+	"    520   6             ",
+	"    6 000026            ",
+	"   6    00002000000     ",
+	"  66        5300000     ",
+	" 6666666666666          ",
+	" 6666666666666          "};
+
+static char *doc_export_svg_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003300",
+	"3	c	#003366",
+	"4	c	#003399",
+	"5	c	#006600",
+	"6	c	#0066CC",
+	"7	c	#0066FF",
+	"8	c	#CC0000",
+	"9	c	#008000",
+	"       99                       ",
+	"     99999999                   ",
+	"   999999999999  00000000       ",
+	"  9999      9950000000000       ",
+	"  999       0000000             ",
+	" 999      0000299               ",
+	" 99     00000  99               ",
+	"999    0000    99               ",
+	"999   0000     99               ",
+	"999  000       99               ",
+	" 99 000        99               ",
+	" 995000       999        88     ",
+	" 99200       999        8888    ",
+	"  9005      9999         88888  ",
+	"   029999999999           88888 ",
+	"  002999999999   888888888888888",
+	"  000 99999      888888888888888",
+	"  000                     88888 ",
+	"  000     7              88888  ",
+	"  000    777            88888   ",
+	"   00   77777            88     ",
+	"   000  777777                  ",
+	"    000677 777                  ",
+	"     0036   777                 ",
+	"     63000   777                ",
+	"     76300000677                ",
+	"    777  00000146               ",
+	"   777     00000000000000       ",
+	"  777          3431000000       ",
+	"  777           777             ",
+	" 7777777777777777777            ",
+	"777777777777777777777           "};
+
+static char **doc_export_svg_xpm[3] = { doc_export_svg_x16, doc_export_svg_x24, doc_export_svg_x32 };
+
diff --git a/app/bin/bitmaps/doc-export-xtc.xpm b/app/bin/bitmaps/doc-export-xtc.xpm
new file mode 100644
index 0000000..6afb7c7
--- /dev/null
+++ b/app/bin/bitmaps/doc-export-xtc.xpm
@@ -0,0 +1,108 @@
+static char *doc_export_xtc_x16[] = {
+	"16 16 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#996666",
+	"3	c	#CC0000",
+	"4	c	#CC3333",
+	"5	c	#CC9999",
+	"6	c	#FFCCCC",
+	"7	c	#FFFFFF",
+	"111111111111    ",
+	"177777777771    ",
+	"177777777771    ",
+	"177777777771    ",
+	"177777777771    ",
+	"1777777777713   ",
+	"17777777777133  ",
+	"1777777755543333",
+	"177777776662 33 ",
+	"17777777777133  ",
+	"1777777777713   ",
+	"177777777771    ",
+	"177777777771    ",
+	"177777777771    ",
+	"177777777771    ",
+	"111111111111    "};
+
+static char *doc_export_xtc_x24[] = {
+	"24 24 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#993333",
+	"3	c	#CC0000",
+	"4	c	#FFCCCC",
+	"5	c	#FFFFFF",
+	" 1111111111111111       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551 33    ",
+	"15555555555555551 3333  ",
+	"15555555555555551  3333 ",
+	"155555555555433333333333",
+	"15555555555544442333333 ",
+	"15555555555555551  333  ",
+	"15555555555555551 333   ",
+	"15555555555555551  3    ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	"15555555555555551       ",
+	" 1111111111111111       "};
+
+static char *doc_export_xtc_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#993333",
+	"3	c	#CC0000",
+	"4	c	#CC3333",
+	"5	c	#CC9999",
+	"6	c	#FFCCCC",
+	"7	c	#FFFFFF",
+	"                                ",
+	" 1111111111111111111111         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771 333     ",
+	" 1777777777777777777771 3333    ",
+	" 1777777777777777777771  33333  ",
+	" 177777777777777766666233333333 ",
+	" 1777777777777776333333333333333",
+	" 177777777777777655555433333333 ",
+	" 1777777777777777777771   3333  ",
+	" 1777777777777777777771 33333   ",
+	" 1777777777777777777771 333     ",
+	" 1777777777777777777771  3      ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1777777777777777777771         ",
+	" 1111111111111111111111         ",
+	"                                "};
+
+static char **doc_export_xtc_xpm[3] = { doc_export_xtc_x16, doc_export_xtc_x24, doc_export_xtc_x32 };
+
diff --git a/app/bin/bitmaps/doc-export.xpm b/app/bin/bitmaps/doc-export.xpm
new file mode 100644
index 0000000..e594e38
--- /dev/null
+++ b/app/bin/bitmaps/doc-export.xpm
@@ -0,0 +1,119 @@
+static char *doc_export_x16[] = {
+	"16 16 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#993333",
+	"3	c	#999999",
+	"4	c	#CC0000",
+	"5	c	#CC6666",
+	"6	c	#CC9999",
+	"7	c	#CCCCCC",
+	"8	c	#FFCCCC",
+	"9	c	#FFFFFF",
+	"A	c	#C0C0C0",
+	"111111111111    ",
+	"199999999991    ",
+	"199999999991    ",
+	"193333333391    ",
+	"193777777391    ",
+	"1937777773914   ",
+	"19377777739144  ",
+	"1937777765824444",
+	"19377777A582444 ",
+	"19377777739144  ",
+	"1937777773914   ",
+	"193333333391    ",
+	"199999999991    ",
+	"199999999991    ",
+	"199999999991    ",
+	"111111111111    "};
+
+static char *doc_export_x24[] = {
+	"24 24 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#993333",
+	"3	c	#999999",
+	"4	c	#CC0000",
+	"5	c	#CC6666",
+	"6	c	#CC9999",
+	"7	c	#CCCCCC",
+	"8	c	#FFCCCC",
+	"9	c	#FFFFFF",
+	"A	c	#C0C0C0",
+	" 1111111111111111       ",
+	"199999999999999991      ",
+	"199999999999999991      ",
+	"199999999999999991      ",
+	"199999999999999991      ",
+	"199333333333333991      ",
+	"199377777777773991      ",
+	"199377777777773991      ",
+	"19937777777777399144    ",
+	"199377777777773991444   ",
+	"199377777777773991 4444 ",
+	"199377777777A44444444444",
+	"19937777777776588244444 ",
+	"199377777777773991 444  ",
+	"199377777777773991444   ",
+	"199377777777773991 4    ",
+	"199377777777773991      ",
+	"199333333333333991      ",
+	"199999999999999991      ",
+	"199999999999999991      ",
+	"199999999999999991      ",
+	"199999999999999991      ",
+	"199999999999999991      ",
+	" 1111111111111111       "};
+
+static char *doc_export_x32[] = {
+	"32 32 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#993333",
+	"3	c	#999999",
+	"4	c	#CC0000",
+	"5	c	#CC3333",
+	"6	c	#CC6666",
+	"7	c	#CC9999",
+	"8	c	#CCCCCC",
+	"9	c	#FFCCCC",
+	"A	c	#FFFFFF",
+	"                                ",
+	" 1111111111111111111111         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAA33333333333333AAA1         ",
+	" 1AA3888888888888883AA1         ",
+	" 1AA3888888888888883AA1         ",
+	" 1AA3888888888888883AA1         ",
+	" 1AA3888888888888883AA1 444     ",
+	" 1AA3888888888888883AA1 4444    ",
+	" 1AA3888888888888883AA1  44444  ",
+	" 1AA388888888888877699244444444 ",
+	" 1AA3888888888888444444444444444",
+	" 1AA388888888888866677544444444 ",
+	" 1AA3888888888888883AA1   4444  ",
+	" 1AA3888888888888883AA1 44444   ",
+	" 1AA3888888888888883AA1 444     ",
+	" 1AA3888888888888883AA1  4      ",
+	" 1AA3888888888888883AA1         ",
+	" 1AA3888888888888883AA1         ",
+	" 1AA3333333333333333AA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1AAAAAAAAAAAAAAAAAAAA1         ",
+	" 1111111111111111111111         ",
+	"                                "};
+
+static char **doc_export_xpm[3] = { doc_export_x16, doc_export_x24, doc_export_x32 };
+
diff --git a/app/bin/bitmaps/doc-import-xtc.xpm b/app/bin/bitmaps/doc-import-xtc.xpm
new file mode 100644
index 0000000..4b00631
--- /dev/null
+++ b/app/bin/bitmaps/doc-import-xtc.xpm
@@ -0,0 +1,123 @@
+static char *doc_import_xtc_x16[] = {
+	"16 16 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#336666",
+	"3	c	#339966",
+	"4	c	#666666",
+	"5	c	#669966",
+	"6	c	#999999",
+	"7	c	#99CC99",
+	"8	c	#99CCCC",
+	"9	c	#CCCCCC",
+	"A	c	#FFFFFF",
+	"B	c	#C0C0C0",
+	"   4444444444444",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   49AAAAAAAAAA4",
+	"   486AAAAAAAAA4",
+	"1112B739AAAAAAA4",
+	"1112B759AAAAAAA4",
+	"   496AAAAAAAAA4",
+	"   4BAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4444444444444"};
+
+static char *doc_import_xtc_x24[] = {
+	"24 24 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#336633",
+	"3	c	#339966",
+	"4	c	#666666",
+	"5	c	#669966",
+	"6	c	#669999",
+	"7	c	#999999",
+	"8	c	#99CC99",
+	"9	c	#CCCCCC",
+	"A	c	#FFFFFF",
+	"B	c	#C0C0C0",
+	"      444444444444444444",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     498AAAAAAAAAAAAAAA4",
+	"     4516AAAAAAAAAAAAAA4",
+	"     4A8139AAAAAAAAAAAA4",
+	"111111111119AAAAAAAAAAA4",
+	"111112775119AAAAAAAAAAA4",
+	"     4A7159AAAAAAAAAAAA4",
+	"     4517AAAAAAAAAAAAAA4",
+	"     49BAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4AAAAAAAAAAAAAAAAA4",
+	"     4444444444444444444"};
+
+static char *doc_import_xtc_x32[] = {
+	"32 32 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006633",
+	"2	c	#009933",
+	"3	c	#339933",
+	"4	c	#339966",
+	"5	c	#666666",
+	"6	c	#669966",
+	"7	c	#669999",
+	"8	c	#99CC99",
+	"9	c	#CCCCCC",
+	"A	c	#CCFFCC",
+	"B	c	#CCFFFF",
+	"C	c	#FFFFFF",
+	"        55555555555555555555555 ",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5939CCCCCCCCCCCCCCCCCCCC5",
+	"       56228CCCCCCCCCCCCCCCCCCC5",
+	"       5C6226CCCCCCCCCCCCCCCCCC5",
+	"       59982239CCCCCCCCCCCCCCCC5",
+	" 22222222222222BCCCCCCCCCCCCCCC5",
+	" 22222222222223CCCCCCCCCCCCCCCC5",
+	"       5CC7226ACCCCCCCCCCCCCCCC5",
+	"       594228CCCCCCCCCCCCCCCCCC5",
+	"       56239CCCCCCCCCCCCCCCCCCC5",
+	"       596ACCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"        55555555555555555555555 "};
+
+static char **doc_import_xtc_xpm[3] = { doc_import_xtc_x16, doc_import_xtc_x24, doc_import_xtc_x32 };
+
diff --git a/app/bin/bitmaps/doc-import.xpm b/app/bin/bitmaps/doc-import.xpm
new file mode 100644
index 0000000..0b10537
--- /dev/null
+++ b/app/bin/bitmaps/doc-import.xpm
@@ -0,0 +1,123 @@
+static char *doc_import_x16[] = {
+	"16 16 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#336666",
+	"3	c	#339966",
+	"4	c	#666666",
+	"5	c	#669966",
+	"6	c	#999999",
+	"7	c	#99CC99",
+	"8	c	#99CCCC",
+	"9	c	#CCCCCC",
+	"A	c	#FFFFFF",
+	"B	c	#C0C0C0",
+	"   4444444444444",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4A666666666A4",
+	"   49699999996A4",
+	"   48599999996A4",
+	"1112B537999996A4",
+	"1112B537999996A4",
+	"   49399999996A4",
+	"   4B699999996A4",
+	"   4A699999996A4",
+	"   4AA66666666A4",
+	"   4AAAAAAAAAAA4",
+	"   4AAAAAAAAAAA4",
+	"   4444444444444"};
+
+static char *doc_import_x24[] = {
+	"24 24 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#336633",
+	"3	c	#339966",
+	"4	c	#666666",
+	"5	c	#669966",
+	"6	c	#999999",
+	"7	c	#99CC99",
+	"8	c	#CCCCCC",
+	"9	c	#FFFFFF",
+	"A	c	#C0C0C0",
+	"      444444444444444444",
+	"     4999999999999999994",
+	"     4999999999999999994",
+	"     4999999999999999994",
+	"     4999999999999999994",
+	"     4999999999999999994",
+	"     4996666666666666994",
+	"     4996888888888886994",
+	"     4876888888888886994",
+	"     4613888888888886994",
+	"     49713A8888888886994",
+	"11111111111A888888886994",
+	"11111266311A888888886994",
+	"     49613A8888888886994",
+	"     4515888888888886994",
+	"     48A6888888888886994",
+	"     4996888888888886994",
+	"     4996888888888886994",
+	"     4999666666666666994",
+	"     4999999999999999994",
+	"     4999999999999999994",
+	"     4999999999999999994",
+	"     4999999999999999994",
+	"     4444444444444444444"};
+
+static char *doc_import_x32[] = {
+	"32 32 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006633",
+	"2	c	#009933",
+	"3	c	#339933",
+	"4	c	#339966",
+	"5	c	#666666",
+	"6	c	#669966",
+	"7	c	#669999",
+	"8	c	#999999",
+	"9	c	#99CC99",
+	"A	c	#CCCCCC",
+	"B	c	#CCFFCC",
+	"C	c	#FFFFFF",
+	"D	c	#C0C0C0",
+	"        55555555555555555555555 ",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCC88888888888888888CCC5",
+	"       5CCC8AAAAAAAAAAAAAAA8CCC5",
+	"       5CCC8AAAAAAAAAAAAAAA8CCC5",
+	"       5B4A8AAAAAAAAAAAAAAA8CCC5",
+	"       56226AAAAAAAAAAAAAAA8CCC5",
+	"       5C7226DAAAAAAAAAAAAA8CCC5",
+	"       5AA92239AAAAAAAAAAAA8CCC5",
+	" 22222222222222DAAAAAAAAAAA8CCC5",
+	" 22222222222222DAAAAAAAAAAA8CCC5",
+	"       5CC7224DAAAAAAAAAAAA8CCC5",
+	"       5A4226AAAAAAAAAAAAAA8CCC5",
+	"       56226AAAAAAAAAAAAAAA8CCC5",
+	"       5A6B8AAAAAAAAAAAAAAA8CCC5",
+	"       5CCC8AAAAAAAAAAAAAAA8CCC5",
+	"       5CCC8AAAAAAAAAAAAAAA8CCC5",
+	"       5CCC8AAAAAAAAAAAAAAA8CCC5",
+	"       5CCC88888888888888888CCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"       5CCCCCCCCCCCCCCCCCCCCCCC5",
+	"        55555555555555555555555 "};
+
+static char **doc_import_xpm[3] = { doc_import_x16, doc_import_x24, doc_import_x32 };
+
diff --git a/app/bin/bitmaps/doc-new.xpm b/app/bin/bitmaps/doc-new.xpm
new file mode 100644
index 0000000..cd4dbc1
--- /dev/null
+++ b/app/bin/bitmaps/doc-new.xpm
@@ -0,0 +1,127 @@
+static char *doc_new_x16[] = {
+	"16 16 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#00CC33",
+	"3	c	#00CC66",
+	"4	c	#00FF66",
+	"5	c	#33CC66",
+	"6	c	#666666",
+	"7	c	#669966",
+	"8	c	#66CC99",
+	"9	c	#99CC99",
+	"A	c	#CCCCCC",
+	"B	c	#CCFFCC",
+	"C	c	#FFFFFF",
+	"D	c	#C0C0C0",
+	"  666666666666  ",
+	"  6CCA9CCCCCC6  ",
+	"  6CC52ACCCCC6  ",
+	"  6D71278CCCC6  ",
+	"  6544444BCCC6  ",
+	"  6AD139DCCCC6  ",
+	"  6CC12ACCCCC6  ",
+	"  6CCA9CCCCCC6  ",
+	"  6CCCCCCCCCC6  ",
+	"  6CCCCCCCCCC6  ",
+	"  6CCCCCCCCCC6  ",
+	"  6CCCCCCCCCC6  ",
+	"  6CCCCCCCCCC6  ",
+	"  6CCCCCCCCCC6  ",
+	"  6CCCCCCCCCC6  ",
+	"  666666666666  "};
+
+static char *doc_new_x24[] = {
+	"24 24 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#00CC33",
+	"3	c	#00CC66",
+	"4	c	#00FF66",
+	"5	c	#33CC66",
+	"6	c	#666666",
+	"7	c	#66CC66",
+	"8	c	#66CC99",
+	"9	c	#99CC99",
+	"A	c	#CCCCCC",
+	"B	c	#CCFFCC",
+	"C	c	#FFFFFF",
+	"   666666666666666666   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCC87ACCCCCCCCC6   ",
+	"   6CCCC347CCCCCCCCC6   ",
+	"   6CCCC547CCCCCCCCC6   ",
+	"   6C87734211ACCCCCC6   ",
+	"   6C344444449CCCCCC6   ",
+	"   6C522342229CCCCCC6   ",
+	"   6CCCB547CCCCCCCCC6   ",
+	"   6CCCB547CCCCCCCCC6   ",
+	"   6CCCC779CCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   6CCCCCCCCCCCCCCCC6   ",
+	"   666666666666666666   "};
+
+static char *doc_new_x32[] = {
+	"32 32 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#00CC33",
+	"3	c	#00FF66",
+	"4	c	#339933",
+	"5	c	#666666",
+	"6	c	#669966",
+	"7	c	#66CC99",
+	"8	c	#99CC99",
+	"9	c	#CCCCCC",
+	"A	c	#CCFFCC",
+	"B	c	#CCFFFF",
+	"C	c	#FFFFFF",
+	"D	c	#C0C0C0",
+	"    555555555555555555555555    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCC8111DCCCCCCCCCCCC5    ",
+	"    5CCCCC8232DCCCCCCCCCCCC5    ",
+	"    5CCCCC8232DCCCCCCCCCCCC5    ",
+	"    5CCAAA82328AAACCCCCCCCC5    ",
+	"    5C822223322221ACCCCCCCC5    ",
+	"    5C823333333332ACCCCCCCC5    ",
+	"    5C823333333332ACCCCCCCC5    ",
+	"    5C988842326888BCCCCCCCC5    ",
+	"    5CCCCC62329CCCCCCCCCCCC5    ",
+	"    5CCCCC72329CCCCCCCCCCCC5    ",
+	"    5CCCCC82229CCCCCCCCCCCC5    ",
+	"    5CCCCC9DDDBCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    5CCCCCCCCCCCCCCCCCCCCCC5    ",
+	"    555555555555555555555555    "};
+
+static char **doc_new_xpm[3] = { doc_new_x16, doc_new_x24, doc_new_x32 };
+
diff --git a/app/bin/bitmaps/doc-open.xpm b/app/bin/bitmaps/doc-open.xpm
new file mode 100644
index 0000000..992c9bf
--- /dev/null
+++ b/app/bin/bitmaps/doc-open.xpm
@@ -0,0 +1,136 @@
+static char *doc_open_x16[] = {
+	"16 16 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#663300",
+	"2	c	#666600",
+	"3	c	#666633",
+	"4	c	#996633",
+	"5	c	#996666",
+	"6	c	#999966",
+	"7	c	#999999",
+	"8	c	#CC9966",
+	"9	c	#CCCC66",
+	"A	c	#CCCC99",
+	"B	c	#CCCCCC",
+	"C	c	#FFCC99",
+	"D	c	#FFFFFF",
+	"E	c	#C0C0C0",
+	"F	c	#808080",
+	"                ",
+	"                ",
+	"2466666677F     ",
+	"3C7BBBBBBBE7431 ",
+	"3C7DDDDDDDDBA61 ",
+	"3C7DDDDDDDDD761 ",
+	"3C51111111111113",
+	"3A3CCCCCCCCCCCC3",
+	"386CCCCCCCCCCC93",
+	"369CCCCCCCCCCC81",
+	"33CCCCCCCCCCCC4 ",
+	"24CCCCCCCCCCCC2 ",
+	"28CCCCCCCCCCCC3 ",
+	"368888888888862 ",
+	"222222222222221 ",
+	"                "};
+
+static char *doc_open_x24[] = {
+	"24 24 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#663300",
+	"2	c	#666600",
+	"3	c	#666633",
+	"4	c	#666666",
+	"5	c	#996633",
+	"6	c	#996666",
+	"7	c	#999933",
+	"8	c	#999966",
+	"9	c	#999999",
+	"A	c	#CC9966",
+	"B	c	#CC9999",
+	"C	c	#CCCC66",
+	"D	c	#CCCC99",
+	"E	c	#FFCC99",
+	"F	c	#FFFFFF",
+	"G	c	#C0C0C0",
+	"                        ",
+	"                        ",
+	"                        ",
+	"355888888869            ",
+	"3CE9GGGGGGGGGGG941111   ",
+	"3CE9FFFFFFFFFFFFBBAA51  ",
+	"3CE9FFFFFFFFFFFFFGDE81  ",
+	"3CE9FFFFFFFFFFFFFFGE81  ",
+	"3CE9FFFFFFFFFFFFFFGE81  ",
+	"3CE988888888888888675333",
+	"3CE5CDDDDDDDDDDDDDDDDDA3",
+	"3CE3EEEEEEEEEEEEEEEEEEA1",
+	"3CC8EEEEEEEEEEEEEEEEEE5 ",
+	"3CACEEEEEEEEEEEEEEEEEE2 ",
+	"3C5EEEEEEEEEEEEEEEEEEE3 ",
+	"3A5EEEEEEEEEEEEEEEEEEA3 ",
+	"3A8EEEEEEEEEEEEEEEEEE71 ",
+	"37CEEEEEEEEEEEEEEEEEE3  ",
+	"33EEEEEEEEEEEEEEEEEEE3  ",
+	"35EEEEEEEEEEEEEEEEEEC3  ",
+	"25AAAAAAAAAAAAAAAAAA71  ",
+	"222222222222222222222   ",
+	"                        ",
+	"                        "};
+
+static char *doc_open_x32[] = {
+	"32 32 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#663300",
+	"2	c	#666600",
+	"3	c	#666633",
+	"4	c	#996633",
+	"5	c	#996666",
+	"6	c	#999933",
+	"7	c	#999966",
+	"8	c	#999999",
+	"9	c	#CC9966",
+	"A	c	#CC9999",
+	"B	c	#CCCC66",
+	"C	c	#CCCC99",
+	"D	c	#CCCCCC",
+	"E	c	#FFCC99",
+	"F	c	#FFFFFF",
+	"G	c	#C0C0C0",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"134444444444433                 ",
+	"17EECGGGGGGGGG8888888           ",
+	"17EEGDFFFFFFFFFFFFFFD8311112    ",
+	"17EEGFFFFFFFFFFFFFFFFFAEEEE4    ",
+	"17EEGFFFFFFFFFFFFFFFFFFAEEE4    ",
+	"17EEGFFFFFFFFFFFFFFFFFFFGEE4    ",
+	"17EEGFFFFFFFFFFFFFFFFFFFDCE4    ",
+	"17EEGFFFFFFFFFFFFFFFFFFFDCE4    ",
+	"17EEGGGGGGGGGGGGGGGGGGGG8793111 ",
+	"17EE7799999999999999999999999941",
+	"17EE5CEEEEEEEEEEEEEEEEEEEEEEEE4 ",
+	"17EE3EEEEEEEEEEEEEEEEEEEEEEEEE2 ",
+	"17EC6EEEEEEEEEEEEEEEEEEEEEEEEE3 ",
+	"17E99EEEEEEEEEEEEEEEEEEEEEEEEB3 ",
+	"17E4EEEEEEEEEEEEEEEEEEEEEEEEE71 ",
+	"17E3EEEEEEEEEEEEEEEEEEEEEEEEE4  ",
+	"17B7EEEEEEEEEEEEEEEEEEEEEEEEE2  ",
+	"1799EEEEEEEEEEEEEEEEEEEEEEEEB3  ",
+	"174EEEEEEEEEEEEEEEEEEEEEEEEE92  ",
+	"174EEEEEEEEEEEEEEEEEEEEEEEEE61  ",
+	"147EEEEEEEEEEEEEEEEEEEEEEEEE2   ",
+	"14BEEEEEEEEEEEEEEEEEEEEEEEEE3   ",
+	"13EEEEEEEEEEEEEEEEEEEEEEEEEB3   ",
+	"12999999999999999999999999941   ",
+	" 222222222222222222222222222    ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **doc_open_xpm[3] = { doc_open_x16, doc_open_x24, doc_open_x32 };
+
diff --git a/app/bin/bitmaps/doc-print.xpm b/app/bin/bitmaps/doc-print.xpm
new file mode 100644
index 0000000..853014f
--- /dev/null
+++ b/app/bin/bitmaps/doc-print.xpm
@@ -0,0 +1,108 @@
+static char *doc_print_x16[] = {
+	"16 16 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#999999",
+	"3	c	#CCCCCC",
+	"4	c	#FFFFFF",
+	"5	c	#C0C0C0",
+	"6	c	#808080",
+	"  111111111111  ",
+	"  144444444441  ",
+	"  144444444441  ",
+	"  144444444441  ",
+	"  144444444441  ",
+	" 666666666666666",
+	"6255555555555556",
+	"6333333333333336",
+	"6333333333333336",
+	"6333333333333336",
+	"6311111111111136",
+	"6316111111654136",
+	"6512666666624136",
+	"6616111111165166",
+	"  166666666341  ",
+	"  111111111111  "};
+
+static char *doc_print_x24[] = {
+	"24 24 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#999999",
+	"3	c	#CCCCCC",
+	"4	c	#FFFFFF",
+	"5	c	#C0C0C0",
+	"6	c	#808080",
+	"    1111111111111111    ",
+	"   144444444444444441   ",
+	"   144444444444444441   ",
+	"   144444444444444441   ",
+	"   144444444444444441   ",
+	"   144444444444444441   ",
+	"   144444444444444441   ",
+	"   144444444444444441   ",
+	" 6666666666666666666666 ",
+	"625555555555555555555526",
+	"653333333333333333333356",
+	"653333333333333333333356",
+	"653333333333333333333356",
+	"653333333333333333333356",
+	"653333333333333333333356",
+	"653111111111111111111356",
+	"653136666666666634441356",
+	"653142222222222255441356",
+	"653142222222222225441356",
+	"662136666666666664441266",
+	"   136666666666666241   ",
+	"   142222222222233441   ",
+	"   145555555555544441   ",
+	"    1111111111111111    "};
+
+static char *doc_print_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"                                ",
+	"     2222222222222222222222     ",
+	"     2555555555555555555552     ",
+	"     2555555555555555555552     ",
+	"     2555555555555555555552     ",
+	"     2555555555555555555552     ",
+	"     2555555555555555555552     ",
+	"     2555555555555555555552     ",
+	"     2555555555555555555552     ",
+	"     2555555555555555555552     ",
+	"     2555555555555555555552     ",
+	" 777777777777777777777777777777 ",
+	" 7666666666666666666666666666677",
+	" 3444444444444444444444444444437",
+	" 3444444444444444444444444444437",
+	" 3444444444444444444444444444437",
+	" 3444444444444444444444444444437",
+	" 3444444444444444444444444444437",
+	" 3444444444444444444444444444437",
+	" 3444444444444444444444444444437",
+	" 3444222222222222222222222244437",
+	" 3444254444444444444455555244437",
+	" 3444267777777777777765555244437",
+	" 3444246666666666666666655244437",
+	" 3444246666666666666666655244437",
+	" 7444267777777777777773555244437",
+	" 777725444444444444444555527777 ",
+	"     2311111111111111111152     ",
+	"     2544444444444444555552     ",
+	"     2377777777777777455552     ",
+	"     2222222222222222222222     ",
+	"                                "};
+
+static char **doc_print_xpm[3] = { doc_print_x16, doc_print_x24, doc_print_x32 };
+
diff --git a/app/bin/bitmaps/doc-revert.xpm b/app/bin/bitmaps/doc-revert.xpm
new file mode 100644
index 0000000..4af778a
--- /dev/null
+++ b/app/bin/bitmaps/doc-revert.xpm
@@ -0,0 +1,134 @@
+static char *doc_revert_x16[] = {
+	"16 16 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#996633",
+	"3	c	#CC6633",
+	"4	c	#CC9900",
+	"5	c	#CC9933",
+	"6	c	#CC9966",
+	"7	c	#CC9999",
+	"8	c	#CCCC33",
+	"9	c	#CCCC99",
+	"A	c	#CCCCCC",
+	"B	c	#FFCC00",
+	"C	c	#FFCC33",
+	"D	c	#FFCCCC",
+	"E	c	#FFFFCC",
+	"F	c	#FFFFFF",
+	"  111111111111  ",
+	"  1FFFFFFFFFF1  ",
+	"  1FFFFFFFFFF1  ",
+	"  1FFFADFFFFF1  ",
+	"  1FF639FFFFF1  ",
+	"  1D5BB529FFF1  ",
+	"  1F65B5B86FF1  ",
+	"  1FF93665C7F1  ",
+	"  1FFFDAFA55E1  ",
+	"  1FFFFFFF7491  ",
+	"  1FFFFFFFD561  ",
+	"  1FFFFFFFF251  ",
+	"  1FFFFFFFF621  ",
+	"  1FFFFFFFFFF1  ",
+	"  1FFFFFFFFFF1  ",
+	"  111111111111  "};
+
+static char *doc_revert_x24[] = {
+	"24 24 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#996600",
+	"3	c	#996633",
+	"4	c	#CC6633",
+	"5	c	#CC9900",
+	"6	c	#CC9933",
+	"7	c	#CC9966",
+	"8	c	#CC9999",
+	"9	c	#CCCC99",
+	"A	c	#CCCCCC",
+	"B	c	#FFCC00",
+	"C	c	#FFCC33",
+	"D	c	#FFCCCC",
+	"E	c	#FFFFCC",
+	"F	c	#FFFFFF",
+	"   111111111111111111   ",
+	"   1FFFFFFFFFFFFFFFF1   ",
+	"   1FFFFFFFFFFFFFFFF1   ",
+	"   1FFFFFFFFFFFFFFFF1   ",
+	"   1FFFFFFFFFFFFFFFF1   ",
+	"   1FFFFFD8FFFFFFFFF1   ",
+	"   1FFFF863FFFFFFFFF1   ",
+	"   1FFD6CB37AFFFFFFF1   ",
+	"   1FA6BBBBB568FFFFF1   ",
+	"   1FF76BBBBBBB7FFFF1   ",
+	"   1FFFA6B2736BB7FFF1   ",
+	"   1FFFFE72FF96B69FF1   ",
+	"   1FFFFFF9FFF96B3FF1   ",
+	"   1FFFFFFFFFFF7B6DF1   ",
+	"   1FFFFFFFFFFFD6B8F1   ",
+	"   1FFFFFFFFFFFF7B3F1   ",
+	"   1FFFFFFFFFFFFA62F1   ",
+	"   1FFFFFFFFFFFFE66F1   ",
+	"   1FFFFFFFFFFFFF34E1   ",
+	"   1FFFFFFFFFFFFFAAF1   ",
+	"   1FFFFFFFFFFFFFFFF1   ",
+	"   1FFFFFFFFFFFFFFFF1   ",
+	"   1FFFFFFFFFFFFFFFF1   ",
+	"   111111111111111111   "};
+
+static char *doc_revert_x32[] = {
+	"32 32 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#996600",
+	"3	c	#996633",
+	"4	c	#CC6633",
+	"5	c	#CC9900",
+	"6	c	#CC9933",
+	"7	c	#CC9966",
+	"8	c	#CC9999",
+	"9	c	#CCCC99",
+	"A	c	#CCCCCC",
+	"B	c	#FFCC00",
+	"C	c	#FFCC33",
+	"D	c	#FFCCCC",
+	"E	c	#FFFFCC",
+	"F	c	#FFFFFF",
+	"    111111111111111111111111    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFE7DFFFFFFFFFFFF1    ",
+	"    1FFFFFF965AFFFFFFFFFFFF1    ",
+	"    1FFFFE76B59FFFFFFFFFFFF1    ",
+	"    1FFF96BBBB6328FFFFFFFFF1    ",
+	"    1FF86BBBBBBBBB68FFFFFFF1    ",
+	"    1FFF76BBBBBBBBBC7FFFFFF1    ",
+	"    1FFFFA6BB5266BBBB7FFFFF1    ",
+	"    1FFFFFF7C5AFA66BBC8FFFF1    ",
+	"    1FFFFFFF849FFF96BB6DFFF1    ",
+	"    1FFFFFFFFAAFFFF96BB7FFF1    ",
+	"    1FFFFFFFFFFFFFFF7BB6FFF1    ",
+	"    1FFFFFFFFFFFFFFFF6B6AFF1    ",
+	"    1FFFFFFFFFFFFFFFF7BB7FF1    ",
+	"    1FFFFFFFFFFFFFFFFD6B3FF1    ",
+	"    1FFFFFFFFFFFFFFFFF3B3FF1    ",
+	"    1FFFFFFFFFFFFFFFFF8B6FF1    ",
+	"    1FFFFFFFFFFFFFFFFFA66DF1    ",
+	"    1FFFFFFFFFFFFFFFFFD66AF1    ",
+	"    1FFFFFFFFFFFFFFFFFF87EF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    1FFFFFFFFFFFFFFFFFFFFFF1    ",
+	"    111111111111111111111111    "};
+
+static char **doc_revert_xpm[3] = { doc_revert_x16, doc_revert_x24, doc_revert_x32 };
+
diff --git a/app/bin/bitmaps/doc-save-as.xpm b/app/bin/bitmaps/doc-save-as.xpm
new file mode 100644
index 0000000..2ded960
--- /dev/null
+++ b/app/bin/bitmaps/doc-save-as.xpm
@@ -0,0 +1,135 @@
+static char *doc_save_as_x16[] = {
+	"16 16 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#996666",
+	"A	c	#999966",
+	"B	c	#9999CC",
+	"C	c	#CC9966",
+	"D	c	#FFCC66",
+	"                ",
+	"111111          ",
+	"11111111        ",
+	"111111111       ",
+	"     1111 1     ",
+	"     111111  95 ",
+	"     111111 9DC5",
+	"      1111 9DD9 ",
+	"       1169DD9  ",
+	"2222222235DD9222",
+	"267B67B65CA98772",
+	"236736735C557442",
+	"2367367356547442",
+	"2367367367447442",
+	"2222222222222222",
+	"                "};
+
+static char *doc_save_as_x24[] = {
+	"24 24 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#996666",
+	"A	c	#999966",
+	"B	c	#9999CC",
+	"C	c	#99CCCC",
+	"D	c	#CC9966",
+	"E	c	#FF9966",
+	"F	c	#FFCC66",
+	"G	c	#808080",
+	"                        ",
+	"                        ",
+	"11111111111             ",
+	"111111111111            ",
+	"1111111111111           ",
+	"        11111           ",
+	"          1111          ",
+	"       1111111111   55  ",
+	"       1111111111  5DA5 ",
+	"        11111111  5DFFA5",
+	"         111111  5DFFE9 ",
+	"          11111 5DFFE9  ",
+	"          1111 5DFFF9   ",
+	"           11 5DFFF9    ",
+	"22222222222225AFFF922222",
+	"2C7C7C6C7C88GDDAF9C7CC72",
+	"286B4C0C4B775FFDG4C68862",
+	"286B4C0C4B775DD9C3C68862",
+	"286B4C0C4B777574C3C68862",
+	"286B4C0C4B77B4C3C3C68862",
+	"287C5C2C5C77C5C4C4C78872",
+	"222222222222222222222222",
+	"                        ",
+	"                        "};
+
+static char *doc_save_as_x32[] = {
+	"32 32 19 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#996666",
+	"A	c	#999966",
+	"B	c	#999999",
+	"C	c	#9999CC",
+	"D	c	#99CCCC",
+	"E	c	#CC9966",
+	"F	c	#FF9966",
+	"G	c	#FFCC66",
+	"H	c	#808080",
+	"                                ",
+	"                                ",
+	" 111111                         ",
+	" 1111111111111                  ",
+	" 111111111111111                ",
+	" 1111111111111111               ",
+	" 1111111111111111               ",
+	"            111111              ",
+	"             11111              ",
+	"          111 1111 111     5    ",
+	"          111111111111    5A5   ",
+	"          111111111111   5EGE5  ",
+	"           1111111111   5EGGGE5 ",
+	"           1111111111  5EGGGGF9 ",
+	"            11111111  5EGGGGF9  ",
+	"             111111  5EGGGGF9   ",
+	"              11111 5EGGGGF9    ",
+	"              1111 5EGGGGF9     ",
+	" 222222222222222325EGGGGF922222 ",
+	"2DDDDDDDDDDDDDDDDB9EGGGFHDDDDDD2",
+	"2D8DD8DD8DD7DD7DBEGEEGFHDD7DD7D2",
+	"2D4CD4CD4CD3DD3DHFGGEEH2DD0DD0D2",
+	"2D4CD4CD4CD3DD3DHFGGFHD0DD0DD0D2",
+	"2D4CD4CD4CD3DD3DHEEE5DD0DD0DD0D2",
+	"2D4CD4CD4CD3DD3DC57B2DD0DD0DD0D2",
+	"2D4CD4CD4CD3DD3DD3DD0DD0DD0DD0D2",
+	"2D4CD4CD4CD3DD3DD3DD0DD0DD0DD0D2",
+	"2D6DD6DD6DD4DD4DD4DD3DD3DD3DD3D2",
+	"2DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD2",
+	"22222222222222222222222222222222",
+	"                                ",
+	"                                "};
+
+static char **doc_save_as_xpm[3] = { doc_save_as_x16, doc_save_as_x24, doc_save_as_x32 };
+
diff --git a/app/bin/bitmaps/doc-save.xpm b/app/bin/bitmaps/doc-save.xpm
new file mode 100644
index 0000000..f775f95
--- /dev/null
+++ b/app/bin/bitmaps/doc-save.xpm
@@ -0,0 +1,116 @@
+static char *doc_save_x16[] = {
+	"16 16 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666699",
+	"6	c	#669999",
+	"7	c	#6699CC",
+	"8	c	#9999CC",
+	"                ",
+	"111111          ",
+	"11111111        ",
+	"111111111       ",
+	"     1111 1     ",
+	"     111111     ",
+	"     111111     ",
+	"      1111      ",
+	"       11       ",
+	"2222222232222222",
+	"2568568567668662",
+	"2356356356446442",
+	"2356356356446442",
+	"2356356356446442",
+	"2222222222222222",
+	"                "};
+
+static char *doc_save_x24[] = {
+	"24 24 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#9999CC",
+	"A	c	#99CCCC",
+	"                        ",
+	"                        ",
+	"11111111111             ",
+	"111111111111            ",
+	"1111111111111           ",
+	"        11111           ",
+	"          1111          ",
+	"       1111111111       ",
+	"       1111111111       ",
+	"        11111111        ",
+	"         111111         ",
+	"          11111         ",
+	"          1111          ",
+	"           11           ",
+	"222222222222222222222222",
+	"2A7A7A6A7A88A7A7A7A7AA72",
+	"28694A0A497794A3A3A68862",
+	"28694A0A497794A3A3A68862",
+	"28694A0A497794A3A3A68862",
+	"28694A0A497794A3A3A68862",
+	"287A5A2A5A77A5A4A4A78872",
+	"222222222222222222222222",
+	"                        ",
+	"                        "};
+
+static char *doc_save_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666699",
+	"6	c	#669999",
+	"7	c	#6699CC",
+	"8	c	#9999CC",
+	"9	c	#99CCCC",
+	"                                ",
+	"                                ",
+	" 111111                         ",
+	" 1111111111111                  ",
+	" 111111111111111                ",
+	" 1111111111111111               ",
+	" 1111111111111111               ",
+	"            111111              ",
+	"             11111              ",
+	"          111 1111 111          ",
+	"          111111111111          ",
+	"          111111111111          ",
+	"           1111111111           ",
+	"           1111111111           ",
+	"            11111111            ",
+	"             111111             ",
+	"              11111             ",
+	"              1111              ",
+	" 222222222222222322222222222222 ",
+	"29999999999999999999999999999992",
+	"29799799799699699699699699699692",
+	"29489489489399399399099099099092",
+	"29489489489399399399099099099092",
+	"29489489489399399399099099099092",
+	"29489489489399399399099099099092",
+	"29489489489399399399099099099092",
+	"29489489489399399399099099099092",
+	"29599599599499499499399399399392",
+	"29999999999999999999999999999992",
+	"22222222222222222222222222222222",
+	"                                ",
+	"                                "};
+
+static char **doc_save_xpm[3] = { doc_save_x16, doc_save_x24, doc_save_x32 };
+
diff --git a/app/bin/bitmaps/doc-setup.xpm b/app/bin/bitmaps/doc-setup.xpm
new file mode 100644
index 0000000..c6c8e48
--- /dev/null
+++ b/app/bin/bitmaps/doc-setup.xpm
@@ -0,0 +1,110 @@
+static char *doc_setup_x16[] = {
+	"16 16 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"22222222222     ",
+	"25555555552     ",
+	"25555555552     ",
+	"25555555552     ",
+	"25555555552     ",
+	"25555555552     ",
+	"255555552222222 ",
+	"255555552555552 ",
+	"255555552555552 ",
+	"2555555477777777",
+	"2555554366666667",
+	"2555554644444443",
+	"2555554622222223",
+	"2222227311111723",
+	"       711111227",
+	"        1111122 "};
+
+static char *doc_setup_x24[] = {
+	"24 24 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"2222222222222222        ",
+	"2555555555555552        ",
+	"2555555555555552        ",
+	"2555555555555552        ",
+	"2555555555555552        ",
+	"2555555555555552        ",
+	"2555555555555552        ",
+	"2555555555555552        ",
+	"2555555555555552        ",
+	"2555555555552222222222  ",
+	"2555555555552555555552  ",
+	"2555555555552555555552  ",
+	"2555555555552555555552  ",
+	"2555555555552555555552  ",
+	"255555555544777777777777",
+	"255555555576666666666667",
+	"255555555574444444444443",
+	"255555555574444444444443",
+	"255555555574222222222243",
+	"255555555574277777735243",
+	"222222222274111111112247",
+	"          77222222223277",
+	"            1222222762  ",
+	"            2222222222  "};
+
+static char *doc_setup_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	" 22222222222222222222           ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"2555555555555555555552          ",
+	"255555555555555522222222222222  ",
+	"255555555555555525555555555552  ",
+	"255555555555555525555555555552  ",
+	"255555555555555525555555555552  ",
+	"255555555555555525555555555552  ",
+	"255555555555555525555555555552  ",
+	"25555555555554447777777777777777",
+	"25555555555556366666666666666667",
+	"25555555555556644444444444444447",
+	"25555555555556644444444444444447",
+	"25555555555556644444444444444447",
+	"25555555555556642222222222222447",
+	"25555555555556642444444444555247",
+	"25555555555556642777777777455247",
+	" 2222222222227342777777777735247",
+	"             7772777777777745277",
+	"                27777777777742  ",
+	"                21111111125552  ",
+	"                22222222222222  "};
+
+static char **doc_setup_xpm[3] = { doc_setup_x16, doc_setup_x24, doc_setup_x32 };
+
diff --git a/app/bin/bitmaps/document-export.xpm b/app/bin/bitmaps/document-export.xpm
deleted file mode 100644
index 8d632de..0000000
--- a/app/bin/bitmaps/document-export.xpm
+++ /dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * export_xpm[] = {
-"16 16 71 1",
-" 	c None",
-".	c #406C98",
-"+	c #DDF0FB",
-"@	c #D4E9F7",
-"#	c #D1E7F5",
-"$	c #CEE4F4",
-"%	c #CCE2F3",
-"&	c #CCE1F2",
-"*	c #A7C2DC",
-"=	c #D6EBF7",
-"-	c #C5DFEF",
-";	c #C1DBED",
-">	c #BCD6EA",
-",	c #B6D0E8",
-"'	c #B3CDE6",
-")	c #B2CCE5",
-"!	c #9AB6D2",
-"~	c #E5F6FF",
-"{	c #D7ECF8",
-"]	c #C7E1EF",
-"^	c #85A4C2",
-"/	c #D7EDF8",
-"(	c #C8E2F0",
-"_	c #D8EEF8",
-":	c #CAE4F1",
-"<	c #D9EEF9",
-"[	c #CBE5F2",
-"}	c #8FAFCF",
-"|	c #83A5C7",
-"1	c #DAEFF9",
-"2	c #CDE7F2",
-"3	c #81A3C5",
-"4	c #105293",
-"5	c #DAF0F9",
-"6	c #CEE8F3",
-"7	c #C0DAEB",
-"8	c #AFCCE0",
-"9	c #9AB9D4",
-"0	c #88A9C9",
-"a	c #7FA1C3",
-"b	c #CCE1F0",
-"c	c #155493",
-"d	c #DBF0FA",
-"e	c #D0EAF4",
-"f	c #CFE8F3",
-"g	c #D4EAF6",
-"h	c #E1F3FD",
-"i	c #195793",
-"j	c #DBF1FA",
-"k	c #D1EBF4",
-"l	c #C1DCEB",
-"m	c #AFCBE0",
-"n	c #98B7D1",
-"o	c #84A4C4",
-"p	c #799BBD",
-"q	c #CBE0EF",
-"r	c #1E5993",
-"s	c #DCF1FA",
-"t	c #D2ECF5",
-"u	c #7597B9",
-"v	c #275D94",
-"w	c #DCF2FB",
-"x	c #D3EDF5",
-"y	c #84A4C0",
-"z	c #6B8DAF",
-"A	c #3D71A5",
-"B	c #DDF2FB",
-"C	c #D4EEF6",
-"D	c #D8EDF8",
-"E	c #E1F4FD",
-"F	c #DFF2FC",
-"  .........     ",
-"  .+@#$%&&*.    ",
-"  .=-;>,')!~.   ",
-"  .{]-;>,'^^^.  ",
-"  ./(]-;>,')&.  ",
-"  ._:(]-;>,'&.  ",
-"  .<[:(]-;>}|   ",
-"  .12[:(]-;3~4  ",
-"  .562[7890ab~c ",
-"  .de62fg1h~~~~i",
-"  .jke6lmnopq~r ",
-"  .stke62[:u~v  ",
-"  .wxtke62[yzA  ",
-"  .BCxtke62[D.  ",
-"  .EBwsjd51<F.  ",
-"  ............  "};
diff --git a/app/bin/bitmaps/document-exportdxf.xpm b/app/bin/bitmaps/document-exportdxf.xpm
deleted file mode 100644
index fc4071b..0000000
--- a/app/bin/bitmaps/document-exportdxf.xpm
+++ /dev/null
@@ -1,84 +0,0 @@
-/* XPM */
-static char * export_dxf_xpm[] = {
-"16 16 65 1",
-" 	c None",
-".	c #406C98",
-"+	c #DDF0FB",
-"@	c #D4E9F7",
-"#	c #11CC22",
-"$	c #CEE4F4",
-"%	c #CCE2F3",
-"&	c #CCE1F2",
-"*	c #A7C2DC",
-"=	c #D6EBF7",
-"-	c #C5DFEF",
-";	c #BCD6EA",
-">	c #B6D0E8",
-",	c #B3CDE6",
-"'	c #9AB6D2",
-")	c #E5F6FF",
-"!	c #D7ECF8",
-"~	c #C7E1EF",
-"{	c #C1DBED",
-"]	c #85A4C2",
-"^	c #D8EEF8",
-"/	c #CAE4F1",
-"(	c #D9EEF9",
-"_	c #CBE5F2",
-":	c #C8E2F0",
-"<	c #8FAFCF",
-"[	c #83A5C7",
-"}	c #DAEFF9",
-"|	c #CDE7F2",
-"1	c #81A3C5",
-"2	c #105293",
-"3	c #AFCCE0",
-"4	c #9AB9D4",
-"5	c #88A9C9",
-"6	c #7FA1C3",
-"7	c #CCE1F0",
-"8	c #155493",
-"9	c #DBF0FA",
-"0	c #D0EAF4",
-"a	c #CFE8F3",
-"b	c #D4EAF6",
-"c	c #E1F3FD",
-"d	c #195793",
-"e	c #DBF1FA",
-"f	c #D1EBF4",
-"g	c #CEE8F3",
-"h	c #C1DCEB",
-"i	c #AFCBE0",
-"j	c #98B7D1",
-"k	c #84A4C4",
-"l	c #799BBD",
-"m	c #CBE0EF",
-"n	c #1E5993",
-"o	c #DCF1FA",
-"p	c #D2ECF5",
-"q	c #7597B9",
-"r	c #275D94",
-"s	c #84A4C0",
-"t	c #6B8DAF",
-"u	c #3D71A5",
-"v	c #DDF2FB",
-"w	c #D4EEF6",
-"x	c #D8EDF8",
-"y	c #E1F4FD",
-"z	c #DFF2FC",
-"  .........     ",
-"  .+@#$%&#*.    ",
-"  .=-#;>,#').   ",
-"  .!~#{;>#]]].  ",
-"  .##########.  ",
-"  .^/#~-{#>,&.  ",
-"  .(_#:~-#;<[   ",
-"  .}|#/:~#{1)2  ",
-"  .#####34567)8 ",
-"  .90#|ab}c))))d",
-"  .ef#ghijklm)n ",
-"  .op#0g|#/q)r  ",
-"  .########stu  ",
-"  .vw#pf0#|_x.  ",
-"  .yv#oe9#}(z.  ",
-"  ............  "};
diff --git a/app/bin/bitmaps/document-import.xpm b/app/bin/bitmaps/document-import.xpm
deleted file mode 100644
index 28dc3c8..0000000
--- a/app/bin/bitmaps/document-import.xpm
+++ /dev/null
@@ -1,92 +0,0 @@
-/* XPM */
-static char * import_xpm[] = {
-"16 16 73 1",
-" 	c None",
-".	c #406C98",
-"+	c #DDF0FB",
-"@	c #D4E9F7",
-"#	c #D1E7F5",
-"$	c #CEE4F4",
-"%	c #CCE2F3",
-"&	c #CCE1F2",
-"*	c #A7C2DC",
-"=	c #D6EBF7",
-"-	c #C5DFEF",
-";	c #C1DBED",
-">	c #BCD6EA",
-",	c #B6D0E8",
-"'	c #B3CDE6",
-")	c #B2CCE5",
-"!	c #9AB6D2",
-"~	c #E5F6FF",
-"{	c #D7ECF8",
-"]	c #C7E1EF",
-"^	c #85A4C2",
-"/	c #D7EDF8",
-"(	c #C8E2F0",
-"_	c #D8EEF8",
-":	c #94B4D1",
-"<	c #86A7C9",
-"[	c #AECBE1",
-"}	c #D9EEF9",
-"|	c #81A3C5",
-"1	c #E4F6FF",
-"2	c #93B2D0",
-"3	c #B6D2E6",
-"4	c #155493",
-"5	c #7FA1C3",
-"6	c #CBE1F0",
-"7	c #DEF2FC",
-"8	c #A5C3DA",
-"9	c #BED9EA",
-"0	c #195793",
-"a	c #DFF2FC",
-"b	c #CFE7F4",
-"c	c #1E5993",
-"d	c #799BBD",
-"e	c #CAE0EF",
-"f	c #A4C2D9",
-"g	c #C0DBEB",
-"h	c #D4EAF7",
-"i	c #DBF1FA",
-"j	c #7597B9",
-"k	c #8BABC7",
-"l	c #B8D4E6",
-"m	c #CBE5F2",
-"n	c #CAE4F1",
-"o	c #D5EBF7",
-"p	c #DCF1FA",
-"q	c #86A6C1",
-"r	c #6F91B2",
-"s	c #ACC9DC",
-"t	c #CEE8F3",
-"u	c #CDE7F2",
-"v	c #D6ECF7",
-"w	c #DCF2FB",
-"x	c #D3EDF5",
-"y	c #D2ECF5",
-"z	c #D1EBF4",
-"A	c #D0EAF4",
-"B	c #DDF2FB",
-"C	c #D4EEF6",
-"D	c #D8EDF8",
-"E	c #E1F4FD",
-"F	c #DBF0FA",
-"G	c #DAF0F9",
-"H	c #DAEFF9",
-"  .........     ",
-"  .+@#$%&&*     ",
-"  .=-;>,')!~    ",
-"  .{]-;>,'^^^.  ",
-"  ./(]-;>,')&.  ",
-"  ._:<[-;>,'&.  ",
-"  .}|123-;>,%.  ",
-" 44556789-;>$.  ",
-"0~~~~1a/b]-;#.  ",
-" ccddeafg(]-h.  ",
-"  .ij1klmn(]o.  ",
-"  .pqrstumn(v.  ",
-"  .wxyzAtumn{.  ",
-"  .BCxyzAtumD.  ",
-"  .EBwpiFGH}a.  ",
-"  ............  "};
diff --git a/app/bin/bitmaps/document-importmod.xpm b/app/bin/bitmaps/document-importmod.xpm
deleted file mode 100644
index d0efd02..0000000
--- a/app/bin/bitmaps/document-importmod.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static char *importmod_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 49 1 ",
-"  c #27795F",
-". c #305173",
-"X c #1A6878",
-"o c #07900F",
-"O c #0E8E14",
-"+ c #0B9C17",
-"@ c #10971E",
-"# c #0BA619",
-"$ c #10A51D",
-"% c #0DB61C",
-"& c #159E22",
-"* c #209E2D",
-"= c #18A727",
-"- c #16B627",
-"; c #27AB35",
-": c #30AF3B",
-"> c #2AB437",
-", c #31B63E",
-"< c #36BD46",
-"1 c #3CC44C",
-"2 c #40C94E",
-"3 c #44CB54",
-"4 c #54DB64",
-"5 c #195793",
-"6 c #3B6D8D",
-"7 c #39798B",
-"8 c #3F6E9C",
-"9 c #377C97",
-"0 c #3D77A6",
-"q c #3F7FBC",
-"w c #37878B",
-"e c #38938E",
-"r c #378399",
-"t c #3983A7",
-"y c #6F91B2",
-"u c #789ABC",
-"i c #7FA1C3",
-"p c #86A6C4",
-"a c #96B4D1",
-"s c #A7C4DB",
-"d c #AECBE1",
-"f c #B9D5E7",
-"g c #C0DBEB",
-"h c #C9E1EF",
-"j c #CDE4F2",
-"k c #D7EDF8",
-"l c #DFF2FC",
-"z c #E5F6FF",
-"x c None",
-/* pixels */
-"xxqqqqqqqqqxxxxx",
-"xxt3111;<>sqxxxx",
-"xxq1<<:O;<a;qxxx",
-"xxq<;;&x=2pppqxx",
-"xxq===$o+;>#xxxx",
-"xxq=aid=$=,1>txx",
-"xxq=ilaf->44>txx",
-"x5qiijlsg-31=0xx",
-"5zzzzzzkjh1,#rxx",
-"x5Xuuhlsf1111exx",
-"xxw<uzpf211;:exx",
-"xx9;pys1<<;$+9xx",
-"xx0@&@=<;;=%#9xx",
-"xx8;<;;===$##7xx",
-"xx8*<<==+@++#7xx",
-"xx.677776667w xx"
-};
diff --git a/app/bin/bitmaps/document-new.xpm b/app/bin/bitmaps/document-new.xpm
deleted file mode 100644
index df4790d..0000000
--- a/app/bin/bitmaps/document-new.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char *document_new[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 16 1",
-"  c #578757875787",
-". c #D8CCC69C0972",
-"X c #F68EE212077A",
-"o c #4DB24DB22F3A",
-"O c #6DBE6C5B24E5",
-"+ c #F4FCE3151187",
-"@ c #F755E8202525",
-"# c #EC82D7FE0467",
-"$ c #383338333833",
-"% c #E683DCF75128",
-"& c #F190EA107861",
-"* c #E462E45CE3EB",
-"= c #FFFDE56F00EE",
-"- c #E1C4CC690469",
-"; c None",
-": c #FFFFE5710000",
-/* pixels */
-" $$$$$$$$$oo.=;;",
-"$********%@++#-;",
-"$*******&@+@++#:",
-"$*******%+@&&@X=",
-"$*******%+@&&@X=",
-"$*****o*&@+@@+#:",
-"$***&****%@++@-;",
-"$*********%%%o;;",
-"$************$;;",
-"$************$;;",
-"$*&**********$;;",
-"$*******&****$;;",
-"$************$;;",
-"$************$;;",
-" $$$$$$$$$$$$ ;;",
-";;;;;;;;;;;;;;;;"
-};
diff --git a/app/bin/bitmaps/document-open.xpm b/app/bin/bitmaps/document-open.xpm
deleted file mode 100644
index be91cd7..0000000
--- a/app/bin/bitmaps/document-open.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * document_open[] = {
-"16 16 16 1",
-" 	c None",
-".	c #181917",
-"+	c #292928",
-"@	c #DBDBDB",
-"#	c #5E5F5E",
-"$	c #181919",
-"%	c #A6A6A5",
-"&	c #09215F",
-"*	c #092260",
-"=	c #88ABD2",
-"-	c #779BCA",
-";	c #4A76B5",
-">	c #265299",
-",	c #243F67",
-"'	c #0F2D6C",
-")	c #082160",
-"    ...+.++.    ",
-"   +.@@@@@@#.   ",
-"++++.@@@@@@@#$  ",
-"+%%#.@#####@@#$ ",
-"+%%#+@@@@@@@@%. ",
-".%%#.@######@%. ",
-".%%#.@@@@@@@@%. ",
-".%&&&&&&&&&&&&&*",
-"+%&=====-======&",
-".%&=;;;;;;;;;;-&",
-".%&=;;-;;;-;;;-&",
-"$%&=;;;-;;;;;;-&",
-".%*;;;>>;>;>>>;&",
-"$%&;>>>;>;>>;>;&",
-".,&,'>'>>>>''>'*",
-"$&&&&&&&&&&&&&*)"};
diff --git a/app/bin/bitmaps/document-print.xpm b/app/bin/bitmaps/document-print.xpm
deleted file mode 100644
index 69802d6..0000000
--- a/app/bin/bitmaps/document-print.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * document_print_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #BABDB6",
-"+	c #EEEEEC",
-"@	c #888A85",
-"#	c #D3D7CF",
-"                ",
-"   ...........  ",
-"   .++++@++++.  ",
-"   .+..@@@..+.  ",
-"   .++@@@@@++.  ",
-"   .+...@...+.  ",
-"   .++++@++++.  ",
-"   .+++++++++.  ",
-" @@@.........@@@",
-" @+++++++++++++@",
-" @+#+.+#+#+#+#+@",
-" @+###########+@",
-" @+.@@@@@@@@@.+@",
-" @+...........+@",
-" @+###########+@",
-" @@@@@@@@@@@@@@@"};
diff --git a/app/bin/bitmaps/document-save.xpm b/app/bin/bitmaps/document-save.xpm
deleted file mode 100644
index afc2ce6..0000000
--- a/app/bin/bitmaps/document-save.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * document_save[] = {
-"16 16 16 1",
-" 	c None",
-".	c #193A55",
-"+	c #192933",
-"@	c #0A2342",
-"#	c #122735",
-"$	c #536974",
-"%	c #A7BDC6",
-"&	c #5180AA",
-"*	c #244E77",
-"=	c #272925",
-"-	c #102C4B",
-";	c #E6E6E6",
-">	c #7095AB",
-",	c #2D5C8D",
-"'	c #6E6E6E",
-")	c #9B9C9B",
-".+..@@@#.       ",
-"...$%%&*@       ",
-"+=#---&%*#=====.",
-"=%;%>,@>&-%;;;;=",
-"=;;%%$@,&-'%;;;=",
-"=;;@@@@,*@@@@;;=",
-"=;;)@&***,&@$%;=",
-"=;;;)@&,,>@$;;;=",
-"=;;;%)@>&@$%;;;=",
-"=;;;;;)#@$;;;;;=",
-"=;;;;;;;;;;;;;;=",
-"=))))))))))))))=",
-"=))')')')')')')=",
-"=))')')')')')')=",
-"=))))))))))))))=",
-"+==============+"};
diff --git a/app/bin/bitmaps/down.xpm b/app/bin/bitmaps/down.xpm
new file mode 100644
index 0000000..8edaca4
--- /dev/null
+++ b/app/bin/bitmaps/down.xpm
@@ -0,0 +1,89 @@
+static char *down_x16[] = {
+	"8 16 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"        ",
+	"        ",
+	"        ",
+	"        ",
+	"        ",
+	"        ",
+	" 000000 ",
+	" 000000 ",
+	"  0000  ",
+	"   00   ",
+	"        ",
+	"        ",
+	"        ",
+	"        ",
+	"        ",
+	"        "};
+
+static char *down_x24[] = {
+	"12 24 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	" 0000000000 ",
+	" 0000000000 ",
+	" 0000000000 ",
+	"  00000000  ",
+	"   000000   ",
+	"    0000    ",
+	"     00     ",
+	"      0     ",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	"            ",
+	"            "};
+
+static char *down_x32[] = {
+	"16 32 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"  0000000000000 ",
+	"  0000000000000 ",
+	"  0000000000000 ",
+	"  000000000000  ",
+	"   0000000000   ",
+	"    00000000    ",
+	"     000000     ",
+	"      0000      ",
+	"       000      ",
+	"       00       ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"                "};
+
+static char **down_xpm[3] = { down_x16, down_x24, down_x32 };
+
diff --git a/app/bin/bitmaps/dpoly.xpm b/app/bin/bitmaps/dpoly.xpm
deleted file mode 100644
index b46993e..0000000
--- a/app/bin/bitmaps/dpoly.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * dpoly_xpm[] = {
-"16 16 3 1",
-"X	c None",
-" 	c #FFFF00000000",
-".	c #000000000000",
-" ..... XXXXXXXXX",
-".XXXXXX..... XXX",
-".XXXXXXXXX..XXXX",
-".XXXXXXXX.XXXXXX",
-".XXXXXX..XXXXXXX",
-".XXXXX.XXXXXXXXX",
-".XXX..XXXXXXXXXX",
-".XX ...XXXXXXXXX",
-".XXXXXX......XXX",
-" XXXXXXXXXXXX.. ",
-"X.XXXXXXXXXXXX.X",
-"X.XXXXXXXXXX..XX",
-"XX.XXXXXXXX.XXXX",
-"XXX.XXXXXX.XXXXX",
-"XXX.XXXX..XXXXXX",
-"XXXX .. XXXXXXXX"};
diff --git a/app/bin/bitmaps/dpolyline.xpm b/app/bin/bitmaps/dpolyline.xpm
deleted file mode 100644
index 7f01bda..0000000
--- a/app/bin/bitmaps/dpolyline.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dpolyline_xpm[] = {
-"16 16 3 1",
-"X	c None",
-" 	c #FFFF00000000",
-".	c #000000000000",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXX .... XXX",
-"XXXXXXXXXX..XXXX",
-"XXXXXXXXX.XXXXXX",
-"XXXXXXX..XXXXXXX",
-"XXXXXX.XXXXXXXXX",
-"XXXX..XXXXXXXXXX",
-"XXX ...XXXXXXXXX",
-"XXXXXXX......XXX",
-" XXXXXXXXXXXX.. ",
-"X.XXXXXXXXXXXX.X",
-"X.XXXXXXXXXX..XX",
-"XX.XXXXXXXX.XXXX",
-"XXX.XXXXXX.XXXXX",
-"XXX.XXXX..XXXXXX",
-"XXXX .. XXXXXXXX"};
-
diff --git a/app/bin/bitmaps/dtbledge.xpm b/app/bin/bitmaps/dtbledge.xpm
deleted file mode 100644
index 7772d10..0000000
--- a/app/bin/bitmaps/dtbledge.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dtbledge_xpm[] = {
-"16 16 4 1",
-"o	c None",
-".	c #000000000000",
-" 	c #0000FFFF0000",
-"X	c #861782078617",
-"               .",
-"              ..",
-"              .X",
-"             ..X",
-"            ..XX",
-"            .XXX",
-"           ..XXX",
-"          ..XXXX",
-"          .XXXXo",
-"         ..XXXXo",
-"         .XXXXoo",
-"..........XXXooo",
-"..........XXXooo",
-"XXXXXXXX..XXoooo",
-"XXXXXXXX..Xooooo",
-"XXXXXXXX..Xooooo"};
diff --git a/app/bin/bitmaps/ease-broad.xpm b/app/bin/bitmaps/ease-broad.xpm
new file mode 100644
index 0000000..646791e
--- /dev/null
+++ b/app/bin/bitmaps/ease-broad.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char * ease_broad_x16[] = {
+"41 16 2 1",
+" 	c None",
+"x	c #000000000000",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x xx    x x    x  x  x x    x  x x ",
+"xxxxx  x x xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"        xxxx                    x        ",
+"        x   x                   x        ",
+"        x   x xxx   xx   xx   xxx        ",
+"        xxxx  x  x x  x x  x x  x        ",
+"        x   x x    x  x x  x x  x        ",
+"        x   x x    x  x x xx x  x        ",
+"        xxxx  x     xx   x x  xxx        ",
+"                                         "};
+
+static char* ease_broad_x24[] = {
+"56 24 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"                                                        ",
+"        xxxxxx                                xx        ",
+"        xx   xx                               xx        ",
+"        xx   xx                               xx        ",
+"        xx   xx                               xx        ",
+"        xxxxxx   xx xxx   xxxxx   xxxxxx  xxxxxx        ",
+"        xx   xx  xxx  xx xx   xx xx   xx xx   xx        ",
+"        xx   xx  xx   xx xx   xx xx   xx xx   xx        ",
+"        xx   xx  xx      xx   xx xx   xx xx   xx        ",
+"        xx   xx  xx      xx   xx xx   xx xx   xx        ",
+"        xxxxxx   xx       xxxxx   xxxx x  xxxxxx        ",
+"                                                        ",
+"                                                        "};
+
+static char* ease_broad_x32[] = {
+"66 32 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx  xx  xx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"          xxxxxxx                                     xx          ",
+"          xxxxxxxx                                    xx          ",
+"          xx     xx                                   xx          ",
+"          xx     xx                                   xx          ",
+"          xx     xx                                   xx          ",
+"          xxxxxxxx   xx xxx    xxxxxx   xxxxxxx   xxxxxx          ",
+"          xxxxxxxx   xx xxxx  xxxxxxxx xxxxxxxx  xxxxxxx          ",
+"          xx     xx  xxx   xx xx    xx xx    xx xx    xx          ",
+"          xx     xx  xx    xx xx    xx xx    xx xx    xx          ",
+"          xx     xx  xx       xx    xx xx    xx xx    xx          ",
+"          xx     xx  xx       xx    xx xx    xx xx    xx          ",
+"          xxxxxxxx   xx       xxxxxxxx xxxxxxxx  xxxxxxx          ",
+"          xxxxxxx    xx        xxxxxx   xxxx xx   xxxxxx          ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  "};
+
+static char **ease_broad_xpm[3] = { ease_broad_x16, ease_broad_x24, ease_broad_x32 };
diff --git a/app/bin/bitmaps/ease-cornu.xpm b/app/bin/bitmaps/ease-cornu.xpm
new file mode 100644
index 0000000..745f436
--- /dev/null
+++ b/app/bin/bitmaps/ease-cornu.xpm
@@ -0,0 +1,96 @@
+/* XPM */
+static char * ease_cornu_x16[] = {
+"41 16 4 1",
+" 	c None",
+"x	c #000000",
+"#	c #009999",
+"$	c #FF9900",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x  x    x x    x  x  x x    x  x x ",
+"xxxxx  xxx xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"   $$$   ###                     $$$$$   ",
+"  $   $ #   #                $$$$     $  ",
+" $  $  $#      ##  ###  ###$$#  # $$$  $ ",
+"$  $ $  #     #  # #$$#$#  # #  #$   $  $",
+"$  $   $#     #$$#$#    #  # #  #  $ $  $",
+" $  $$$ #  $#$#  # #    #  # #  #$  $  $ ",
+"  $     $###   ##  #    #  #  ##  $   $  ",
+"   $$$$$                           $$$   "};
+
+static char* ease_cornu_x24[] = {
+"56 24 4 1",
+" 	c	None",
+"x	c	#000000",
+"#	c	#009999",
+"-	c	#FF9900",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"     ---                                                ",
+"   ------ #####                                         ",
+"  ---   -##   ##                              -----     ",
+"  -- --- ##                               -----------   ",
+" -- ---- ##                          ------        ---  ",
+" -- ---- ##       #####  ## ### -##-###  ##   ## -  --  ",
+" -- ---- ##      ##   ## ###--##-###  ## ##   ## --  -- ",
+" --- --- ##      ##  -##-##--    ##   ## ##   ## --- -- ",
+"   ---   ##   ## ##---## ##      ##   ## ##   ## -- --  ",
+"    ----- #####---#####  ##      ##   ##  #### #   ---  ",
+"      -----                                   -------   ",
+"                                               -----    ",
+"                                                        "};
+
+static char* ease_cornu_x32[] = {
+"66 32 4 1",
+" 	c	None",
+"x	c	#000000",
+"#	c	#009999",
+"-	c	#FF9900",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx xxx xxx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"      -----  ######                                               ",
+"     ------ ########                                              ",
+"    --     ##     ##                               --------       ",
+"   --  ----##                                   -------------     ",
+"   --  ----##--       ######   ## ###  ## ####  ##    ##  ----    ",
+"  --  -----## --     ######## ######## ######## ##    ##    ---   ",
+"  --  -----## --     ##    ## ###   ## ### - ## ##    ##--   --   ",
+"  --  -----## -      ##    ## ##    -- ## -- ## ##    ##---   --  ",
+"  --   ----##        ##    ## ## ----- ##    ## ##    ##----  --  ",
+"  --    ---##     ## ##    ## ## ---   ##    ## ##   -##----  --  ",
+"   --       ######## ######## ##       ##    ## ########----  --  ",
+"   ---       ###### - ######  ##       ##    ##  ##### #---- ---  ",
+"    ----     --------                               -- ----  --   ",
+"     ------------                                   ---     ---   ",
+"         ---                                         ---- ----    ",
+"                                                      ------      ",
+"                                                                  "};
+
+static char **ease_cornu_xpm[3] = { ease_cornu_x16, ease_cornu_x24, ease_cornu_x32 };
+
diff --git a/app/bin/bitmaps/ease-gt-broad.xpm b/app/bin/bitmaps/ease-gt-broad.xpm
new file mode 100644
index 0000000..b2dc1cc
--- /dev/null
+++ b/app/bin/bitmaps/ease-gt-broad.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char * ease_gtbroad_x16[] = {
+"41 16 2 1",
+" 	c None",
+"x	c #000000000000",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x xx    x x    x  x  x x    x  x x ",
+"xxxxx  x x xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"                                         ",
+"     x     xxxx                    x     ",
+"      x    x   x                   x     ",
+"       x   x   x xxx   xx   xx   xxx     ",
+"        x  xxxx  x  x x  x x  x x  x     ",
+"       x   x   x x    x  x x  x x  x     ",
+"      x    x   x x    x  x x xx x  x     ",
+"     x     xxxx  x     xx  xx x  xx      "};
+
+static char* ease_gtbroad_x24[] = {
+"56 24 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"                                                        ",
+"  xx         xxxxxx                                xx   ",
+"   xx        xx   xx                               xx   ",
+"    xx       xx   xx                               xx   ",
+"     xx      xx   xx                               xx   ",
+"      xx     xxxxxx   xx xxx   xxxxx   xxxxxx  xxxxxx   ",
+"      xx     xx   xx  xxx  xx xx   xx xx   xx xx   xx   ",
+"     xx      xx   xx  xx   xx xx   xx xx   xx xx   xx   ",
+"    xx       xx   xx  xx      xx   xx xx   xx xx   xx   ",
+"   xx        xx   xx  xx      xx   xx xx   xx xx   xx   ",
+"  xx         xxxxxx   xx       xxxxx   xxxx x  xxxxxx   ",
+"                                                        ",
+"                                                        "};
+
+static char* ease_gtbroad_x32[] = {
+"66 32 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx xxx xxx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"  xx              xxxxxxx                                     xx  ",
+"   xx             xxxxxxxx                                    xx  ",
+"    xx            xx     xx                                   xx  ",
+"     xx           xx     xx                                   xx  ",
+"      xx          xx     xx                                   xx  ",
+"       xx         xxxxxxxx   xx xxx    xxxxxx   xxxxxxx   xxxxxx  ",
+"        xx        xxxxxxxx   xx xxxx  xxxxxxxx xxxxxxxx  xxxxxxx  ",
+"       xx         xx     xx  xxx   xx xx    xx xx    xx xx    xx  ",
+"      xx          xx     xx  xx    xx xx    xx xx    xx xx    xx  ",
+"     xx           xx     xx  xx       xx    xx xx    xx xx    xx  ",
+"    xx            xx     xx  xx       xx    xx xx    xx xx    xx  ",
+"   xx             xxxxxxxx   xx       xxxxxxxx xxxxxxxx  xxxxxxx  ",
+"  xx              xxxxxxx    xx        xxxxxx   xxxx xx   xxxxxx  ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  "};
+
+static char **ease_gtbroad_xpm[3] = { ease_gtbroad_x16, ease_gtbroad_x24, ease_gtbroad_x32 };
diff --git a/app/bin/bitmaps/ease-gt-sharp.xpm b/app/bin/bitmaps/ease-gt-sharp.xpm
new file mode 100644
index 0000000..bd12492
--- /dev/null
+++ b/app/bin/bitmaps/ease-gt-sharp.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char * ease_gtsharp_x16[] = {
+"41 16 2 1",
+" 	c None",
+"x	c #000000000000",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x xx    x x    x  x  x x    x  x x ",
+"xxxxx  x x xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"     x      xxxxx x                      ",
+"      x    x      x                      ",
+"       x   x      xxx   xx  xxx  xxx     ",
+"        x   xxxxx x  x x  x x  x x  x    ",
+"       x        x x  x x  x x    x  x    ",
+"      x         x x  x x xx x    xxx     ",
+"     x     xxxxx  x  x  x x x    x       ",
+"                                 x       "};
+
+static char* ease_gtsharp_x24[] = {
+"56 24 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"                                                        ",
+"  xx           xxxxxx  xx                               ",
+"   xx         xx       xx                               ",
+"    xx        xx       xx                               ",
+"     xx       xx       xx                               ",
+"      xx       xxxxx   xx xxx   xxxxxx xx xxx  xxxxxx   ",
+"      xx           xx  xxx  xx xx   xx xxx  xx xx   xx  ",
+"     xx            xx  xx   xx xx   xx xx      xx   xx  ",
+"    xx             xx  xx   xx xx   xx xx      xx   xx  ",
+"   xx              xx  xx   xx xx   xx xx      xxx  xx  ",
+"  xx          xxxxxx   xx   xx  xxxx x xx      xx xxx   ",
+"                                               xx       ",
+"                                               xx       "};
+
+static char* ease_gtsharp_x32[] = {
+"66 32 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx xxx xxx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"  xx                xxxxxxx  xx                                   ",
+"   xx              xxxxxxxx  xx                                   ",
+"    xx            xx         xx                                   ",
+"     xx           xx         xx                                   ",
+"      xx          xx         xx                                   ",
+"       xx          xxxxxx    xx xxx    xxxxxxx xx xxx   xxxxxx    ",
+"        xx          xxxxxx   xxxxxxx  xxxxxxxx xx xxxx  xxxxxxx   ",
+"       xx                xx  xxx   xx xx    xx xxx   xx xx    xx  ",
+"      xx                 xx  xx    xx xx    xx xx    xx xx    xx  ",
+"     xx                  xx  xx    xx xx    xx xx       xx    xx  ",
+"    xx                   xx  xx    xx xx    xx xx       xx    xx  ",
+"   xx             xxxxxxxx   xx    xx xxxxxxxx xx       xxxxxxxx  ",
+"  xx              xxxxxxx    xx    xx  xxxx xx xx       xxxxxxx   ",
+"                                                        xx        ",
+"                                                        xx        ",
+"                                                        xx        ",
+"                                                                  "};
+
+static char **ease_gtsharp_xpm[3] = { ease_gtsharp_x16, ease_gtsharp_x24, ease_gtsharp_x32 };
diff --git a/app/bin/bitmaps/ease-lt-broad.xpm b/app/bin/bitmaps/ease-lt-broad.xpm
new file mode 100644
index 0000000..ab043ee
--- /dev/null
+++ b/app/bin/bitmaps/ease-lt-broad.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char * ease_ltbroad_x16[] = {
+"41 16 2 1",
+" 	c None",
+"x	c #000000000000",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x xx    x x    x  x  x x    x  x x ",
+"xxxxx  x x xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"                                         ",
+"        x  xxxx                    x     ",
+"       x   x   x                   x     ",
+"      x    x   x xxx   xx   xx   xxx     ",
+"     x     xxxx  x  x x  x x  x x  x     ",
+"      x    x   x x    x  x x  x x  x     ",
+"       x   x   x x    x  x x xx x  x     ",
+"        x  xxxx  x     xx  xx x  xx      "};
+
+static char* ease_ltbroad_x24[] = {
+"56 24 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"                                                        ",
+"      xx     xxxxxx                                xx   ",
+"     xx      xx   xx                               xx   ",
+"    xx       xx   xx                               xx   ",
+"   xx        xx   xx                               xx   ",
+"  xx         xxxxxx   xx xxx   xxxxx   xxxxxx  xxxxxx   ",
+"  xx         xx   xx  xxx  xx xx   xx xx   xx xx   xx   ",
+"   xx        xx   xx  xx   xx xx   xx xx   xx xx   xx   ",
+"    xx       xx   xx  xx      xx   xx xx   xx xx   xx   ",
+"     xx      xx   xx  xx      xx   xx xx   xx xx   xx   ",
+"      xx     xxxxxx   xx       xxxxx   xxxx x  xxxxxx   ",
+"                                                        ",
+"                                                        "};
+
+static char* ease_ltbroad_x32[] = {
+"66 32 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx xxx xxx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"        xx        xxxxxxx                                     xx  ",
+"       xx         xxxxxxxx                                    xx  ",
+"      xx          xx     xx                                   xx  ",
+"     xx           xx     xx                                   xx  ",
+"    xx            xx     xx                                   xx  ",
+"   xx             xxxxxxxx   xx xxx    xxxxxx   xxxxxxx   xxxxxx  ",
+"  xx              xxxxxxxx   xx xxxx  xxxxxxxx xxxxxxxx  xxxxxxx  ",
+"   xx             xx     xx  xxx   xx xx    xx xx    xx xx    xx  ",
+"    xx            xx     xx  xx    xx xx    xx xx    xx xx    xx  ",
+"     xx           xx     xx  xx       xx    xx xx    xx xx    xx  ",
+"      xx          xx     xx  xx       xx    xx xx    xx xx    xx  ",
+"       xx         xxxxxxxx   xx       xxxxxxxx xxxxxxxx  xxxxxxx  ",
+"        xx        xxxxxxx    xx        xxxxxx   xxxx xx   xxxxxx  ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  "};
+
+static char **ease_ltbroad_xpm[3] = { ease_ltbroad_x16, ease_ltbroad_x24, ease_ltbroad_x32 };
diff --git a/app/bin/bitmaps/ease-lt-sharp.xpm b/app/bin/bitmaps/ease-lt-sharp.xpm
new file mode 100644
index 0000000..93faf60
--- /dev/null
+++ b/app/bin/bitmaps/ease-lt-sharp.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char * ease_ltsharp_x16[] = {
+"41 16 2 1",
+" 	c None",
+"x	c #000000000000",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x xx    x x    x  x  x x    x  x x ",
+"xxxxx  x x xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"     x      xxxxx x                      ",
+"    x      x      x                      ",
+"   x       x      xxx   xx  xxx  xxx     ",
+"  x         xxxxx x  x x  x x  x x  x    ",
+"   x            x x  x x  x x    x  x    ",
+"    x           x x  x x xx x    xxx     ",
+"     x     xxxxx  x  x  x x x    x       ",
+"                                 x       "};
+
+static char* ease_ltsharp_x24[] = {
+"56 24 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"                                                        ",
+"  xx           xxxxxx  xx                               ",
+"   xx         xx       xx                               ",
+"    xx        xx       xx                               ",
+"     xx       xx       xx                               ",
+"      xx       xxxxx   xx xxx   xxxxxx xx xxx  xxxxxx   ",
+"      xx           xx  xxx  xx xx   xx xxx  xx xx   xx  ",
+"     xx            xx  xx   xx xx   xx xx      xx   xx  ",
+"    xx             xx  xx   xx xx   xx xx      xx   xx  ",
+"   xx              xx  xx   xx xx   xx xx      xxx  xx  ",
+"  xx          xxxxxx   xx   xx  xxxx x xx      xx xxx   ",
+"                                               xx       ",
+"                                               xx       "};
+
+static char* ease_ltsharp_x32[] = {
+"66 32 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx xxx xxx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"        xx          xxxxxxx  xx                                   ",
+"       xx          xxxxxxxx  xx                                   ",
+"      xx          xx         xx                                   ",
+"     xx           xx         xx                                   ",
+"    xx            xx         xx                                   ",
+"   xx              xxxxxx    xx xxx    xxxxxxx xx xxx   xxxxxx    ",
+"  xx                xxxxxx   xxxxxxx  xxxxxxxx xx xxxx  xxxxxxx   ",
+"   xx                    xx  xxx   xx xx    xx xxx   xx xx    xx  ",
+"    xx                   xx  xx    xx xx    xx xx    xx xx    xx  ",
+"     xx                  xx  xx    xx xx    xx xx       xx    xx  ",
+"      xx                 xx  xx    xx xx    xx xx       xx    xx  ",
+"       xx         xxxxxxxx   xx    xx xxxxxxxx xx       xxxxxxxx  ",
+"        xx        xxxxxxx    xx    xx  xxxx xx xx       xxxxxxx   ",
+"                                                        xx        ",
+"                                                        xx        ",
+"                                                        xx        ",
+"                                                                  "};
+
+static char **ease_ltsharp_xpm[3] = { ease_ltsharp_x16, ease_ltsharp_x24, ease_ltsharp_x32 };
diff --git a/app/bin/bitmaps/ease-none.xpm b/app/bin/bitmaps/ease-none.xpm
new file mode 100644
index 0000000..b2fe985
--- /dev/null
+++ b/app/bin/bitmaps/ease-none.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char * ease_none_x16[] = {
+"41 16 2 1",
+" 	c None",
+"x	c #000000000000",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x  x    x x    x  x  x x    x  x x ",
+"xxxxx  xxx xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"          x   x                          ",
+"          xx  x                          ",
+"          xxx x  xx  xxx   xx            ",
+"          x x x x  x x  x x  x           ",
+"          x xxx x  x x  x xxx            ",
+"          x  xx x  x x  x x              ",
+"          x   x  xx  x  x  xxx           ",
+"                                         "};
+
+static char* ease_none_x24[] = {
+"56 24 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"                                                        ",
+"            xx   xx                                     ",
+"            xx   xx                                     ",
+"            xxx  xx                                     ",
+"            xxxx xx                                     ",
+"            xxxxxxx   xxxxx  xx xxx   xxxxx             ",
+"            xx xxxx  xx   xx xxx  xx xx   xx            ",
+"            xx  xxx  xx   xx xx   xx xx   xx            ",
+"            xx   xx  xx   xx xx   xx xxxxxxx            ",
+"            xx   xx  xx   xx xx   xx xx                 ",
+"            xx   xx   xxxxx  xx   xx  xxxxxx            ",
+"                                                        ",
+"                                                        "};
+
+static char* ease_none_x32[] = {
+"66 32 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx xxx xxx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"               xx     xx                                          ",
+"               xx     xx                                          ",
+"               xx     xx                                          ",
+"               xxx    xx                                          ",
+"               xxxx   xx                                          ",
+"               xxxxx  xx   xxxxxx  xx xxxx   xxxxxx               ",
+"               xx xxx xx  xxxxxxxx xxxxxxxx xxxxxxxx              ",
+"               xx  xxxxx  xx    xx xxx   xx xx    xx              ",
+"               xx   xxxx  xx    xx xx    xx xxxxxxxx              ",
+"               xx    xxx  xx    xx xx    xx xxxxxxxx              ",
+"               xx     xx  xx    xx xx    xx xx                    ",
+"               xx     xx  xxxxxxxx xx    xx xxxxxxxx              ",
+"               xx     xx   xxxxxx  xx    xx  xxxxxxx              ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  "};
+
+static char **ease_none_xpm[3] = { ease_none_x16, ease_none_x24, ease_none_x32 };
diff --git a/app/bin/bitmaps/ease-normal.xpm b/app/bin/bitmaps/ease-normal.xpm
new file mode 100644
index 0000000..411a036
--- /dev/null
+++ b/app/bin/bitmaps/ease-normal.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char * ease_normal_x16[] = {
+"41 16 2 1",
+" 	c None",
+"x	c #000000000000",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x  x    x x    x  x  x x    x  x x ",
+"xxxxx  xxx xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"     x   x                        x      ",
+"     xx  x                        x      ",
+"     xxx x  xx  xxx  xxx xx   xx  x      ",
+"     x x x x  x x  x x  x  x x  x x      ",
+"     x xxx x  x x    x  x  x x  x x      ",
+"     x  xx x  x x    x  x  x x  x x      ",
+"     x   x  xx  x    x  x  x  xxx  x     ",
+"                                         "};
+
+static char* ease_normal_x24[] = {
+"56 24 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"                                                        ",
+"      xx   xx                                   xx      ",
+"      xx   xx                                   xx      ",
+"      xxx  xx                                   xx      ",
+"      xxxx xx                                   xx      ",
+"      xxxxxxx   xxxxx  xx xxx  xx xx xx  xxxxxx xx      ",
+"      xx xxxx  xx   xx xxx  xx xxxxxxxx xx   xx xx      ",
+"      xx  xxx  xx   xx xx      xx xx xx xx   xx xx      ",
+"      xx   xx  xx   xx xx      xx xx xx xx   xx xx      ",
+"      xx   xx  xx   xx xx      xx xx xx xx   xx xx      ",
+"      xx   xx   xxxxx  xx      xx xx xx  xxxx x  xx     ",
+"                                                        ",
+"                                                        "};
+
+static char* ease_normal_x32[] = {
+"66 32 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx xxx xxx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"        xx     xx                                       xx        ",
+"        xx     xx                                       xx        ",
+"        xx     xx                                       xx        ",
+"        xxx    xx                                       xx        ",
+"        xxxx   xx                                       xx        ",
+"        xxxxx  xx   xxxxxx  xx xxx  xx  xx  xx  xxxxxxx xx        ",
+"        xx xxx xx  xxxxxxxx xxxxxxx xxxxxxxxxx xxxxxxxx xx        ",
+"        xx  xxxxx  xx    xx xxx  xx xx xxx xxx xx    xx xx        ",
+"        xx   xxxx  xx    xx xx      xx  xx  xx xx    xx xx        ",
+"        xx    xxx  xx    xx xx      xx  xx  xx xx    xx xx        ",
+"        xx     xx  xx    xx xx      xx  xx  xx xx    xx xx        ",
+"        xx     xx  xxxxxxxx xx      xx  xx  xx xxxxxxxx xxx       ",
+"        xx     xx   xxxxxx  xx      xx  xx  xx  xxxx xx  xxx      ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  ",
+"                                                                  "};
+
+static char **ease_normal_xpm[3] = { ease_normal_x16, ease_normal_x24, ease_normal_x32 };
diff --git a/app/bin/bitmaps/ease-sharp.xpm b/app/bin/bitmaps/ease-sharp.xpm
new file mode 100644
index 0000000..05c5c3b
--- /dev/null
+++ b/app/bin/bitmaps/ease-sharp.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char * ease_sharp_x16[] = {
+"41 16 2 1",
+" 	c None",
+"x	c #000000000000",
+"xxxxx                                  x ",
+"x                                     xxx",
+"x      xx   xxx  xx  xxx xx   xx  xxx  x ",
+"xxxx  x  x x    x  x x  x  x x  x x  x x ",
+"x     x  x  xx  xxxx x  x  x xxxx x  x x ",
+"x     x xx    x x    x  x  x x    x  x x ",
+"xxxxx  x x xxx   xxx x  x  x  xxx x  x  x",
+"                                         ",
+"        xxxxx x                          ",
+"       x      x                          ",
+"       x      xxx   xx  xxx  xxx         ",
+"        xxxx  x  x x  x x  x x  x        ",
+"            x x  x x  x x    x  x        ",
+"            x x  x x xx x    xxx         ",
+"       xxxxx  x  x  x x x    x           ",
+"                             x           "};
+
+static char* ease_sharp_x24[] = {
+"56 24 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                        ",
+"xxxxxx                                                  ",
+"xx                                                      ",
+"xx                                                  x   ",
+"xx                                                  xx  ",
+"xxxx   xxxxx  xxxxx  xxxx  xxx  xx   xxxx  xx xx  xxxxxx",
+"xx    xx  xx xx     xx  xx xxxxxxxx xx  xx xxx xx   xx  ",
+"xx    xx  xx xxx    xx  xx xx xx xx xx  xx xx  xx   xx  ",
+"xx    xx  xx   xxxx xxxxxx xx xx xx xxxxxx xx  xx   xx  ",
+"xx    xx  xx     xx xx     xx xx xx xx     xx  xx   xx  ",
+"xxxxxx xxx x xxxxx   xxxxx xx xx xx  xxxxx xx  xx    xxx",
+"                                                        ",
+"         xxxxxx  xx                                     ",
+"        xx       xx                                     ",
+"        xx       xx                                     ",
+"        xx       xx                                     ",
+"         xxxxx   xx xxx   xxxxxx xx xxx  xxxxxx         ",
+"             xx  xxx  xx xx   xx xxx  xx xx   xx        ",
+"             xx  xx   xx xx   xx xx      xx   xx        ",
+"             xx  xx   xx xx   xx xx      xx   xx        ",
+"             xx  xx   xx xx   xx xx      xxx  xx        ",
+"        xxxxxx   xx   xx  xxxx x xx      xx xxx         ",
+"                                         xx             ",
+"                                         xx             "};
+
+static char* ease_sharp_x32[] = {
+"66 32 2 1",
+" 	c	None",
+"x	c	#000000",
+"                                                                  ",
+"xxxxxxx                                                           ",
+"xxxxxxx                                                           ",
+"xx                                                            x   ",
+"xx                                                            xx  ",
+"xx                                                            xx  ",
+"xxxxx     xxxxx  xxxxxx   xxxx   xxxx  xxx    xxxx  xx xx   xxxxxx",
+"xxxxx    xxxxxx xxxxxxx  xxxxxx  xxxxxxxxxx  xxxxxx xxxxxx  xxxxxx",
+"xx      xx   xx xxx     xx   xx  xx xxx xxx xx   xx xxx  xx   xx  ",
+"xx      xx   xx  xxx    xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx    xxx  xxxxxxx  xx  xx  xx xxxxxxx xx   xx   xx  ",
+"xx      xx   xx     xxx xx       xx  xx  xx xx      xx   xx   xx  ",
+"xxxxxxx xxxxxxx xxxxxxx xxxxxxx  xx  xx  xx  xxxxxx xx   xx   xxxx",
+"xxxxxxx  xxx xx xxxxxx   xxxxxx  xx  xx  xx  xxxxxx xx   xx    xxx",
+"                                                                  ",
+"            xxxxxxx  xx                                           ",
+"           xxxxxxxx  xx                                           ",
+"          xx         xx                                           ",
+"          xx         xx                                           ",
+"          xx         xx                                           ",
+"           xxxxxx    xx xxx    xxxxxxx xx xxx   xxxxxx            ",
+"            xxxxxx   xxxxxxx  xxxxxxxx xx xxxx  xxxxxxx           ",
+"                 xx  xxx   xx xx    xx xxx   xx xx    xx          ",
+"                 xx  xx    xx xx    xx xx    xx xx    xx          ",
+"                 xx  xx    xx xx    xx xx       xx    xx          ",
+"                 xx  xx    xx xx    xx xx       xx    xx          ",
+"          xxxxxxxx   xx    xx xxxxxxxx xx       xxxxxxxx          ",
+"          xxxxxxx    xx    xx  xxxx xx xx       xxxxxxx           ",
+"                                                xx                ",
+"                                                xx                ",
+"                                                xx                ",
+"                                                                  "};
+
+static char **ease_sharp_xpm[3] = { ease_sharp_x16, ease_sharp_x24, ease_sharp_x32 };
diff --git a/app/bin/bitmaps/ebroad.xpm b/app/bin/bitmaps/ebroad.xpm
deleted file mode 100644
index 11bc4d6..0000000
--- a/app/bin/bitmaps/ebroad.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * ebroad_xpm[] = {
-"41 16 2 1",
-".	c None",
-" 	c #000000000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .  .... . .... .. .. . .... .. . .",
-"     .. . .   ...   . .. .. ..   . .. .. ",
-".........................................",
-".........................................",
-"........    .................... ........",
-"........ ... ................... ........",
-"........ ... .   ...  ...  ...   ........",
-"........    .. .. . .. . .. . .. ........",
-"........ ... . .... .. . .. . .. ........",
-"........ ... . .... .. . .  . .. ........",
-"........    .. .....  ... . ..   ........"};
diff --git a/app/bin/bitmaps/ecornu.xpm b/app/bin/bitmaps/ecornu.xpm
deleted file mode 100644
index e32e56a..0000000
--- a/app/bin/bitmaps/ecornu.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * ecornu_xpm[] = {
-"41 16 4 1",
-".	c None",
-" 	c #000000000000",
-"#	c #FFFF00000000",
-"$	c #808080000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .. .... . .... .. .. . .... .. . .",
-"     ..   .   ...   . .. .. ..   . .. .. ",
-".........................................",
-"...$$$...###.....................$$$$$...",
-"..$...$.#...#................$$$$.....$..",
-".$..$..$#......##..###..###$$#..#.$$$..$.",
-"$..$.$..#.....#..#.#$$#$#..#.#..#$...$..$",
-"$..$...$#.....#$$#$#....#..#.#..#..$.$..$",
-".$..$$$.#..$#$#..#.#....#..#.#..#$..$..$.",
-"..$.....$###...##..#....#..#..##..$...$..",
-"...$$$$$...........................$$$..."};
diff --git a/app/bin/bitmaps/edit-redo.xpm b/app/bin/bitmaps/edit-redo.xpm
deleted file mode 100644
index 3d3a70c..0000000
--- a/app/bin/bitmaps/edit-redo.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char *edit_redo[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 7 1",
-"  c #4EE29B270680",
-". c #73EAD2BE1616",
-"X c #94FB9F050707",
-"o c #A20EDAEE280A",
-"O c #CC4BD6801D9D",
-"+ c #AEC8ED136114",
-"@ c None",
-/* pixels */
-"@@@@@@@@@ @@@@@@",
-"@@@@@@@@@  @@@@@",
-"@@@@@@@@@ + @@@@",
-"@@@@@@    ++ @@@",
-"@@@@ X+++++.+ @@",
-"@@@ ++ooooo..+ @",
-"@@ o+ooooo....+ ",
-"@ o+oooO.....+ @",
-"@.+OOoooooO.o @@",
-"@ +OX     oo @@@",
-"@ +X @@@@ o @@@@",
-"@ o @@@@@  @@@@@",
-"@ + @@@@@ @@@@@@",
-"@ oX@@@@@@@@@@@@",
-"@@ OX@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"
-};
diff --git a/app/bin/bitmaps/edit-undo.xpm b/app/bin/bitmaps/edit-undo.xpm
deleted file mode 100644
index 4840284..0000000
--- a/app/bin/bitmaps/edit-undo.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char *edit_undo[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 6 1",
-"  c #BD4FA17C1684",
-". c #C482A29B05D3",
-"X c #ECB0D6B82037",
-"o c #F318E3AA67FF",
-"O c #FA79F1F1A77C",
-"+ c None",
-/* pixels */
-"++++++.+++++++++",
-"+++++..+++++++++",
-"++++.O.+++++++++",
-"+++.OX..   +++++",
-"++.OXXoooo  ++++",
-"+.OXXoXXXXoo +++",
-".OXXXXXXXXXXX ++",
-"+.OXXXXXXXXXo  +",
-"++.oXoooooXX.o.+",
-"+++.oo.....oXo +",
-"++++.o.++++.oo +",
-"+++++..+++++.O +",
-"++++++.+++++.o +",
-"++++++++++++Xo++",
-"++++++++++++o ++",
-"++++++++++++++++"
-};
diff --git a/app/bin/bitmaps/egtbroad.xpm b/app/bin/bitmaps/egtbroad.xpm
deleted file mode 100644
index 1a6ca6d..0000000
--- a/app/bin/bitmaps/egtbroad.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * egtbroad_xpm[] = {
-"41 16 2 1",
-".	c None",
-" 	c #000000000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .  .... . .... .. .. . .... .. . .",
-"     .. . .   ...   . .. .. ..   . .. .. ",
-".........................................",
-".........................................",
-"..... .....    .................... .....",
-"...... .... ... ................... .....",
-"....... ... ... .   ...  ...  ...   .....",
-"........ ..    .. .. . .. . .. . .. .....",
-"....... ... ... . .... .. . .. . .. .....",
-"...... .... ... . .... .. . .  . .. .....",
-"..... .....    .. .....  ..  . ..  ......"};
diff --git a/app/bin/bitmaps/egtsharp.xpm b/app/bin/bitmaps/egtsharp.xpm
deleted file mode 100644
index 63212a0..0000000
--- a/app/bin/bitmaps/egtsharp.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * egtsharp_xpm[] = {
-"41 16 2 1",
-".	c None",
-" 	c #000000000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .  .... . .... .. .. . .... .. . .",
-"     .. . .   ...   . .. .. ..   . .. .. ",
-".........................................",
-"..... ......     . ......................",
-"...... .... ...... ......................",
-"....... ... ......   ...  ..   ..   .....",
-"........ ...     . .. . .. . .. . .. ....",
-"....... ........ . .. . .. . .... .. ....",
-"...... ......... . .. . .  . ....   .....",
-"..... .....     .. .. .. . . .... .......",
-"................................. ......."};
diff --git a/app/bin/bitmaps/elev.xpm b/app/bin/bitmaps/elev.xpm
deleted file mode 100644
index de8cd96..0000000
--- a/app/bin/bitmaps/elev.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * elev_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #FFFF0000FFFF",
-"o	c #000000000000",
-"      .         ",
-"     ...        ",
-"    . . .  XXXXX",
-"   .  .  .     X",
-"      .       X ",
-"      .      X  ",
-"      .     X   ",
-"      .    X    ",
-"      .    XXXXX",
-" o   o   o   o  ",
-"ooooooooooooooo ",
-" o   o   o   o  ",
-" o   o   o   o  ",
-" o   o   o   o  ",
-"ooooooooooooooo ",
-" o   o   o   o  "};
diff --git a/app/bin/bitmaps/elevation.xpm b/app/bin/bitmaps/elevation.xpm
new file mode 100644
index 0000000..ab65147
--- /dev/null
+++ b/app/bin/bitmaps/elevation.xpm
@@ -0,0 +1,117 @@
+static char *elevation_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC6600",
+	"3	c	#FF0000",
+	"                ",
+	"    1    11111  ",
+	"   131      33  ",
+	"  13331    33   ",
+	"    1     33    ",
+	"    1    33     ",
+	"    1    11111  ",
+	"    1           ",
+	"                ",
+	" 2 2 2 2 2 2 2  ",
+	" 00000000000000 ",
+	" 2 2 2 2 2 2 2  ",
+	" 00000000000000 ",
+	" 2 2 2 2 2 2 2  ",
+	"                ",
+	"                "};
+
+static char *elevation_x24[] = {
+	"24 24 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#663300",
+	"2	c	#666600",
+	"3	c	#996600",
+	"4	c	#996633",
+	"5	c	#CC0000",
+	"6	c	#CC3300",
+	"7	c	#CC6600",
+	"8	c	#CC6633",
+	"9	c	#CC9933",
+	"A	c	#FF6633",
+	"B	c	#FF9933",
+	"C	c	#FFCC33",
+	"                        ",
+	"                        ",
+	"               5555555  ",
+	"               55555555 ",
+	"                   555  ",
+	"          55      555   ",
+	"         5555    555    ",
+	"        555555   55     ",
+	"       5555555  555     ",
+	"        5 55 5 55555555 ",
+	"          55   55555555 ",
+	"          55            ",
+	"          55            ",
+	"          55            ",
+	"          55            ",
+	"  440440345640180090081 ",
+	" 0440440345640180090081 ",
+	"  BB BB BC57C  C  C  C  ",
+	"  BB BB BC5AC  C  C  C  ",
+	"  BB BB BC  C  C  C  C  ",
+	"  440440340240180090081 ",
+	" 0440440340240180090081 ",
+	"                        ",
+	"                        "};
+
+static char *elevation_x32[] = {
+	"32 32 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#663300",
+	"3	c	#666600",
+	"4	c	#990000",
+	"5	c	#996600",
+	"6	c	#996633",
+	"7	c	#CC0000",
+	"8	c	#CC3300",
+	"9	c	#CC6600",
+	"A	c	#CC6633",
+	"B	c	#CC9933",
+	"C	c	#FF9933",
+	"D	c	#FFCC33",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                     777777777  ",
+	"                     777777777  ",
+	"                          777   ",
+	"                         777    ",
+	"             77         7777    ",
+	"            7777        777     ",
+	"           777777      777      ",
+	"          77777777    777       ",
+	"          777777777  777        ",
+	"          77 777 77 7777777777  ",
+	"             777    7777777777  ",
+	"             777    7777777777  ",
+	"             777                ",
+	"             777                ",
+	"             777                ",
+	"             777                ",
+	"             777                ",
+	"   BB  BB  6B778B   B   B5  B6  ",
+	"  02200220013474500050005100310 ",
+	"   DC  CC   D778D   D   D   D   ",
+	"   DC  CC   D778D   D   D   D   ",
+	"   DC  CC   D779D   D   D   D   ",
+	"   DC  CC   D   D   D   D   D   ",
+	"   DC  CC   D   D   D   D   D   ",
+	"  06500660036002A000B000A200630 ",
+	"  06500660036002A000B000A200630 ",
+	"   D        D   D   C   D   D   ",
+	"                                ",
+	"                                "};
+
+static char **elevation_xpm[3] = { elevation_x16, elevation_x24, elevation_x32 };
+
diff --git a/app/bin/bitmaps/eltbroad.xpm b/app/bin/bitmaps/eltbroad.xpm
deleted file mode 100644
index a2fb83a..0000000
--- a/app/bin/bitmaps/eltbroad.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * eltbroad_xpm[] = {
-"41 16 2 1",
-".	c None",
-" 	c #000000000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .  .... . .... .. .. . .... .. . .",
-"     .. . .   ...   . .. .. ..   . .. .. ",
-".........................................",
-".........................................",
-"........ ..    .................... .....",
-"....... ... ... ................... .....",
-"...... .... ... .   ...  ...  ...   .....",
-"..... .....    .. .. . .. . .. . .. .....",
-"...... .... ... . .... .. . .. . .. .....",
-"....... ... ... . .... .. . .  . .. .....",
-"........ ..    .. .....  ..  . ..  ......"};
diff --git a/app/bin/bitmaps/eltsharp.xpm b/app/bin/bitmaps/eltsharp.xpm
deleted file mode 100644
index 70985c1..0000000
--- a/app/bin/bitmaps/eltsharp.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * eltsharp_xpm[] = {
-"41 16 2 1",
-".	c None",
-" 	c #000000000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .  .... . .... .. .. . .... .. . .",
-"     .. . .   ...   . .. .. ..   . .. .. ",
-".........................................",
-"..... ......     . ......................",
-".... ...... ...... ......................",
-"... ....... ......   ...  ..   ..   .....",
-".. .........     . .. . .. . .. . .. ....",
-"... ............ . .. . .. . .... .. ....",
-".... ........... . .. . .  . ....   .....",
-"..... .....     .. .. .. . . .... .......",
-"................................. ......."};
diff --git a/app/bin/bitmaps/enone.xpm b/app/bin/bitmaps/enone.xpm
deleted file mode 100644
index bcc479e..0000000
--- a/app/bin/bitmaps/enone.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * enone_xpm[] = {
-"41 16 2 1",
-".	c None",
-" 	c #000000000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .. .... . .... .. .. . .... .. . .",
-"     ..   .   ...   . .. .. ..   . .. .. ",
-".........................................",
-".......... ... ..........................",
-"..........  .. ..........................",
-"..........   . ..  ..   ...  ............",
-".......... . . . .. . .. . .. ...........",
-".......... .   . .. . .. .   ............",
-".......... ..  . .. . .. . ..............",
-".......... ... ..  .. .. ..   ...........",
-"........................................."};
diff --git a/app/bin/bitmaps/enormal.xpm b/app/bin/bitmaps/enormal.xpm
deleted file mode 100644
index fa5890a..0000000
--- a/app/bin/bitmaps/enormal.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * enormal_xpm[] = {
-"41 16 2 1",
-".	c None",
-" 	c #000000000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .. .... . .... .. .. . .... .. . .",
-"     ..   .   ...   . .. .. ..   . .. .. ",
-".........................................",
-"..... ... ........................ ......",
-".....  .. ........................ ......",
-".....   . ..  ..   ..   .  ...  .. ......",
-"..... . . . .. . .. . .. .. . .. . ......",
-"..... .   . .. . .... .. .. . .. . ......",
-"..... ..  . .. . .... .. .. . .. . ......",
-"..... ... ..  .. .... .. .. ..   .. .....",
-"........................................."};
diff --git a/app/bin/bitmaps/esharp.xpm b/app/bin/bitmaps/esharp.xpm
deleted file mode 100644
index b7129f0..0000000
--- a/app/bin/bitmaps/esharp.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * esharp_xpm[] = {
-"41 16 2 1",
-".	c None",
-" 	c #000000000000",
-"     .................................. .",
-" .....................................   ",
-" ......  ...   ..  ..   .  ...  ..   .. .",
-"    .. .. . .... .. . .. .. . .. . .. . .",
-" ..... .. ..  ..    . .. .. .    . .. . .",
-" ..... .  .... . .... .. .. . .... .. . .",
-"     .. . .   ...   . .. .. ..   . .. .. ",
-".........................................",
-"........     . ..........................",
-"....... ...... ..........................",
-"....... ......   ...  ..   ..   .........",
-"........     . .. . .. . .. . .. ........",
-"............ . .. . .. . .... .. ........",
-"............ . .. . .  . ....   .........",
-".......     .. .. .. . . .... ...........",
-"............................. ..........."};
diff --git a/app/bin/bitmaps/exit.xpm b/app/bin/bitmaps/exit.xpm
index ab8c191..7daf3ab 100644
--- a/app/bin/bitmaps/exit.xpm
+++ b/app/bin/bitmaps/exit.xpm
@@ -1,21 +1,94 @@
-/* XPM */
-static char*exit_xpm[]={
-"16 16 2 1",
-". c None",
-"# c #000000000000",
-"................",
-"................",
-".###.#.#.#.###..",
-".#...#.#.#..#...",
-".#...#.#.#..#...",
-".#...#.#.#..#...",
-".#....#..#..#...",
-".###..#..#..#...",
-".#....#..#..#...",
-".#...#.#.#..#...",
-".#...#.#.#..#...",
-".#...#.#.#..#...",
-".###.#.#.#..#...",
-"................",
-"................",
-"................"};
+static char *exit_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#FF0000",
+	"                ",
+	"       1        ",
+	"      111       ",
+	"     11111      ",
+	"       1        ",
+	"       1        ",
+	"       1        ",
+	"       1        ",
+	"                ",
+	"                ",
+	" 000 0 0 0 000  ",
+	" 0   0 0 0  0   ",
+	" 00   0  0  0   ",
+	" 0   0 0 0  0   ",
+	" 000 0 0 0  0   ",
+	"                "};
+
+static char *exit_x24[] = {
+	"24 24 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#CC0000",
+	"3	c	#808080",
+	"                        ",
+	"                        ",
+	"           22           ",
+	"          2222          ",
+	"         222222         ",
+	"        22222222        ",
+	"           22           ",
+	"           22           ",
+	"           22           ",
+	"           22           ",
+	"           22           ",
+	"           22           ",
+	"                        ",
+	"                        ",
+	"  00000 0   0 00 000000 ",
+	"  00    01 10 00   00   ",
+	"  00     030  00   00   ",
+	"  0000   303  00   00   ",
+	"  00     030  00   00   ",
+	"  00    01 10 00   00   ",
+	"  00000 0   0 00   00   ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *exit_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                                ",
+	"               11               ",
+	"              1111              ",
+	"             111111             ",
+	"           111111111            ",
+	"          11111111111           ",
+	"         11111111111111         ",
+	"         1111 1111 1111         ",
+	"         111  1111  111         ",
+	"              1111   1          ",
+	"              1111              ",
+	"              1111              ",
+	"              1111              ",
+	"              1111              ",
+	"              1111              ",
+	"              1111              ",
+	"              1111              ",
+	"              111               ",
+	"                                ",
+	"                                ",
+	"                                ",
+	" 00000000 000   00  00 000000000",
+	" 00000000  000 000  00 00000000 ",
+	" 00        000000   00    000   ",
+	" 000        00000   00    000   ",
+	" 0000000     000    00    000   ",
+	" 0000000    0000    00    000   ",
+	" 00         00000   00    000   ",
+	" 00        000 000  00    000   ",
+	" 00000000 000  000  00    000   ",
+	" 00000000 00    000 00    000   ",
+	"                                "};
+
+static char **exit_xpm[3] = { exit_x16, exit_x24, exit_x32 };
+
diff --git a/app/bin/bitmaps/extend.xpm b/app/bin/bitmaps/extend.xpm
index 4fb45d1..43490a0 100644
--- a/app/bin/bitmaps/extend.xpm
+++ b/app/bin/bitmaps/extend.xpm
@@ -1,23 +1,143 @@
-/* XPM */
-static char * extend_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #000000000000",
-"o	c #0000FFFFFFFF",
-"                ",
-"            .   ",
-"           ...  ",
-"          . . . ",
-"         .X . X.",
-"         XXX.XXX",
-"          X . X ",
-"       X X .  X ",
-"        X  . X  ",
-"o  o X X X.  X  ",
-"oooooXX  .X X   ",
-"o  o X ..  X    ",
-"o  o...  XX X   ",
-"o  o X XX       ",
-"oooooXX         ",
-"o  o X          "};
+static char *extend_x16[] = {
+	"16 16 21 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#3366CC",
+	"3	c	#3366FF",
+	"4	c	#3399FF",
+	"5	c	#666666",
+	"6	c	#6666CC",
+	"7	c	#6699FF",
+	"8	c	#66CCFF",
+	"9	c	#993333",
+	"A	c	#996666",
+	"B	c	#999999",
+	"C	c	#9999CC",
+	"D	c	#CC0000",
+	"E	c	#CC3333",
+	"F	c	#CC6633",
+	"G	c	#CC6666",
+	"H	c	#CCCCCC",
+	"I	c	#C0C0C0",
+	"J	c	#808080",
+	"            D   ",
+	"           DDD  ",
+	"          GAE9  ",
+	"          BJEJI ",
+	"          BJD5  ",
+	"          BBGJH ",
+	"         HJFE5  ",
+	"         BJEJB  ",
+	"        CJGEJH  ",
+	"        46FJI   ",
+	"      734832    ",
+	"  884438814     ",
+	" 343448 34      ",
+	"  8 8441        ",
+	"  411338        ",
+	"  44 8          "};
+
+static char *extend_x24[] = {
+	"24 24 21 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#3366FF",
+	"3	c	#3399FF",
+	"4	c	#666666",
+	"5	c	#6666CC",
+	"6	c	#6699FF",
+	"7	c	#66CCFF",
+	"8	c	#993333",
+	"9	c	#999999",
+	"A	c	#CC0000",
+	"B	c	#CC3300",
+	"C	c	#CC3333",
+	"D	c	#CC6633",
+	"E	c	#CC6666",
+	"F	c	#CC6699",
+	"G	c	#CC9999",
+	"H	c	#CCCCCC",
+	"I	c	#C0C0C0",
+	"J	c	#808080",
+	"                        ",
+	"                  AA    ",
+	"                AAAAA   ",
+	"                B AA    ",
+	"                99EGJI  ",
+	"                J9DG4H  ",
+	"                44A 4   ",
+	"               HJIC94   ",
+	"                4GE99H  ",
+	"              H94AA44   ",
+	"               JICG4    ",
+	"             H44CE99    ",
+	"             9JGA 4I    ",
+	"            75 EGJ4     ",
+	"            37 A9JH     ",
+	"          62 7732       ",
+	"       77227  32        ",
+	"   7776223  7 1 7       ",
+	"  23323277  32          ",
+	"  236 7  76117          ",
+	"   77 77112             ",
+	"   76111117             ",
+	"  112117                ",
+	"   77                   "};
+
+static char *extend_x32[] = {
+	"32 32 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066FF",
+	"2	c	#3366CC",
+	"3	c	#3366FF",
+	"4	c	#3399FF",
+	"5	c	#666666",
+	"6	c	#6699FF",
+	"7	c	#66CCFF",
+	"8	c	#999999",
+	"9	c	#CC0000",
+	"A	c	#CC3300",
+	"B	c	#CC3333",
+	"C	c	#CC6666",
+	"D	c	#CC9999",
+	"E	c	#CCCCCC",
+	"F	c	#C0C0C0",
+	"G	c	#808080",
+	"                                ",
+	"                        99      ",
+	"                      999999    ",
+	"                     99999999   ",
+	"                     99 99 99   ",
+	"                      5 99 5    ",
+	"                     EGECBEGE   ",
+	"                      5 998G    ",
+	"                      5 9955    ",
+	"                    E8G 9955    ",
+	"                    E88D9FG8    ",
+	"                     559AEGFE   ",
+	"                   EF5 99 5     ",
+	"                   E88D9 55     ",
+	"                    5 CBE5      ",
+	"                 EE55 9B8GE     ",
+	"                  8G 99 5       ",
+	"                  5ED9B55       ",
+	"                73  9CF5        ",
+	"                377   5FE       ",
+	"             763  77 12         ",
+	"          7  347   741          ",
+	"          7633 7   147          ",
+	"     7 77334    7 11            ",
+	"    463333  7   431             ",
+	"   334337   77 1147             ",
+	"     7  77   711                ",
+	"     7   7 1136                 ",
+	"     7   411  7                 ",
+	"   11311147                     ",
+	"    37    7                     ",
+	"     7                          "};
+
+static char **extend_xpm[3] = { extend_x16, extend_x24, extend_x32 };
+
diff --git a/app/bin/bitmaps/filled-box.xpm b/app/bin/bitmaps/filled-box.xpm
new file mode 100644
index 0000000..cd85179
--- /dev/null
+++ b/app/bin/bitmaps/filled-box.xpm
@@ -0,0 +1,120 @@
+static char *filled_box_x16[] = {
+	"16 16 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#9999CC",
+	"3	c	#99CCCC",
+	"4	c	#99CCFF",
+	"5	c	#99FFFF",
+	"6	c	#CC0000",
+	"7	c	#CC6666",
+	"8	c	#CC6699",
+	"9	c	#CC9999",
+	"A	c	#CC99CC",
+	"                ",
+	" 00000000000000 ",
+	" 05555555542220 ",
+	" 05555555542860 ",
+	" 0555555555A271 ",
+	" 05555555592581 ",
+	" 05555554935540 ",
+	" 05555549355550 ",
+	" 05555483555550 ",
+	" 05554845555550 ",
+	" 05548455555550 ",
+	" 05484555555550 ",
+	" 04845555555550 ",
+	" 18455555555550 ",
+	" 00000000000000 ",
+	"                "};
+
+static char *filled_box_x24[] = {
+	"24 24 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#9999CC",
+	"2	c	#99CCCC",
+	"3	c	#99CCFF",
+	"4	c	#99FFFF",
+	"5	c	#CC0000",
+	"6	c	#CC3333",
+	"7	c	#CC6666",
+	"8	c	#CC6699",
+	"9	c	#CC9999",
+	"A	c	#CC99CC",
+	"                        ",
+	"                        ",
+	" 0000000000000000000000 ",
+	" 0444444444444433333340 ",
+	" 0444444444444415555640 ",
+	" 0444444444444433317540 ",
+	" 0444444444444444292530 ",
+	" 0444444444444441942530 ",
+	" 04444444444444A1443530 ",
+	" 0444444444444914443230 ",
+	" 0444444444439244444440 ",
+	" 0444444444392444444440 ",
+	" 0444444443824444444440 ",
+	" 0444444438344444444440 ",
+	" 0444444383444444444440 ",
+	" 0444443834444444444440 ",
+	" 0444438344444444444440 ",
+	" 0444283444444444444440 ",
+	" 0442934444444444444440 ",
+	" 0429344444444444444440 ",
+	" 0314444444444444444440 ",
+	" 0000000000000000000000 ",
+	"                        ",
+	"                        "};
+
+static char *filled_box_x32[] = {
+	"32 32 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#9999CC",
+	"2	c	#99CCCC",
+	"3	c	#99CCFF",
+	"4	c	#99FFFF",
+	"5	c	#CC0000",
+	"6	c	#CC3333",
+	"7	c	#CC3366",
+	"8	c	#CC6666",
+	"9	c	#CC6699",
+	"A	c	#CC9999",
+	"B	c	#CC99CC",
+	"                                ",
+	"                                ",
+	" 000000000000000000000000000000 ",
+	" 000000000000000000000000000000 ",
+	" 004444444444444444444444444400 ",
+	" 004444444444444444436555558400 ",
+	" 004444444444444444436555556400 ",
+	" 004444444444444444444436555400 ",
+	" 004444444444444444444265A85300 ",
+	" 00444444444444444444265A485300 ",
+	" 0044444444444444444255B4495300 ",
+	" 0044444444444444441551444A5300 ",
+	" 004444444444444441552444431300 ",
+	" 0044444444444444A5524444444400 ",
+	" 004444444444444A56244444444400 ",
+	" 00444444444443A562444444444400 ",
+	" 0044444444443A5634444444444400 ",
+	" 004444444443857344444444444400 ",
+	" 004444444438583444444444444400 ",
+	" 004444444385834444444444444400 ",
+	" 004444443758344444444444444400 ",
+	" 004444436593444444444444444400 ",
+	" 004444265A34444444444444444400 ",
+	" 00444265A344444444444444444400 ",
+	" 0044255A4444444444444444444400 ",
+	" 004155144444444444444444444400 ",
+	" 003651444444444444444444444400 ",
+	" 004224444444444444444444444400 ",
+	" 000000000000000000000000000000 ",
+	" 000000000000000000000000000000 ",
+	"                                ",
+	"                                "};
+
+static char **filled_box_xpm[3] = { filled_box_x16, filled_box_x24, filled_box_x32 };
+
diff --git a/app/bin/bitmaps/filled-polygon.xpm b/app/bin/bitmaps/filled-polygon.xpm
new file mode 100644
index 0000000..2620b74
--- /dev/null
+++ b/app/bin/bitmaps/filled-polygon.xpm
@@ -0,0 +1,121 @@
+static char *filled_polygon_x16[] = {
+	"16 16 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#336699",
+	"6	c	#669999",
+	"7	c	#6699CC",
+	"8	c	#66CCCC",
+	"9	c	#66CCFF",
+	"A	c	#99FFFF",
+	"                ",
+	"   01220144     ",
+	"  17799AAA93    ",
+	" 17AAAAAAAA84   ",
+	" 29AAAAAAAAA83  ",
+	" 4AAAAAAAAAAA83 ",
+	"06AAAAAAAAAAAA71",
+	" 4AAAAAAAAAAAA82",
+	" 19AAAAAAAAAAA82",
+	" 17AAAAAAAAAAA82",
+	"  4AAAAAAAAAAA82",
+	"  19AAAAAAAAAA92",
+	"  1179AAAAAAAA92",
+	"    1279AAAA9752",
+	"      227640210 ",
+	"        00      "};
+
+static char *filled_polygon_x24[] = {
+	"24 24 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003333",
+	"3	c	#333333",
+	"4	c	#333366",
+	"5	c	#336666",
+	"6	c	#336699",
+	"7	c	#339999",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#66CCCC",
+	"B	c	#66CCFF",
+	"C	c	#99FFFF",
+	"                        ",
+	"            0032        ",
+	"    0033105599A62       ",
+	"   299ABBCCCCCCB62      ",
+	"  06CCCCCCCCCCCCB5      ",
+	"  3ACCCCCCCCCCCCCB5     ",
+	"  2BCCCCCCCCCCCCCCB5    ",
+	" 07CCCCCCCCCCCCCCCCB5   ",
+	" 3ACCCCCCCCCCCCCCCCCB4  ",
+	" 1BCCCCCCCCCCCCCCCCCCB4 ",
+	" 3BCCCCCCCCCCCCCCCCCCC4 ",
+	" 08CCCCCCCCCCCCCCCCCCC4 ",
+	"  2CCCCCCCCCCCCCCCCCCC4 ",
+	"  3BCCCCCCCCCCCCCCCCCC5 ",
+	"  07CCCCCCCCCCCCCCCCCC5 ",
+	"   2BCCCCCCCCCCCCCCCCC5 ",
+	"   3ACCCCCCCCCCCCCCCCC5 ",
+	"   07CCCCCCCCCCCCCCCCC5 ",
+	"    45BCCCCCCCCCCCCCCC5 ",
+	"      35BCCCCCCCCCCCCC5 ",
+	"        36BCCCCCCCBA850 ",
+	"         028BBA952230   ",
+	"           22230        ",
+	"                        "};
+
+static char *filled_polygon_x32[] = {
+	"32 32 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333366",
+	"3	c	#336666",
+	"4	c	#336699",
+	"5	c	#339999",
+	"6	c	#669999",
+	"7	c	#6699CC",
+	"8	c	#66CCCC",
+	"9	c	#66CCFF",
+	"A	c	#99FFFF",
+	"                                ",
+	"                 0000           ",
+	"          000000000000          ",
+	"    0000000000447789300         ",
+	"    004477999AAAAAAA9300        ",
+	"   008AAAAAAAAAAAAAAA9100       ",
+	"   019AAAAAAAAAAAAAAAA9100      ",
+	"   05AAAAAAAAAAAAAAAAAA9100     ",
+	"  008AAAAAAAAAAAAAAAAAAA810     ",
+	"  029AAAAAAAAAAAAAAAAAAAA800    ",
+	" 006AAAAAAAAAAAAAAAAAAAAAA800   ",
+	" 009AAAAAAAAAAAAAAAAAAAAAAA700  ",
+	" 02AAAAAAAAAAAAAAAAAAAAAAAAA700 ",
+	" 009AAAAAAAAAAAAAAAAAAAAAAAAA30 ",
+	" 008AAAAAAAAAAAAAAAAAAAAAAAAA40 ",
+	"  04AAAAAAAAAAAAAAAAAAAAAAAAA40 ",
+	"  009AAAAAAAAAAAAAAAAAAAAAAAA50 ",
+	"  008AAAAAAAAAAAAAAAAAAAAAAAA60 ",
+	"   04AAAAAAAAAAAAAAAAAAAAAAAA60 ",
+	"   009AAAAAAAAAAAAAAAAAAAAAAA60 ",
+	"   007AAAAAAAAAAAAAAAAAAAAAAA60 ",
+	"    04AAAAAAAAAAAAAAAAAAAAAAA60 ",
+	"    009AAAAAAAAAAAAAAAAAAAAAA60 ",
+	"    0069AAAAAAAAAAAAAAAAAAAAA60 ",
+	"     0027AAAAAAAAAAAAAAAAAAAA70 ",
+	"      00038AAAAAAAAAAAAAAAAAA70 ",
+	"        00038AAAAAAAAAAAAAA9840 ",
+	"          00049AAAAAAA997520000 ",
+	"            00059A98630000000   ",
+	"              00010000000       ",
+	"                0000            ",
+	"                                "};
+
+static char **filled_polygon_xpm[3] = { filled_polygon_x16, filled_polygon_x24, filled_polygon_x32 };
+
diff --git a/app/bin/bitmaps/flip.xpm b/app/bin/bitmaps/flip.xpm
deleted file mode 100644
index 03966eb..0000000
--- a/app/bin/bitmaps/flip.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * flip_xpm[] = {
-"16 16 4 1",
-"#	c None",
-".	c #0000ffffffff",
-"b	c #000000000000",
-"a	c #ffff00000000",
-".######a#######b",
-"..#####a######bb",
-"...####a#####bbb",
-"....###a####bbbb",
-".....##a###bbbbb",
-"......#a##bbbbbb",
-".......a#bbbbbbb",
-".......abbbbbbbb",
-".......abbbbbbbb",
-".......a#bbbbbbb",
-"......#a##bbbbbb",
-".....##a###bbbbb",
-"....###a####bbbb",
-"...####a#####bbb",
-"..#####a######bb",
-".######a#######b"};
diff --git a/app/bin/bitmaps/funnel.xpm b/app/bin/bitmaps/funnel.xpm
new file mode 100644
index 0000000..ef7cd23
--- /dev/null
+++ b/app/bin/bitmaps/funnel.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char *funnel_xpm[] = {
+"16 16 43 1",
+" 	c None",
+".	c #216262",
+"+	c #123737",
+"@	c #030A0A",
+"#	c #000000",
+"$	c #010303",
+"%	c #050E0E",
+"&	c #091C1C",
+"*	c #0F2E2E",
+"=	c #164242",
+"-	c #1C5353",
+";	c #76D1D1",
+">	c #82D5D5",
+",	c #79D2D2",
+"'	c #62CBCB",
+")	c #65CCCC",
+"!	c #75D1D1",
+"~	c #80D5D5",
+"{	c #5FCACA",
+"]	c #52C5C5",
+"^	c #42C0C0",
+"/	c #39ACAC",
+"(	c #3BB1B1",
+"_	c #57C7C7",
+":	c #7BD3D3",
+"<	c #89D8D8",
+"[	c #7ED4D4",
+"}	c #60CACA",
+"|	c #43C0C0",
+"1	c #4BC3C3",
+"2	c #86D7D7",
+"3	c #71D0D0",
+"4	c #46C1C1",
+"5	c #50C5C5",
+"6	c #49C2C2",
+"7	c #4CC3C3",
+"8	c #5EC9C9",
+"9	c #000101",
+"0	c #040B0B",
+"a	c #020606",
+"b	c #72D0D0",
+"c	c #010404",
+"d	c #313333",
+"                ",
+" .+@###$%&*=-.  ",
+" .;;;>,')!~;;.  ",
+" .+;{]^/(^_:-.  ",
+"  +<;[}|1:;2-   ",
+"  +@;;345;;=-   ",
+"   @#;;6_;*=    ",
+"    ##;78&*     ",
+"     ##'%&      ",
+"      #'%       ",
+"      #'%       ",
+"      #'%       ",
+"      9'0       ",
+"      $'a       ",
+"      #bc       ",
+"      ##d       "};
diff --git a/app/bin/bitmaps/funnelclear.xpm b/app/bin/bitmaps/funnelclear.xpm
new file mode 100644
index 0000000..45d948f
--- /dev/null
+++ b/app/bin/bitmaps/funnelclear.xpm
@@ -0,0 +1,124 @@
+/* XPM */
+static char * funnelclear_xpm[] = {
+"16 16 105 2",
+"  	c None",
+". 	c #216262",
+"+ 	c #123737",
+"@ 	c #030A0A",
+"# 	c #000000",
+"$ 	c #010303",
+"% 	c #050E0E",
+"& 	c #091C1C",
+"* 	c #0F2E2E",
+"= 	c #164242",
+"- 	c #1C5353",
+"; 	c #76D1D1",
+"> 	c #82D5D5",
+", 	c #79D2D2",
+"' 	c #62CBCB",
+") 	c #65CCCC",
+"! 	c #75D1D1",
+"~ 	c #80D5D5",
+"{ 	c #7AAEAE",
+"] 	c #9D5E5E",
+"^ 	c #6DA5A5",
+"/ 	c #39ACAC",
+"( 	c #3BB1B1",
+"_ 	c #42C0C0",
+": 	c #57C7C7",
+"< 	c #8AB6B6",
+"[ 	c #A21717",
+"} 	c #7D4747",
+"| 	c #92BABA",
+"1 	c #9F6464",
+"2 	c #FF7777",
+"3 	c #9C6060",
+"4 	c #6CA5A5",
+"5 	c #4BC3C3",
+"6 	c #7BD3D3",
+"7 	c #86B4B4",
+"8 	c #A16767",
+"9 	c #F87070",
+"0 	c #A70000",
+"a 	c #9C0101",
+"b 	c #FE7676",
+"c 	c #D44C4C",
+"d 	c #FA7272",
+"e 	c #965C5C",
+"f 	c #70AAAA",
+"g 	c #85B4B4",
+"h 	c #9B6464",
+"i 	c #EA6262",
+"j 	c #E45C5C",
+"k 	c #A30000",
+"l 	c #8C0303",
+"m 	c #990000",
+"n 	c #EF6767",
+"o 	c #BE3636",
+"p 	c #E65E5E",
+"q 	c #955F5F",
+"r 	c #996464",
+"s 	c #D74F4F",
+"t 	c #CD4545",
+"u 	c #A00000",
+"v 	c #A10000",
+"w 	c #880000",
+"x 	c #940000",
+"y 	c #DB5353",
+"z 	c #B72E2E",
+"A 	c #C63D3D",
+"B 	c #BA3131",
+"C 	c #9F1515",
+"D 	c #A81E1E",
+"E 	c #9B0000",
+"F 	c #9C0000",
+"G 	c #830000",
+"H 	c #8F0000",
+"I 	c #B42525",
+"J 	c #A21111",
+"K 	c #A51414",
+"L 	c #970000",
+"M 	c #980000",
+"N 	c #910000",
+"O 	c #8B0000",
+"P 	c #AF1515",
+"Q 	c #AC1111",
+"R 	c #920000",
+"S 	c #8C0000",
+"T 	c #8D0000",
+"U 	c #B81111",
+"V 	c #870000",
+"W 	c #C41111",
+"X 	c #800202",
+"Y 	c #820000",
+"Z 	c #D01111",
+"` 	c #7C6161",
+" .	c #5A0606",
+"..	c #570000",
+"+.	c #720000",
+"@.	c #D81111",
+"#.	c #6C0000",
+"$.	c #5FAFAF",
+"%.	c #020606",
+"&.	c #340000",
+"*.	c #5F0000",
+"=.	c #270000",
+"-.	c #6AC2C2",
+";.	c #360000",
+">.	c #313333",
+"                                ",
+"  . + @ # # # $ % & * = - .     ",
+"  . ; ; ; > , ' ) ! ~ ; ; .     ",
+"  . + ; { ] ^ / ( _ : < [ }     ",
+"    + | 1 2 3 4 5 6 7 8 9 0 0   ",
+"    + a b c d e f g h i c j k   ",
+"      l m n o p q r s o t u v   ",
+"        w x y z A B C D E F     ",
+"          G H I J J K L M       ",
+"          N O P Q Q Q R N       ",
+"        S T U U U U U U T S     ",
+"      V V W W W X V W W W V V   ",
+"      Y Z Z Z `  .G Y Z Z Z Y   ",
+"      ..+.@.#.$.%.  ..+.@.+...  ",
+"      # &.*.=.-.$ # # ;.*.&.#   ",
+"            # # >.              "};
diff --git a/app/bin/bitmaps/go.xpm b/app/bin/bitmaps/go.xpm
index b8a5478..deb8a81 100644
--- a/app/bin/bitmaps/go.xpm
+++ b/app/bin/bitmaps/go.xpm
@@ -1,22 +1,135 @@
-/* XPM */
-static char * go_xpm[] = {
-"16 16 3 1",
-" 	c None",
-"X	c #000000000000",
-"o	c #0000FFFF0000",
-"     XXXXX      ",
-"   XXXXXXXXX    ",
-"  XXoooooooXX   ",
-" XXoooooooooXX  ",
-" XoooooooooooX  ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-" XoooooooooooX  ",
-" XXoooooooooXX  ",
-"  XXoooooooXX   ",
-"   XXXXXXXXX    ",
-"     XXXXX      ",
-"                "};
+static char *go_x16[] = {
+	"16 16 16 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#006600",
+	"3	c	#006633",
+	"4	c	#009933",
+	"5	c	#339933",
+	"6	c	#33CC33",
+	"7	c	#33CC66",
+	"8	c	#66CC66",
+	"9	c	#66CC99",
+	"A	c	#99CC99",
+	"B	c	#99FF99",
+	"C	c	#99FFCC",
+	"D	c	#CCFFCC",
+	"E	c	#008000",
+	"       00       ",
+	"      1221      ",
+	"    11577511    ",
+	"  015788887510  ",
+	" 12678898887620 ",
+	" 14788AAAA877E0 ",
+	" 1478AACCA98740 ",
+	" 1478ACDDB98740 ",
+	" 1478ABCCA98740 ",
+	" 14789ABBA887E0 ",
+	" 147789AA9876E0 ",
+	" 11578888877410 ",
+	"   1377777631   ",
+	"    01476410    ",
+	"      1111      ",
+	"                "};
+
+static char *go_x24[] = {
+	"24 24 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#006600",
+	"3	c	#006633",
+	"4	c	#009900",
+	"5	c	#009933",
+	"6	c	#00CC33",
+	"7	c	#339933",
+	"8	c	#33CC33",
+	"9	c	#33CC66",
+	"A	c	#66CC66",
+	"B	c	#66CC99",
+	"C	c	#99CC99",
+	"D	c	#99FF99",
+	"E	c	#99FFCC",
+	"F	c	#CCFFCC",
+	"G	c	#008000",
+	"                        ",
+	"          0110          ",
+	"         138721         ",
+	"       1279999711       ",
+	"     11799999999510     ",
+	"   015899AAAAAA99821    ",
+	"  125899AAABBAAA998510  ",
+	"  15899AABCCCBBAA986G0  ",
+	"  1589AABCCCCCCAA998G0  ",
+	"  1589AACCEEECCBAA98G0  ",
+	"  1599ABCCEFEECCAA9850  ",
+	"  1599ABCEEFFECCAA9850  ",
+	"  1599ABCDEFFECCAA9850  ",
+	"  1599AACCEEEECBAA9850  ",
+	"  1589AABCCCCCCBAA98G0  ",
+	"  15899AABCCCCBAA996G0  ",
+	"  14689AAABBBBAA9986G0  ",
+	"   1G899AAAAAAA9986G1   ",
+	"    117999AAAA998511    ",
+	"      128999999711      ",
+	"       015888821        ",
+	"         115G10         ",
+	"           10           ",
+	"                        "};
+
+static char *go_x32[] = {
+	"32 32 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#006600",
+	"3	c	#006633",
+	"4	c	#009900",
+	"5	c	#009933",
+	"6	c	#00CC33",
+	"7	c	#339933",
+	"8	c	#33CC33",
+	"9	c	#33CC66",
+	"A	c	#66CC66",
+	"B	c	#66CC99",
+	"C	c	#99CC99",
+	"D	c	#99FF99",
+	"E	c	#99FFCC",
+	"F	c	#CCFFCC",
+	"G	c	#008000",
+	"                                ",
+	"               11               ",
+	"             115310             ",
+	"           015888721            ",
+	"          138999998711          ",
+	"        1179999999998511        ",
+	"      1158999AAAAA9999831       ",
+	"    01G8899AAAAAAAAA9998511     ",
+	"   1258899AAAAAAAAAAA99986G1    ",
+	"   146899AAAABCCCBBAAA99886G0   ",
+	"   156899AAABCCCCCCBAAA9986G0   ",
+	"   15899AAABCCCCCCCCBAA9986G0   ",
+	"   15899AABCCCEEEDCCBAAA988G0   ",
+	"   15899AABCCEEEEEDCCBAA998G0   ",
+	"   1589AAACCCEEFFEECCBAA998G0   ",
+	"   1589AAACCDEFFFEECCBAA99850   ",
+	"   1589AAACCCEFFFEECCBAA998G0   ",
+	"   15899AABCCEEEEEDCCBAA998G0   ",
+	"   15899AABCCCEEEECCCAAA988G0   ",
+	"   15899AAABCCCCCCCCBAA9986G0   ",
+	"   156899AABCCCCCCCBAAA9986G0   ",
+	"   156899AAAABCCCBBAAA99886G0   ",
+	"   1G68899AAAAABAAAAAA9986520   ",
+	"    1158899AAAAAAAAA99986511    ",
+	"      1G88999AAAAAA9998711      ",
+	"       11589999999999821        ",
+	"         11789999998510         ",
+	"           1278888511           ",
+	"            0136511             ",
+	"              111               ",
+	"                                ",
+	"                                "};
+
+static char **go_xpm[3] = { go_x16, go_x24, go_x32 };
+
diff --git a/app/bin/bitmaps/helix.xpm b/app/bin/bitmaps/helix.xpm
new file mode 100644
index 0000000..d02bb29
--- /dev/null
+++ b/app/bin/bitmaps/helix.xpm
@@ -0,0 +1,95 @@
+static char *helix_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"      1111      ",
+	"   1111111111   ",
+	"  11   11    11 ",
+	" 11 111111111 1 ",
+	"11111       1111",
+	"111  2222222  11",
+	"11 2222    22111",
+	"112        11111",
+	"111     1111  12",
+	"22111       1112",
+	"221 111111111 22",
+	"2211    1    22 ",
+	" 2 11111222222  ",
+	"  22  1122      ",
+	"   2222         ",
+	"     2222       "};
+
+static char *helix_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"           11           ",
+	"       11111111111      ",
+	"     111        1111    ",
+	"    11             11   ",
+	"  11    11111111     1  ",
+	"  1   1111 11 11111   1 ",
+	" 11 111           111 1 ",
+	" 1 11      22       111 ",
+	" 111   22222222222   11 ",
+	" 11  222         222111 ",
+	" 11 22             1111 ",
+	" 112            1111 21 ",
+	" 111       1111111   11 ",
+	" 1211               1122",
+	" 22 111           111 2 ",
+	" 21   1111111111111   2 ",
+	" 221     1111111     2  ",
+	" 22 11             22   ",
+	"  2  1111       2222    ",
+	"  22   11111222222      ",
+	"   22                   ",
+	"     22                 ",
+	"      222222            ",
+	"          22            "};
+
+static char *helix_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"               1                ",
+	"          1111111111111         ",
+	"        111111111111111111      ",
+	"      11111           11111     ",
+	"     111                 1111   ",
+	"   111       1111111       111  ",
+	"  111    111111111111111    11  ",
+	"  11   1111111 11  11111111  11 ",
+	" 111 11111             11111 11 ",
+	" 11 111                   11111 ",
+	" 11111     22222222222     1111 ",
+	" 1111   22222222222222222   111 ",
+	" 111  222222         2222221111 ",
+	" 111 2222                211111 ",
+	" 111222                 1111211 ",
+	" 11122              1111111 211 ",
+	" 1111          1111111111   111 ",
+	" 12111         111111      1112 ",
+	" 2121111                 111122 ",
+	" 211 11111             11111 22 ",
+	" 2211  1111111111111111111   22 ",
+	" 22111   111111111111111    222 ",
+	" 22 111        11          222  ",
+	" 222 1111               22222   ",
+	"  22  111111         222222     ",
+	"   22   11111111222222222       ",
+	"   222     11111222222          ",
+	"    2222                        ",
+	"     22222                      ",
+	"       2222222                  ",
+	"         22222222               ",
+	"             2222               "};
+
+static char **helix_xpm[3] = { helix_x16, helix_x24, helix_x32 };
+
diff --git a/app/bin/bitmaps/hndldto.xpm b/app/bin/bitmaps/hndldto.xpm
deleted file mode 100644
index f49fef6..0000000
--- a/app/bin/bitmaps/hndldto.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * hndldto_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000000000",
-"          .  .  ",
-"           ..   ",
-"       .  ...   ",
-"        ..  . . ",
-"    .       ..  ",
-" .   ......  .  ",
-"... ....... ... ",
-" . ........  .  ",
-" .    ..     .  ",
-"..... .. ...... ",
-" .    .. .   .  ",
-"      ..        ",
-"      ..        ",
-"      ..        ",
-"      ..        ",
-"                "};
diff --git a/app/bin/bitmaps/join-line.xpm b/app/bin/bitmaps/join-line.xpm
new file mode 100644
index 0000000..1912e9a
--- /dev/null
+++ b/app/bin/bitmaps/join-line.xpm
@@ -0,0 +1,99 @@
+static char *join_line_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#CC0000",
+	"3	c	#800000",
+	"                ",
+	"              00",
+	"              0 ",
+	"              0 ",
+	"              0 ",
+	"            223 ",
+	"            222 ",
+	"            222 ",
+	"            2   ",
+	"           2    ",
+	"          2     ",
+	"      2  2      ",
+	"      222       ",
+	"     022        ",
+	" 00000 22       ",
+	" 000            "};
+
+static char *join_line_x24[] = {
+	"24 24 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#800000",
+	"                        ",
+	"                      0 ",
+	"                     00 ",
+	"                     00 ",
+	"                     00 ",
+	"                     00 ",
+	"                     0  ",
+	"                    00  ",
+	"                  2223  ",
+	"                  2222  ",
+	"                   2222 ",
+	"                  22    ",
+	"                  2     ",
+	"                 22     ",
+	"                22      ",
+	"               22       ",
+	"              22        ",
+	"         2   22         ",
+	"         22222          ",
+	"         222            ",
+	"        0122            ",
+	"     0000  22           ",
+	" 000000                 ",
+	"                        "};
+
+static char *join_line_x32[] = {
+	"32 32 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#660000",
+	"2	c	#990000",
+	"3	c	#CC0000",
+	"4	c	#800000",
+	"                                ",
+	"                             0  ",
+	"                             0  ",
+	"                             0  ",
+	"                             0  ",
+	"                             0  ",
+	"                            00  ",
+	"                            00  ",
+	"                            0   ",
+	"                            0   ",
+	"                           21   ",
+	"                       333333   ",
+	"                       3333333  ",
+	"                         33333  ",
+	"                         33 33  ",
+	"                        333     ",
+	"                        33      ",
+	"                       33       ",
+	"                      333       ",
+	"                     333        ",
+	"                    333         ",
+	"                   333          ",
+	"                  333           ",
+	"            33   333            ",
+	"            33 3333             ",
+	"            33333               ",
+	"            3333                ",
+	"           04333                ",
+	"        0000  333               ",
+	"  0000000       3               ",
+	" 00000                          ",
+	"                                "};
+
+static char **join_line_xpm[3] = { join_line_x16, join_line_x24, join_line_x32 };
+
diff --git a/app/bin/bitmaps/join.xpm b/app/bin/bitmaps/join.xpm
index b42f2cb..944e443 100644
--- a/app/bin/bitmaps/join.xpm
+++ b/app/bin/bitmaps/join.xpm
@@ -1,22 +1,117 @@
-/* XPM */
-static char * join_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"                ",
-"             . .",
-"              . ",
-"           . . .",
-"            .   ",
-"           . . .",
-"              . ",
-"         XXX . .",
-".  .      XX    ",
-"..... X  X X    ",
-".  . X  X       ",
-".  .XXXX        ",
-".  . X          ",
-"..... X         ",
-".  .            "};
+static char *join_x16[] = {
+	"16 16 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#660000",
+	"4	c	#663300",
+	"5	c	#990000",
+	"6	c	#996600",
+	"7	c	#CC0000",
+	"8	c	#CC3300",
+	"9	c	#CC6600",
+	"A	c	#CC9900",
+	"B	c	#800000",
+	"           66 0 ",
+	"           66A2A",
+	"           20 0 ",
+	"          A4964 ",
+	"           3 46 ",
+	"         7777B  ",
+	"           777  ",
+	"          77    ",
+	"          7     ",
+	"         7      ",
+	"     7 77       ",
+	" 9161777        ",
+	"0406977         ",
+	" A A6157        ",
+	"04006           ",
+	" 9  A           "};
+
+static char *join_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#990000",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"                     0  ",
+	"                8558827 ",
+	"                 338818 ",
+	"                 00  0  ",
+	"                825  0  ",
+	"                7288538 ",
+	"                00  158 ",
+	"              6666660   ",
+	"              6666664   ",
+	"                66666   ",
+	"                66 666  ",
+	"               666  6   ",
+	"              666       ",
+	"             666        ",
+	"        6   666         ",
+	"       66  666          ",
+	"       666666           ",
+	"  7 33066666            ",
+	" 02007 666              ",
+	"  8  8866666            ",
+	"  8  8500466            ",
+	" 350005                 ",
+	" 15   8                 ",
+	"  8                     "};
+
+static char *join_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#990000",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"9	c	#800000",
+	"                                ",
+	"                       20   00  ",
+	"                      855888558 ",
+	"                       00   05  ",
+	"                       0    0   ",
+	"                       0    0   ",
+	"                     88388  0   ",
+	"                      03888758  ",
+	"                      0    038  ",
+	"                     64666 0    ",
+	"                   666666660    ",
+	"                   666666664    ",
+	"                      666666    ",
+	"                      666 666   ",
+	"                     666  666   ",
+	"                    6666        ",
+	"                   6666         ",
+	"                  6666          ",
+	"                 6666           ",
+	"          66    6666            ",
+	"          66   6666             ",
+	"         666 66666              ",
+	"      87096666666               ",
+	"  88 0320666666                 ",
+	" 0100038 66666                  ",
+	"  78   8 666666                 ",
+	"  88   88  46666                ",
+	"  88    7000 666                ",
+	"  57000033                      ",
+	" 02300  88                      ",
+	"   8     8                      ",
+	"   8                            "};
+
+static char **join_xpm[3] = { join_x16, join_x24, join_x32 };
+
diff --git a/app/bin/bitmaps/joinline.xpm b/app/bin/bitmaps/joinline.xpm
deleted file mode 100644
index 06e22f8..0000000
--- a/app/bin/bitmaps/joinline.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * joinline_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"                ",
-"                ",
-"               .",
-"              ..",
-"             ...",
-"            ... ",
-"           ...  ",
-"         XXX    ",
-"          X X   ",
-"     X   X  X   ",
-".....X  X       ",
-".....XXXX       ",
-"..... X         ",
-"      X         ",
-"                "};
\ No newline at end of file
diff --git a/app/bin/bitmaps/l1.xbm b/app/bin/bitmaps/l1.xbm
index e332794..031edd1 100644
--- a/app/bin/bitmaps/l1.xbm
+++ b/app/bin/bitmaps/l1.xbm
@@ -1,6 +1,78 @@
-#define l1_width 14
-#define l1_height 16
-static char l1_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x00, 0x50, 0x00, 
-  0x48, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l1_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x80, 0x03, 
+	0xC0, 0x03, 
+	0xE0, 0x03, 
+	0x80, 0x03, 
+	0x80, 0x03, 
+	0x80, 0x03, 
+	0x80, 0x03, 
+	0x80, 0x03, 
+	0x80, 0x03, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l1_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1E, 0x00, 
+	0x00, 0x1E, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x80, 0x1D, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l1_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xF0, 0x00, 0x00, 
+	0x00, 0xF8, 0x00, 0x00, 
+	0x00, 0xFC, 0x00, 0x00, 
+	0x00, 0xFE, 0x00, 0x00, 
+	0x00, 0xE6, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0xE0, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l10.xbm b/app/bin/bitmaps/l10.xbm
index 0cf7dc8..10920b9 100644
--- a/app/bin/bitmaps/l10.xbm
+++ b/app/bin/bitmaps/l10.xbm
@@ -1,6 +1,78 @@
-#define l10_width 14
-#define l10_height 16
-static char l10_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x8A, 0x18, 
-  0x89, 0x14, 0x88, 0x12, 0x88, 0x11, 0x88, 0x10, 0x88, 0x10, 0x08, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l10_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x78, 0x3F, 
+	0x7C, 0x33, 
+	0x70, 0x33, 
+	0x70, 0x33, 
+	0x70, 0x33, 
+	0x70, 0x33, 
+	0x70, 0x3F, 
+	0x70, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l10_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xE0, 0x71, 0x07, 
+	0xE0, 0x31, 0x07, 
+	0xF0, 0x39, 0x06, 
+	0xD8, 0x39, 0x06, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x31, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l10_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x80, 0x03, 0xFF, 0x00, 
+	0xC0, 0x03, 0xEF, 0x01, 
+	0xE0, 0x83, 0xC7, 0x01, 
+	0xF0, 0x83, 0xC3, 0x03, 
+	0xF8, 0x83, 0xC3, 0x03, 
+	0x98, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0x83, 0xC3, 0x03, 
+	0x80, 0x83, 0xC3, 0x03, 
+	0x80, 0x83, 0xC7, 0x01, 
+	0x80, 0x03, 0xEF, 0x01, 
+	0x80, 0x03, 0xFF, 0x00, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l11.xbm b/app/bin/bitmaps/l11.xbm
index c38f98b..ce82cfe 100644
--- a/app/bin/bitmaps/l11.xbm
+++ b/app/bin/bitmaps/l11.xbm
@@ -1,6 +1,78 @@
-#define l11_width 14
-#define l11_height 16
-static char l11_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x0C, 0x06, 0x0A, 0x05, 
-  0x89, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l11_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1C, 
+	0x78, 0x1E, 
+	0x7C, 0x1F, 
+	0x70, 0x1C, 
+	0x70, 0x1C, 
+	0x70, 0x1C, 
+	0x70, 0x1C, 
+	0x70, 0x1C, 
+	0x70, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l11_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0x81, 0x03, 
+	0xE0, 0xC1, 0x03, 
+	0xE0, 0xC1, 0x03, 
+	0xF0, 0xE1, 0x03, 
+	0xD8, 0xB1, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l11_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0xC0, 0x03, 0x78, 0x00, 
+	0xE0, 0x03, 0x7C, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x03, 0x7F, 0x00, 
+	0x98, 0x03, 0x73, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x80, 0x03, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l12.xbm b/app/bin/bitmaps/l12.xbm
index 19b8726..e660ef3 100644
--- a/app/bin/bitmaps/l12.xbm
+++ b/app/bin/bitmaps/l12.xbm
@@ -1,6 +1,78 @@
-#define l12_width 14
-#define l12_height 16
-static char l12_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x8A, 0x10, 
-  0x09, 0x08, 0x08, 0x04, 0x08, 0x02, 0x08, 0x01, 0x88, 0x00, 0x88, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l12_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x78, 0x3F, 
+	0x7C, 0x33, 
+	0x70, 0x30, 
+	0x70, 0x38, 
+	0x70, 0x1C, 
+	0x70, 0x0E, 
+	0x70, 0x07, 
+	0x70, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l12_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xE0, 0x71, 0x07, 
+	0xE0, 0x39, 0x06, 
+	0xF0, 0x39, 0x0E, 
+	0xD8, 0x01, 0x0E, 
+	0xC0, 0x01, 0x0E, 
+	0xC0, 0x01, 0x07, 
+	0xC0, 0x81, 0x07, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0xC1, 0x01, 
+	0xC0, 0xE1, 0x01, 
+	0xC0, 0xF1, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x79, 0x00, 
+	0xC0, 0xF9, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l12_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0xFE, 0x00, 
+	0x80, 0x03, 0xFF, 0x01, 
+	0xC0, 0x83, 0xE7, 0x03, 
+	0xE0, 0x83, 0xC3, 0x03, 
+	0xF0, 0xC3, 0x83, 0x03, 
+	0xF8, 0xC3, 0x83, 0x03, 
+	0x98, 0x03, 0x80, 0x03, 
+	0x80, 0x03, 0xC0, 0x03, 
+	0x80, 0x03, 0xC0, 0x03, 
+	0x80, 0x03, 0xE0, 0x01, 
+	0x80, 0x03, 0xF0, 0x01, 
+	0x80, 0x03, 0xF8, 0x00, 
+	0x80, 0x03, 0x78, 0x00, 
+	0x80, 0x03, 0x3C, 0x00, 
+	0x80, 0x03, 0x1E, 0x00, 
+	0x80, 0x03, 0x0F, 0x00, 
+	0x80, 0x83, 0x07, 0x00, 
+	0x80, 0x83, 0x07, 0x00, 
+	0x80, 0xC3, 0xFF, 0x03, 
+	0x80, 0xC3, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l13.xbm b/app/bin/bitmaps/l13.xbm
index 812bbe3..a11c7f7 100644
--- a/app/bin/bitmaps/l13.xbm
+++ b/app/bin/bitmaps/l13.xbm
@@ -1,6 +1,78 @@
-#define l13_width 14
-#define l13_height 16
-static char l13_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x0A, 0x10, 
-  0x09, 0x10, 0x08, 0x0E, 0x08, 0x10, 0x08, 0x10, 0x88, 0x10, 0x08, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l13_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x78, 0x3B, 
+	0x7C, 0x38, 
+	0x70, 0x18, 
+	0x70, 0x3C, 
+	0x70, 0x38, 
+	0x70, 0x33, 
+	0x70, 0x3F, 
+	0x70, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l13_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xE0, 0x71, 0x07, 
+	0xE0, 0x39, 0x07, 
+	0xF0, 0x01, 0x07, 
+	0xD8, 0x01, 0x07, 
+	0xC0, 0x01, 0x07, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0xC1, 0x07, 
+	0xC0, 0x01, 0x07, 
+	0xC0, 0x01, 0x0E, 
+	0xC0, 0x01, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l13_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x80, 0x03, 0xFF, 0x00, 
+	0xC0, 0x83, 0xE7, 0x01, 
+	0xE0, 0x83, 0xC7, 0x01, 
+	0xF0, 0x83, 0xC3, 0x03, 
+	0xF8, 0x03, 0xC0, 0x03, 
+	0x98, 0x03, 0xC0, 0x01, 
+	0x80, 0x03, 0xE0, 0x01, 
+	0x80, 0x03, 0xFC, 0x00, 
+	0x80, 0x03, 0xFC, 0x00, 
+	0x80, 0x03, 0xE0, 0x01, 
+	0x80, 0x03, 0xC0, 0x03, 
+	0x80, 0x03, 0x80, 0x03, 
+	0x80, 0x03, 0x80, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0x83, 0xC7, 0x03, 
+	0x80, 0x83, 0xE7, 0x01, 
+	0x80, 0x03, 0xFF, 0x01, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l14.xbm b/app/bin/bitmaps/l14.xbm
index 63f2e44..765ca93 100644
--- a/app/bin/bitmaps/l14.xbm
+++ b/app/bin/bitmaps/l14.xbm
@@ -1,6 +1,78 @@
-#define l14_width 14
-#define l14_height 16
-static char l14_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x0C, 0x0C, 0x0A, 0x0A, 
-  0x09, 0x09, 0x88, 0x08, 0x88, 0x1F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l14_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1C, 
+	0x78, 0x1C, 
+	0x7C, 0x1E, 
+	0x70, 0x1E, 
+	0x70, 0x1F, 
+	0x70, 0x1B, 
+	0xF0, 0x3F, 
+	0x70, 0x18, 
+	0x70, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l14_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0x81, 0x03, 
+	0xE0, 0x81, 0x03, 
+	0xE0, 0xC1, 0x03, 
+	0xF0, 0xC1, 0x03, 
+	0xD8, 0xE1, 0x03, 
+	0xC0, 0xE1, 0x03, 
+	0xC0, 0xF1, 0x03, 
+	0xC0, 0xB1, 0x03, 
+	0xC0, 0xB9, 0x03, 
+	0xC0, 0x99, 0x03, 
+	0xC0, 0xFD, 0x0F, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l14_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0xF0, 0x00, 
+	0x80, 0x03, 0xF0, 0x00, 
+	0xC0, 0x03, 0xF8, 0x00, 
+	0xE0, 0x03, 0xF8, 0x00, 
+	0xF0, 0x03, 0xFC, 0x00, 
+	0xF8, 0x03, 0xFC, 0x00, 
+	0x98, 0x03, 0xFE, 0x00, 
+	0x80, 0x03, 0xEE, 0x00, 
+	0x80, 0x03, 0xEF, 0x00, 
+	0x80, 0x83, 0xE7, 0x00, 
+	0x80, 0x83, 0xE7, 0x00, 
+	0x80, 0xC3, 0xE3, 0x00, 
+	0x80, 0xC3, 0xE1, 0x00, 
+	0x80, 0xE3, 0xFF, 0x03, 
+	0x80, 0xE3, 0xFF, 0x03, 
+	0x80, 0x03, 0xE0, 0x00, 
+	0x80, 0x03, 0xE0, 0x00, 
+	0x80, 0x03, 0xE0, 0x00, 
+	0x80, 0x03, 0xE0, 0x00, 
+	0x80, 0x03, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l15.xbm b/app/bin/bitmaps/l15.xbm
index 4d66f1b..7850754 100644
--- a/app/bin/bitmaps/l15.xbm
+++ b/app/bin/bitmaps/l15.xbm
@@ -1,6 +1,78 @@
-#define l15_width 14
-#define l15_height 16
-static char l15_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x1F, 0x8C, 0x00, 0x8A, 0x00, 
-  0x89, 0x0F, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x88, 0x10, 0x08, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l15_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x3F, 
+	0x78, 0x07, 
+	0x7C, 0x07, 
+	0x70, 0x1F, 
+	0x70, 0x3B, 
+	0x70, 0x30, 
+	0x70, 0x33, 
+	0x70, 0x3F, 
+	0x70, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l15_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xF1, 0x07, 
+	0xE0, 0x71, 0x00, 
+	0xE0, 0x71, 0x00, 
+	0xF0, 0x31, 0x00, 
+	0xD8, 0x31, 0x00, 
+	0xC0, 0xF9, 0x03, 
+	0xC0, 0x79, 0x07, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x01, 0x0E, 
+	0xC0, 0x01, 0x0E, 
+	0xC0, 0x01, 0x0E, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l15_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0xFF, 0x03, 
+	0x80, 0x03, 0xFF, 0x03, 
+	0xC0, 0x03, 0x07, 0x00, 
+	0xE0, 0x03, 0x07, 0x00, 
+	0xF0, 0x83, 0x07, 0x00, 
+	0xF8, 0x83, 0x07, 0x00, 
+	0x98, 0x83, 0x7F, 0x00, 
+	0x80, 0x83, 0xFF, 0x01, 
+	0x80, 0x83, 0xE7, 0x01, 
+	0x80, 0x83, 0xC3, 0x03, 
+	0x80, 0x03, 0xC0, 0x03, 
+	0x80, 0x03, 0x80, 0x03, 
+	0x80, 0x03, 0x80, 0x03, 
+	0x80, 0x03, 0x80, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0xC3, 0x03, 
+	0x80, 0x83, 0xC3, 0x03, 
+	0x80, 0x83, 0xE7, 0x01, 
+	0x80, 0x03, 0xFF, 0x00, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l16.xbm b/app/bin/bitmaps/l16.xbm
index 84366d3..88e94f6 100644
--- a/app/bin/bitmaps/l16.xbm
+++ b/app/bin/bitmaps/l16.xbm
@@ -1,6 +1,78 @@
-#define l16_width 14
-#define l16_height 16
-static char l16_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x00, 0x8A, 0x00, 
-  0x89, 0x0F, 0x88, 0x10, 0x88, 0x10, 0x88, 0x10, 0x88, 0x10, 0x08, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l16_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x78, 0x3F, 
+	0x7C, 0x03, 
+	0x70, 0x1F, 
+	0x70, 0x3F, 
+	0x70, 0x33, 
+	0x70, 0x33, 
+	0x70, 0x3F, 
+	0x70, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l16_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xE0, 0x71, 0x07, 
+	0xE0, 0x31, 0x07, 
+	0xF0, 0x39, 0x00, 
+	0xD8, 0x39, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0xC0, 0xF9, 0x03, 
+	0xC0, 0x79, 0x07, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x31, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l16_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0xFC, 0x00, 
+	0x80, 0x03, 0xFF, 0x01, 
+	0xC0, 0x03, 0xEF, 0x01, 
+	0xE0, 0x83, 0xC7, 0x03, 
+	0xF0, 0x83, 0xC3, 0x03, 
+	0xF8, 0x83, 0x03, 0x00, 
+	0x98, 0xC3, 0x03, 0x00, 
+	0x80, 0xC3, 0x7F, 0x00, 
+	0x80, 0xC3, 0xFF, 0x01, 
+	0x80, 0xC3, 0xEF, 0x01, 
+	0x80, 0xC3, 0xC7, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0x83, 0x83, 0x03, 
+	0x80, 0x83, 0xC7, 0x03, 
+	0x80, 0x83, 0xEF, 0x01, 
+	0x80, 0x03, 0xFF, 0x01, 
+	0x80, 0x03, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l17.xbm b/app/bin/bitmaps/l17.xbm
index 0881871..df3fb94 100644
--- a/app/bin/bitmaps/l17.xbm
+++ b/app/bin/bitmaps/l17.xbm
@@ -1,6 +1,78 @@
-#define l17_width 14
-#define l17_height 16
-static char l17_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x1F, 0x0C, 0x10, 0x0A, 0x08, 
-  0x09, 0x08, 0x08, 0x04, 0x08, 0x04, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l17_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x3F, 
+	0x78, 0x38, 
+	0x7C, 0x18, 
+	0x70, 0x1C, 
+	0x70, 0x0C, 
+	0x70, 0x0E, 
+	0x70, 0x0E, 
+	0x70, 0x06, 
+	0x70, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l17_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xF9, 0x0F, 
+	0xE0, 0x01, 0x0F, 
+	0xE0, 0x01, 0x07, 
+	0xF0, 0x81, 0x03, 
+	0xD8, 0x81, 0x03, 
+	0xC0, 0xC1, 0x01, 
+	0xC0, 0xC1, 0x01, 
+	0xC0, 0xC1, 0x01, 
+	0xC0, 0xE1, 0x00, 
+	0xC0, 0xE1, 0x00, 
+	0xC0, 0xE1, 0x00, 
+	0xC0, 0xE1, 0x00, 
+	0xC0, 0xE1, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l17_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0xC3, 0xFF, 0x03, 
+	0x80, 0xC3, 0xFF, 0x03, 
+	0xC0, 0x03, 0xC0, 0x03, 
+	0xE0, 0x03, 0xE0, 0x01, 
+	0xF0, 0x03, 0xE0, 0x01, 
+	0xF8, 0x03, 0xF0, 0x00, 
+	0x98, 0x03, 0xF0, 0x00, 
+	0x80, 0x03, 0x78, 0x00, 
+	0x80, 0x03, 0x78, 0x00, 
+	0x80, 0x03, 0x38, 0x00, 
+	0x80, 0x03, 0x3C, 0x00, 
+	0x80, 0x03, 0x3C, 0x00, 
+	0x80, 0x03, 0x1C, 0x00, 
+	0x80, 0x03, 0x1E, 0x00, 
+	0x80, 0x03, 0x1E, 0x00, 
+	0x80, 0x03, 0x1E, 0x00, 
+	0x80, 0x03, 0x1E, 0x00, 
+	0x80, 0x03, 0x0E, 0x00, 
+	0x80, 0x03, 0x0E, 0x00, 
+	0x80, 0x03, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l18.xbm b/app/bin/bitmaps/l18.xbm
index 3e9074c..7ab0b30 100644
--- a/app/bin/bitmaps/l18.xbm
+++ b/app/bin/bitmaps/l18.xbm
@@ -1,6 +1,78 @@
-#define l18_width 14
-#define l18_height 16
-static char l18_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x8A, 0x10, 
-  0x89, 0x10, 0x08, 0x0F, 0x88, 0x10, 0x88, 0x10, 0x88, 0x10, 0x08, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l18_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x78, 0x3F, 
+	0x7C, 0x3B, 
+	0x70, 0x3F, 
+	0x70, 0x1E, 
+	0x70, 0x3F, 
+	0x70, 0x33, 
+	0x70, 0x3F, 
+	0x70, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l18_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xE0, 0x71, 0x07, 
+	0xE0, 0x31, 0x07, 
+	0xF0, 0x39, 0x07, 
+	0xD8, 0x39, 0x07, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l18_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x80, 0x03, 0xFF, 0x00, 
+	0xC0, 0x83, 0xEF, 0x01, 
+	0xE0, 0x83, 0xC7, 0x01, 
+	0xF0, 0x83, 0xC3, 0x03, 
+	0xF8, 0x83, 0xC3, 0x03, 
+	0x98, 0x83, 0xC7, 0x01, 
+	0x80, 0x03, 0xEF, 0x01, 
+	0x80, 0x03, 0xFE, 0x00, 
+	0x80, 0x03, 0xFF, 0x00, 
+	0x80, 0x83, 0xE7, 0x01, 
+	0x80, 0x83, 0xC3, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0x83, 0xC3, 0x03, 
+	0x80, 0x83, 0xE7, 0x01, 
+	0x80, 0x03, 0xFF, 0x01, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l19.xbm b/app/bin/bitmaps/l19.xbm
index 71beff5..08aee34 100644
--- a/app/bin/bitmaps/l19.xbm
+++ b/app/bin/bitmaps/l19.xbm
@@ -1,6 +1,78 @@
-#define l19_width 14
-#define l19_height 16
-static char l19_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x8A, 0x10, 
-  0x89, 0x10, 0x08, 0x1F, 0x08, 0x10, 0x08, 0x10, 0x08, 0x08, 0x08, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l19_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x78, 0x3F, 
+	0x7C, 0x33, 
+	0x70, 0x33, 
+	0x70, 0x3F, 
+	0x70, 0x3E, 
+	0x70, 0x30, 
+	0x70, 0x3B, 
+	0x70, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l19_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x01, 
+	0xE0, 0x71, 0x07, 
+	0xE0, 0x39, 0x07, 
+	0xF0, 0x39, 0x06, 
+	0xD8, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x0F, 
+	0xC0, 0x71, 0x0F, 
+	0xC0, 0xE1, 0x0F, 
+	0xC0, 0x01, 0x0E, 
+	0xC0, 0x01, 0x06, 
+	0xC0, 0x01, 0x06, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x71, 0x03, 
+	0xC0, 0xF1, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l19_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x80, 0x03, 0xFF, 0x00, 
+	0xC0, 0x83, 0xEF, 0x01, 
+	0xE0, 0x83, 0xC7, 0x01, 
+	0xF0, 0xC3, 0x83, 0x03, 
+	0xF8, 0xC3, 0x83, 0x03, 
+	0x98, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0xC3, 0x83, 0x03, 
+	0x80, 0x83, 0xC3, 0x03, 
+	0x80, 0x83, 0xE7, 0x03, 
+	0x80, 0x03, 0xFF, 0x03, 
+	0x80, 0x03, 0xFE, 0x03, 
+	0x80, 0x03, 0x80, 0x03, 
+	0x80, 0x03, 0x80, 0x03, 
+	0x80, 0x83, 0xC3, 0x03, 
+	0x80, 0x83, 0xC3, 0x01, 
+	0x80, 0x83, 0xE7, 0x01, 
+	0x80, 0x03, 0xFF, 0x00, 
+	0x80, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l2.xbm b/app/bin/bitmaps/l2.xbm
index 5efcb45..4ab709c 100644
--- a/app/bin/bitmaps/l2.xbm
+++ b/app/bin/bitmaps/l2.xbm
@@ -1,6 +1,78 @@
-#define l2_width 14
-#define l2_height 16
-static char l2_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x08, 0x01, 
-  0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00, 0x08, 0x00, 0xF8, 0x01, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l2_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0xE0, 0x07, 
+	0x60, 0x06, 
+	0x00, 0x06, 
+	0x00, 0x07, 
+	0x80, 0x03, 
+	0xC0, 0x01, 
+	0xE0, 0x00, 
+	0xE0, 0x07, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l2_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0xC0, 0x31, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0x00, 0x70, 0x00, 
+	0x00, 0x70, 0x00, 
+	0x00, 0x38, 0x00, 
+	0x00, 0x3C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x0E, 0x00, 
+	0x00, 0x0F, 0x00, 
+	0x80, 0x07, 0x00, 
+	0x80, 0x03, 0x00, 
+	0xC0, 0x03, 0x00, 
+	0xC0, 0x7F, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l2_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0xFC, 0x01, 0x00, 
+	0x00, 0xFE, 0x03, 0x00, 
+	0x00, 0xCF, 0x07, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x00, 0x00, 0x07, 0x00, 
+	0x00, 0x80, 0x07, 0x00, 
+	0x00, 0x80, 0x07, 0x00, 
+	0x00, 0xC0, 0x03, 0x00, 
+	0x00, 0xE0, 0x03, 0x00, 
+	0x00, 0xF0, 0x01, 0x00, 
+	0x00, 0xF0, 0x00, 0x00, 
+	0x00, 0x78, 0x00, 0x00, 
+	0x00, 0x3C, 0x00, 0x00, 
+	0x00, 0x1E, 0x00, 0x00, 
+	0x00, 0x0F, 0x00, 0x00, 
+	0x00, 0x0F, 0x00, 0x00, 
+	0x80, 0xFF, 0x07, 0x00, 
+	0x80, 0xFF, 0x07, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l20.xbm b/app/bin/bitmaps/l20.xbm
index 3b89521..9da3bef 100644
--- a/app/bin/bitmaps/l20.xbm
+++ b/app/bin/bitmaps/l20.xbm
@@ -1,6 +1,78 @@
-#define l20_width 14
-#define l20_height 16
-static char l20_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x18, 
-  0x90, 0x14, 0x88, 0x12, 0x84, 0x11, 0x82, 0x10, 0x81, 0x10, 0x3F, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l20_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x33, 
+	0xC0, 0x33, 
+	0xE0, 0x33, 
+	0x70, 0x33, 
+	0x38, 0x33, 
+	0x1C, 0x3F, 
+	0xFC, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l20_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x1C, 0x33, 0x07, 
+	0x1C, 0x3F, 0x06, 
+	0x00, 0x3F, 0x06, 
+	0x00, 0x3F, 0x0E, 
+	0x80, 0x3B, 0x0E, 
+	0xC0, 0x3B, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xE0, 0x38, 0x0E, 
+	0xF0, 0x38, 0x06, 
+	0x78, 0x38, 0x06, 
+	0x38, 0x30, 0x07, 
+	0x3C, 0x70, 0x07, 
+	0xFC, 0xE7, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l20_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0x7E, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0x3C, 0x1F, 0xEF, 0x01, 
+	0x1C, 0x9E, 0xC7, 0x01, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0xCF, 0x83, 0x03, 
+	0x80, 0xCF, 0x83, 0x03, 
+	0xC0, 0xC7, 0x83, 0x03, 
+	0xC0, 0xC3, 0x83, 0x03, 
+	0xE0, 0xC1, 0x83, 0x03, 
+	0xF0, 0x80, 0xC3, 0x03, 
+	0x78, 0x80, 0xC3, 0x03, 
+	0x3C, 0x80, 0xC7, 0x01, 
+	0x3C, 0x00, 0xEF, 0x01, 
+	0xFE, 0x1F, 0xFF, 0x00, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l21.xbm b/app/bin/bitmaps/l21.xbm
index 4c21534..32d81cc 100644
--- a/app/bin/bitmaps/l21.xbm
+++ b/app/bin/bitmaps/l21.xbm
@@ -1,6 +1,78 @@
-#define l21_width 14
-#define l21_height 16
-static char l21_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x21, 0x06, 0x21, 0x05, 
-  0x90, 0x04, 0x08, 0x04, 0x04, 0x04, 0x02, 0x04, 0x01, 0x04, 0x3F, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l21_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xFC, 0x1E, 
+	0xCC, 0x1F, 
+	0xC0, 0x1C, 
+	0xE0, 0x1C, 
+	0x70, 0x1C, 
+	0x38, 0x1C, 
+	0x1C, 0x1C, 
+	0xFC, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l21_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0xC3, 0x03, 
+	0x1C, 0xC3, 0x03, 
+	0x1C, 0xE7, 0x03, 
+	0x00, 0xB7, 0x03, 
+	0x00, 0x87, 0x03, 
+	0x80, 0x83, 0x03, 
+	0xC0, 0x83, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xE0, 0x80, 0x03, 
+	0xF0, 0x80, 0x03, 
+	0x78, 0x80, 0x03, 
+	0x38, 0x80, 0x03, 
+	0x3C, 0x80, 0x03, 
+	0xFC, 0x87, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l21_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0x70, 0x00, 
+	0xF8, 0x0F, 0x70, 0x00, 
+	0x3C, 0x1F, 0x78, 0x00, 
+	0x1C, 0x1E, 0x7C, 0x00, 
+	0x1E, 0x1C, 0x7E, 0x00, 
+	0x1E, 0x1C, 0x7F, 0x00, 
+	0x00, 0x1C, 0x73, 0x00, 
+	0x00, 0x1E, 0x70, 0x00, 
+	0x00, 0x1E, 0x70, 0x00, 
+	0x00, 0x0F, 0x70, 0x00, 
+	0x80, 0x0F, 0x70, 0x00, 
+	0xC0, 0x07, 0x70, 0x00, 
+	0xC0, 0x03, 0x70, 0x00, 
+	0xE0, 0x01, 0x70, 0x00, 
+	0xF0, 0x00, 0x70, 0x00, 
+	0x78, 0x00, 0x70, 0x00, 
+	0x3C, 0x00, 0x70, 0x00, 
+	0x3C, 0x00, 0x70, 0x00, 
+	0xFE, 0x1F, 0x70, 0x00, 
+	0xFE, 0x1F, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l22.xbm b/app/bin/bitmaps/l22.xbm
index 1d3d0b8..9cfc394 100644
--- a/app/bin/bitmaps/l22.xbm
+++ b/app/bin/bitmaps/l22.xbm
@@ -1,6 +1,78 @@
-#define l22_width 14
-#define l22_height 16
-static char l22_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0x10, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x81, 0x00, 0xBF, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l22_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x33, 
+	0xC0, 0x30, 
+	0xE0, 0x38, 
+	0x70, 0x1C, 
+	0x38, 0x0E, 
+	0x1C, 0x07, 
+	0xFC, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l22_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x1C, 0x3B, 0x06, 
+	0x1C, 0x3F, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x80, 0x03, 0x07, 
+	0xC0, 0x83, 0x07, 
+	0xC0, 0x81, 0x03, 
+	0xE0, 0xC0, 0x01, 
+	0xF0, 0xE0, 0x01, 
+	0x78, 0xF0, 0x00, 
+	0x38, 0x70, 0x00, 
+	0x3C, 0x78, 0x00, 
+	0xFC, 0xFF, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l22_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0xFE, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0x3C, 0x9F, 0xE7, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0x1E, 0xC0, 0x03, 
+	0x00, 0x1E, 0xC0, 0x03, 
+	0x00, 0x0F, 0xE0, 0x01, 
+	0x80, 0x0F, 0xF0, 0x01, 
+	0xC0, 0x07, 0xF8, 0x00, 
+	0xC0, 0x03, 0x78, 0x00, 
+	0xE0, 0x01, 0x3C, 0x00, 
+	0xF0, 0x00, 0x1E, 0x00, 
+	0x78, 0x00, 0x0F, 0x00, 
+	0x3C, 0x80, 0x07, 0x00, 
+	0x3C, 0x80, 0x07, 0x00, 
+	0xFE, 0xDF, 0xFF, 0x03, 
+	0xFE, 0xDF, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l23.xbm b/app/bin/bitmaps/l23.xbm
index 27bb4ad..efb4ac4 100644
--- a/app/bin/bitmaps/l23.xbm
+++ b/app/bin/bitmaps/l23.xbm
@@ -1,6 +1,78 @@
-#define l23_width 14
-#define l23_height 16
-static char l23_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0x21, 0x10, 
-  0x10, 0x10, 0x08, 0x0E, 0x04, 0x10, 0x02, 0x10, 0x81, 0x10, 0x3F, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l23_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3B, 
+	0xCC, 0x38, 
+	0xC0, 0x18, 
+	0xE0, 0x3C, 
+	0x70, 0x38, 
+	0x38, 0x33, 
+	0x1C, 0x3F, 
+	0xFC, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l23_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x1C, 0x3B, 0x07, 
+	0x1C, 0x07, 0x07, 
+	0x00, 0x07, 0x07, 
+	0x00, 0x07, 0x07, 
+	0x80, 0x83, 0x03, 
+	0xC0, 0xC3, 0x07, 
+	0xC0, 0x01, 0x07, 
+	0xE0, 0x00, 0x0E, 
+	0xF0, 0x00, 0x0E, 
+	0x78, 0x38, 0x0E, 
+	0x38, 0x38, 0x07, 
+	0x3C, 0x70, 0x07, 
+	0xFC, 0xE7, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l23_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0x7E, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0x3C, 0x9F, 0xE7, 0x01, 
+	0x1C, 0x9E, 0xC7, 0x01, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x1C, 0xC0, 0x03, 
+	0x00, 0x1C, 0xC0, 0x01, 
+	0x00, 0x1E, 0xE0, 0x01, 
+	0x00, 0x1E, 0xFC, 0x00, 
+	0x00, 0x0F, 0xFC, 0x00, 
+	0x80, 0x0F, 0xE0, 0x01, 
+	0xC0, 0x07, 0xC0, 0x03, 
+	0xC0, 0x03, 0x80, 0x03, 
+	0xE0, 0x01, 0x80, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0x78, 0xC0, 0x83, 0x03, 
+	0x3C, 0x80, 0xC7, 0x03, 
+	0x3C, 0x80, 0xE7, 0x01, 
+	0xFE, 0x1F, 0xFF, 0x01, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l24.xbm b/app/bin/bitmaps/l24.xbm
index 8b2efc5..8fd49ae 100644
--- a/app/bin/bitmaps/l24.xbm
+++ b/app/bin/bitmaps/l24.xbm
@@ -1,6 +1,78 @@
-#define l24_width 14
-#define l24_height 16
-static char l24_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x21, 0x0C, 0x21, 0x0A, 
-  0x10, 0x09, 0x88, 0x08, 0x84, 0x1F, 0x02, 0x08, 0x01, 0x08, 0x3F, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l24_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xFC, 0x1C, 
+	0xCC, 0x1E, 
+	0xC0, 0x1E, 
+	0xE0, 0x1F, 
+	0x70, 0x1B, 
+	0xB8, 0x3F, 
+	0x1C, 0x18, 
+	0xFC, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l24_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0x1C, 0xC3, 0x03, 
+	0x1C, 0xC7, 0x03, 
+	0x00, 0xE7, 0x03, 
+	0x00, 0xE7, 0x03, 
+	0x80, 0xF3, 0x03, 
+	0xC0, 0xB3, 0x03, 
+	0xC0, 0xB9, 0x03, 
+	0xE0, 0x98, 0x03, 
+	0xF0, 0xFC, 0x0F, 
+	0x78, 0x80, 0x03, 
+	0x38, 0x80, 0x03, 
+	0x3C, 0x80, 0x03, 
+	0xFC, 0x87, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l24_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0xF0, 0x00, 
+	0xF8, 0x0F, 0xF0, 0x00, 
+	0x3C, 0x1F, 0xF8, 0x00, 
+	0x1C, 0x1E, 0xF8, 0x00, 
+	0x1E, 0x1C, 0xFC, 0x00, 
+	0x1E, 0x1C, 0xFC, 0x00, 
+	0x00, 0x1C, 0xFE, 0x00, 
+	0x00, 0x1E, 0xEE, 0x00, 
+	0x00, 0x1E, 0xEF, 0x00, 
+	0x00, 0x8F, 0xE7, 0x00, 
+	0x80, 0x8F, 0xE7, 0x00, 
+	0xC0, 0xC7, 0xE3, 0x00, 
+	0xC0, 0xC3, 0xE1, 0x00, 
+	0xE0, 0xE1, 0xFF, 0x03, 
+	0xF0, 0xE0, 0xFF, 0x03, 
+	0x78, 0x00, 0xE0, 0x00, 
+	0x3C, 0x00, 0xE0, 0x00, 
+	0x3C, 0x00, 0xE0, 0x00, 
+	0xFE, 0x1F, 0xE0, 0x00, 
+	0xFE, 0x1F, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l25.xbm b/app/bin/bitmaps/l25.xbm
index f4751dc..6bf1e2b 100644
--- a/app/bin/bitmaps/l25.xbm
+++ b/app/bin/bitmaps/l25.xbm
@@ -1,6 +1,78 @@
-#define l25_width 14
-#define l25_height 16
-static char l25_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0xA1, 0x00, 0xA1, 0x00, 
-  0x90, 0x0F, 0x08, 0x10, 0x04, 0x10, 0x02, 0x10, 0x81, 0x10, 0x3F, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l25_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xFC, 0x07, 
+	0xCC, 0x07, 
+	0xC0, 0x1F, 
+	0xE0, 0x3B, 
+	0x70, 0x30, 
+	0x38, 0x33, 
+	0x1C, 0x3F, 
+	0xFC, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l25_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF1, 0x07, 
+	0xB8, 0x73, 0x00, 
+	0x1C, 0x73, 0x00, 
+	0x1C, 0x37, 0x00, 
+	0x00, 0x37, 0x00, 
+	0x00, 0xFF, 0x03, 
+	0x80, 0x7B, 0x07, 
+	0xC0, 0x3B, 0x07, 
+	0xC0, 0x01, 0x0E, 
+	0xE0, 0x00, 0x0E, 
+	0xF0, 0x00, 0x0E, 
+	0x78, 0x38, 0x06, 
+	0x38, 0x38, 0x07, 
+	0x3C, 0x70, 0x07, 
+	0xFC, 0xE7, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l25_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0xFF, 0x03, 
+	0xF8, 0x0F, 0xFF, 0x03, 
+	0x3C, 0x1F, 0x07, 0x00, 
+	0x1C, 0x1E, 0x07, 0x00, 
+	0x1E, 0x9C, 0x07, 0x00, 
+	0x1E, 0x9C, 0x07, 0x00, 
+	0x00, 0x9C, 0x7F, 0x00, 
+	0x00, 0x9E, 0xFF, 0x01, 
+	0x00, 0x9E, 0xE7, 0x01, 
+	0x00, 0x8F, 0xC3, 0x03, 
+	0x80, 0x0F, 0xC0, 0x03, 
+	0xC0, 0x07, 0x80, 0x03, 
+	0xC0, 0x03, 0x80, 0x03, 
+	0xE0, 0x01, 0x80, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0x78, 0xC0, 0xC3, 0x03, 
+	0x3C, 0x80, 0xC3, 0x03, 
+	0x3C, 0x80, 0xE7, 0x01, 
+	0xFE, 0x1F, 0xFF, 0x00, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l26.xbm b/app/bin/bitmaps/l26.xbm
index 9e67365..ebed83b 100644
--- a/app/bin/bitmaps/l26.xbm
+++ b/app/bin/bitmaps/l26.xbm
@@ -1,6 +1,78 @@
-#define l26_width 14
-#define l26_height 16
-static char l26_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x00, 0xA1, 0x00, 
-  0x90, 0x0F, 0x88, 0x10, 0x84, 0x10, 0x82, 0x10, 0x81, 0x10, 0x3F, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l26_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x03, 
+	0xC0, 0x1F, 
+	0xE0, 0x3F, 
+	0x70, 0x33, 
+	0x38, 0x33, 
+	0x1C, 0x3F, 
+	0xFC, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l26_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x1C, 0x33, 0x07, 
+	0x1C, 0x3F, 0x00, 
+	0x00, 0x3F, 0x00, 
+	0x00, 0x3F, 0x00, 
+	0x80, 0xFB, 0x03, 
+	0xC0, 0x7B, 0x07, 
+	0xC0, 0x39, 0x07, 
+	0xE0, 0x38, 0x0E, 
+	0xF0, 0x38, 0x0E, 
+	0x78, 0x38, 0x0E, 
+	0x38, 0x30, 0x07, 
+	0x3C, 0x70, 0x07, 
+	0xFC, 0xE7, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l26_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0xFC, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0x3C, 0x1F, 0xEF, 0x01, 
+	0x1C, 0x9E, 0xC7, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0x03, 0x00, 
+	0x00, 0xDC, 0x03, 0x00, 
+	0x00, 0xDE, 0x7F, 0x00, 
+	0x00, 0xDE, 0xFF, 0x01, 
+	0x00, 0xCF, 0xEF, 0x01, 
+	0x80, 0xCF, 0xC7, 0x03, 
+	0xC0, 0xC7, 0x83, 0x03, 
+	0xC0, 0xC3, 0x83, 0x03, 
+	0xE0, 0xC1, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0x78, 0x80, 0x83, 0x03, 
+	0x3C, 0x80, 0xC7, 0x03, 
+	0x3C, 0x80, 0xEF, 0x01, 
+	0xFE, 0x1F, 0xFF, 0x01, 
+	0xFE, 0x1F, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l27.xbm b/app/bin/bitmaps/l27.xbm
index abdbb55..d611f65 100644
--- a/app/bin/bitmaps/l27.xbm
+++ b/app/bin/bitmaps/l27.xbm
@@ -1,6 +1,78 @@
-#define l27_width 14
-#define l27_height 16
-static char l27_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x21, 0x10, 0x21, 0x08, 
-  0x10, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x02, 0x3F, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l27_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xFC, 0x38, 
+	0xCC, 0x18, 
+	0xC0, 0x1C, 
+	0xE0, 0x0C, 
+	0x70, 0x0E, 
+	0x38, 0x0E, 
+	0x1C, 0x06, 
+	0xFC, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l27_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF9, 0x0F, 
+	0xB8, 0x03, 0x0F, 
+	0x1C, 0x03, 0x07, 
+	0x1C, 0x87, 0x03, 
+	0x00, 0x87, 0x03, 
+	0x00, 0xC7, 0x01, 
+	0x80, 0xC3, 0x01, 
+	0xC0, 0xC3, 0x01, 
+	0xC0, 0xE1, 0x00, 
+	0xE0, 0xE0, 0x00, 
+	0xF0, 0xE0, 0x00, 
+	0x78, 0xE0, 0x00, 
+	0x38, 0xE0, 0x00, 
+	0x3C, 0x70, 0x00, 
+	0xFC, 0x77, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l27_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0xC7, 0xFF, 0x03, 
+	0xF8, 0xCF, 0xFF, 0x03, 
+	0x3C, 0x1F, 0xC0, 0x03, 
+	0x1C, 0x1E, 0xE0, 0x01, 
+	0x1E, 0x1C, 0xE0, 0x01, 
+	0x1E, 0x1C, 0xF0, 0x00, 
+	0x00, 0x1C, 0xF0, 0x00, 
+	0x00, 0x1E, 0x78, 0x00, 
+	0x00, 0x1E, 0x78, 0x00, 
+	0x00, 0x0F, 0x38, 0x00, 
+	0x80, 0x0F, 0x3C, 0x00, 
+	0xC0, 0x07, 0x3C, 0x00, 
+	0xC0, 0x03, 0x1C, 0x00, 
+	0xE0, 0x01, 0x1E, 0x00, 
+	0xF0, 0x00, 0x1E, 0x00, 
+	0x78, 0x00, 0x1E, 0x00, 
+	0x3C, 0x00, 0x1E, 0x00, 
+	0x3C, 0x00, 0x0E, 0x00, 
+	0xFE, 0x1F, 0x0E, 0x00, 
+	0xFE, 0x1F, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l28.xbm b/app/bin/bitmaps/l28.xbm
index ceb8a68..d5ae122 100644
--- a/app/bin/bitmaps/l28.xbm
+++ b/app/bin/bitmaps/l28.xbm
@@ -1,6 +1,78 @@
-#define l28_width 14
-#define l28_height 16
-static char l28_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0x90, 0x10, 0x08, 0x0F, 0x84, 0x10, 0x82, 0x10, 0x81, 0x10, 0x3F, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l28_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x3B, 
+	0xC0, 0x3F, 
+	0xE0, 0x1E, 
+	0x70, 0x3F, 
+	0x38, 0x33, 
+	0x1C, 0x3F, 
+	0xFC, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l28_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x1C, 0x33, 0x07, 
+	0x1C, 0x3F, 0x07, 
+	0x00, 0x3F, 0x07, 
+	0x00, 0x3F, 0x07, 
+	0x80, 0x73, 0x07, 
+	0xC0, 0xE3, 0x03, 
+	0xC0, 0x71, 0x07, 
+	0xE0, 0x38, 0x06, 
+	0xF0, 0x38, 0x0E, 
+	0x78, 0x38, 0x0E, 
+	0x38, 0x38, 0x06, 
+	0x3C, 0x70, 0x07, 
+	0xFC, 0xE7, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l28_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0x7E, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0x3C, 0x9F, 0xEF, 0x01, 
+	0x1C, 0x9E, 0xC7, 0x01, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x00, 0x9C, 0xC7, 0x01, 
+	0x00, 0x1E, 0xEF, 0x01, 
+	0x00, 0x1E, 0xFE, 0x00, 
+	0x00, 0x0F, 0xFF, 0x00, 
+	0x80, 0x8F, 0xE7, 0x01, 
+	0xC0, 0x87, 0xC3, 0x03, 
+	0xC0, 0xC3, 0x83, 0x03, 
+	0xE0, 0xC1, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0x78, 0xC0, 0x83, 0x03, 
+	0x3C, 0x80, 0xC3, 0x03, 
+	0x3C, 0x80, 0xE7, 0x01, 
+	0xFE, 0x1F, 0xFF, 0x01, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l29.xbm b/app/bin/bitmaps/l29.xbm
index 84c6512..7b23c07 100644
--- a/app/bin/bitmaps/l29.xbm
+++ b/app/bin/bitmaps/l29.xbm
@@ -1,6 +1,78 @@
-#define l29_width 14
-#define l29_height 16
-static char l29_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0x90, 0x10, 0x08, 0x1F, 0x04, 0x10, 0x02, 0x10, 0x01, 0x08, 0x3F, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l29_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x33, 
+	0xC0, 0x33, 
+	0xE0, 0x3F, 
+	0x70, 0x3E, 
+	0x38, 0x30, 
+	0x1C, 0x3B, 
+	0xFC, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l29_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x01, 
+	0xB8, 0x73, 0x07, 
+	0x1C, 0x3B, 0x07, 
+	0x1C, 0x3F, 0x06, 
+	0x00, 0x3F, 0x0E, 
+	0x00, 0x3F, 0x0E, 
+	0x80, 0x3B, 0x0F, 
+	0xC0, 0x73, 0x0F, 
+	0xC0, 0xE1, 0x0F, 
+	0xE0, 0x00, 0x0E, 
+	0xF0, 0x00, 0x06, 
+	0x78, 0x00, 0x06, 
+	0x38, 0x38, 0x07, 
+	0x3C, 0x70, 0x03, 
+	0xFC, 0xF7, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l29_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x07, 0x7E, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0x3C, 0x9F, 0xEF, 0x01, 
+	0x1C, 0x9E, 0xC7, 0x01, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0x8F, 0xC3, 0x03, 
+	0x80, 0x8F, 0xE7, 0x03, 
+	0xC0, 0x07, 0xFF, 0x03, 
+	0xC0, 0x03, 0xFE, 0x03, 
+	0xE0, 0x01, 0x80, 0x03, 
+	0xF0, 0x00, 0x80, 0x03, 
+	0x78, 0x80, 0xC3, 0x03, 
+	0x3C, 0x80, 0xC3, 0x01, 
+	0x3C, 0x80, 0xE7, 0x01, 
+	0xFE, 0x1F, 0xFF, 0x00, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l3.xbm b/app/bin/bitmaps/l3.xbm
index be5c0d1..070b9bb 100644
--- a/app/bin/bitmaps/l3.xbm
+++ b/app/bin/bitmaps/l3.xbm
@@ -1,6 +1,78 @@
-#define l3_width 14
-#define l3_height 16
-static char l3_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x00, 0x01, 
-  0x00, 0x01, 0xE0, 0x00, 0x00, 0x01, 0x00, 0x01, 0x08, 0x01, 0xF0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l3_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0x60, 0x07, 
+	0x00, 0x07, 
+	0x00, 0x03, 
+	0x80, 0x07, 
+	0x00, 0x07, 
+	0x60, 0x06, 
+	0xE0, 0x07, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l3_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0x00, 0x38, 0x00, 
+	0x00, 0x38, 0x00, 
+	0x00, 0x38, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x3E, 0x00, 
+	0x00, 0x38, 0x00, 
+	0x00, 0x70, 0x00, 
+	0x00, 0x70, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l3_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0xFC, 0x00, 0x00, 
+	0x00, 0xFE, 0x01, 0x00, 
+	0x00, 0xCF, 0x03, 0x00, 
+	0x00, 0x8F, 0x03, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0x80, 0x07, 0x00, 
+	0x00, 0x80, 0x03, 0x00, 
+	0x00, 0xC0, 0x03, 0x00, 
+	0x00, 0xF8, 0x01, 0x00, 
+	0x00, 0xF8, 0x01, 0x00, 
+	0x00, 0xC0, 0x03, 0x00, 
+	0x00, 0x80, 0x07, 0x00, 
+	0x00, 0x00, 0x07, 0x00, 
+	0x00, 0x00, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x00, 0x8F, 0x07, 0x00, 
+	0x00, 0xCF, 0x03, 0x00, 
+	0x00, 0xFE, 0x03, 0x00, 
+	0x00, 0xFC, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l30.xbm b/app/bin/bitmaps/l30.xbm
index f7ab137..324f979 100644
--- a/app/bin/bitmaps/l30.xbm
+++ b/app/bin/bitmaps/l30.xbm
@@ -1,6 +1,78 @@
-#define l30_width 14
-#define l30_height 16
-static char l30_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA0, 0x18, 
-  0xA0, 0x14, 0x9C, 0x12, 0xA0, 0x11, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l30_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xEC, 0x3F, 
+	0xE0, 0x33, 
+	0x60, 0x33, 
+	0xF0, 0x33, 
+	0xE0, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l30_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x33, 0x07, 
+	0x80, 0x3B, 0x06, 
+	0x80, 0x3B, 0x06, 
+	0x80, 0x3B, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xE0, 0x3B, 0x0E, 
+	0x80, 0x3B, 0x0E, 
+	0x00, 0x3F, 0x0E, 
+	0x00, 0x3F, 0x06, 
+	0x1C, 0x3F, 0x06, 
+	0x9C, 0x33, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l30_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x3C, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x00, 0x9E, 0xC3, 0x03, 
+	0x00, 0xCE, 0x83, 0x03, 
+	0x00, 0xCF, 0x83, 0x03, 
+	0xE0, 0xC7, 0x83, 0x03, 
+	0xE0, 0xC7, 0x83, 0x03, 
+	0x00, 0xCF, 0x83, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x3C, 0x9E, 0xC7, 0x01, 
+	0x3C, 0x0F, 0xEF, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l31.xbm b/app/bin/bitmaps/l31.xbm
index 5ca3354..e379ca6 100644
--- a/app/bin/bitmaps/l31.xbm
+++ b/app/bin/bitmaps/l31.xbm
@@ -1,6 +1,78 @@
-#define l31_width 14
-#define l31_height 16
-static char l31_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x21, 0x06, 0x20, 0x05, 
-  0xA0, 0x04, 0x1C, 0x04, 0x20, 0x04, 0x20, 0x04, 0x21, 0x04, 0x1E, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l31_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xEC, 0x1E, 
+	0xE0, 0x1F, 
+	0x60, 0x1C, 
+	0xF0, 0x1C, 
+	0xE0, 0x1C, 
+	0xCC, 0x1C, 
+	0xFC, 0x1C, 
+	0x78, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l31_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0xC3, 0x03, 
+	0x9C, 0xC3, 0x03, 
+	0x80, 0xE3, 0x03, 
+	0x80, 0xB3, 0x03, 
+	0x80, 0x83, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xE0, 0x83, 0x03, 
+	0x80, 0x83, 0x03, 
+	0x00, 0x87, 0x03, 
+	0x00, 0x87, 0x03, 
+	0x1C, 0x87, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l31_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x70, 0x00, 
+	0xF8, 0x07, 0x70, 0x00, 
+	0x3C, 0x0F, 0x78, 0x00, 
+	0x3C, 0x0E, 0x7C, 0x00, 
+	0x1C, 0x1E, 0x7E, 0x00, 
+	0x00, 0x1E, 0x7F, 0x00, 
+	0x00, 0x0E, 0x73, 0x00, 
+	0x00, 0x0F, 0x70, 0x00, 
+	0xE0, 0x07, 0x70, 0x00, 
+	0xE0, 0x07, 0x70, 0x00, 
+	0x00, 0x0F, 0x70, 0x00, 
+	0x00, 0x1E, 0x70, 0x00, 
+	0x00, 0x1C, 0x70, 0x00, 
+	0x00, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x3C, 0x1E, 0x70, 0x00, 
+	0x3C, 0x0F, 0x70, 0x00, 
+	0xF8, 0x0F, 0x70, 0x00, 
+	0xF0, 0x03, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l32.xbm b/app/bin/bitmaps/l32.xbm
index c083094..3cbaaac 100644
--- a/app/bin/bitmaps/l32.xbm
+++ b/app/bin/bitmaps/l32.xbm
@@ -1,6 +1,78 @@
-#define l32_width 14
-#define l32_height 16
-static char l32_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA0, 0x10, 
-  0x20, 0x08, 0x1C, 0x04, 0x20, 0x02, 0x20, 0x01, 0xA1, 0x00, 0x9E, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l32_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xEC, 0x3F, 
+	0xE0, 0x33, 
+	0x60, 0x30, 
+	0xF0, 0x38, 
+	0xE0, 0x1C, 
+	0xCC, 0x0E, 
+	0xFC, 0x07, 
+	0x78, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l32_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x3B, 0x06, 
+	0x80, 0x3B, 0x0E, 
+	0x80, 0x03, 0x0E, 
+	0x80, 0x03, 0x0E, 
+	0xC0, 0x01, 0x07, 
+	0xE0, 0x83, 0x07, 
+	0x80, 0x83, 0x03, 
+	0x00, 0xC7, 0x01, 
+	0x00, 0xE7, 0x01, 
+	0x1C, 0xF7, 0x00, 
+	0x9C, 0x73, 0x00, 
+	0xB8, 0x7B, 0x00, 
+	0xF0, 0xF9, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l32_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFE, 0x00, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0x3C, 0x8F, 0xE7, 0x03, 
+	0x3C, 0x8E, 0xC3, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0x0E, 0x80, 0x03, 
+	0x00, 0x0F, 0xC0, 0x03, 
+	0xE0, 0x07, 0xC0, 0x03, 
+	0xE0, 0x07, 0xE0, 0x01, 
+	0x00, 0x0F, 0xF0, 0x01, 
+	0x00, 0x1E, 0xF8, 0x00, 
+	0x00, 0x1C, 0x78, 0x00, 
+	0x00, 0x1C, 0x3C, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1C, 0x0F, 0x00, 
+	0x3C, 0x9E, 0x07, 0x00, 
+	0x3C, 0x8F, 0x07, 0x00, 
+	0xF8, 0xCF, 0xFF, 0x03, 
+	0xF0, 0xC3, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l33.xbm b/app/bin/bitmaps/l33.xbm
index 241eac5..8d318c6 100644
--- a/app/bin/bitmaps/l33.xbm
+++ b/app/bin/bitmaps/l33.xbm
@@ -1,6 +1,78 @@
-#define l33_width 14
-#define l33_height 16
-static char l33_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0x20, 0x10, 
-  0x20, 0x10, 0x1C, 0x0E, 0x20, 0x10, 0x20, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l33_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xEC, 0x3B, 
+	0xE0, 0x38, 
+	0x60, 0x18, 
+	0xF0, 0x3C, 
+	0xE0, 0x38, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l33_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0x80, 0x03, 0x07, 
+	0x80, 0x03, 0x07, 
+	0x80, 0x03, 0x07, 
+	0xC0, 0x81, 0x03, 
+	0xE0, 0xC3, 0x07, 
+	0x80, 0x03, 0x07, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l33_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x00, 0x1E, 0xC0, 0x03, 
+	0x00, 0x0E, 0xC0, 0x01, 
+	0x00, 0x0F, 0xE0, 0x01, 
+	0xE0, 0x07, 0xFC, 0x00, 
+	0xE0, 0x07, 0xFC, 0x00, 
+	0x00, 0x0F, 0xE0, 0x01, 
+	0x00, 0x1E, 0xC0, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x3C, 0x9E, 0xC7, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l34.xbm b/app/bin/bitmaps/l34.xbm
index 552eafd..4e90020 100644
--- a/app/bin/bitmaps/l34.xbm
+++ b/app/bin/bitmaps/l34.xbm
@@ -1,6 +1,78 @@
-#define l34_width 14
-#define l34_height 16
-static char l34_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x21, 0x0C, 0x20, 0x0A, 
-  0x20, 0x09, 0x9C, 0x08, 0xA0, 0x1F, 0x20, 0x08, 0x21, 0x08, 0x1E, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l34_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xEC, 0x1C, 
+	0xE0, 0x1E, 
+	0x60, 0x1E, 
+	0xF0, 0x1F, 
+	0xE0, 0x1B, 
+	0xCC, 0x3F, 
+	0xFC, 0x18, 
+	0x78, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l34_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0x9C, 0xC3, 0x03, 
+	0x80, 0xC3, 0x03, 
+	0x80, 0xE3, 0x03, 
+	0x80, 0xE3, 0x03, 
+	0xC0, 0xF1, 0x03, 
+	0xE0, 0xB3, 0x03, 
+	0x80, 0xBB, 0x03, 
+	0x00, 0x9F, 0x03, 
+	0x00, 0xFF, 0x0F, 
+	0x1C, 0x87, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l34_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xF0, 0x00, 
+	0xF8, 0x07, 0xF0, 0x00, 
+	0x3C, 0x0F, 0xF8, 0x00, 
+	0x3C, 0x0E, 0xF8, 0x00, 
+	0x1C, 0x1E, 0xFC, 0x00, 
+	0x00, 0x1E, 0xFC, 0x00, 
+	0x00, 0x0E, 0xFE, 0x00, 
+	0x00, 0x0F, 0xEE, 0x00, 
+	0xE0, 0x07, 0xEF, 0x00, 
+	0xE0, 0x87, 0xE7, 0x00, 
+	0x00, 0x8F, 0xE7, 0x00, 
+	0x00, 0xDE, 0xE3, 0x00, 
+	0x00, 0xDC, 0xE1, 0x00, 
+	0x00, 0xFC, 0xFF, 0x03, 
+	0x1E, 0xFC, 0xFF, 0x03, 
+	0x1E, 0x1C, 0xE0, 0x00, 
+	0x3C, 0x1E, 0xE0, 0x00, 
+	0x3C, 0x0F, 0xE0, 0x00, 
+	0xF8, 0x0F, 0xE0, 0x00, 
+	0xF0, 0x03, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l35.xbm b/app/bin/bitmaps/l35.xbm
index 4bf7b2f..f8de169 100644
--- a/app/bin/bitmaps/l35.xbm
+++ b/app/bin/bitmaps/l35.xbm
@@ -1,6 +1,78 @@
-#define l35_width 14
-#define l35_height 16
-static char l35_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0xA1, 0x00, 0xA0, 0x00, 
-  0xA0, 0x0F, 0x1C, 0x10, 0x20, 0x10, 0x20, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l35_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xEC, 0x07, 
+	0xE0, 0x07, 
+	0x60, 0x1F, 
+	0xF0, 0x3B, 
+	0xE0, 0x30, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l35_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF1, 0x07, 
+	0xB8, 0x73, 0x00, 
+	0x9C, 0x73, 0x00, 
+	0x80, 0x33, 0x00, 
+	0x80, 0x33, 0x00, 
+	0x80, 0xFB, 0x03, 
+	0xC0, 0x79, 0x07, 
+	0xE0, 0x3B, 0x07, 
+	0x80, 0x03, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x1C, 0x3F, 0x06, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l35_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFF, 0x03, 
+	0xF8, 0x07, 0xFF, 0x03, 
+	0x3C, 0x0F, 0x07, 0x00, 
+	0x3C, 0x0E, 0x07, 0x00, 
+	0x1C, 0x9E, 0x07, 0x00, 
+	0x00, 0x9E, 0x07, 0x00, 
+	0x00, 0x8E, 0x7F, 0x00, 
+	0x00, 0x8F, 0xFF, 0x01, 
+	0xE0, 0x87, 0xE7, 0x01, 
+	0xE0, 0x87, 0xC3, 0x03, 
+	0x00, 0x0F, 0xC0, 0x03, 
+	0x00, 0x1E, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0xC3, 0x03, 
+	0x3C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l36.xbm b/app/bin/bitmaps/l36.xbm
index a048e6d..c3c19eb 100644
--- a/app/bin/bitmaps/l36.xbm
+++ b/app/bin/bitmaps/l36.xbm
@@ -1,6 +1,78 @@
-#define l36_width 14
-#define l36_height 16
-static char l36_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x00, 0xA0, 0x00, 
-  0xA0, 0x0F, 0x9C, 0x10, 0xA0, 0x10, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l36_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xEC, 0x3F, 
+	0xE0, 0x03, 
+	0x60, 0x1F, 
+	0xF0, 0x3F, 
+	0xE0, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l36_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x33, 0x07, 
+	0x80, 0x3B, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0xC0, 0xF9, 0x03, 
+	0xE0, 0x7B, 0x07, 
+	0x80, 0x3B, 0x07, 
+	0x00, 0x3F, 0x0E, 
+	0x00, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x9C, 0x33, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l36_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFC, 0x00, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0x3C, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x00, 0x9E, 0x03, 0x00, 
+	0x00, 0xCE, 0x03, 0x00, 
+	0x00, 0xCF, 0x7F, 0x00, 
+	0xE0, 0xC7, 0xFF, 0x01, 
+	0xE0, 0xC7, 0xEF, 0x01, 
+	0x00, 0xCF, 0xC7, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0x9C, 0x83, 0x03, 
+	0x3C, 0x9E, 0xC7, 0x03, 
+	0x3C, 0x8F, 0xEF, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l37.xbm b/app/bin/bitmaps/l37.xbm
index cd58fcd..df579f5 100644
--- a/app/bin/bitmaps/l37.xbm
+++ b/app/bin/bitmaps/l37.xbm
@@ -1,6 +1,78 @@
-#define l37_width 14
-#define l37_height 16
-static char l37_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x21, 0x10, 0x20, 0x08, 
-  0x20, 0x08, 0x1C, 0x04, 0x20, 0x04, 0x20, 0x02, 0x21, 0x02, 0x1E, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l37_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xEC, 0x38, 
+	0xE0, 0x18, 
+	0x60, 0x1C, 
+	0xF0, 0x0C, 
+	0xE0, 0x0E, 
+	0xCC, 0x0E, 
+	0xFC, 0x06, 
+	0x78, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l37_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF9, 0x0F, 
+	0xB8, 0x03, 0x0F, 
+	0x9C, 0x03, 0x07, 
+	0x80, 0x83, 0x03, 
+	0x80, 0x83, 0x03, 
+	0x80, 0xC3, 0x01, 
+	0xC0, 0xC1, 0x01, 
+	0xE0, 0xC3, 0x01, 
+	0x80, 0xE3, 0x00, 
+	0x00, 0xE7, 0x00, 
+	0x00, 0xE7, 0x00, 
+	0x1C, 0xE7, 0x00, 
+	0x9C, 0xE3, 0x00, 
+	0xB8, 0x73, 0x00, 
+	0xF0, 0x71, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l37_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0xC3, 0xFF, 0x03, 
+	0xF8, 0xC7, 0xFF, 0x03, 
+	0x3C, 0x0F, 0xC0, 0x03, 
+	0x3C, 0x0E, 0xE0, 0x01, 
+	0x1C, 0x1E, 0xE0, 0x01, 
+	0x00, 0x1E, 0xF0, 0x00, 
+	0x00, 0x0E, 0xF0, 0x00, 
+	0x00, 0x0F, 0x78, 0x00, 
+	0xE0, 0x07, 0x78, 0x00, 
+	0xE0, 0x07, 0x38, 0x00, 
+	0x00, 0x0F, 0x3C, 0x00, 
+	0x00, 0x1E, 0x3C, 0x00, 
+	0x00, 0x1C, 0x1C, 0x00, 
+	0x00, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x3C, 0x1E, 0x1E, 0x00, 
+	0x3C, 0x0F, 0x0E, 0x00, 
+	0xF8, 0x0F, 0x0E, 0x00, 
+	0xF0, 0x03, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l38.xbm b/app/bin/bitmaps/l38.xbm
index d47e1ea..424b263 100644
--- a/app/bin/bitmaps/l38.xbm
+++ b/app/bin/bitmaps/l38.xbm
@@ -1,6 +1,78 @@
-#define l38_width 14
-#define l38_height 16
-static char l38_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA0, 0x10, 
-  0xA0, 0x10, 0x1C, 0x0F, 0xA0, 0x10, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l38_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xEC, 0x3F, 
+	0xE0, 0x3B, 
+	0x60, 0x3F, 
+	0xF0, 0x1E, 
+	0xE0, 0x3F, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l38_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x33, 0x07, 
+	0x80, 0x3B, 0x07, 
+	0x80, 0x3B, 0x07, 
+	0x80, 0x3B, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xE0, 0xE3, 0x03, 
+	0x80, 0x73, 0x07, 
+	0x00, 0x3F, 0x06, 
+	0x00, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x9C, 0x3B, 0x06, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l38_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x3C, 0x8F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x00, 0x9E, 0xC3, 0x03, 
+	0x00, 0x8E, 0xC7, 0x01, 
+	0x00, 0x0F, 0xEF, 0x01, 
+	0xE0, 0x07, 0xFE, 0x00, 
+	0xE0, 0x07, 0xFF, 0x00, 
+	0x00, 0x8F, 0xE7, 0x01, 
+	0x00, 0x9E, 0xC3, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x3C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l39.xbm b/app/bin/bitmaps/l39.xbm
index 459ad96..51d14ab 100644
--- a/app/bin/bitmaps/l39.xbm
+++ b/app/bin/bitmaps/l39.xbm
@@ -1,6 +1,78 @@
-#define l39_width 14
-#define l39_height 16
-static char l39_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA0, 0x10, 
-  0xA0, 0x10, 0x1C, 0x1F, 0x20, 0x10, 0x20, 0x10, 0x21, 0x08, 0x1E, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l39_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xEC, 0x3F, 
+	0xE0, 0x33, 
+	0x60, 0x33, 
+	0xF0, 0x3F, 
+	0xE0, 0x3E, 
+	0xCC, 0x30, 
+	0xFC, 0x3B, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l39_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x01, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0x80, 0x3B, 0x06, 
+	0x80, 0x3B, 0x0E, 
+	0x80, 0x3B, 0x0E, 
+	0xC0, 0x39, 0x0F, 
+	0xE0, 0x73, 0x0F, 
+	0x80, 0xE3, 0x0F, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x07, 0x06, 
+	0x1C, 0x07, 0x06, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x03, 
+	0xF0, 0xF1, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l39_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x3C, 0x8F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0xCE, 0x83, 0x03, 
+	0x00, 0xCF, 0x83, 0x03, 
+	0xE0, 0xC7, 0x83, 0x03, 
+	0xE0, 0x87, 0xC3, 0x03, 
+	0x00, 0x8F, 0xE7, 0x03, 
+	0x00, 0x1E, 0xFF, 0x03, 
+	0x00, 0x1C, 0xFE, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x3C, 0x9E, 0xC3, 0x01, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l4.xbm b/app/bin/bitmaps/l4.xbm
index ea52f95..411ad63 100644
--- a/app/bin/bitmaps/l4.xbm
+++ b/app/bin/bitmaps/l4.xbm
@@ -1,6 +1,78 @@
-#define l4_width 14
-#define l4_height 16
-static char l4_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xC0, 0x00, 0xA0, 0x00, 
-  0x90, 0x00, 0x88, 0x00, 0xF8, 0x01, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l4_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x80, 0x03, 
+	0x80, 0x03, 
+	0xC0, 0x03, 
+	0xC0, 0x03, 
+	0xE0, 0x03, 
+	0x60, 0x03, 
+	0xF0, 0x07, 
+	0x00, 0x03, 
+	0x00, 0x03, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l4_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1E, 0x00, 
+	0x00, 0x1E, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x80, 0x1F, 0x00, 
+	0x80, 0x1D, 0x00, 
+	0xC0, 0x1D, 0x00, 
+	0xC0, 0x1C, 0x00, 
+	0xE0, 0x7F, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l4_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0xE0, 0x01, 0x00, 
+	0x00, 0xE0, 0x01, 0x00, 
+	0x00, 0xF0, 0x01, 0x00, 
+	0x00, 0xF0, 0x01, 0x00, 
+	0x00, 0xF8, 0x01, 0x00, 
+	0x00, 0xF8, 0x01, 0x00, 
+	0x00, 0xFC, 0x01, 0x00, 
+	0x00, 0xDC, 0x01, 0x00, 
+	0x00, 0xDE, 0x01, 0x00, 
+	0x00, 0xCF, 0x01, 0x00, 
+	0x00, 0xCF, 0x01, 0x00, 
+	0x80, 0xC7, 0x01, 0x00, 
+	0x80, 0xC3, 0x01, 0x00, 
+	0xC0, 0xFF, 0x07, 0x00, 
+	0xC0, 0xFF, 0x07, 0x00, 
+	0x00, 0xC0, 0x01, 0x00, 
+	0x00, 0xC0, 0x01, 0x00, 
+	0x00, 0xC0, 0x01, 0x00, 
+	0x00, 0xC0, 0x01, 0x00, 
+	0x00, 0xC0, 0x01, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l40.xbm b/app/bin/bitmaps/l40.xbm
index f8d17da..8ee8e0f 100644
--- a/app/bin/bitmaps/l40.xbm
+++ b/app/bin/bitmaps/l40.xbm
@@ -1,6 +1,78 @@
-#define l40_width 14
-#define l40_height 16
-static char l40_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x94, 0x18, 
-  0x92, 0x14, 0x91, 0x12, 0xBF, 0x11, 0x90, 0x10, 0x90, 0x10, 0x10, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l40_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x70, 0x3F, 
+	0x78, 0x33, 
+	0x78, 0x33, 
+	0x7C, 0x33, 
+	0x6C, 0x33, 
+	0xFE, 0x33, 
+	0x60, 0x3F, 
+	0x60, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l40_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xC0, 0x71, 0x07, 
+	0xE0, 0x31, 0x07, 
+	0xE0, 0x39, 0x06, 
+	0xF0, 0x39, 0x06, 
+	0xF0, 0x39, 0x0E, 
+	0xF8, 0x39, 0x0E, 
+	0xD8, 0x39, 0x0E, 
+	0xDC, 0x39, 0x0E, 
+	0xCC, 0x39, 0x0E, 
+	0xFE, 0x3F, 0x06, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x31, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l40_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0x7E, 0x00, 
+	0x80, 0x07, 0xFF, 0x00, 
+	0xC0, 0x07, 0xEF, 0x01, 
+	0xC0, 0x87, 0xC7, 0x01, 
+	0xE0, 0x87, 0xC3, 0x03, 
+	0xE0, 0x87, 0xC3, 0x03, 
+	0xF0, 0xC7, 0x83, 0x03, 
+	0x70, 0xC7, 0x83, 0x03, 
+	0x78, 0xC7, 0x83, 0x03, 
+	0x3C, 0xC7, 0x83, 0x03, 
+	0x3C, 0xC7, 0x83, 0x03, 
+	0x1E, 0xC7, 0x83, 0x03, 
+	0x0E, 0xC7, 0x83, 0x03, 
+	0xFF, 0xDF, 0x83, 0x03, 
+	0xFF, 0x9F, 0xC3, 0x03, 
+	0x00, 0x87, 0xC3, 0x03, 
+	0x00, 0x87, 0xC7, 0x01, 
+	0x00, 0x07, 0xEF, 0x01, 
+	0x00, 0x07, 0xFF, 0x00, 
+	0x00, 0x07, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l41.xbm b/app/bin/bitmaps/l41.xbm
index 2029d0a..8535fda 100644
--- a/app/bin/bitmaps/l41.xbm
+++ b/app/bin/bitmaps/l41.xbm
@@ -1,6 +1,78 @@
-#define l41_width 14
-#define l41_height 16
-static char l41_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x18, 0x06, 0x14, 0x05, 
-  0x92, 0x04, 0x11, 0x04, 0x3F, 0x04, 0x10, 0x04, 0x10, 0x04, 0x10, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l41_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1C, 
+	0x70, 0x1E, 
+	0x78, 0x1F, 
+	0x78, 0x1C, 
+	0x7C, 0x1C, 
+	0x6C, 0x1C, 
+	0xFE, 0x1C, 
+	0x60, 0x1C, 
+	0x60, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l41_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0xC1, 0x03, 
+	0xE0, 0xC1, 0x03, 
+	0xE0, 0xE1, 0x03, 
+	0xF0, 0xB1, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0xF8, 0x81, 0x03, 
+	0xD8, 0x81, 0x03, 
+	0xDC, 0x81, 0x03, 
+	0xCC, 0x81, 0x03, 
+	0xFE, 0x87, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l41_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0x70, 0x00, 
+	0x80, 0x07, 0x70, 0x00, 
+	0xC0, 0x07, 0x78, 0x00, 
+	0xC0, 0x07, 0x7C, 0x00, 
+	0xE0, 0x07, 0x7E, 0x00, 
+	0xE0, 0x07, 0x7F, 0x00, 
+	0xF0, 0x07, 0x73, 0x00, 
+	0x70, 0x07, 0x70, 0x00, 
+	0x78, 0x07, 0x70, 0x00, 
+	0x3C, 0x07, 0x70, 0x00, 
+	0x3C, 0x07, 0x70, 0x00, 
+	0x1E, 0x07, 0x70, 0x00, 
+	0x0E, 0x07, 0x70, 0x00, 
+	0xFF, 0x1F, 0x70, 0x00, 
+	0xFF, 0x1F, 0x70, 0x00, 
+	0x00, 0x07, 0x70, 0x00, 
+	0x00, 0x07, 0x70, 0x00, 
+	0x00, 0x07, 0x70, 0x00, 
+	0x00, 0x07, 0x70, 0x00, 
+	0x00, 0x07, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l42.xbm b/app/bin/bitmaps/l42.xbm
index b5be599..1b1b742 100644
--- a/app/bin/bitmaps/l42.xbm
+++ b/app/bin/bitmaps/l42.xbm
@@ -1,6 +1,78 @@
-#define l42_width 14
-#define l42_height 16
-static char l42_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x94, 0x10, 
-  0x12, 0x08, 0x11, 0x04, 0x3F, 0x02, 0x10, 0x01, 0x90, 0x00, 0x90, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l42_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x70, 0x3F, 
+	0x78, 0x33, 
+	0x78, 0x30, 
+	0x7C, 0x38, 
+	0x6C, 0x1C, 
+	0xFE, 0x0E, 
+	0x60, 0x07, 
+	0x60, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l42_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xC0, 0x71, 0x07, 
+	0xE0, 0x39, 0x06, 
+	0xE0, 0x39, 0x0E, 
+	0xF0, 0x01, 0x0E, 
+	0xF0, 0x01, 0x0E, 
+	0xF8, 0x01, 0x07, 
+	0xD8, 0x81, 0x07, 
+	0xDC, 0x81, 0x03, 
+	0xCC, 0xC1, 0x01, 
+	0xFE, 0xE7, 0x01, 
+	0xC0, 0xF1, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x79, 0x00, 
+	0xC0, 0xF9, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l42_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0xFE, 0x00, 
+	0x80, 0x07, 0xFF, 0x01, 
+	0xC0, 0x87, 0xE7, 0x03, 
+	0xC0, 0x87, 0xC3, 0x03, 
+	0xE0, 0xC7, 0x83, 0x03, 
+	0xE0, 0xC7, 0x83, 0x03, 
+	0xF0, 0x07, 0x80, 0x03, 
+	0x70, 0x07, 0xC0, 0x03, 
+	0x78, 0x07, 0xC0, 0x03, 
+	0x3C, 0x07, 0xE0, 0x01, 
+	0x3C, 0x07, 0xF0, 0x01, 
+	0x1E, 0x07, 0xF8, 0x00, 
+	0x0E, 0x07, 0x78, 0x00, 
+	0xFF, 0x1F, 0x3C, 0x00, 
+	0xFF, 0x1F, 0x1E, 0x00, 
+	0x00, 0x07, 0x0F, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0xC7, 0xFF, 0x03, 
+	0x00, 0xC7, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l43.xbm b/app/bin/bitmaps/l43.xbm
index 23ea804..1512650 100644
--- a/app/bin/bitmaps/l43.xbm
+++ b/app/bin/bitmaps/l43.xbm
@@ -1,6 +1,78 @@
-#define l43_width 14
-#define l43_height 16
-static char l43_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x14, 0x10, 
-  0x12, 0x10, 0x11, 0x0E, 0x3F, 0x10, 0x10, 0x10, 0x90, 0x10, 0x10, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l43_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x70, 0x3B, 
+	0x78, 0x38, 
+	0x78, 0x18, 
+	0x7C, 0x3C, 
+	0x6C, 0x38, 
+	0xFE, 0x33, 
+	0x60, 0x3F, 
+	0x60, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l43_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xC0, 0x71, 0x07, 
+	0xE0, 0x39, 0x07, 
+	0xE0, 0x01, 0x07, 
+	0xF0, 0x01, 0x07, 
+	0xF0, 0x01, 0x07, 
+	0xF8, 0x81, 0x03, 
+	0xD8, 0xC1, 0x07, 
+	0xDC, 0x01, 0x07, 
+	0xCC, 0x01, 0x0E, 
+	0xFE, 0x07, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l43_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0x7E, 0x00, 
+	0x80, 0x07, 0xFF, 0x00, 
+	0xC0, 0x87, 0xE7, 0x01, 
+	0xC0, 0x87, 0xC7, 0x01, 
+	0xE0, 0x87, 0xC3, 0x03, 
+	0xE0, 0x07, 0xC0, 0x03, 
+	0xF0, 0x07, 0xC0, 0x01, 
+	0x70, 0x07, 0xE0, 0x01, 
+	0x78, 0x07, 0xFC, 0x00, 
+	0x3C, 0x07, 0xFC, 0x00, 
+	0x3C, 0x07, 0xE0, 0x01, 
+	0x1E, 0x07, 0xC0, 0x03, 
+	0x0E, 0x07, 0x80, 0x03, 
+	0xFF, 0x1F, 0x80, 0x03, 
+	0xFF, 0xDF, 0x83, 0x03, 
+	0x00, 0xC7, 0x83, 0x03, 
+	0x00, 0x87, 0xC7, 0x03, 
+	0x00, 0x87, 0xE7, 0x01, 
+	0x00, 0x07, 0xFF, 0x01, 
+	0x00, 0x07, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l44.xbm b/app/bin/bitmaps/l44.xbm
index f55e45c..7a96e04 100644
--- a/app/bin/bitmaps/l44.xbm
+++ b/app/bin/bitmaps/l44.xbm
@@ -1,6 +1,78 @@
-#define l44_width 14
-#define l44_height 16
-static char l44_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x18, 0x0C, 0x14, 0x0A, 
-  0x12, 0x09, 0x91, 0x08, 0xBF, 0x1F, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l44_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1C, 
+	0x70, 0x1C, 
+	0x78, 0x1E, 
+	0x78, 0x1E, 
+	0x7C, 0x1F, 
+	0x6C, 0x1B, 
+	0xFE, 0x3F, 
+	0x60, 0x18, 
+	0x60, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l44_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xE0, 0xC1, 0x03, 
+	0xE0, 0xC1, 0x03, 
+	0xF0, 0xE1, 0x03, 
+	0xF0, 0xE1, 0x03, 
+	0xF8, 0xF1, 0x03, 
+	0xD8, 0xB1, 0x03, 
+	0xDC, 0xB9, 0x03, 
+	0xCC, 0x99, 0x03, 
+	0xFE, 0xFF, 0x0F, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l44_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0xF0, 0x00, 
+	0x80, 0x07, 0xF0, 0x00, 
+	0xC0, 0x07, 0xF8, 0x00, 
+	0xC0, 0x07, 0xF8, 0x00, 
+	0xE0, 0x07, 0xFC, 0x00, 
+	0xE0, 0x07, 0xFC, 0x00, 
+	0xF0, 0x07, 0xFE, 0x00, 
+	0x70, 0x07, 0xEE, 0x00, 
+	0x78, 0x07, 0xEF, 0x00, 
+	0x3C, 0x87, 0xE7, 0x00, 
+	0x3C, 0x87, 0xE7, 0x00, 
+	0x1E, 0xC7, 0xE3, 0x00, 
+	0x0E, 0xC7, 0xE1, 0x00, 
+	0xFF, 0xFF, 0xFF, 0x03, 
+	0xFF, 0xFF, 0xFF, 0x03, 
+	0x00, 0x07, 0xE0, 0x00, 
+	0x00, 0x07, 0xE0, 0x00, 
+	0x00, 0x07, 0xE0, 0x00, 
+	0x00, 0x07, 0xE0, 0x00, 
+	0x00, 0x07, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l45.xbm b/app/bin/bitmaps/l45.xbm
index 8509e7c..d326cc1 100644
--- a/app/bin/bitmaps/l45.xbm
+++ b/app/bin/bitmaps/l45.xbm
@@ -1,6 +1,78 @@
-#define l45_width 14
-#define l45_height 16
-static char l45_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x1F, 0x98, 0x00, 0x94, 0x00, 
-  0x92, 0x0F, 0x11, 0x10, 0x3F, 0x10, 0x10, 0x10, 0x90, 0x10, 0x10, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l45_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x3F, 
+	0x70, 0x07, 
+	0x78, 0x07, 
+	0x78, 0x1F, 
+	0x7C, 0x3B, 
+	0x6C, 0x30, 
+	0xFE, 0x33, 
+	0x60, 0x3F, 
+	0x60, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l45_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xF1, 0x07, 
+	0xC0, 0x71, 0x00, 
+	0xE0, 0x71, 0x00, 
+	0xE0, 0x31, 0x00, 
+	0xF0, 0x31, 0x00, 
+	0xF0, 0xF9, 0x03, 
+	0xF8, 0x79, 0x07, 
+	0xD8, 0x39, 0x07, 
+	0xDC, 0x01, 0x0E, 
+	0xCC, 0x01, 0x0E, 
+	0xFE, 0x07, 0x0E, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l45_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0xFF, 0x03, 
+	0x80, 0x07, 0xFF, 0x03, 
+	0xC0, 0x07, 0x07, 0x00, 
+	0xC0, 0x07, 0x07, 0x00, 
+	0xE0, 0x87, 0x07, 0x00, 
+	0xE0, 0x87, 0x07, 0x00, 
+	0xF0, 0x87, 0x7F, 0x00, 
+	0x70, 0x87, 0xFF, 0x01, 
+	0x78, 0x87, 0xE7, 0x01, 
+	0x3C, 0x87, 0xC3, 0x03, 
+	0x3C, 0x07, 0xC0, 0x03, 
+	0x1E, 0x07, 0x80, 0x03, 
+	0x0E, 0x07, 0x80, 0x03, 
+	0xFF, 0x1F, 0x80, 0x03, 
+	0xFF, 0xDF, 0x83, 0x03, 
+	0x00, 0xC7, 0xC3, 0x03, 
+	0x00, 0x87, 0xC3, 0x03, 
+	0x00, 0x87, 0xE7, 0x01, 
+	0x00, 0x07, 0xFF, 0x00, 
+	0x00, 0x07, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l46.xbm b/app/bin/bitmaps/l46.xbm
index 873164e..5313ab6 100644
--- a/app/bin/bitmaps/l46.xbm
+++ b/app/bin/bitmaps/l46.xbm
@@ -1,6 +1,78 @@
-#define l46_width 14
-#define l46_height 16
-static char l46_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x00, 0x94, 0x00, 
-  0x92, 0x0F, 0x91, 0x10, 0xBF, 0x10, 0x90, 0x10, 0x90, 0x10, 0x10, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l46_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x70, 0x3F, 
+	0x78, 0x03, 
+	0x78, 0x1F, 
+	0x7C, 0x3F, 
+	0x6C, 0x33, 
+	0xFE, 0x33, 
+	0x60, 0x3F, 
+	0x60, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l46_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xC0, 0x71, 0x07, 
+	0xE0, 0x31, 0x07, 
+	0xE0, 0x39, 0x00, 
+	0xF0, 0x39, 0x00, 
+	0xF0, 0x39, 0x00, 
+	0xF8, 0xF9, 0x03, 
+	0xD8, 0x79, 0x07, 
+	0xDC, 0x39, 0x07, 
+	0xCC, 0x39, 0x0E, 
+	0xFE, 0x3F, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x31, 0x07, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l46_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0xFC, 0x00, 
+	0x80, 0x07, 0xFF, 0x01, 
+	0xC0, 0x07, 0xEF, 0x01, 
+	0xC0, 0x87, 0xC7, 0x03, 
+	0xE0, 0x87, 0xC3, 0x03, 
+	0xE0, 0x87, 0x03, 0x00, 
+	0xF0, 0xC7, 0x03, 0x00, 
+	0x70, 0xC7, 0x7F, 0x00, 
+	0x78, 0xC7, 0xFF, 0x01, 
+	0x3C, 0xC7, 0xEF, 0x01, 
+	0x3C, 0xC7, 0xC7, 0x03, 
+	0x1E, 0xC7, 0x83, 0x03, 
+	0x0E, 0xC7, 0x83, 0x03, 
+	0xFF, 0xDF, 0x83, 0x03, 
+	0xFF, 0xDF, 0x83, 0x03, 
+	0x00, 0x87, 0x83, 0x03, 
+	0x00, 0x87, 0xC7, 0x03, 
+	0x00, 0x87, 0xEF, 0x01, 
+	0x00, 0x07, 0xFF, 0x01, 
+	0x00, 0x07, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l47.xbm b/app/bin/bitmaps/l47.xbm
index 61043f1..e635d03 100644
--- a/app/bin/bitmaps/l47.xbm
+++ b/app/bin/bitmaps/l47.xbm
@@ -1,6 +1,78 @@
-#define l47_width 14
-#define l47_height 16
-static char l47_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x1F, 0x18, 0x10, 0x14, 0x08, 
-  0x12, 0x08, 0x11, 0x04, 0x3F, 0x04, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l47_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x3F, 
+	0x70, 0x38, 
+	0x78, 0x18, 
+	0x78, 0x1C, 
+	0x7C, 0x0C, 
+	0x6C, 0x0E, 
+	0xFE, 0x0E, 
+	0x60, 0x06, 
+	0x60, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l47_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xF9, 0x0F, 
+	0xC0, 0x01, 0x0F, 
+	0xE0, 0x01, 0x07, 
+	0xE0, 0x81, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0xF0, 0xC1, 0x01, 
+	0xF8, 0xC1, 0x01, 
+	0xD8, 0xC1, 0x01, 
+	0xDC, 0xE1, 0x00, 
+	0xCC, 0xE1, 0x00, 
+	0xFE, 0xE7, 0x00, 
+	0xC0, 0xE1, 0x00, 
+	0xC0, 0xE1, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l47_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0xC7, 0xFF, 0x03, 
+	0x80, 0xC7, 0xFF, 0x03, 
+	0xC0, 0x07, 0xC0, 0x03, 
+	0xC0, 0x07, 0xE0, 0x01, 
+	0xE0, 0x07, 0xE0, 0x01, 
+	0xE0, 0x07, 0xF0, 0x00, 
+	0xF0, 0x07, 0xF0, 0x00, 
+	0x70, 0x07, 0x78, 0x00, 
+	0x78, 0x07, 0x78, 0x00, 
+	0x3C, 0x07, 0x38, 0x00, 
+	0x3C, 0x07, 0x3C, 0x00, 
+	0x1E, 0x07, 0x3C, 0x00, 
+	0x0E, 0x07, 0x1C, 0x00, 
+	0xFF, 0x1F, 0x1E, 0x00, 
+	0xFF, 0x1F, 0x1E, 0x00, 
+	0x00, 0x07, 0x1E, 0x00, 
+	0x00, 0x07, 0x1E, 0x00, 
+	0x00, 0x07, 0x0E, 0x00, 
+	0x00, 0x07, 0x0E, 0x00, 
+	0x00, 0x07, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l48.xbm b/app/bin/bitmaps/l48.xbm
index 0a04953..977b660 100644
--- a/app/bin/bitmaps/l48.xbm
+++ b/app/bin/bitmaps/l48.xbm
@@ -1,6 +1,78 @@
-#define l48_width 14
-#define l48_height 16
-static char l48_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x94, 0x10, 
-  0x92, 0x10, 0x11, 0x0F, 0xBF, 0x10, 0x90, 0x10, 0x90, 0x10, 0x10, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l48_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x70, 0x3F, 
+	0x78, 0x3B, 
+	0x78, 0x3F, 
+	0x7C, 0x1E, 
+	0x6C, 0x3F, 
+	0xFE, 0x33, 
+	0x60, 0x3F, 
+	0x60, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l48_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x03, 
+	0xC0, 0x71, 0x07, 
+	0xE0, 0x31, 0x07, 
+	0xE0, 0x39, 0x07, 
+	0xF0, 0x39, 0x07, 
+	0xF0, 0x39, 0x07, 
+	0xF8, 0x71, 0x07, 
+	0xD8, 0xE1, 0x03, 
+	0xDC, 0x71, 0x07, 
+	0xCC, 0x39, 0x06, 
+	0xFE, 0x3F, 0x0E, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x71, 0x07, 
+	0xC0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l48_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0x7E, 0x00, 
+	0x80, 0x07, 0xFF, 0x00, 
+	0xC0, 0x87, 0xEF, 0x01, 
+	0xC0, 0x87, 0xC7, 0x01, 
+	0xE0, 0x87, 0xC3, 0x03, 
+	0xE0, 0x87, 0xC3, 0x03, 
+	0xF0, 0x87, 0xC7, 0x01, 
+	0x70, 0x07, 0xEF, 0x01, 
+	0x78, 0x07, 0xFE, 0x00, 
+	0x3C, 0x07, 0xFF, 0x00, 
+	0x3C, 0x87, 0xE7, 0x01, 
+	0x1E, 0x87, 0xC3, 0x03, 
+	0x0E, 0xC7, 0x83, 0x03, 
+	0xFF, 0xDF, 0x83, 0x03, 
+	0xFF, 0xDF, 0x83, 0x03, 
+	0x00, 0xC7, 0x83, 0x03, 
+	0x00, 0x87, 0xC3, 0x03, 
+	0x00, 0x87, 0xE7, 0x01, 
+	0x00, 0x07, 0xFF, 0x01, 
+	0x00, 0x07, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l49.xbm b/app/bin/bitmaps/l49.xbm
index 14b9914..e930612 100644
--- a/app/bin/bitmaps/l49.xbm
+++ b/app/bin/bitmaps/l49.xbm
@@ -1,6 +1,78 @@
-#define l49_width 14
-#define l49_height 16
-static char l49_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x94, 0x10, 
-  0x92, 0x10, 0x11, 0x1F, 0x3F, 0x10, 0x10, 0x10, 0x10, 0x08, 0x10, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l49_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x70, 0x1E, 
+	0x70, 0x3F, 
+	0x78, 0x33, 
+	0x78, 0x33, 
+	0x7C, 0x3F, 
+	0x6C, 0x3E, 
+	0xFE, 0x30, 
+	0x60, 0x3B, 
+	0x60, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l49_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0xE1, 0x01, 
+	0xC0, 0x71, 0x07, 
+	0xE0, 0x39, 0x07, 
+	0xE0, 0x39, 0x06, 
+	0xF0, 0x39, 0x0E, 
+	0xF0, 0x39, 0x0E, 
+	0xF8, 0x39, 0x0F, 
+	0xD8, 0x71, 0x0F, 
+	0xDC, 0xE1, 0x0F, 
+	0xCC, 0x01, 0x0E, 
+	0xFE, 0x07, 0x06, 
+	0xC0, 0x01, 0x06, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x71, 0x03, 
+	0xC0, 0xF1, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l49_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0x07, 0x7E, 0x00, 
+	0x80, 0x07, 0xFF, 0x00, 
+	0xC0, 0x87, 0xEF, 0x01, 
+	0xC0, 0x87, 0xC7, 0x01, 
+	0xE0, 0xC7, 0x83, 0x03, 
+	0xE0, 0xC7, 0x83, 0x03, 
+	0xF0, 0xC7, 0x83, 0x03, 
+	0x70, 0xC7, 0x83, 0x03, 
+	0x78, 0xC7, 0x83, 0x03, 
+	0x3C, 0x87, 0xC3, 0x03, 
+	0x3C, 0x87, 0xE7, 0x03, 
+	0x1E, 0x07, 0xFF, 0x03, 
+	0x0E, 0x07, 0xFE, 0x03, 
+	0xFF, 0x1F, 0x80, 0x03, 
+	0xFF, 0x1F, 0x80, 0x03, 
+	0x00, 0x87, 0xC3, 0x03, 
+	0x00, 0x87, 0xC3, 0x01, 
+	0x00, 0x87, 0xE7, 0x01, 
+	0x00, 0x07, 0xFF, 0x00, 
+	0x00, 0x07, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l5.xbm b/app/bin/bitmaps/l5.xbm
index da409be..4d43af0 100644
--- a/app/bin/bitmaps/l5.xbm
+++ b/app/bin/bitmaps/l5.xbm
@@ -1,6 +1,78 @@
-#define l5_width 14
-#define l5_height 16
-static char l5_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x08, 0x00, 0x08, 0x00, 
-  0xF8, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x08, 0x01, 0xF0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l5_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xE0, 0x07, 
+	0xE0, 0x00, 
+	0xE0, 0x00, 
+	0xE0, 0x03, 
+	0x60, 0x07, 
+	0x00, 0x06, 
+	0x60, 0x06, 
+	0xE0, 0x07, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l5_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x80, 0x3F, 0x00, 
+	0x80, 0x03, 0x00, 
+	0x80, 0x03, 0x00, 
+	0x80, 0x01, 0x00, 
+	0x80, 0x01, 0x00, 
+	0xC0, 0x1F, 0x00, 
+	0xC0, 0x3B, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0x00, 0x70, 0x00, 
+	0x00, 0x70, 0x00, 
+	0x00, 0x70, 0x00, 
+	0xC0, 0x31, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l5_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0xFE, 0x07, 0x00, 
+	0x00, 0xFE, 0x07, 0x00, 
+	0x00, 0x0E, 0x00, 0x00, 
+	0x00, 0x0E, 0x00, 0x00, 
+	0x00, 0x0F, 0x00, 0x00, 
+	0x00, 0x0F, 0x00, 0x00, 
+	0x00, 0xFF, 0x00, 0x00, 
+	0x00, 0xFF, 0x03, 0x00, 
+	0x00, 0xCF, 0x03, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0x80, 0x07, 0x00, 
+	0x00, 0x00, 0x07, 0x00, 
+	0x00, 0x00, 0x07, 0x00, 
+	0x00, 0x00, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x87, 0x07, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0xCF, 0x03, 0x00, 
+	0x00, 0xFE, 0x01, 0x00, 
+	0x00, 0xFC, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l50.xbm b/app/bin/bitmaps/l50.xbm
index 981e2c8..834ab8f 100644
--- a/app/bin/bitmaps/l50.xbm
+++ b/app/bin/bitmaps/l50.xbm
@@ -1,6 +1,78 @@
-#define l50_width 14
-#define l50_height 16
-static char l50_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x81, 0x18, 
-  0x9F, 0x14, 0xA0, 0x12, 0xA0, 0x11, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l50_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0x1C, 0x3F, 
+	0x1C, 0x33, 
+	0x7C, 0x33, 
+	0xEC, 0x33, 
+	0xC0, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l50_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0xE3, 0x03, 
+	0x38, 0x70, 0x07, 
+	0x38, 0x30, 0x07, 
+	0x18, 0x38, 0x06, 
+	0x18, 0x38, 0x06, 
+	0xFC, 0x39, 0x0E, 
+	0xBC, 0x3B, 0x0E, 
+	0x9C, 0x3B, 0x0E, 
+	0x00, 0x3F, 0x0E, 
+	0x00, 0x3F, 0x0E, 
+	0x00, 0x3F, 0x06, 
+	0x1C, 0x3B, 0x06, 
+	0x9C, 0x33, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l50_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0x7E, 0x00, 
+	0xF8, 0x1F, 0xFF, 0x00, 
+	0x38, 0x00, 0xEF, 0x01, 
+	0x38, 0x80, 0xC7, 0x01, 
+	0x3C, 0x80, 0xC3, 0x03, 
+	0x3C, 0x80, 0xC3, 0x03, 
+	0xFC, 0xC3, 0x83, 0x03, 
+	0xFC, 0xCF, 0x83, 0x03, 
+	0x3C, 0xCF, 0x83, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x00, 0xDE, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC7, 0x01, 
+	0x3C, 0x0F, 0xEF, 0x01, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l51.xbm b/app/bin/bitmaps/l51.xbm
index ac2e9a2..8081e2f 100644
--- a/app/bin/bitmaps/l51.xbm
+++ b/app/bin/bitmaps/l51.xbm
@@ -1,6 +1,78 @@
-#define l51_width 14
-#define l51_height 16
-static char l51_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x04, 0x01, 0x06, 0x01, 0x05, 
-  0x9F, 0x04, 0x20, 0x04, 0x20, 0x04, 0x20, 0x04, 0x21, 0x04, 0x1E, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l51_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1C, 
+	0x1C, 0x1E, 
+	0x1C, 0x1F, 
+	0x7C, 0x1C, 
+	0xEC, 0x1C, 
+	0xC0, 0x1C, 
+	0xCC, 0x1C, 
+	0xFC, 0x1C, 
+	0x78, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l51_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0x83, 0x03, 
+	0x38, 0xC0, 0x03, 
+	0x38, 0xC0, 0x03, 
+	0x18, 0xE0, 0x03, 
+	0x18, 0xB0, 0x03, 
+	0xFC, 0x81, 0x03, 
+	0xBC, 0x83, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0x00, 0x87, 0x03, 
+	0x00, 0x87, 0x03, 
+	0x00, 0x87, 0x03, 
+	0x1C, 0x83, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l51_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0x70, 0x00, 
+	0xF8, 0x1F, 0x70, 0x00, 
+	0x38, 0x00, 0x78, 0x00, 
+	0x38, 0x00, 0x7C, 0x00, 
+	0x3C, 0x00, 0x7E, 0x00, 
+	0x3C, 0x00, 0x7F, 0x00, 
+	0xFC, 0x03, 0x73, 0x00, 
+	0xFC, 0x0F, 0x70, 0x00, 
+	0x3C, 0x0F, 0x70, 0x00, 
+	0x1C, 0x1E, 0x70, 0x00, 
+	0x00, 0x1E, 0x70, 0x00, 
+	0x00, 0x1C, 0x70, 0x00, 
+	0x00, 0x1C, 0x70, 0x00, 
+	0x00, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1E, 0x70, 0x00, 
+	0x1C, 0x1E, 0x70, 0x00, 
+	0x3C, 0x0F, 0x70, 0x00, 
+	0xF8, 0x07, 0x70, 0x00, 
+	0xF0, 0x03, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l52.xbm b/app/bin/bitmaps/l52.xbm
index 266c9a4..1547b10 100644
--- a/app/bin/bitmaps/l52.xbm
+++ b/app/bin/bitmaps/l52.xbm
@@ -1,6 +1,78 @@
-#define l52_width 14
-#define l52_height 16
-static char l52_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x81, 0x10, 
-  0x1F, 0x08, 0x20, 0x04, 0x20, 0x02, 0x20, 0x01, 0xA1, 0x00, 0x9E, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l52_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0x1C, 0x3F, 
+	0x1C, 0x33, 
+	0x7C, 0x30, 
+	0xEC, 0x38, 
+	0xC0, 0x1C, 
+	0xCC, 0x0E, 
+	0xFC, 0x07, 
+	0x78, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l52_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0xE3, 0x03, 
+	0x38, 0x70, 0x07, 
+	0x38, 0x38, 0x06, 
+	0x18, 0x38, 0x0E, 
+	0x18, 0x00, 0x0E, 
+	0xFC, 0x01, 0x0E, 
+	0xBC, 0x03, 0x07, 
+	0x9C, 0x83, 0x07, 
+	0x00, 0x87, 0x03, 
+	0x00, 0xC7, 0x01, 
+	0x00, 0xE7, 0x01, 
+	0x1C, 0xF3, 0x00, 
+	0x9C, 0x73, 0x00, 
+	0xB8, 0x7B, 0x00, 
+	0xF0, 0xF9, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l52_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0xFE, 0x00, 
+	0xF8, 0x1F, 0xFF, 0x01, 
+	0x38, 0x80, 0xE7, 0x03, 
+	0x38, 0x80, 0xC3, 0x03, 
+	0x3C, 0xC0, 0x83, 0x03, 
+	0x3C, 0xC0, 0x83, 0x03, 
+	0xFC, 0x03, 0x80, 0x03, 
+	0xFC, 0x0F, 0xC0, 0x03, 
+	0x3C, 0x0F, 0xC0, 0x03, 
+	0x1C, 0x1E, 0xE0, 0x01, 
+	0x00, 0x1E, 0xF0, 0x01, 
+	0x00, 0x1C, 0xF8, 0x00, 
+	0x00, 0x1C, 0x78, 0x00, 
+	0x00, 0x1C, 0x3C, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1E, 0x0F, 0x00, 
+	0x1C, 0x9E, 0x07, 0x00, 
+	0x3C, 0x8F, 0x07, 0x00, 
+	0xF8, 0xC7, 0xFF, 0x03, 
+	0xF0, 0xC3, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l53.xbm b/app/bin/bitmaps/l53.xbm
index 232b96c..a9620b9 100644
--- a/app/bin/bitmaps/l53.xbm
+++ b/app/bin/bitmaps/l53.xbm
@@ -1,6 +1,78 @@
-#define l53_width 14
-#define l53_height 16
-static char l53_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x01, 0x10, 
-  0x1F, 0x10, 0x20, 0x0E, 0x20, 0x10, 0x20, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l53_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0x1C, 0x3B, 
+	0x1C, 0x38, 
+	0x7C, 0x18, 
+	0xEC, 0x3C, 
+	0xC0, 0x38, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l53_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0xE3, 0x03, 
+	0x38, 0x70, 0x07, 
+	0x38, 0x38, 0x07, 
+	0x18, 0x00, 0x07, 
+	0x18, 0x00, 0x07, 
+	0xFC, 0x01, 0x07, 
+	0xBC, 0x83, 0x03, 
+	0x9C, 0xC3, 0x07, 
+	0x00, 0x07, 0x07, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x1C, 0x3B, 0x0E, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l53_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0x7E, 0x00, 
+	0xF8, 0x1F, 0xFF, 0x00, 
+	0x38, 0x80, 0xE7, 0x01, 
+	0x38, 0x80, 0xC7, 0x01, 
+	0x3C, 0x80, 0xC3, 0x03, 
+	0x3C, 0x00, 0xC0, 0x03, 
+	0xFC, 0x03, 0xC0, 0x01, 
+	0xFC, 0x0F, 0xE0, 0x01, 
+	0x3C, 0x0F, 0xFC, 0x00, 
+	0x1C, 0x1E, 0xFC, 0x00, 
+	0x00, 0x1E, 0xE0, 0x01, 
+	0x00, 0x1C, 0xC0, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDE, 0x83, 0x03, 
+	0x1C, 0x9E, 0xC7, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l54.xbm b/app/bin/bitmaps/l54.xbm
index e68e643..68a392e 100644
--- a/app/bin/bitmaps/l54.xbm
+++ b/app/bin/bitmaps/l54.xbm
@@ -1,6 +1,78 @@
-#define l54_width 14
-#define l54_height 16
-static char l54_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x08, 0x01, 0x0C, 0x01, 0x0A, 
-  0x1F, 0x09, 0xA0, 0x08, 0xA0, 0x1F, 0x20, 0x08, 0x21, 0x08, 0x1E, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l54_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1C, 
+	0x1C, 0x1C, 
+	0x1C, 0x1E, 
+	0x7C, 0x1E, 
+	0xEC, 0x1F, 
+	0xC0, 0x1B, 
+	0xCC, 0x3F, 
+	0xFC, 0x18, 
+	0x78, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l54_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0x83, 0x03, 
+	0x38, 0x80, 0x03, 
+	0x38, 0xC0, 0x03, 
+	0x18, 0xC0, 0x03, 
+	0x18, 0xE0, 0x03, 
+	0xFC, 0xE1, 0x03, 
+	0xBC, 0xF3, 0x03, 
+	0x9C, 0xB3, 0x03, 
+	0x00, 0xBF, 0x03, 
+	0x00, 0x9F, 0x03, 
+	0x00, 0xFF, 0x0F, 
+	0x1C, 0x83, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l54_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0xF0, 0x00, 
+	0xF8, 0x1F, 0xF0, 0x00, 
+	0x38, 0x00, 0xF8, 0x00, 
+	0x38, 0x00, 0xF8, 0x00, 
+	0x3C, 0x00, 0xFC, 0x00, 
+	0x3C, 0x00, 0xFC, 0x00, 
+	0xFC, 0x03, 0xFE, 0x00, 
+	0xFC, 0x0F, 0xEE, 0x00, 
+	0x3C, 0x0F, 0xEF, 0x00, 
+	0x1C, 0x9E, 0xE7, 0x00, 
+	0x00, 0x9E, 0xE7, 0x00, 
+	0x00, 0xDC, 0xE3, 0x00, 
+	0x00, 0xDC, 0xE1, 0x00, 
+	0x00, 0xFC, 0xFF, 0x03, 
+	0x1E, 0xFC, 0xFF, 0x03, 
+	0x1E, 0x1E, 0xE0, 0x00, 
+	0x1C, 0x1E, 0xE0, 0x00, 
+	0x3C, 0x0F, 0xE0, 0x00, 
+	0xF8, 0x07, 0xE0, 0x00, 
+	0xF0, 0x03, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l55.xbm b/app/bin/bitmaps/l55.xbm
index 6b29ef2..8c35927 100644
--- a/app/bin/bitmaps/l55.xbm
+++ b/app/bin/bitmaps/l55.xbm
@@ -1,6 +1,78 @@
-#define l55_width 14
-#define l55_height 16
-static char l55_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x1F, 0x81, 0x00, 0x81, 0x00, 
-  0x9F, 0x0F, 0x20, 0x10, 0x20, 0x10, 0x20, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l55_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x3F, 
+	0x1C, 0x07, 
+	0x1C, 0x07, 
+	0x7C, 0x1F, 
+	0xEC, 0x3B, 
+	0xC0, 0x30, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l55_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0xF3, 0x07, 
+	0x38, 0x70, 0x00, 
+	0x38, 0x70, 0x00, 
+	0x18, 0x30, 0x00, 
+	0x18, 0x30, 0x00, 
+	0xFC, 0xF9, 0x03, 
+	0xBC, 0x7B, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x1C, 0x3B, 0x06, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l55_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0xFF, 0x03, 
+	0xF8, 0x1F, 0xFF, 0x03, 
+	0x38, 0x00, 0x07, 0x00, 
+	0x38, 0x00, 0x07, 0x00, 
+	0x3C, 0x80, 0x07, 0x00, 
+	0x3C, 0x80, 0x07, 0x00, 
+	0xFC, 0x83, 0x7F, 0x00, 
+	0xFC, 0x8F, 0xFF, 0x01, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x00, 0x1E, 0xC0, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDE, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l56.xbm b/app/bin/bitmaps/l56.xbm
index 20eedef..e8f4d59 100644
--- a/app/bin/bitmaps/l56.xbm
+++ b/app/bin/bitmaps/l56.xbm
@@ -1,6 +1,78 @@
-#define l56_width 14
-#define l56_height 16
-static char l56_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x00, 0x81, 0x00, 
-  0x9F, 0x0F, 0xA0, 0x10, 0xA0, 0x10, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l56_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0x1C, 0x3F, 
+	0x1C, 0x03, 
+	0x7C, 0x1F, 
+	0xEC, 0x3F, 
+	0xC0, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l56_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0xE3, 0x03, 
+	0x38, 0x70, 0x07, 
+	0x38, 0x30, 0x07, 
+	0x18, 0x38, 0x00, 
+	0x18, 0x38, 0x00, 
+	0xFC, 0x39, 0x00, 
+	0xBC, 0xFB, 0x03, 
+	0x9C, 0x7B, 0x07, 
+	0x00, 0x3F, 0x07, 
+	0x00, 0x3F, 0x0E, 
+	0x00, 0x3F, 0x0E, 
+	0x1C, 0x3B, 0x0E, 
+	0x9C, 0x33, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l56_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0xFC, 0x00, 
+	0xF8, 0x1F, 0xFF, 0x01, 
+	0x38, 0x00, 0xEF, 0x01, 
+	0x38, 0x80, 0xC7, 0x03, 
+	0x3C, 0x80, 0xC3, 0x03, 
+	0x3C, 0x80, 0x03, 0x00, 
+	0xFC, 0xC3, 0x03, 0x00, 
+	0xFC, 0xCF, 0x7F, 0x00, 
+	0x3C, 0xCF, 0xFF, 0x01, 
+	0x1C, 0xDE, 0xEF, 0x01, 
+	0x00, 0xDE, 0xC7, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0x9E, 0x83, 0x03, 
+	0x1C, 0x9E, 0xC7, 0x03, 
+	0x3C, 0x8F, 0xEF, 0x01, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l57.xbm b/app/bin/bitmaps/l57.xbm
index a9b7d42..5149c54 100644
--- a/app/bin/bitmaps/l57.xbm
+++ b/app/bin/bitmaps/l57.xbm
@@ -1,6 +1,78 @@
-#define l57_width 14
-#define l57_height 16
-static char l57_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x1F, 0x01, 0x10, 0x01, 0x08, 
-  0x1F, 0x08, 0x20, 0x04, 0x20, 0x04, 0x20, 0x02, 0x21, 0x02, 0x1E, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l57_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x3F, 
+	0x1C, 0x38, 
+	0x1C, 0x18, 
+	0x7C, 0x1C, 
+	0xEC, 0x0C, 
+	0xC0, 0x0E, 
+	0xCC, 0x0E, 
+	0xFC, 0x06, 
+	0x78, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l57_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0xFB, 0x0F, 
+	0x38, 0x00, 0x0F, 
+	0x38, 0x00, 0x07, 
+	0x18, 0x80, 0x03, 
+	0x18, 0x80, 0x03, 
+	0xFC, 0xC1, 0x01, 
+	0xBC, 0xC3, 0x01, 
+	0x9C, 0xC3, 0x01, 
+	0x00, 0xE7, 0x00, 
+	0x00, 0xE7, 0x00, 
+	0x00, 0xE7, 0x00, 
+	0x1C, 0xE3, 0x00, 
+	0x9C, 0xE3, 0x00, 
+	0xB8, 0x73, 0x00, 
+	0xF0, 0x71, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l57_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0xDF, 0xFF, 0x03, 
+	0xF8, 0xDF, 0xFF, 0x03, 
+	0x38, 0x00, 0xC0, 0x03, 
+	0x38, 0x00, 0xE0, 0x01, 
+	0x3C, 0x00, 0xE0, 0x01, 
+	0x3C, 0x00, 0xF0, 0x00, 
+	0xFC, 0x03, 0xF0, 0x00, 
+	0xFC, 0x0F, 0x78, 0x00, 
+	0x3C, 0x0F, 0x78, 0x00, 
+	0x1C, 0x1E, 0x38, 0x00, 
+	0x00, 0x1E, 0x3C, 0x00, 
+	0x00, 0x1C, 0x3C, 0x00, 
+	0x00, 0x1C, 0x1C, 0x00, 
+	0x00, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1E, 0x1E, 0x00, 
+	0x1C, 0x1E, 0x1E, 0x00, 
+	0x3C, 0x0F, 0x0E, 0x00, 
+	0xF8, 0x07, 0x0E, 0x00, 
+	0xF0, 0x03, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l58.xbm b/app/bin/bitmaps/l58.xbm
index 01fb1bd..3fe4ad7 100644
--- a/app/bin/bitmaps/l58.xbm
+++ b/app/bin/bitmaps/l58.xbm
@@ -1,6 +1,78 @@
-#define l58_width 14
-#define l58_height 16
-static char l58_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x81, 0x10, 
-  0x9F, 0x10, 0x20, 0x0F, 0xA0, 0x10, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l58_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0x1C, 0x3F, 
+	0x1C, 0x3B, 
+	0x7C, 0x3F, 
+	0xEC, 0x1E, 
+	0xC0, 0x3F, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l58_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0xE3, 0x03, 
+	0x38, 0x70, 0x07, 
+	0x38, 0x30, 0x07, 
+	0x18, 0x38, 0x07, 
+	0x18, 0x38, 0x07, 
+	0xFC, 0x39, 0x07, 
+	0xBC, 0x73, 0x07, 
+	0x9C, 0xE3, 0x03, 
+	0x00, 0x77, 0x07, 
+	0x00, 0x3F, 0x06, 
+	0x00, 0x3F, 0x0E, 
+	0x1C, 0x3B, 0x0E, 
+	0x9C, 0x3B, 0x06, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l58_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0x7E, 0x00, 
+	0xF8, 0x1F, 0xFF, 0x00, 
+	0x38, 0x80, 0xEF, 0x01, 
+	0x38, 0x80, 0xC7, 0x01, 
+	0x3C, 0x80, 0xC3, 0x03, 
+	0x3C, 0x80, 0xC3, 0x03, 
+	0xFC, 0x83, 0xC7, 0x01, 
+	0xFC, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x0F, 0xFE, 0x00, 
+	0x1C, 0x1E, 0xFF, 0x00, 
+	0x00, 0x9E, 0xE7, 0x01, 
+	0x00, 0x9C, 0xC3, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDE, 0x83, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l59.xbm b/app/bin/bitmaps/l59.xbm
index 8f5b367..9459753 100644
--- a/app/bin/bitmaps/l59.xbm
+++ b/app/bin/bitmaps/l59.xbm
@@ -1,6 +1,78 @@
-#define l59_width 14
-#define l59_height 16
-static char l59_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x81, 0x10, 
-  0x9F, 0x10, 0x20, 0x1F, 0x20, 0x10, 0x20, 0x10, 0x21, 0x08, 0x1E, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l59_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0x1C, 0x3F, 
+	0x1C, 0x33, 
+	0x7C, 0x33, 
+	0xEC, 0x3F, 
+	0xC0, 0x3E, 
+	0xCC, 0x30, 
+	0xFC, 0x3B, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l59_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF8, 0xE3, 0x01, 
+	0x38, 0x70, 0x07, 
+	0x38, 0x38, 0x07, 
+	0x18, 0x38, 0x06, 
+	0x18, 0x38, 0x0E, 
+	0xFC, 0x39, 0x0E, 
+	0xBC, 0x3B, 0x0F, 
+	0x9C, 0x73, 0x0F, 
+	0x00, 0xE7, 0x0F, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x07, 0x06, 
+	0x1C, 0x03, 0x06, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x03, 
+	0xF0, 0xF1, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l59_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF8, 0x1F, 0x7E, 0x00, 
+	0xF8, 0x1F, 0xFF, 0x00, 
+	0x38, 0x80, 0xEF, 0x01, 
+	0x38, 0x80, 0xC7, 0x01, 
+	0x3C, 0xC0, 0x83, 0x03, 
+	0x3C, 0xC0, 0x83, 0x03, 
+	0xFC, 0xC3, 0x83, 0x03, 
+	0xFC, 0xCF, 0x83, 0x03, 
+	0x3C, 0xCF, 0x83, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x00, 0x9E, 0xE7, 0x03, 
+	0x00, 0x1C, 0xFF, 0x03, 
+	0x00, 0x1C, 0xFE, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x01, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l6.xbm b/app/bin/bitmaps/l6.xbm
index 89efd19..325c80c 100644
--- a/app/bin/bitmaps/l6.xbm
+++ b/app/bin/bitmaps/l6.xbm
@@ -1,6 +1,78 @@
-#define l6_width 14
-#define l6_height 16
-static char l6_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x00, 0x08, 0x00, 
-  0xF8, 0x00, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01, 0xF0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l6_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0xE0, 0x07, 
+	0x60, 0x00, 
+	0xE0, 0x03, 
+	0xE0, 0x07, 
+	0x60, 0x06, 
+	0x60, 0x06, 
+	0xE0, 0x07, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l6_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0x80, 0x39, 0x00, 
+	0xC0, 0x01, 0x00, 
+	0xC0, 0x01, 0x00, 
+	0xC0, 0x01, 0x00, 
+	0xC0, 0x1F, 0x00, 
+	0xC0, 0x3B, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0x80, 0x39, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l6_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0xF8, 0x01, 0x00, 
+	0x00, 0xFE, 0x03, 0x00, 
+	0x00, 0xDE, 0x03, 0x00, 
+	0x00, 0x8F, 0x07, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0x07, 0x00, 0x00, 
+	0x80, 0x07, 0x00, 0x00, 
+	0x80, 0xFF, 0x00, 0x00, 
+	0x80, 0xFF, 0x03, 0x00, 
+	0x80, 0xDF, 0x03, 0x00, 
+	0x80, 0x8F, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x00, 0x07, 0x07, 0x00, 
+	0x00, 0x8F, 0x07, 0x00, 
+	0x00, 0xDF, 0x03, 0x00, 
+	0x00, 0xFE, 0x03, 0x00, 
+	0x00, 0xF8, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l60.xbm b/app/bin/bitmaps/l60.xbm
index 29692e4..11b9cc7 100644
--- a/app/bin/bitmaps/l60.xbm
+++ b/app/bin/bitmaps/l60.xbm
@@ -1,6 +1,78 @@
-#define l60_width 14
-#define l60_height 16
-static char l60_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x81, 0x18, 
-  0x9F, 0x14, 0xA1, 0x12, 0xA1, 0x11, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l60_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0x0C, 0x33, 
+	0x7C, 0x33, 
+	0xFC, 0x33, 
+	0xCC, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l60_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x33, 0x07, 
+	0x1C, 0x38, 0x06, 
+	0x1C, 0x38, 0x06, 
+	0x1C, 0x38, 0x0E, 
+	0xFC, 0x39, 0x0E, 
+	0xBC, 0x3B, 0x0E, 
+	0x9C, 0x3B, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x06, 
+	0x1C, 0x3F, 0x06, 
+	0x98, 0x33, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l60_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0x7E, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0x78, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x9E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x80, 0xC3, 0x03, 
+	0x1E, 0xC0, 0x83, 0x03, 
+	0xFE, 0xC3, 0x83, 0x03, 
+	0xFE, 0xCF, 0x83, 0x03, 
+	0x7E, 0xCF, 0x83, 0x03, 
+	0x3E, 0xDE, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1C, 0x9C, 0xC3, 0x03, 
+	0x3C, 0x9E, 0xC7, 0x01, 
+	0x7C, 0x0F, 0xEF, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xE0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l61.xbm b/app/bin/bitmaps/l61.xbm
index 22973a9..1983790 100644
--- a/app/bin/bitmaps/l61.xbm
+++ b/app/bin/bitmaps/l61.xbm
@@ -1,6 +1,78 @@
-#define l61_width 14
-#define l61_height 16
-static char l61_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x01, 0x06, 0x01, 0x05, 
-  0x9F, 0x04, 0x21, 0x04, 0x21, 0x04, 0x21, 0x04, 0x21, 0x04, 0x1E, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l61_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xFC, 0x1E, 
+	0x0C, 0x1F, 
+	0x7C, 0x1C, 
+	0xFC, 0x1C, 
+	0xCC, 0x1C, 
+	0xCC, 0x1C, 
+	0xFC, 0x1C, 
+	0x78, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l61_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0xC3, 0x03, 
+	0x98, 0xC3, 0x03, 
+	0x1C, 0xE0, 0x03, 
+	0x1C, 0xB0, 0x03, 
+	0x1C, 0x80, 0x03, 
+	0xFC, 0x81, 0x03, 
+	0xBC, 0x83, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0x1C, 0x87, 0x03, 
+	0x1C, 0x87, 0x03, 
+	0x1C, 0x87, 0x03, 
+	0x98, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l61_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0x70, 0x00, 
+	0xF8, 0x0F, 0x70, 0x00, 
+	0x78, 0x0F, 0x78, 0x00, 
+	0x3C, 0x1E, 0x7C, 0x00, 
+	0x1C, 0x1E, 0x7E, 0x00, 
+	0x1C, 0x00, 0x7F, 0x00, 
+	0x1E, 0x00, 0x73, 0x00, 
+	0xFE, 0x03, 0x70, 0x00, 
+	0xFE, 0x0F, 0x70, 0x00, 
+	0x7E, 0x0F, 0x70, 0x00, 
+	0x3E, 0x1E, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1C, 0x1C, 0x70, 0x00, 
+	0x3C, 0x1E, 0x70, 0x00, 
+	0x7C, 0x0F, 0x70, 0x00, 
+	0xF8, 0x0F, 0x70, 0x00, 
+	0xE0, 0x03, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l62.xbm b/app/bin/bitmaps/l62.xbm
index 0447b20..93573ec 100644
--- a/app/bin/bitmaps/l62.xbm
+++ b/app/bin/bitmaps/l62.xbm
@@ -1,6 +1,78 @@
-#define l62_width 14
-#define l62_height 16
-static char l62_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x81, 0x10, 
-  0x1F, 0x08, 0x21, 0x04, 0x21, 0x02, 0x21, 0x01, 0xA1, 0x00, 0x9E, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l62_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0x0C, 0x33, 
+	0x7C, 0x30, 
+	0xFC, 0x38, 
+	0xCC, 0x1C, 
+	0xCC, 0x0E, 
+	0xFC, 0x07, 
+	0x78, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l62_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x3B, 0x06, 
+	0x1C, 0x38, 0x0E, 
+	0x1C, 0x00, 0x0E, 
+	0x1C, 0x00, 0x0E, 
+	0xFC, 0x01, 0x07, 
+	0xBC, 0x83, 0x07, 
+	0x9C, 0x83, 0x03, 
+	0x1C, 0xC7, 0x01, 
+	0x1C, 0xE7, 0x01, 
+	0x1C, 0xF7, 0x00, 
+	0x98, 0x73, 0x00, 
+	0xB8, 0x7B, 0x00, 
+	0xF0, 0xF9, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l62_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0xFE, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0x78, 0x8F, 0xE7, 0x03, 
+	0x3C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x1C, 0xC0, 0x83, 0x03, 
+	0x1E, 0x00, 0x80, 0x03, 
+	0xFE, 0x03, 0xC0, 0x03, 
+	0xFE, 0x0F, 0xC0, 0x03, 
+	0x7E, 0x0F, 0xE0, 0x01, 
+	0x3E, 0x1E, 0xF0, 0x01, 
+	0x1E, 0x1C, 0xF8, 0x00, 
+	0x1E, 0x1C, 0x78, 0x00, 
+	0x1E, 0x1C, 0x3C, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1C, 0x1C, 0x0F, 0x00, 
+	0x3C, 0x9E, 0x07, 0x00, 
+	0x7C, 0x8F, 0x07, 0x00, 
+	0xF8, 0xCF, 0xFF, 0x03, 
+	0xE0, 0xC3, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l63.xbm b/app/bin/bitmaps/l63.xbm
index 8fb46f9..6b95b4d 100644
--- a/app/bin/bitmaps/l63.xbm
+++ b/app/bin/bitmaps/l63.xbm
@@ -1,6 +1,78 @@
-#define l63_width 14
-#define l63_height 16
-static char l63_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x01, 0x10, 
-  0x1F, 0x10, 0x21, 0x0E, 0x21, 0x10, 0x21, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l63_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3B, 
+	0x0C, 0x38, 
+	0x7C, 0x18, 
+	0xFC, 0x3C, 
+	0xCC, 0x38, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l63_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x3B, 0x07, 
+	0x1C, 0x00, 0x07, 
+	0x1C, 0x00, 0x07, 
+	0x1C, 0x00, 0x07, 
+	0xFC, 0x81, 0x03, 
+	0xBC, 0xC3, 0x07, 
+	0x9C, 0x03, 0x07, 
+	0x1C, 0x07, 0x0E, 
+	0x1C, 0x07, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x98, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l63_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0x7E, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0x78, 0x8F, 0xE7, 0x01, 
+	0x3C, 0x9E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x00, 0xC0, 0x03, 
+	0x1E, 0x00, 0xC0, 0x01, 
+	0xFE, 0x03, 0xE0, 0x01, 
+	0xFE, 0x0F, 0xFC, 0x00, 
+	0x7E, 0x0F, 0xFC, 0x00, 
+	0x3E, 0x1E, 0xE0, 0x01, 
+	0x1E, 0x1C, 0xC0, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1C, 0xDC, 0x83, 0x03, 
+	0x3C, 0x9E, 0xC7, 0x03, 
+	0x7C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xE0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l64.xbm b/app/bin/bitmaps/l64.xbm
index 8fec658..e2a6cc5 100644
--- a/app/bin/bitmaps/l64.xbm
+++ b/app/bin/bitmaps/l64.xbm
@@ -1,6 +1,78 @@
-#define l64_width 14
-#define l64_height 16
-static char l64_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x01, 0x0C, 0x01, 0x0A, 
-  0x1F, 0x09, 0xA1, 0x08, 0xA1, 0x1F, 0x21, 0x08, 0x21, 0x08, 0x1E, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l64_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xFC, 0x1C, 
+	0x0C, 0x1E, 
+	0x7C, 0x1E, 
+	0xFC, 0x1F, 
+	0xCC, 0x1B, 
+	0xCC, 0x3F, 
+	0xFC, 0x18, 
+	0x78, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l64_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0x98, 0xC3, 0x03, 
+	0x1C, 0xC0, 0x03, 
+	0x1C, 0xE0, 0x03, 
+	0x1C, 0xE0, 0x03, 
+	0xFC, 0xF1, 0x03, 
+	0xBC, 0xB3, 0x03, 
+	0x9C, 0xBB, 0x03, 
+	0x1C, 0x9F, 0x03, 
+	0x1C, 0xFF, 0x0F, 
+	0x1C, 0x87, 0x03, 
+	0x98, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l64_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0xF0, 0x00, 
+	0xF8, 0x0F, 0xF0, 0x00, 
+	0x78, 0x0F, 0xF8, 0x00, 
+	0x3C, 0x1E, 0xF8, 0x00, 
+	0x1C, 0x1E, 0xFC, 0x00, 
+	0x1C, 0x00, 0xFC, 0x00, 
+	0x1E, 0x00, 0xFE, 0x00, 
+	0xFE, 0x03, 0xEE, 0x00, 
+	0xFE, 0x0F, 0xEF, 0x00, 
+	0x7E, 0x8F, 0xE7, 0x00, 
+	0x3E, 0x9E, 0xE7, 0x00, 
+	0x1E, 0xDC, 0xE3, 0x00, 
+	0x1E, 0xDC, 0xE1, 0x00, 
+	0x1E, 0xFC, 0xFF, 0x03, 
+	0x1E, 0xFC, 0xFF, 0x03, 
+	0x1C, 0x1C, 0xE0, 0x00, 
+	0x3C, 0x1E, 0xE0, 0x00, 
+	0x7C, 0x0F, 0xE0, 0x00, 
+	0xF8, 0x0F, 0xE0, 0x00, 
+	0xE0, 0x03, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l65.xbm b/app/bin/bitmaps/l65.xbm
index 34b6f4a..3ab1ce6 100644
--- a/app/bin/bitmaps/l65.xbm
+++ b/app/bin/bitmaps/l65.xbm
@@ -1,6 +1,78 @@
-#define l65_width 14
-#define l65_height 16
-static char l65_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x81, 0x00, 0x81, 0x00, 
-  0x9F, 0x0F, 0x21, 0x10, 0x21, 0x10, 0x21, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l65_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xFC, 0x07, 
+	0x0C, 0x07, 
+	0x7C, 0x1F, 
+	0xFC, 0x3B, 
+	0xCC, 0x30, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l65_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF1, 0x07, 
+	0xB8, 0x73, 0x00, 
+	0x98, 0x73, 0x00, 
+	0x1C, 0x30, 0x00, 
+	0x1C, 0x30, 0x00, 
+	0x1C, 0xF8, 0x03, 
+	0xFC, 0x79, 0x07, 
+	0xBC, 0x3B, 0x07, 
+	0x9C, 0x03, 0x0E, 
+	0x1C, 0x07, 0x0E, 
+	0x1C, 0x07, 0x0E, 
+	0x1C, 0x3F, 0x06, 
+	0x98, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l65_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0xFF, 0x03, 
+	0xF8, 0x0F, 0xFF, 0x03, 
+	0x78, 0x0F, 0x07, 0x00, 
+	0x3C, 0x1E, 0x07, 0x00, 
+	0x1C, 0x9E, 0x07, 0x00, 
+	0x1C, 0x80, 0x07, 0x00, 
+	0x1E, 0x80, 0x7F, 0x00, 
+	0xFE, 0x83, 0xFF, 0x01, 
+	0xFE, 0x8F, 0xE7, 0x01, 
+	0x7E, 0x8F, 0xC3, 0x03, 
+	0x3E, 0x1E, 0xC0, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1C, 0xDC, 0xC3, 0x03, 
+	0x3C, 0x9E, 0xC3, 0x03, 
+	0x7C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xE0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l66.xbm b/app/bin/bitmaps/l66.xbm
index 1e28cf3..1abbf7c 100644
--- a/app/bin/bitmaps/l66.xbm
+++ b/app/bin/bitmaps/l66.xbm
@@ -1,6 +1,78 @@
-#define l66_width 14
-#define l66_height 16
-static char l66_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x00, 0x81, 0x00, 
-  0x9F, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l66_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0x0C, 0x03, 
+	0x7C, 0x1F, 
+	0xFC, 0x3F, 
+	0xCC, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l66_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x33, 0x07, 
+	0x1C, 0x38, 0x00, 
+	0x1C, 0x38, 0x00, 
+	0x1C, 0x38, 0x00, 
+	0xFC, 0xF9, 0x03, 
+	0xBC, 0x7B, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x98, 0x33, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l66_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0xFC, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0x78, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x9E, 0xC7, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x80, 0x03, 0x00, 
+	0x1E, 0xC0, 0x03, 0x00, 
+	0xFE, 0xC3, 0x7F, 0x00, 
+	0xFE, 0xCF, 0xFF, 0x01, 
+	0x7E, 0xCF, 0xEF, 0x01, 
+	0x3E, 0xDE, 0xC7, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1C, 0x9C, 0x83, 0x03, 
+	0x3C, 0x9E, 0xC7, 0x03, 
+	0x7C, 0x8F, 0xEF, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xE0, 0x03, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l67.xbm b/app/bin/bitmaps/l67.xbm
index bbc56bf..8cce97c 100644
--- a/app/bin/bitmaps/l67.xbm
+++ b/app/bin/bitmaps/l67.xbm
@@ -1,6 +1,78 @@
-#define l67_width 14
-#define l67_height 16
-static char l67_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x01, 0x10, 0x01, 0x08, 
-  0x1F, 0x08, 0x21, 0x04, 0x21, 0x04, 0x21, 0x02, 0x21, 0x02, 0x1E, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l67_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xFC, 0x38, 
+	0x0C, 0x18, 
+	0x7C, 0x1C, 
+	0xFC, 0x0C, 
+	0xCC, 0x0E, 
+	0xCC, 0x0E, 
+	0xFC, 0x06, 
+	0x78, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l67_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF9, 0x0F, 
+	0xB8, 0x03, 0x0F, 
+	0x98, 0x03, 0x07, 
+	0x1C, 0x80, 0x03, 
+	0x1C, 0x80, 0x03, 
+	0x1C, 0xC0, 0x01, 
+	0xFC, 0xC1, 0x01, 
+	0xBC, 0xC3, 0x01, 
+	0x9C, 0xE3, 0x00, 
+	0x1C, 0xE7, 0x00, 
+	0x1C, 0xE7, 0x00, 
+	0x1C, 0xE7, 0x00, 
+	0x98, 0xE3, 0x00, 
+	0xB8, 0x73, 0x00, 
+	0xF0, 0x71, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l67_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0xC7, 0xFF, 0x03, 
+	0xF8, 0xCF, 0xFF, 0x03, 
+	0x78, 0x0F, 0xC0, 0x03, 
+	0x3C, 0x1E, 0xE0, 0x01, 
+	0x1C, 0x1E, 0xE0, 0x01, 
+	0x1C, 0x00, 0xF0, 0x00, 
+	0x1E, 0x00, 0xF0, 0x00, 
+	0xFE, 0x03, 0x78, 0x00, 
+	0xFE, 0x0F, 0x78, 0x00, 
+	0x7E, 0x0F, 0x38, 0x00, 
+	0x3E, 0x1E, 0x3C, 0x00, 
+	0x1E, 0x1C, 0x3C, 0x00, 
+	0x1E, 0x1C, 0x1C, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1C, 0x1C, 0x1E, 0x00, 
+	0x3C, 0x1E, 0x1E, 0x00, 
+	0x7C, 0x0F, 0x0E, 0x00, 
+	0xF8, 0x0F, 0x0E, 0x00, 
+	0xE0, 0x03, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l68.xbm b/app/bin/bitmaps/l68.xbm
index db31fa9..e32b8c2 100644
--- a/app/bin/bitmaps/l68.xbm
+++ b/app/bin/bitmaps/l68.xbm
@@ -1,6 +1,78 @@
-#define l68_width 14
-#define l68_height 16
-static char l68_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x81, 0x10, 
-  0x9F, 0x10, 0x21, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l68_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0x0C, 0x3B, 
+	0x7C, 0x3F, 
+	0xFC, 0x1E, 
+	0xCC, 0x3F, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l68_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x33, 0x07, 
+	0x1C, 0x38, 0x07, 
+	0x1C, 0x38, 0x07, 
+	0x1C, 0x38, 0x07, 
+	0xFC, 0x71, 0x07, 
+	0xBC, 0xE3, 0x03, 
+	0x9C, 0x73, 0x07, 
+	0x1C, 0x3F, 0x06, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x98, 0x3B, 0x06, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l68_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0x7E, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0x78, 0x8F, 0xEF, 0x01, 
+	0x3C, 0x9E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x80, 0xC3, 0x03, 
+	0x1E, 0x80, 0xC7, 0x01, 
+	0xFE, 0x03, 0xEF, 0x01, 
+	0xFE, 0x0F, 0xFE, 0x00, 
+	0x7E, 0x0F, 0xFF, 0x00, 
+	0x3E, 0x9E, 0xE7, 0x01, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1C, 0xDC, 0x83, 0x03, 
+	0x3C, 0x9E, 0xC3, 0x03, 
+	0x7C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xE0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l69.xbm b/app/bin/bitmaps/l69.xbm
index 2d79bc7..8df10ca 100644
--- a/app/bin/bitmaps/l69.xbm
+++ b/app/bin/bitmaps/l69.xbm
@@ -1,6 +1,78 @@
-#define l69_width 14
-#define l69_height 16
-static char l69_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x81, 0x10, 
-  0x9F, 0x10, 0x21, 0x1F, 0x21, 0x10, 0x21, 0x10, 0x21, 0x08, 0x1E, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l69_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0x0C, 0x33, 
+	0x7C, 0x33, 
+	0xFC, 0x3F, 
+	0xCC, 0x3E, 
+	0xCC, 0x30, 
+	0xFC, 0x3B, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l69_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x01, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x3B, 0x07, 
+	0x1C, 0x38, 0x06, 
+	0x1C, 0x38, 0x0E, 
+	0x1C, 0x38, 0x0E, 
+	0xFC, 0x39, 0x0F, 
+	0xBC, 0x73, 0x0F, 
+	0x9C, 0xE3, 0x0F, 
+	0x1C, 0x07, 0x0E, 
+	0x1C, 0x07, 0x06, 
+	0x1C, 0x07, 0x06, 
+	0x98, 0x3B, 0x07, 
+	0xB8, 0x73, 0x03, 
+	0xF0, 0xF1, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l69_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xE0, 0x07, 0x7E, 0x00, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0x78, 0x8F, 0xEF, 0x01, 
+	0x3C, 0x9E, 0xC7, 0x01, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x1C, 0xC0, 0x83, 0x03, 
+	0x1E, 0xC0, 0x83, 0x03, 
+	0xFE, 0xC3, 0x83, 0x03, 
+	0xFE, 0xCF, 0x83, 0x03, 
+	0x7E, 0x8F, 0xC3, 0x03, 
+	0x3E, 0x9E, 0xE7, 0x03, 
+	0x1E, 0x1C, 0xFF, 0x03, 
+	0x1E, 0x1C, 0xFE, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1C, 0x9C, 0xC3, 0x03, 
+	0x3C, 0x9E, 0xC3, 0x01, 
+	0x7C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xE0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l7.xbm b/app/bin/bitmaps/l7.xbm
index 28b2698..a86a7cc 100644
--- a/app/bin/bitmaps/l7.xbm
+++ b/app/bin/bitmaps/l7.xbm
@@ -1,6 +1,78 @@
-#define l7_width 14
-#define l7_height 16
-static char l7_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x00, 0x01, 0x80, 0x00, 
-  0x80, 0x00, 0x40, 0x00, 0x40, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l7_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xE0, 0x07, 
+	0x00, 0x07, 
+	0x00, 0x03, 
+	0x80, 0x03, 
+	0x80, 0x01, 
+	0xC0, 0x01, 
+	0xC0, 0x01, 
+	0xC0, 0x00, 
+	0xC0, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l7_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xC0, 0x7F, 0x00, 
+	0x00, 0x78, 0x00, 
+	0x00, 0x38, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x1C, 0x00, 
+	0x00, 0x0E, 0x00, 
+	0x00, 0x0E, 0x00, 
+	0x00, 0x0E, 0x00, 
+	0x00, 0x07, 0x00, 
+	0x00, 0x07, 0x00, 
+	0x00, 0x07, 0x00, 
+	0x00, 0x07, 0x00, 
+	0x00, 0x07, 0x00, 
+	0x80, 0x03, 0x00, 
+	0x80, 0x03, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l7_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x80, 0xFF, 0x07, 0x00, 
+	0x80, 0xFF, 0x07, 0x00, 
+	0x00, 0x80, 0x07, 0x00, 
+	0x00, 0xC0, 0x03, 0x00, 
+	0x00, 0xC0, 0x03, 0x00, 
+	0x00, 0xE0, 0x01, 0x00, 
+	0x00, 0xE0, 0x01, 0x00, 
+	0x00, 0xF0, 0x00, 0x00, 
+	0x00, 0xF0, 0x00, 0x00, 
+	0x00, 0x70, 0x00, 0x00, 
+	0x00, 0x78, 0x00, 0x00, 
+	0x00, 0x78, 0x00, 0x00, 
+	0x00, 0x38, 0x00, 0x00, 
+	0x00, 0x3C, 0x00, 0x00, 
+	0x00, 0x3C, 0x00, 0x00, 
+	0x00, 0x3C, 0x00, 0x00, 
+	0x00, 0x3C, 0x00, 0x00, 
+	0x00, 0x1C, 0x00, 0x00, 
+	0x00, 0x1C, 0x00, 0x00, 
+	0x00, 0x1C, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l70.xbm b/app/bin/bitmaps/l70.xbm
index 16b4c70..cfa65e6 100644
--- a/app/bin/bitmaps/l70.xbm
+++ b/app/bin/bitmaps/l70.xbm
@@ -1,6 +1,78 @@
-#define l70_width 14
-#define l70_height 16
-static char l70_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x90, 0x18, 
-  0x90, 0x14, 0x88, 0x12, 0x88, 0x11, 0x84, 0x10, 0x84, 0x10, 0x04, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l70_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0xE0, 0x3F, 
+	0x60, 0x33, 
+	0x70, 0x33, 
+	0x30, 0x33, 
+	0x38, 0x33, 
+	0x38, 0x33, 
+	0x18, 0x3F, 
+	0x18, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l70_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0xE7, 0x03, 
+	0x80, 0x77, 0x07, 
+	0x80, 0x33, 0x07, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x39, 0x06, 
+	0xE0, 0x38, 0x0E, 
+	0xE0, 0x38, 0x0E, 
+	0xE0, 0x38, 0x0E, 
+	0x70, 0x38, 0x0E, 
+	0x70, 0x38, 0x0E, 
+	0x70, 0x38, 0x06, 
+	0x70, 0x38, 0x06, 
+	0x70, 0x30, 0x07, 
+	0x38, 0x70, 0x07, 
+	0x38, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l70_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0xFE, 0x1F, 0xFF, 0x00, 
+	0x00, 0x1E, 0xEF, 0x01, 
+	0x00, 0x8F, 0xC7, 0x01, 
+	0x00, 0x8F, 0xC3, 0x03, 
+	0x80, 0x87, 0xC3, 0x03, 
+	0x80, 0xC7, 0x83, 0x03, 
+	0xC0, 0xC3, 0x83, 0x03, 
+	0xC0, 0xC3, 0x83, 0x03, 
+	0xC0, 0xC1, 0x83, 0x03, 
+	0xE0, 0xC1, 0x83, 0x03, 
+	0xE0, 0xC1, 0x83, 0x03, 
+	0xE0, 0xC0, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0x80, 0xC3, 0x03, 
+	0xF0, 0x80, 0xC3, 0x03, 
+	0xF0, 0x80, 0xC7, 0x01, 
+	0x70, 0x00, 0xEF, 0x01, 
+	0x70, 0x00, 0xFF, 0x00, 
+	0x70, 0x00, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l71.xbm b/app/bin/bitmaps/l71.xbm
index 12223f5..eeb2d63 100644
--- a/app/bin/bitmaps/l71.xbm
+++ b/app/bin/bitmaps/l71.xbm
@@ -1,6 +1,78 @@
-#define l71_width 14
-#define l71_height 16
-static char l71_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x04, 0x20, 0x06, 0x10, 0x05, 
-  0x90, 0x04, 0x08, 0x04, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l71_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1C, 
+	0xE0, 0x1E, 
+	0x60, 0x1F, 
+	0x70, 0x1C, 
+	0x30, 0x1C, 
+	0x38, 0x1C, 
+	0x38, 0x1C, 
+	0x18, 0x1C, 
+	0x18, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l71_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0x87, 0x03, 
+	0x80, 0xC7, 0x03, 
+	0x80, 0xC3, 0x03, 
+	0xC0, 0xE1, 0x03, 
+	0xC0, 0xB1, 0x03, 
+	0xE0, 0x80, 0x03, 
+	0xE0, 0x80, 0x03, 
+	0xE0, 0x80, 0x03, 
+	0x70, 0x80, 0x03, 
+	0x70, 0x80, 0x03, 
+	0x70, 0x80, 0x03, 
+	0x70, 0x80, 0x03, 
+	0x70, 0x80, 0x03, 
+	0x38, 0x80, 0x03, 
+	0x38, 0x80, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l71_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0x70, 0x00, 
+	0xFE, 0x1F, 0x70, 0x00, 
+	0x00, 0x1E, 0x78, 0x00, 
+	0x00, 0x0F, 0x7C, 0x00, 
+	0x00, 0x0F, 0x7E, 0x00, 
+	0x80, 0x07, 0x7F, 0x00, 
+	0x80, 0x07, 0x73, 0x00, 
+	0xC0, 0x03, 0x70, 0x00, 
+	0xC0, 0x03, 0x70, 0x00, 
+	0xC0, 0x01, 0x70, 0x00, 
+	0xE0, 0x01, 0x70, 0x00, 
+	0xE0, 0x01, 0x70, 0x00, 
+	0xE0, 0x00, 0x70, 0x00, 
+	0xF0, 0x00, 0x70, 0x00, 
+	0xF0, 0x00, 0x70, 0x00, 
+	0xF0, 0x00, 0x70, 0x00, 
+	0xF0, 0x00, 0x70, 0x00, 
+	0x70, 0x00, 0x70, 0x00, 
+	0x70, 0x00, 0x70, 0x00, 
+	0x70, 0x00, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l72.xbm b/app/bin/bitmaps/l72.xbm
index 164f621..9ff206f 100644
--- a/app/bin/bitmaps/l72.xbm
+++ b/app/bin/bitmaps/l72.xbm
@@ -1,6 +1,78 @@
-#define l72_width 14
-#define l72_height 16
-static char l72_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x90, 0x10, 
-  0x10, 0x08, 0x08, 0x04, 0x08, 0x02, 0x04, 0x01, 0x84, 0x00, 0x84, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l72_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0xE0, 0x3F, 
+	0x60, 0x33, 
+	0x70, 0x30, 
+	0x30, 0x38, 
+	0x38, 0x1C, 
+	0x38, 0x0E, 
+	0x18, 0x07, 
+	0x18, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l72_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0xE7, 0x03, 
+	0x80, 0x77, 0x07, 
+	0x80, 0x3B, 0x06, 
+	0xC0, 0x39, 0x0E, 
+	0xC0, 0x01, 0x0E, 
+	0xE0, 0x00, 0x0E, 
+	0xE0, 0x00, 0x07, 
+	0xE0, 0x80, 0x07, 
+	0x70, 0x80, 0x03, 
+	0x70, 0xC0, 0x01, 
+	0x70, 0xE0, 0x01, 
+	0x70, 0xF0, 0x00, 
+	0x70, 0x70, 0x00, 
+	0x38, 0x78, 0x00, 
+	0x38, 0xF8, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l72_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0xFE, 0x00, 
+	0xFE, 0x1F, 0xFF, 0x01, 
+	0x00, 0x9E, 0xE7, 0x03, 
+	0x00, 0x8F, 0xC3, 0x03, 
+	0x00, 0xCF, 0x83, 0x03, 
+	0x80, 0xC7, 0x83, 0x03, 
+	0x80, 0x07, 0x80, 0x03, 
+	0xC0, 0x03, 0xC0, 0x03, 
+	0xC0, 0x03, 0xC0, 0x03, 
+	0xC0, 0x01, 0xE0, 0x01, 
+	0xE0, 0x01, 0xF0, 0x01, 
+	0xE0, 0x01, 0xF8, 0x00, 
+	0xE0, 0x00, 0x78, 0x00, 
+	0xF0, 0x00, 0x3C, 0x00, 
+	0xF0, 0x00, 0x1E, 0x00, 
+	0xF0, 0x00, 0x0F, 0x00, 
+	0xF0, 0x80, 0x07, 0x00, 
+	0x70, 0x80, 0x07, 0x00, 
+	0x70, 0xC0, 0xFF, 0x03, 
+	0x70, 0xC0, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l73.xbm b/app/bin/bitmaps/l73.xbm
index 0031594..64dfbb4 100644
--- a/app/bin/bitmaps/l73.xbm
+++ b/app/bin/bitmaps/l73.xbm
@@ -1,6 +1,78 @@
-#define l73_width 14
-#define l73_height 16
-static char l73_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x10, 0x10, 
-  0x10, 0x10, 0x08, 0x0E, 0x08, 0x10, 0x04, 0x10, 0x84, 0x10, 0x04, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l73_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0xE0, 0x3B, 
+	0x60, 0x38, 
+	0x70, 0x18, 
+	0x30, 0x3C, 
+	0x38, 0x38, 
+	0x38, 0x33, 
+	0x18, 0x3F, 
+	0x18, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l73_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0xE7, 0x03, 
+	0x80, 0x77, 0x07, 
+	0x80, 0x3B, 0x07, 
+	0xC0, 0x01, 0x07, 
+	0xC0, 0x01, 0x07, 
+	0xE0, 0x00, 0x07, 
+	0xE0, 0x80, 0x03, 
+	0xE0, 0xC0, 0x07, 
+	0x70, 0x00, 0x07, 
+	0x70, 0x00, 0x0E, 
+	0x70, 0x00, 0x0E, 
+	0x70, 0x38, 0x0E, 
+	0x70, 0x38, 0x07, 
+	0x38, 0x70, 0x07, 
+	0x38, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l73_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0xFE, 0x1F, 0xFF, 0x00, 
+	0x00, 0x9E, 0xE7, 0x01, 
+	0x00, 0x8F, 0xC7, 0x01, 
+	0x00, 0x8F, 0xC3, 0x03, 
+	0x80, 0x07, 0xC0, 0x03, 
+	0x80, 0x07, 0xC0, 0x01, 
+	0xC0, 0x03, 0xE0, 0x01, 
+	0xC0, 0x03, 0xFC, 0x00, 
+	0xC0, 0x01, 0xFC, 0x00, 
+	0xE0, 0x01, 0xE0, 0x01, 
+	0xE0, 0x01, 0xC0, 0x03, 
+	0xE0, 0x00, 0x80, 0x03, 
+	0xF0, 0x00, 0x80, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0x80, 0xC7, 0x03, 
+	0x70, 0x80, 0xE7, 0x01, 
+	0x70, 0x00, 0xFF, 0x01, 
+	0x70, 0x00, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l74.xbm b/app/bin/bitmaps/l74.xbm
index be95f2c..c41ea54 100644
--- a/app/bin/bitmaps/l74.xbm
+++ b/app/bin/bitmaps/l74.xbm
@@ -1,6 +1,78 @@
-#define l74_width 14
-#define l74_height 16
-static char l74_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x08, 0x20, 0x0C, 0x10, 0x0A, 
-  0x10, 0x09, 0x88, 0x08, 0x88, 0x1F, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l74_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1C, 
+	0xE0, 0x1C, 
+	0x60, 0x1E, 
+	0x70, 0x1E, 
+	0x30, 0x1F, 
+	0x38, 0x1B, 
+	0xB8, 0x3F, 
+	0x18, 0x18, 
+	0x18, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l74_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0x87, 0x03, 
+	0x80, 0x87, 0x03, 
+	0x80, 0xC3, 0x03, 
+	0xC0, 0xC1, 0x03, 
+	0xC0, 0xE1, 0x03, 
+	0xE0, 0xE0, 0x03, 
+	0xE0, 0xF0, 0x03, 
+	0xE0, 0xB0, 0x03, 
+	0x70, 0xB8, 0x03, 
+	0x70, 0x98, 0x03, 
+	0x70, 0xFC, 0x0F, 
+	0x70, 0x80, 0x03, 
+	0x70, 0x80, 0x03, 
+	0x38, 0x80, 0x03, 
+	0x38, 0x80, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l74_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0xF0, 0x00, 
+	0xFE, 0x1F, 0xF0, 0x00, 
+	0x00, 0x1E, 0xF8, 0x00, 
+	0x00, 0x0F, 0xF8, 0x00, 
+	0x00, 0x0F, 0xFC, 0x00, 
+	0x80, 0x07, 0xFC, 0x00, 
+	0x80, 0x07, 0xFE, 0x00, 
+	0xC0, 0x03, 0xEE, 0x00, 
+	0xC0, 0x03, 0xEF, 0x00, 
+	0xC0, 0x81, 0xE7, 0x00, 
+	0xE0, 0x81, 0xE7, 0x00, 
+	0xE0, 0xC1, 0xE3, 0x00, 
+	0xE0, 0xC0, 0xE1, 0x00, 
+	0xF0, 0xE0, 0xFF, 0x03, 
+	0xF0, 0xE0, 0xFF, 0x03, 
+	0xF0, 0x00, 0xE0, 0x00, 
+	0xF0, 0x00, 0xE0, 0x00, 
+	0x70, 0x00, 0xE0, 0x00, 
+	0x70, 0x00, 0xE0, 0x00, 
+	0x70, 0x00, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l75.xbm b/app/bin/bitmaps/l75.xbm
index 3524c94..58a6c52 100644
--- a/app/bin/bitmaps/l75.xbm
+++ b/app/bin/bitmaps/l75.xbm
@@ -1,6 +1,78 @@
-#define l75_width 14
-#define l75_height 16
-static char l75_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x1F, 0xA0, 0x00, 0x90, 0x00, 
-  0x90, 0x0F, 0x08, 0x10, 0x08, 0x10, 0x04, 0x10, 0x84, 0x10, 0x04, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l75_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x3F, 
+	0xE0, 0x07, 
+	0x60, 0x07, 
+	0x70, 0x1F, 
+	0x30, 0x3B, 
+	0x38, 0x30, 
+	0x38, 0x33, 
+	0x18, 0x3F, 
+	0x18, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l75_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0xF7, 0x07, 
+	0x80, 0x77, 0x00, 
+	0x80, 0x73, 0x00, 
+	0xC0, 0x31, 0x00, 
+	0xC0, 0x31, 0x00, 
+	0xE0, 0xF8, 0x03, 
+	0xE0, 0x78, 0x07, 
+	0xE0, 0x38, 0x07, 
+	0x70, 0x00, 0x0E, 
+	0x70, 0x00, 0x0E, 
+	0x70, 0x00, 0x0E, 
+	0x70, 0x38, 0x06, 
+	0x70, 0x38, 0x07, 
+	0x38, 0x70, 0x07, 
+	0x38, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l75_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0xFF, 0x03, 
+	0xFE, 0x1F, 0xFF, 0x03, 
+	0x00, 0x1E, 0x07, 0x00, 
+	0x00, 0x0F, 0x07, 0x00, 
+	0x00, 0x8F, 0x07, 0x00, 
+	0x80, 0x87, 0x07, 0x00, 
+	0x80, 0x87, 0x7F, 0x00, 
+	0xC0, 0x83, 0xFF, 0x01, 
+	0xC0, 0x83, 0xE7, 0x01, 
+	0xC0, 0x81, 0xC3, 0x03, 
+	0xE0, 0x01, 0xC0, 0x03, 
+	0xE0, 0x01, 0x80, 0x03, 
+	0xE0, 0x00, 0x80, 0x03, 
+	0xF0, 0x00, 0x80, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0xC0, 0xC3, 0x03, 
+	0xF0, 0x80, 0xC3, 0x03, 
+	0x70, 0x80, 0xE7, 0x01, 
+	0x70, 0x00, 0xFF, 0x00, 
+	0x70, 0x00, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l76.xbm b/app/bin/bitmaps/l76.xbm
index 83e8f59..9b385dc 100644
--- a/app/bin/bitmaps/l76.xbm
+++ b/app/bin/bitmaps/l76.xbm
@@ -1,6 +1,78 @@
-#define l76_width 14
-#define l76_height 16
-static char l76_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x00, 0x90, 0x00, 
-  0x90, 0x0F, 0x88, 0x10, 0x88, 0x10, 0x84, 0x10, 0x84, 0x10, 0x04, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l76_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0xE0, 0x3F, 
+	0x60, 0x03, 
+	0x70, 0x1F, 
+	0x30, 0x3F, 
+	0x38, 0x33, 
+	0x38, 0x33, 
+	0x18, 0x3F, 
+	0x18, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l76_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0xE7, 0x03, 
+	0x80, 0x77, 0x07, 
+	0x80, 0x33, 0x07, 
+	0xC0, 0x39, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0xE0, 0x38, 0x00, 
+	0xE0, 0xF8, 0x03, 
+	0xE0, 0x78, 0x07, 
+	0x70, 0x38, 0x07, 
+	0x70, 0x38, 0x0E, 
+	0x70, 0x38, 0x0E, 
+	0x70, 0x38, 0x0E, 
+	0x70, 0x30, 0x07, 
+	0x38, 0x70, 0x07, 
+	0x38, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l76_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0xFC, 0x00, 
+	0xFE, 0x1F, 0xFF, 0x01, 
+	0x00, 0x1E, 0xEF, 0x01, 
+	0x00, 0x8F, 0xC7, 0x03, 
+	0x00, 0x8F, 0xC3, 0x03, 
+	0x80, 0x87, 0x03, 0x00, 
+	0x80, 0xC7, 0x03, 0x00, 
+	0xC0, 0xC3, 0x7F, 0x00, 
+	0xC0, 0xC3, 0xFF, 0x01, 
+	0xC0, 0xC1, 0xEF, 0x01, 
+	0xE0, 0xC1, 0xC7, 0x03, 
+	0xE0, 0xC1, 0x83, 0x03, 
+	0xE0, 0xC0, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0x80, 0x83, 0x03, 
+	0xF0, 0x80, 0xC7, 0x03, 
+	0x70, 0x80, 0xEF, 0x01, 
+	0x70, 0x00, 0xFF, 0x01, 
+	0x70, 0x00, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l77.xbm b/app/bin/bitmaps/l77.xbm
index 4e48354..c406f2d 100644
--- a/app/bin/bitmaps/l77.xbm
+++ b/app/bin/bitmaps/l77.xbm
@@ -1,6 +1,78 @@
-#define l77_width 14
-#define l77_height 16
-static char l77_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x1F, 0x20, 0x10, 0x10, 0x08, 
-  0x10, 0x08, 0x08, 0x04, 0x08, 0x04, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l77_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x3F, 
+	0xE0, 0x38, 
+	0x60, 0x18, 
+	0x70, 0x1C, 
+	0x30, 0x0C, 
+	0x38, 0x0E, 
+	0x38, 0x0E, 
+	0x18, 0x06, 
+	0x18, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l77_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0xFF, 0x0F, 
+	0x80, 0x07, 0x0F, 
+	0x80, 0x03, 0x07, 
+	0xC0, 0x81, 0x03, 
+	0xC0, 0x81, 0x03, 
+	0xE0, 0xC0, 0x01, 
+	0xE0, 0xC0, 0x01, 
+	0xE0, 0xC0, 0x01, 
+	0x70, 0xE0, 0x00, 
+	0x70, 0xE0, 0x00, 
+	0x70, 0xE0, 0x00, 
+	0x70, 0xE0, 0x00, 
+	0x70, 0xE0, 0x00, 
+	0x38, 0x70, 0x00, 
+	0x38, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l77_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0xDF, 0xFF, 0x03, 
+	0xFE, 0xDF, 0xFF, 0x03, 
+	0x00, 0x1E, 0xC0, 0x03, 
+	0x00, 0x0F, 0xE0, 0x01, 
+	0x00, 0x0F, 0xE0, 0x01, 
+	0x80, 0x07, 0xF0, 0x00, 
+	0x80, 0x07, 0xF0, 0x00, 
+	0xC0, 0x03, 0x78, 0x00, 
+	0xC0, 0x03, 0x78, 0x00, 
+	0xC0, 0x01, 0x38, 0x00, 
+	0xE0, 0x01, 0x3C, 0x00, 
+	0xE0, 0x01, 0x3C, 0x00, 
+	0xE0, 0x00, 0x1C, 0x00, 
+	0xF0, 0x00, 0x1E, 0x00, 
+	0xF0, 0x00, 0x1E, 0x00, 
+	0xF0, 0x00, 0x1E, 0x00, 
+	0xF0, 0x00, 0x1E, 0x00, 
+	0x70, 0x00, 0x0E, 0x00, 
+	0x70, 0x00, 0x0E, 0x00, 
+	0x70, 0x00, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l78.xbm b/app/bin/bitmaps/l78.xbm
index 731d05d..0674918 100644
--- a/app/bin/bitmaps/l78.xbm
+++ b/app/bin/bitmaps/l78.xbm
@@ -1,6 +1,78 @@
-#define l78_width 14
-#define l78_height 16
-static char l78_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x90, 0x10, 
-  0x90, 0x10, 0x08, 0x0F, 0x88, 0x10, 0x84, 0x10, 0x84, 0x10, 0x04, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l78_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0xE0, 0x3F, 
+	0x60, 0x3B, 
+	0x70, 0x3F, 
+	0x30, 0x1E, 
+	0x38, 0x3F, 
+	0x38, 0x33, 
+	0x18, 0x3F, 
+	0x18, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l78_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0xE7, 0x03, 
+	0x80, 0x77, 0x07, 
+	0x80, 0x33, 0x07, 
+	0xC0, 0x39, 0x07, 
+	0xC0, 0x39, 0x07, 
+	0xE0, 0x38, 0x07, 
+	0xE0, 0x70, 0x07, 
+	0xE0, 0xE0, 0x03, 
+	0x70, 0x70, 0x07, 
+	0x70, 0x38, 0x06, 
+	0x70, 0x38, 0x0E, 
+	0x70, 0x38, 0x0E, 
+	0x70, 0x38, 0x06, 
+	0x38, 0x70, 0x07, 
+	0x38, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l78_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0xFE, 0x1F, 0xFF, 0x00, 
+	0x00, 0x9E, 0xEF, 0x01, 
+	0x00, 0x8F, 0xC7, 0x01, 
+	0x00, 0x8F, 0xC3, 0x03, 
+	0x80, 0x87, 0xC3, 0x03, 
+	0x80, 0x87, 0xC7, 0x01, 
+	0xC0, 0x03, 0xEF, 0x01, 
+	0xC0, 0x03, 0xFE, 0x00, 
+	0xC0, 0x01, 0xFF, 0x00, 
+	0xE0, 0x81, 0xE7, 0x01, 
+	0xE0, 0x81, 0xC3, 0x03, 
+	0xE0, 0xC0, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0xC0, 0x83, 0x03, 
+	0xF0, 0x80, 0xC3, 0x03, 
+	0x70, 0x80, 0xE7, 0x01, 
+	0x70, 0x00, 0xFF, 0x01, 
+	0x70, 0x00, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l79.xbm b/app/bin/bitmaps/l79.xbm
index 4e5259a..c1d909b 100644
--- a/app/bin/bitmaps/l79.xbm
+++ b/app/bin/bitmaps/l79.xbm
@@ -1,6 +1,78 @@
-#define l79_width 14
-#define l79_height 16
-static char l79_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x90, 0x10, 
-  0x90, 0x10, 0x08, 0x1F, 0x08, 0x10, 0x04, 0x10, 0x04, 0x08, 0x04, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l79_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x1E, 
+	0xE0, 0x3F, 
+	0x60, 0x33, 
+	0x70, 0x33, 
+	0x30, 0x3F, 
+	0x38, 0x3E, 
+	0x38, 0x30, 
+	0x18, 0x3B, 
+	0x18, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l79_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xFC, 0xE7, 0x01, 
+	0x80, 0x77, 0x07, 
+	0x80, 0x3B, 0x07, 
+	0xC0, 0x39, 0x06, 
+	0xC0, 0x39, 0x0E, 
+	0xE0, 0x38, 0x0E, 
+	0xE0, 0x38, 0x0F, 
+	0xE0, 0x70, 0x0F, 
+	0x70, 0xE0, 0x0F, 
+	0x70, 0x00, 0x0E, 
+	0x70, 0x00, 0x06, 
+	0x70, 0x00, 0x06, 
+	0x70, 0x38, 0x07, 
+	0x38, 0x70, 0x03, 
+	0x38, 0xF0, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l79_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x1F, 0x7E, 0x00, 
+	0xFE, 0x1F, 0xFF, 0x00, 
+	0x00, 0x9E, 0xEF, 0x01, 
+	0x00, 0x8F, 0xC7, 0x01, 
+	0x00, 0xCF, 0x83, 0x03, 
+	0x80, 0xC7, 0x83, 0x03, 
+	0x80, 0xC7, 0x83, 0x03, 
+	0xC0, 0xC3, 0x83, 0x03, 
+	0xC0, 0xC3, 0x83, 0x03, 
+	0xC0, 0x81, 0xC3, 0x03, 
+	0xE0, 0x81, 0xE7, 0x03, 
+	0xE0, 0x01, 0xFF, 0x03, 
+	0xE0, 0x00, 0xFE, 0x03, 
+	0xF0, 0x00, 0x80, 0x03, 
+	0xF0, 0x00, 0x80, 0x03, 
+	0xF0, 0x80, 0xC3, 0x03, 
+	0xF0, 0x80, 0xC3, 0x01, 
+	0x70, 0x80, 0xE7, 0x01, 
+	0x70, 0x00, 0xFF, 0x00, 
+	0x70, 0x00, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l8.xbm b/app/bin/bitmaps/l8.xbm
index cf07c8f..1054bfd 100644
--- a/app/bin/bitmaps/l8.xbm
+++ b/app/bin/bitmaps/l8.xbm
@@ -1,6 +1,78 @@
-#define l8_width 14
-#define l8_height 16
-static char l8_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x08, 0x01, 
-  0x08, 0x01, 0xF0, 0x00, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01, 0xF0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l8_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0xE0, 0x07, 
+	0x60, 0x07, 
+	0xE0, 0x07, 
+	0xC0, 0x03, 
+	0xE0, 0x07, 
+	0x60, 0x06, 
+	0xE0, 0x07, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l8_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0x80, 0x39, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0xC0, 0x31, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x31, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0x00, 0x1F, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l8_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0xFC, 0x00, 0x00, 
+	0x00, 0xFE, 0x01, 0x00, 
+	0x00, 0xDF, 0x03, 0x00, 
+	0x00, 0x8F, 0x03, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0x8F, 0x03, 0x00, 
+	0x00, 0xDE, 0x03, 0x00, 
+	0x00, 0xFC, 0x01, 0x00, 
+	0x00, 0xFE, 0x01, 0x00, 
+	0x00, 0xCF, 0x03, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0xCF, 0x03, 0x00, 
+	0x00, 0xFE, 0x03, 0x00, 
+	0x00, 0xFC, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l80.xbm b/app/bin/bitmaps/l80.xbm
index 116c68f..8dc12d0 100644
--- a/app/bin/bitmaps/l80.xbm
+++ b/app/bin/bitmaps/l80.xbm
@@ -1,6 +1,78 @@
-#define l80_width 14
-#define l80_height 16
-static char l80_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x18, 
-  0xA1, 0x14, 0x9E, 0x12, 0xA1, 0x11, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l80_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xEC, 0x33, 
+	0xFC, 0x33, 
+	0x78, 0x33, 
+	0xFC, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l80_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x33, 0x07, 
+	0x9C, 0x3B, 0x06, 
+	0x9C, 0x3B, 0x06, 
+	0x9C, 0x3B, 0x0E, 
+	0xB8, 0x3B, 0x0E, 
+	0xF0, 0x39, 0x0E, 
+	0xB8, 0x3B, 0x0E, 
+	0x1C, 0x3B, 0x0E, 
+	0x1C, 0x3F, 0x06, 
+	0x1C, 0x3F, 0x06, 
+	0x1C, 0x33, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l80_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x7C, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0xCE, 0x83, 0x03, 
+	0x78, 0xCF, 0x83, 0x03, 
+	0xF0, 0xC7, 0x83, 0x03, 
+	0xF8, 0xC7, 0x83, 0x03, 
+	0x3C, 0xCF, 0x83, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC7, 0x01, 
+	0x3C, 0x0F, 0xEF, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l81.xbm b/app/bin/bitmaps/l81.xbm
index 747787e..118901b 100644
--- a/app/bin/bitmaps/l81.xbm
+++ b/app/bin/bitmaps/l81.xbm
@@ -1,6 +1,78 @@
-#define l81_width 14
-#define l81_height 16
-static char l81_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x21, 0x06, 0x21, 0x05, 
-  0xA1, 0x04, 0x1E, 0x04, 0x21, 0x04, 0x21, 0x04, 0x21, 0x04, 0x1E, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l81_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xFC, 0x1E, 
+	0xEC, 0x1F, 
+	0xFC, 0x1C, 
+	0x78, 0x1C, 
+	0xFC, 0x1C, 
+	0xCC, 0x1C, 
+	0xFC, 0x1C, 
+	0x78, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l81_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0xC3, 0x03, 
+	0x98, 0xC3, 0x03, 
+	0x9C, 0xE3, 0x03, 
+	0x9C, 0xB3, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0x1C, 0x83, 0x03, 
+	0x1C, 0x87, 0x03, 
+	0x1C, 0x87, 0x03, 
+	0x1C, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l81_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x70, 0x00, 
+	0xF8, 0x07, 0x70, 0x00, 
+	0x7C, 0x0F, 0x78, 0x00, 
+	0x3C, 0x0E, 0x7C, 0x00, 
+	0x1C, 0x1E, 0x7E, 0x00, 
+	0x1C, 0x1E, 0x7F, 0x00, 
+	0x3C, 0x0E, 0x73, 0x00, 
+	0x78, 0x0F, 0x70, 0x00, 
+	0xF0, 0x07, 0x70, 0x00, 
+	0xF8, 0x07, 0x70, 0x00, 
+	0x3C, 0x0F, 0x70, 0x00, 
+	0x1C, 0x1E, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1C, 0x1E, 0x70, 0x00, 
+	0x3C, 0x0F, 0x70, 0x00, 
+	0xF8, 0x0F, 0x70, 0x00, 
+	0xF0, 0x03, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l82.xbm b/app/bin/bitmaps/l82.xbm
index e8758f9..74edb5d 100644
--- a/app/bin/bitmaps/l82.xbm
+++ b/app/bin/bitmaps/l82.xbm
@@ -1,6 +1,78 @@
-#define l82_width 14
-#define l82_height 16
-static char l82_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0x21, 0x08, 0x1E, 0x04, 0x21, 0x02, 0x21, 0x01, 0xA1, 0x00, 0x9E, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l82_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xEC, 0x33, 
+	0xFC, 0x30, 
+	0x78, 0x38, 
+	0xFC, 0x1C, 
+	0xCC, 0x0E, 
+	0xFC, 0x07, 
+	0x78, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l82_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x3B, 0x06, 
+	0x9C, 0x3B, 0x0E, 
+	0x9C, 0x03, 0x0E, 
+	0x9C, 0x03, 0x0E, 
+	0xB8, 0x03, 0x07, 
+	0xF0, 0x81, 0x07, 
+	0xB8, 0x83, 0x03, 
+	0x1C, 0xC3, 0x01, 
+	0x1C, 0xE7, 0x01, 
+	0x1C, 0xF7, 0x00, 
+	0x1C, 0x73, 0x00, 
+	0xB8, 0x7B, 0x00, 
+	0xF0, 0xF9, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l82_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFE, 0x00, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0x7C, 0x8F, 0xE7, 0x03, 
+	0x3C, 0x8E, 0xC3, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x3C, 0x0E, 0x80, 0x03, 
+	0x78, 0x0F, 0xC0, 0x03, 
+	0xF0, 0x07, 0xC0, 0x03, 
+	0xF8, 0x07, 0xE0, 0x01, 
+	0x3C, 0x0F, 0xF0, 0x01, 
+	0x1C, 0x1E, 0xF8, 0x00, 
+	0x1E, 0x1C, 0x78, 0x00, 
+	0x1E, 0x1C, 0x3C, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1C, 0x0F, 0x00, 
+	0x1C, 0x9E, 0x07, 0x00, 
+	0x3C, 0x8F, 0x07, 0x00, 
+	0xF8, 0xCF, 0xFF, 0x03, 
+	0xF0, 0xC3, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l83.xbm b/app/bin/bitmaps/l83.xbm
index 8ccbf89..3f7a1a0 100644
--- a/app/bin/bitmaps/l83.xbm
+++ b/app/bin/bitmaps/l83.xbm
@@ -1,6 +1,78 @@
-#define l83_width 14
-#define l83_height 16
-static char l83_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0x21, 0x10, 
-  0x21, 0x10, 0x1E, 0x0E, 0x21, 0x10, 0x21, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l83_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3B, 
+	0xEC, 0x38, 
+	0xFC, 0x18, 
+	0x78, 0x3C, 
+	0xFC, 0x38, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l83_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x3B, 0x07, 
+	0x9C, 0x03, 0x07, 
+	0x9C, 0x03, 0x07, 
+	0x9C, 0x03, 0x07, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0xC1, 0x07, 
+	0xB8, 0x03, 0x07, 
+	0x1C, 0x03, 0x0E, 
+	0x1C, 0x07, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l83_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x7C, 0x8F, 0xE7, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x1E, 0xC0, 0x03, 
+	0x3C, 0x0E, 0xC0, 0x01, 
+	0x78, 0x0F, 0xE0, 0x01, 
+	0xF0, 0x07, 0xFC, 0x00, 
+	0xF8, 0x07, 0xFC, 0x00, 
+	0x3C, 0x0F, 0xE0, 0x01, 
+	0x1C, 0x1E, 0xC0, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1C, 0x9E, 0xC7, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l84.xbm b/app/bin/bitmaps/l84.xbm
index 5e0e1ba..0cce4be 100644
--- a/app/bin/bitmaps/l84.xbm
+++ b/app/bin/bitmaps/l84.xbm
@@ -1,6 +1,78 @@
-#define l84_width 14
-#define l84_height 16
-static char l84_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x21, 0x0C, 0x21, 0x0A, 
-  0x21, 0x09, 0x9E, 0x08, 0xA1, 0x1F, 0x21, 0x08, 0x21, 0x08, 0x1E, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l84_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xFC, 0x1C, 
+	0xEC, 0x1E, 
+	0xFC, 0x1E, 
+	0x78, 0x1F, 
+	0xFC, 0x1B, 
+	0xCC, 0x3F, 
+	0xFC, 0x18, 
+	0x78, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l84_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x81, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0x98, 0xC3, 0x03, 
+	0x9C, 0xC3, 0x03, 
+	0x9C, 0xE3, 0x03, 
+	0x9C, 0xE3, 0x03, 
+	0xB8, 0xF3, 0x03, 
+	0xF0, 0xB1, 0x03, 
+	0xB8, 0xBB, 0x03, 
+	0x1C, 0x9B, 0x03, 
+	0x1C, 0xFF, 0x0F, 
+	0x1C, 0x87, 0x03, 
+	0x1C, 0x83, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0xF0, 0x81, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l84_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xF0, 0x00, 
+	0xF8, 0x07, 0xF0, 0x00, 
+	0x7C, 0x0F, 0xF8, 0x00, 
+	0x3C, 0x0E, 0xF8, 0x00, 
+	0x1C, 0x1E, 0xFC, 0x00, 
+	0x1C, 0x1E, 0xFC, 0x00, 
+	0x3C, 0x0E, 0xFE, 0x00, 
+	0x78, 0x0F, 0xEE, 0x00, 
+	0xF0, 0x07, 0xEF, 0x00, 
+	0xF8, 0x87, 0xE7, 0x00, 
+	0x3C, 0x8F, 0xE7, 0x00, 
+	0x1C, 0xDE, 0xE3, 0x00, 
+	0x1E, 0xDC, 0xE1, 0x00, 
+	0x1E, 0xFC, 0xFF, 0x03, 
+	0x1E, 0xFC, 0xFF, 0x03, 
+	0x1E, 0x1C, 0xE0, 0x00, 
+	0x1C, 0x1E, 0xE0, 0x00, 
+	0x3C, 0x0F, 0xE0, 0x00, 
+	0xF8, 0x0F, 0xE0, 0x00, 
+	0xF0, 0x03, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l85.xbm b/app/bin/bitmaps/l85.xbm
index ee8ed02..420ea67 100644
--- a/app/bin/bitmaps/l85.xbm
+++ b/app/bin/bitmaps/l85.xbm
@@ -1,6 +1,78 @@
-#define l85_width 14
-#define l85_height 16
-static char l85_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0xA1, 0x00, 0xA1, 0x00, 
-  0xA1, 0x0F, 0x1E, 0x10, 0x21, 0x10, 0x21, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l85_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xFC, 0x07, 
+	0xEC, 0x07, 
+	0xFC, 0x1F, 
+	0x78, 0x3B, 
+	0xFC, 0x30, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l85_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF1, 0x07, 
+	0xB8, 0x73, 0x00, 
+	0x98, 0x73, 0x00, 
+	0x9C, 0x33, 0x00, 
+	0x9C, 0x33, 0x00, 
+	0x9C, 0xFB, 0x03, 
+	0xB8, 0x7B, 0x07, 
+	0xF0, 0x39, 0x07, 
+	0xB8, 0x03, 0x0E, 
+	0x1C, 0x03, 0x0E, 
+	0x1C, 0x07, 0x0E, 
+	0x1C, 0x3F, 0x06, 
+	0x1C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l85_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFF, 0x03, 
+	0xF8, 0x07, 0xFF, 0x03, 
+	0x7C, 0x0F, 0x07, 0x00, 
+	0x3C, 0x0E, 0x07, 0x00, 
+	0x1C, 0x9E, 0x07, 0x00, 
+	0x1C, 0x9E, 0x07, 0x00, 
+	0x3C, 0x8E, 0x7F, 0x00, 
+	0x78, 0x8F, 0xFF, 0x01, 
+	0xF0, 0x87, 0xE7, 0x01, 
+	0xF8, 0x87, 0xC3, 0x03, 
+	0x3C, 0x0F, 0xC0, 0x03, 
+	0x1C, 0x1E, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l86.xbm b/app/bin/bitmaps/l86.xbm
index 49e4a8d..31ee6f1 100644
--- a/app/bin/bitmaps/l86.xbm
+++ b/app/bin/bitmaps/l86.xbm
@@ -1,6 +1,78 @@
-#define l86_width 14
-#define l86_height 16
-static char l86_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x00, 0xA1, 0x00, 
-  0xA1, 0x0F, 0x9E, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l86_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xEC, 0x03, 
+	0xFC, 0x1F, 
+	0x78, 0x3F, 
+	0xFC, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l86_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x33, 0x07, 
+	0x9C, 0x3B, 0x00, 
+	0x9C, 0x3B, 0x00, 
+	0x9C, 0x3B, 0x00, 
+	0xB8, 0xFB, 0x03, 
+	0xF0, 0x79, 0x07, 
+	0xB8, 0x3B, 0x07, 
+	0x1C, 0x3B, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x33, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l86_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFC, 0x00, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0x7C, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x9E, 0x03, 0x00, 
+	0x3C, 0xCE, 0x03, 0x00, 
+	0x78, 0xCF, 0x7F, 0x00, 
+	0xF0, 0xC7, 0xFF, 0x01, 
+	0xF8, 0xC7, 0xEF, 0x01, 
+	0x3C, 0xCF, 0xC7, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0x9C, 0x83, 0x03, 
+	0x1C, 0x9E, 0xC7, 0x03, 
+	0x3C, 0x8F, 0xEF, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l87.xbm b/app/bin/bitmaps/l87.xbm
index bbba679..dcd52b5 100644
--- a/app/bin/bitmaps/l87.xbm
+++ b/app/bin/bitmaps/l87.xbm
@@ -1,6 +1,78 @@
-#define l87_width 14
-#define l87_height 16
-static char l87_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x21, 0x10, 0x21, 0x08, 
-  0x21, 0x08, 0x1E, 0x04, 0x21, 0x04, 0x21, 0x02, 0x21, 0x02, 0x1E, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l87_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xFC, 0x38, 
+	0xEC, 0x18, 
+	0xFC, 0x1C, 
+	0x78, 0x0C, 
+	0xFC, 0x0E, 
+	0xCC, 0x0E, 
+	0xFC, 0x06, 
+	0x78, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l87_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF9, 0x0F, 
+	0xB8, 0x03, 0x0F, 
+	0x98, 0x03, 0x07, 
+	0x9C, 0x83, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0x9C, 0xC3, 0x01, 
+	0xB8, 0xC3, 0x01, 
+	0xF0, 0xC1, 0x01, 
+	0xB8, 0xE3, 0x00, 
+	0x1C, 0xE3, 0x00, 
+	0x1C, 0xE7, 0x00, 
+	0x1C, 0xE7, 0x00, 
+	0x1C, 0xE3, 0x00, 
+	0xB8, 0x73, 0x00, 
+	0xF0, 0x71, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l87_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0xC3, 0xFF, 0x03, 
+	0xF8, 0xC7, 0xFF, 0x03, 
+	0x7C, 0x0F, 0xC0, 0x03, 
+	0x3C, 0x0E, 0xE0, 0x01, 
+	0x1C, 0x1E, 0xE0, 0x01, 
+	0x1C, 0x1E, 0xF0, 0x00, 
+	0x3C, 0x0E, 0xF0, 0x00, 
+	0x78, 0x0F, 0x78, 0x00, 
+	0xF0, 0x07, 0x78, 0x00, 
+	0xF8, 0x07, 0x38, 0x00, 
+	0x3C, 0x0F, 0x3C, 0x00, 
+	0x1C, 0x1E, 0x3C, 0x00, 
+	0x1E, 0x1C, 0x1C, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1E, 0x1C, 0x1E, 0x00, 
+	0x1C, 0x1E, 0x1E, 0x00, 
+	0x3C, 0x0F, 0x0E, 0x00, 
+	0xF8, 0x0F, 0x0E, 0x00, 
+	0xF0, 0x03, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l88.xbm b/app/bin/bitmaps/l88.xbm
index 17a4121..4d06b28 100644
--- a/app/bin/bitmaps/l88.xbm
+++ b/app/bin/bitmaps/l88.xbm
@@ -1,6 +1,78 @@
-#define l88_width 14
-#define l88_height 16
-static char l88_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0xA1, 0x10, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l88_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xEC, 0x3B, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l88_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x33, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x1C, 0x3B, 0x06, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3B, 0x06, 
+	0xB8, 0x73, 0x07, 
+	0xF0, 0xE1, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l88_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x7C, 0x8F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x78, 0x0F, 0xEF, 0x01, 
+	0xF0, 0x07, 0xFE, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l89.xbm b/app/bin/bitmaps/l89.xbm
index 625081d..74b1448 100644
--- a/app/bin/bitmaps/l89.xbm
+++ b/app/bin/bitmaps/l89.xbm
@@ -1,6 +1,78 @@
-#define l89_width 14
-#define l89_height 16
-static char l89_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0xA1, 0x10, 0x1E, 0x1F, 0x21, 0x10, 0x21, 0x10, 0x21, 0x08, 0x1E, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l89_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xEC, 0x33, 
+	0xFC, 0x33, 
+	0x78, 0x3F, 
+	0xFC, 0x3E, 
+	0xCC, 0x30, 
+	0xFC, 0x3B, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l89_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE1, 0x01, 
+	0xB8, 0x73, 0x07, 
+	0x98, 0x3B, 0x07, 
+	0x9C, 0x3B, 0x06, 
+	0x9C, 0x3B, 0x0E, 
+	0x9C, 0x3B, 0x0E, 
+	0xB8, 0x3B, 0x0F, 
+	0xF0, 0x71, 0x0F, 
+	0xB8, 0xE3, 0x0F, 
+	0x1C, 0x03, 0x0E, 
+	0x1C, 0x07, 0x06, 
+	0x1C, 0x07, 0x06, 
+	0x1C, 0x3B, 0x07, 
+	0xB8, 0x73, 0x03, 
+	0xF0, 0xF1, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l89_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x7C, 0x8F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x3C, 0xCE, 0x83, 0x03, 
+	0x78, 0xCF, 0x83, 0x03, 
+	0xF0, 0xC7, 0x83, 0x03, 
+	0xF8, 0x87, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x03, 
+	0x1C, 0x1E, 0xFF, 0x03, 
+	0x1E, 0x1C, 0xFE, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x01, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x0F, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l9.xbm b/app/bin/bitmaps/l9.xbm
index 14a43a4..281474c 100644
--- a/app/bin/bitmaps/l9.xbm
+++ b/app/bin/bitmaps/l9.xbm
@@ -1,6 +1,78 @@
-#define l9_width 14
-#define l9_height 16
-static char l9_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x08, 0x01, 
-  0x08, 0x01, 0xF0, 0x01, 0x00, 0x01, 0x00, 0x01, 0x80, 0x00, 0x70, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l9_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0xE0, 0x07, 
+	0x60, 0x06, 
+	0x60, 0x06, 
+	0xE0, 0x07, 
+	0xC0, 0x07, 
+	0x00, 0x06, 
+	0x60, 0x07, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l9_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x0F, 0x00, 
+	0x80, 0x3B, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0xC0, 0x31, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x71, 0x00, 
+	0xC0, 0x79, 0x00, 
+	0x80, 0x7B, 0x00, 
+	0x00, 0x7F, 0x00, 
+	0x00, 0x70, 0x00, 
+	0x00, 0x30, 0x00, 
+	0x00, 0x30, 0x00, 
+	0xC0, 0x39, 0x00, 
+	0x80, 0x1B, 0x00, 
+	0x80, 0x0F, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l9_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0xFC, 0x00, 0x00, 
+	0x00, 0xFE, 0x01, 0x00, 
+	0x00, 0xDF, 0x03, 0x00, 
+	0x00, 0x8F, 0x03, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x80, 0x07, 0x07, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0xCF, 0x07, 0x00, 
+	0x00, 0xFE, 0x07, 0x00, 
+	0x00, 0xFC, 0x07, 0x00, 
+	0x00, 0x00, 0x07, 0x00, 
+	0x00, 0x00, 0x07, 0x00, 
+	0x00, 0x87, 0x07, 0x00, 
+	0x00, 0x87, 0x03, 0x00, 
+	0x00, 0xCF, 0x03, 0x00, 
+	0x00, 0xFE, 0x01, 0x00, 
+	0x00, 0xFC, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l90.xbm b/app/bin/bitmaps/l90.xbm
index f251dbe..d56c618 100644
--- a/app/bin/bitmaps/l90.xbm
+++ b/app/bin/bitmaps/l90.xbm
@@ -1,6 +1,78 @@
-#define l90_width 14
-#define l90_height 16
-static char l90_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x18, 
-  0xA1, 0x14, 0xBE, 0x12, 0xA0, 0x11, 0xA0, 0x10, 0x90, 0x10, 0x0E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l90_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x33, 
+	0xF8, 0x33, 
+	0xC0, 0x33, 
+	0xEC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l90_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE0, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x33, 0x07, 
+	0x1C, 0x3B, 0x06, 
+	0x1C, 0x3F, 0x06, 
+	0x1C, 0x3F, 0x0E, 
+	0x9C, 0x3F, 0x0E, 
+	0xB8, 0x3F, 0x0E, 
+	0xF0, 0x3F, 0x0E, 
+	0x00, 0x3F, 0x0E, 
+	0x00, 0x3B, 0x06, 
+	0x00, 0x3B, 0x06, 
+	0x9C, 0x33, 0x07, 
+	0xB8, 0x71, 0x07, 
+	0xF8, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l90_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x7C, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x3C, 0xDF, 0x83, 0x03, 
+	0xF8, 0xDF, 0x83, 0x03, 
+	0xF0, 0xDF, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0x9C, 0xC3, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x8E, 0xC7, 0x01, 
+	0x3C, 0x0F, 0xEF, 0x01, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l91.xbm b/app/bin/bitmaps/l91.xbm
index 4df09a2..cb63233 100644
--- a/app/bin/bitmaps/l91.xbm
+++ b/app/bin/bitmaps/l91.xbm
@@ -1,6 +1,78 @@
-#define l91_width 14
-#define l91_height 16
-static char l91_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x21, 0x06, 0x21, 0x05, 
-  0xA1, 0x04, 0x3E, 0x04, 0x20, 0x04, 0x20, 0x04, 0x10, 0x04, 0x0E, 0x04, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l91_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xFC, 0x1E, 
+	0xCC, 0x1F, 
+	0xCC, 0x1C, 
+	0xFC, 0x1C, 
+	0xF8, 0x1C, 
+	0xC0, 0x1C, 
+	0xEC, 0x1C, 
+	0x78, 0x1C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l91_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x80, 0x03, 
+	0xB8, 0xC3, 0x03, 
+	0x9C, 0xC3, 0x03, 
+	0x1C, 0xE3, 0x03, 
+	0x1C, 0xB7, 0x03, 
+	0x1C, 0x87, 0x03, 
+	0x9C, 0x87, 0x03, 
+	0xB8, 0x87, 0x03, 
+	0xF0, 0x87, 0x03, 
+	0x00, 0x87, 0x03, 
+	0x00, 0x83, 0x03, 
+	0x00, 0x83, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0xB8, 0x81, 0x03, 
+	0xF8, 0x80, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l91_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x70, 0x00, 
+	0xF8, 0x07, 0x70, 0x00, 
+	0x7C, 0x0F, 0x78, 0x00, 
+	0x3C, 0x0E, 0x7C, 0x00, 
+	0x1E, 0x1C, 0x7E, 0x00, 
+	0x1E, 0x1C, 0x7F, 0x00, 
+	0x1E, 0x1C, 0x73, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1E, 0x1C, 0x70, 0x00, 
+	0x1C, 0x1E, 0x70, 0x00, 
+	0x3C, 0x1F, 0x70, 0x00, 
+	0xF8, 0x1F, 0x70, 0x00, 
+	0xF0, 0x1F, 0x70, 0x00, 
+	0x00, 0x1C, 0x70, 0x00, 
+	0x00, 0x1C, 0x70, 0x00, 
+	0x1C, 0x1E, 0x70, 0x00, 
+	0x1C, 0x0E, 0x70, 0x00, 
+	0x3C, 0x0F, 0x70, 0x00, 
+	0xF8, 0x07, 0x70, 0x00, 
+	0xF0, 0x03, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l92.xbm b/app/bin/bitmaps/l92.xbm
index 16a5631..8323e42 100644
--- a/app/bin/bitmaps/l92.xbm
+++ b/app/bin/bitmaps/l92.xbm
@@ -1,6 +1,78 @@
-#define l92_width 14
-#define l92_height 16
-static char l92_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0x21, 0x08, 0x3E, 0x04, 0x20, 0x02, 0x20, 0x01, 0x90, 0x00, 0x8E, 0x1F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l92_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x33, 
+	0xCC, 0x30, 
+	0xFC, 0x38, 
+	0xF8, 0x1C, 
+	0xC0, 0x0E, 
+	0xEC, 0x07, 
+	0x78, 0x3F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l92_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE0, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x3B, 0x06, 
+	0x1C, 0x3B, 0x0E, 
+	0x1C, 0x07, 0x0E, 
+	0x1C, 0x07, 0x0E, 
+	0x9C, 0x07, 0x07, 
+	0xB8, 0x87, 0x07, 
+	0xF0, 0x87, 0x03, 
+	0x00, 0xC7, 0x01, 
+	0x00, 0xE3, 0x01, 
+	0x00, 0xF3, 0x00, 
+	0x9C, 0x73, 0x00, 
+	0xB8, 0x79, 0x00, 
+	0xF8, 0xF8, 0x0F, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l92_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFE, 0x00, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0x7C, 0x8F, 0xE7, 0x03, 
+	0x3C, 0x8E, 0xC3, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0x1C, 0x80, 0x03, 
+	0x1E, 0x1C, 0xC0, 0x03, 
+	0x1E, 0x1C, 0xC0, 0x03, 
+	0x1C, 0x1E, 0xE0, 0x01, 
+	0x3C, 0x1F, 0xF0, 0x01, 
+	0xF8, 0x1F, 0xF8, 0x00, 
+	0xF0, 0x1F, 0x78, 0x00, 
+	0x00, 0x1C, 0x3C, 0x00, 
+	0x00, 0x1C, 0x1E, 0x00, 
+	0x1C, 0x1E, 0x0F, 0x00, 
+	0x1C, 0x8E, 0x07, 0x00, 
+	0x3C, 0x8F, 0x07, 0x00, 
+	0xF8, 0xC7, 0xFF, 0x03, 
+	0xF0, 0xC3, 0xFF, 0x03, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l93.xbm b/app/bin/bitmaps/l93.xbm
index 72515dd..4be9859 100644
--- a/app/bin/bitmaps/l93.xbm
+++ b/app/bin/bitmaps/l93.xbm
@@ -1,6 +1,78 @@
-#define l93_width 14
-#define l93_height 16
-static char l93_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0x21, 0x10, 
-  0x21, 0x10, 0x3E, 0x0E, 0x20, 0x10, 0x20, 0x10, 0x90, 0x10, 0x0E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l93_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3B, 
+	0xCC, 0x38, 
+	0xCC, 0x18, 
+	0xFC, 0x3C, 
+	0xF8, 0x38, 
+	0xC0, 0x33, 
+	0xEC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l93_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE0, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0x1C, 0x03, 0x07, 
+	0x1C, 0x07, 0x07, 
+	0x1C, 0x07, 0x07, 
+	0x9C, 0x87, 0x03, 
+	0xB8, 0xC7, 0x07, 
+	0xF0, 0x07, 0x07, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x03, 0x0E, 
+	0x00, 0x3B, 0x0E, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x71, 0x07, 
+	0xF8, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l93_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x7C, 0x8F, 0xE7, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x1C, 0xC0, 0x03, 
+	0x1E, 0x1C, 0xC0, 0x01, 
+	0x1E, 0x1C, 0xE0, 0x01, 
+	0x1E, 0x1C, 0xFC, 0x00, 
+	0x1C, 0x1E, 0xFC, 0x00, 
+	0x3C, 0x1F, 0xE0, 0x01, 
+	0xF8, 0x1F, 0xC0, 0x03, 
+	0xF0, 0x1F, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x1C, 0x8E, 0xC7, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l94.xbm b/app/bin/bitmaps/l94.xbm
index 5732695..65f4306 100644
--- a/app/bin/bitmaps/l94.xbm
+++ b/app/bin/bitmaps/l94.xbm
@@ -1,6 +1,78 @@
-#define l94_width 14
-#define l94_height 16
-static char l94_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x21, 0x0C, 0x21, 0x0A, 
-  0x21, 0x09, 0xBE, 0x08, 0xA0, 0x1F, 0x20, 0x08, 0x10, 0x08, 0x0E, 0x08, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l94_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1C, 
+	0xFC, 0x1C, 
+	0xCC, 0x1E, 
+	0xCC, 0x1E, 
+	0xFC, 0x1F, 
+	0xF8, 0x1B, 
+	0xC0, 0x3F, 
+	0xEC, 0x18, 
+	0x78, 0x18, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l94_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0x80, 0x03, 
+	0xB8, 0x83, 0x03, 
+	0x9C, 0xC3, 0x03, 
+	0x1C, 0xC3, 0x03, 
+	0x1C, 0xE7, 0x03, 
+	0x1C, 0xE7, 0x03, 
+	0x9C, 0xF7, 0x03, 
+	0xB8, 0xB7, 0x03, 
+	0xF0, 0xBF, 0x03, 
+	0x00, 0x9F, 0x03, 
+	0x00, 0xFF, 0x0F, 
+	0x00, 0x83, 0x03, 
+	0x9C, 0x83, 0x03, 
+	0xB8, 0x81, 0x03, 
+	0xF8, 0x80, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l94_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xF0, 0x00, 
+	0xF8, 0x07, 0xF0, 0x00, 
+	0x7C, 0x0F, 0xF8, 0x00, 
+	0x3C, 0x0E, 0xF8, 0x00, 
+	0x1E, 0x1C, 0xFC, 0x00, 
+	0x1E, 0x1C, 0xFC, 0x00, 
+	0x1E, 0x1C, 0xFE, 0x00, 
+	0x1E, 0x1C, 0xEE, 0x00, 
+	0x1E, 0x1C, 0xEF, 0x00, 
+	0x1C, 0x9E, 0xE7, 0x00, 
+	0x3C, 0x9F, 0xE7, 0x00, 
+	0xF8, 0xDF, 0xE3, 0x00, 
+	0xF0, 0xDF, 0xE1, 0x00, 
+	0x00, 0xFC, 0xFF, 0x03, 
+	0x00, 0xFC, 0xFF, 0x03, 
+	0x1C, 0x1E, 0xE0, 0x00, 
+	0x1C, 0x0E, 0xE0, 0x00, 
+	0x3C, 0x0F, 0xE0, 0x00, 
+	0xF8, 0x07, 0xE0, 0x00, 
+	0xF0, 0x03, 0xE0, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l95.xbm b/app/bin/bitmaps/l95.xbm
index 33560b1..e8ab2c2 100644
--- a/app/bin/bitmaps/l95.xbm
+++ b/app/bin/bitmaps/l95.xbm
@@ -1,6 +1,78 @@
-#define l95_width 14
-#define l95_height 16
-static char l95_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0xA1, 0x00, 0xA1, 0x00, 
-  0xA1, 0x0F, 0x3E, 0x10, 0x20, 0x10, 0x20, 0x10, 0x90, 0x10, 0x0E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l95_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xFC, 0x07, 
+	0xCC, 0x07, 
+	0xCC, 0x1F, 
+	0xFC, 0x3B, 
+	0xF8, 0x30, 
+	0xC0, 0x33, 
+	0xEC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l95_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF0, 0x07, 
+	0xB8, 0x73, 0x00, 
+	0x9C, 0x73, 0x00, 
+	0x1C, 0x33, 0x00, 
+	0x1C, 0x37, 0x00, 
+	0x1C, 0xFF, 0x03, 
+	0x9C, 0x7F, 0x07, 
+	0xB8, 0x3F, 0x07, 
+	0xF0, 0x07, 0x0E, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x03, 0x0E, 
+	0x00, 0x3B, 0x06, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x71, 0x07, 
+	0xF8, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l95_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFF, 0x03, 
+	0xF8, 0x07, 0xFF, 0x03, 
+	0x7C, 0x0F, 0x07, 0x00, 
+	0x3C, 0x0E, 0x07, 0x00, 
+	0x1E, 0x9C, 0x07, 0x00, 
+	0x1E, 0x9C, 0x07, 0x00, 
+	0x1E, 0x9C, 0x7F, 0x00, 
+	0x1E, 0x9C, 0xFF, 0x01, 
+	0x1E, 0x9C, 0xE7, 0x01, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x1F, 0xC0, 0x03, 
+	0xF8, 0x1F, 0x80, 0x03, 
+	0xF0, 0x1F, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1C, 0xDE, 0xC3, 0x03, 
+	0x1C, 0x8E, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l96.xbm b/app/bin/bitmaps/l96.xbm
index a959a68..b114e81 100644
--- a/app/bin/bitmaps/l96.xbm
+++ b/app/bin/bitmaps/l96.xbm
@@ -1,6 +1,78 @@
-#define l96_width 14
-#define l96_height 16
-static char l96_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x00, 0xA1, 0x00, 
-  0xA1, 0x0F, 0xBE, 0x10, 0xA0, 0x10, 0xA0, 0x10, 0x90, 0x10, 0x0E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l96_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x03, 
+	0xCC, 0x1F, 
+	0xFC, 0x3F, 
+	0xF8, 0x33, 
+	0xC0, 0x33, 
+	0xEC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l96_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE0, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x33, 0x07, 
+	0x1C, 0x3B, 0x00, 
+	0x1C, 0x3F, 0x00, 
+	0x1C, 0x3F, 0x00, 
+	0x9C, 0xFF, 0x03, 
+	0xB8, 0x7F, 0x07, 
+	0xF0, 0x3F, 0x07, 
+	0x00, 0x3F, 0x0E, 
+	0x00, 0x3B, 0x0E, 
+	0x00, 0x3B, 0x0E, 
+	0x9C, 0x33, 0x07, 
+	0xB8, 0x71, 0x07, 
+	0xF8, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l96_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0xFC, 0x00, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0x7C, 0x0F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0x03, 0x00, 
+	0x1E, 0xDC, 0x03, 0x00, 
+	0x1E, 0xDC, 0x7F, 0x00, 
+	0x1E, 0xDC, 0xFF, 0x01, 
+	0x1C, 0xDE, 0xEF, 0x01, 
+	0x3C, 0xDF, 0xC7, 0x03, 
+	0xF8, 0xDF, 0x83, 0x03, 
+	0xF0, 0xDF, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1C, 0x9E, 0x83, 0x03, 
+	0x1C, 0x8E, 0xC7, 0x03, 
+	0x3C, 0x8F, 0xEF, 0x01, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7C, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l97.xbm b/app/bin/bitmaps/l97.xbm
index 1cd2c1e..75ab190 100644
--- a/app/bin/bitmaps/l97.xbm
+++ b/app/bin/bitmaps/l97.xbm
@@ -1,6 +1,78 @@
-#define l97_width 14
-#define l97_height 16
-static char l97_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x21, 0x10, 0x21, 0x08, 
-  0x21, 0x08, 0x3E, 0x04, 0x20, 0x04, 0x20, 0x02, 0x10, 0x02, 0x0E, 0x02, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l97_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x3F, 
+	0xFC, 0x38, 
+	0xCC, 0x18, 
+	0xCC, 0x1C, 
+	0xFC, 0x0C, 
+	0xF8, 0x0E, 
+	0xC0, 0x0E, 
+	0xEC, 0x06, 
+	0x78, 0x06, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l97_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xF8, 0x0F, 
+	0xB8, 0x03, 0x0F, 
+	0x9C, 0x03, 0x07, 
+	0x1C, 0x83, 0x03, 
+	0x1C, 0x87, 0x03, 
+	0x1C, 0xC7, 0x01, 
+	0x9C, 0xC7, 0x01, 
+	0xB8, 0xC7, 0x01, 
+	0xF0, 0xE7, 0x00, 
+	0x00, 0xE7, 0x00, 
+	0x00, 0xE3, 0x00, 
+	0x00, 0xE3, 0x00, 
+	0x9C, 0xE3, 0x00, 
+	0xB8, 0x71, 0x00, 
+	0xF8, 0x70, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l97_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0xC3, 0xFF, 0x03, 
+	0xF8, 0xC7, 0xFF, 0x03, 
+	0x7C, 0x0F, 0xC0, 0x03, 
+	0x3C, 0x0E, 0xE0, 0x01, 
+	0x1E, 0x1C, 0xE0, 0x01, 
+	0x1E, 0x1C, 0xF0, 0x00, 
+	0x1E, 0x1C, 0xF0, 0x00, 
+	0x1E, 0x1C, 0x78, 0x00, 
+	0x1E, 0x1C, 0x78, 0x00, 
+	0x1C, 0x1E, 0x38, 0x00, 
+	0x3C, 0x1F, 0x3C, 0x00, 
+	0xF8, 0x1F, 0x3C, 0x00, 
+	0xF0, 0x1F, 0x1C, 0x00, 
+	0x00, 0x1C, 0x1E, 0x00, 
+	0x00, 0x1C, 0x1E, 0x00, 
+	0x1C, 0x1E, 0x1E, 0x00, 
+	0x1C, 0x0E, 0x1E, 0x00, 
+	0x3C, 0x0F, 0x0E, 0x00, 
+	0xF8, 0x07, 0x0E, 0x00, 
+	0xF0, 0x03, 0x0E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l98.xbm b/app/bin/bitmaps/l98.xbm
index bad329d..744aad6 100644
--- a/app/bin/bitmaps/l98.xbm
+++ b/app/bin/bitmaps/l98.xbm
@@ -1,6 +1,78 @@
-#define l98_width 14
-#define l98_height 16
-static char l98_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0xA1, 0x10, 0x3E, 0x0F, 0xA0, 0x10, 0xA0, 0x10, 0x90, 0x10, 0x0E, 0x0F, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l98_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x3B, 
+	0xCC, 0x3F, 
+	0xFC, 0x1E, 
+	0xF8, 0x3F, 
+	0xC0, 0x33, 
+	0xEC, 0x3F, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l98_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE0, 0x03, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x33, 0x07, 
+	0x1C, 0x3B, 0x07, 
+	0x1C, 0x3F, 0x07, 
+	0x1C, 0x3F, 0x07, 
+	0x9C, 0x77, 0x07, 
+	0xB8, 0xE7, 0x03, 
+	0xF0, 0x77, 0x07, 
+	0x00, 0x3F, 0x06, 
+	0x00, 0x3B, 0x0E, 
+	0x00, 0x3B, 0x0E, 
+	0x9C, 0x3B, 0x06, 
+	0xB8, 0x71, 0x07, 
+	0xF8, 0xE0, 0x03, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l98_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x7C, 0x8F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0xC3, 0x03, 
+	0x1E, 0x9C, 0xC7, 0x01, 
+	0x1E, 0x1C, 0xEF, 0x01, 
+	0x1E, 0x1C, 0xFE, 0x00, 
+	0x1C, 0x1E, 0xFF, 0x00, 
+	0x3C, 0x9F, 0xE7, 0x01, 
+	0xF8, 0x9F, 0xC3, 0x03, 
+	0xF0, 0xDF, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x00, 0xDC, 0x83, 0x03, 
+	0x1C, 0xDE, 0x83, 0x03, 
+	0x1C, 0x8E, 0xC3, 0x03, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x07, 0xFF, 0x01, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/l99.xbm b/app/bin/bitmaps/l99.xbm
index 53b1b0e..b7d956a 100644
--- a/app/bin/bitmaps/l99.xbm
+++ b/app/bin/bitmaps/l99.xbm
@@ -1,6 +1,78 @@
-#define l99_width 14
-#define l99_height 16
-static char l99_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 
-  0xA1, 0x10, 0x3E, 0x1F, 0x20, 0x10, 0x20, 0x10, 0x10, 0x08, 0x0E, 0x07, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+static char l99_x16[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x78, 0x1E, 
+	0xFC, 0x3F, 
+	0xCC, 0x33, 
+	0xCC, 0x33, 
+	0xFC, 0x3F, 
+	0xF8, 0x3E, 
+	0xC0, 0x30, 
+	0xEC, 0x3B, 
+	0x78, 0x1E, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, };
+
+static char l99_x24[] = {
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0xF0, 0xE0, 0x01, 
+	0xB8, 0x73, 0x07, 
+	0x9C, 0x3B, 0x07, 
+	0x1C, 0x3B, 0x06, 
+	0x1C, 0x3F, 0x0E, 
+	0x1C, 0x3F, 0x0E, 
+	0x9C, 0x3F, 0x0F, 
+	0xB8, 0x77, 0x0F, 
+	0xF0, 0xE7, 0x0F, 
+	0x00, 0x07, 0x0E, 
+	0x00, 0x03, 0x06, 
+	0x00, 0x03, 0x06, 
+	0x9C, 0x3B, 0x07, 
+	0xB8, 0x71, 0x03, 
+	0xF8, 0xF0, 0x01, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, };
+
+static char l99_x32[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0x7C, 0x8F, 0xEF, 0x01, 
+	0x3C, 0x8E, 0xC7, 0x01, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1E, 0xDC, 0x83, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x3C, 0x9F, 0xE7, 0x03, 
+	0xF8, 0x1F, 0xFF, 0x03, 
+	0xF0, 0x1F, 0xFE, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x00, 0x1C, 0x80, 0x03, 
+	0x1C, 0x9E, 0xC3, 0x03, 
+	0x1C, 0x8E, 0xC3, 0x01, 
+	0x3C, 0x8F, 0xE7, 0x01, 
+	0xF8, 0x07, 0xFF, 0x00, 
+	0xF0, 0x03, 0x7E, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, };
+
diff --git a/app/bin/bitmaps/layers.xpm b/app/bin/bitmaps/layers.xpm
new file mode 100644
index 0000000..60e1761
--- /dev/null
+++ b/app/bin/bitmaps/layers.xpm
@@ -0,0 +1,110 @@
+static char *layers_x16[] = {
+	"16 16 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"                ",
+	"                ",
+	"   177777777771 ",
+	"  0755555555541 ",
+	"  1455555555570 ",
+	" 13555555555411 ",
+	" 13333333333231 ",
+	" 01777777777371 ",
+	"  1666666666610 ",
+	" 17333333333720 ",
+	" 11122222222271 ",
+	"  133333333331  ",
+	" 0233333333371  ",
+	" 011111111111   ",
+	"                ",
+	"                "};
+
+static char *layers_x24[] = {
+	"24 24 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"                        ",
+	"                        ",
+	"                        ",
+	"     100000000000000001 ",
+	"    165555555555555552  ",
+	"    155555555555555541  ",
+	"   165555555555555552   ",
+	"   155555555555555561   ",
+	"  165555555555555551001 ",
+	"  14444444444444443761  ",
+	"  11122222222222227631  ",
+	"   136666666666666661   ",
+	"   166666666666666631   ",
+	"  136666666666666661001 ",
+	"  133333333333333372320 ",
+	"  11122222222222222371  ",
+	"   0233333333333333320  ",
+	"   173333333333333371   ",
+	"  0233333333333333320   ",
+	"  173333333333333371    ",
+	"  00000000000000000     ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *layers_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"       10000000000000000000001  ",
+	"      135555555555555555555561  ",
+	"      14555555555555555555551   ",
+	"     135555555555555555555561   ",
+	"     15555555555555555555551    ",
+	"    165555555555555555555561    ",
+	"    155555555555555555555410    ",
+	"   165555555555555555555531221  ",
+	"   155555555555555555555416671  ",
+	"  117277777777777777777727631   ",
+	"     173333333333333333336620   ",
+	"    026666666666666666666631    ",
+	"    136666666666666666666620    ",
+	"   026666666666666666666631000  ",
+	"   136666666666666666666622720  ",
+	"  1266666666666666666666313370  ",
+	"  100000000000000000000017330   ",
+	"     173333333333333333333320   ",
+	"    013333333333333333333330    ",
+	"    173333333333333333333320    ",
+	"   013333333333333333333330     ",
+	"   173333333333333333333320     ",
+	"  017777777777777777777770      ",
+	"  111111111111111111111110      ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **layers_xpm[3] = { layers_x16, layers_x24, layers_x32 };
+
diff --git a/app/bin/bitmaps/magnet.xpm b/app/bin/bitmaps/magnet.xpm
index 99a31db..3d9a5ac 100644
--- a/app/bin/bitmaps/magnet.xpm
+++ b/app/bin/bitmaps/magnet.xpm
@@ -1,22 +1,139 @@
-/* XPM */
-static char * magnet_xpm[] = {
-"16 16 3 1",
-" 	c #FF0000",
-".	c None",
-"X	c #FFFF00",
-"................",
-"........  ......",
-".......     ....",
-"......       ...",
-".....         ..",
-".....    .     .",
-"....    ...    .",  
-"...    ...     .",
-"..XXX  ...    ..",
-".XXXXX...     ..",
-"..XXXX..     ...",
-"...XX..XX   ....",
-"......XXXXX ....",
-"......XXXXX.....",
-"........XX......",
-"................"};
+static char *magnet_x16[] = {
+	"16 16 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#660000",
+	"4	c	#663300",
+	"5	c	#666600",
+	"6	c	#990000",
+	"7	c	#999900",
+	"8	c	#CC0000",
+	"9	c	#CC3300",
+	"A	c	#CC9900",
+	"B	c	#CCCC00",
+	"C	c	#FF0000",
+	"D	c	#FF6600",
+	"E	c	#FFCC00",
+	"F	c	#FFFF00",
+	"G	c	#800000",
+	"        1110    ",
+	"      11888610  ",
+	"     16CCCCCCG0 ",
+	"    08CC836CCC30",
+	"   06CC83 13CC81",
+	"   3CC83    GCC1",
+	"  1CCC3     3CC1",
+	" 5DCC3     38C81",
+	"5BEDG1    38CC3 ",
+	" 5EA4    38CCG0 ",
+	"  55    18CC61  ",
+	"       18CC81   ",
+	"      5ACC83    ",
+	"     27FE93     ",
+	"      5AB5      ",
+	"       55       "};
+
+static char *magnet_x24[] = {
+	"24 24 19 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#660000",
+	"4	c	#663300",
+	"5	c	#666600",
+	"6	c	#990000",
+	"7	c	#996600",
+	"8	c	#999900",
+	"9	c	#CC0000",
+	"A	c	#CC9900",
+	"B	c	#FF0000",
+	"C	c	#FF6600",
+	"D	c	#FF9900",
+	"E	c	#FFCC00",
+	"F	c	#FFFF00",
+	"G	c	#800000",
+	"H	c	#808000",
+	"             000        ",
+	"           3399G310     ",
+	"         019BBBBBBG1    ",
+	"        0GBBBBBBBBB91   ",
+	"       0GBBBBBBBBBBBB1  ",
+	"      06BBBBBG319BBBBB1 ",
+	"     03BBBBB31  GGBBBBG0",
+	"     3BBBBB3     6GBBB91",
+	"    1BBBBB3       G9BBB1",
+	"   19BBBBG        39BBB1",
+	"  29BBBB6G       G9BBB60",
+	" 48DBBB93       GGBBBB1 ",
+	"58FFDB91        GBBBBG0 ",
+	" 5EFFE3        GBBBB91  ",
+	"  5EE72       3BBBBB1   ",
+	"   5H4       3BBBBB3    ",
+	"    2       3BBBBB3     ",
+	"          13BBBBBG1     ",
+	"          HCBBBBG1      ",
+	"         5EECBB63       ",
+	"        48FFFD61        ",
+	"         5HEFA2         ",
+	"          45A5          ",
+	"            5           "};
+
+static char *magnet_x32[] = {
+	"32 32 19 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#660000",
+	"4	c	#663300",
+	"5	c	#666600",
+	"6	c	#990000",
+	"7	c	#996600",
+	"8	c	#CC0000",
+	"9	c	#CC9900",
+	"A	c	#CCCC00",
+	"B	c	#FF0000",
+	"C	c	#FF3300",
+	"D	c	#FF6600",
+	"E	c	#FFCC00",
+	"F	c	#FFFF00",
+	"G	c	#800000",
+	"H	c	#808000",
+	"                                ",
+	"               013GGG010        ",
+	"              16BBBBBB8G00      ",
+	"             38BBBBBBBBBB30     ",
+	"           03BBBBBBBBBBBBB80    ",
+	"          03BBBBBBBBBBBBBBB80   ",
+	"         0GBBBBBBB88BBBBBBBB80  ",
+	"        03BBBBBBB83G3GBBBBBBBG0 ",
+	"        1BBBBBBB61   G38BBBBBB0 ",
+	"       1BBBBBBB61      G8BBBBBG0",
+	"      1BBBBBBB63        3BBBBB80",
+	"     08BBBBBB63         6GBBBB80",
+	"    06BBBBBB63          68BBBB81",
+	"   03BBBBBB83          8GBBBBBG0",
+	"   5CBBBBB83           3BBBBBB1 ",
+	"  5EECBBBB3           G8BBBBBG0 ",
+	" 5EFFECBBG1          G8BBBBB81  ",
+	" 5EFFFED81          G8BBBBBB1   ",
+	"  5EFFFE4          38BBBBBBG0   ",
+	"   5EFE5          38BBBBBB81    ",
+	"    5A5          18BBBBBB81     ",
+	"     5          18BBBBBB81      ",
+	"               08BBBBBBB3       ",
+	"              08BBBBBBB3        ",
+	"             59CBBBBBB3         ",
+	"            5AFECBBBB3          ",
+	"           59FFFECBBG           ",
+	"           45EFFFEDG0           ",
+	"             5EFFE70            ",
+	"              5EE74             ",
+	"               5H2              ",
+	"                2               "};
+
+static char **magnet_xpm[3] = { magnet_x16, magnet_x24, magnet_x32 };
+
diff --git a/app/bin/bitmaps/magnifier.xpm b/app/bin/bitmaps/magnifier.xpm
deleted file mode 100644
index 69a3faa..0000000
--- a/app/bin/bitmaps/magnifier.xpm
+++ /dev/null
@@ -1,89 +0,0 @@
-/* XPM */
-static char * magnifier_xpm[] = {
-"16 16 70 1",
-" 	c None",
-".	c #545454",
-"+	c #555555",
-"@	c #515151",
-"#	c #5E6063",
-"$	c #94A3B1",
-"%	c #C5D5E6",
-"&	c #DFEAF4",
-"*	c #D9E3ED",
-"=	c #A2ACB6",
-"-	c #4D4D4D",
-";	c #5A5D5F",
-">	c #AEC1D5",
-",	c #C4D8EB",
-"'	c #E2ECF6",
-")	c #E4EDF6",
-"!	c #B8C8D9",
-"~	c #5B5D60",
-"{	c #494949",
-"]	c #919FAD",
-"^	c #BBD2E8",
-"/	c #D5E3F1",
-"(	c #D6E4F2",
-"_	c #97A4B0",
-":	c #434343",
-"<	c #B6CBE0",
-"[	c #C1D3E4",
-"}	c #3E3E3E",
-"|	c #BED4E9",
-"1	c #C8DBED",
-"2	c #383838",
-"3	c #BCCFE1",
-"4	c #CAD8E7",
-"5	c #313131",
-"6	c #939DA8",
-"7	c #BFD5EA",
-"8	c #DFE9F5",
-"9	c #9EA6AD",
-"0	c #373737",
-"a	c #444647",
-"b	c #C4D1DE",
-"c	c #D9E6F3",
-"d	c #E6EFF7",
-"e	c #D3D9DF",
-"f	c #3B3C3D",
-"g	c #262626",
-"h	c #3B3B3B",
-"i	c #3C3C3C",
-"j	c #ADADAF",
-"k	c #28292B",
-"l	c #91979D",
-"m	c #E3E8EE",
-"n	c #EDF3F9",
-"o	c #E5EAEF",
-"p	c #9EA0A3",
-"q	c #282829",
-"r	c #464647",
-"s	c #B8B8BC",
-"t	c #151516",
-"u	c #141414",
-"v	c #3D3D3D",
-"w	c #515153",
-"x	c #C4C4CC",
-"y	c #212122",
-"z	c #606064",
-"A	c #D1D1DD",
-"B	c #2E2E30",
-"C	c #DADAEA",
-"D	c #3F3F43",
-"E	c #151515",
-"       .+++++.  ",
-"      @#$%&*=#@ ",
-"     -;>,'))'!~-",
-"     {]^/))))(_{",
-"     :<^^^^^^^[:",
-"     }|^^)))))1}",
-"     23^))))))42",
-"     5678))))'95",
-"     0abc)))defg",
-"    hijklmnopq  ",
-"   irst uuuuu   ",
-"  vwxy          ",
-" }zAB           ",
-" 0CD            ",
-" Eu             ",
-"                "};
diff --git a/app/bin/bitmaps/manage.xpm b/app/bin/bitmaps/manage.xpm
new file mode 100644
index 0000000..12264cf
--- /dev/null
+++ b/app/bin/bitmaps/manage.xpm
@@ -0,0 +1,110 @@
+static char *manage_x16[] = {
+	"16 16 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"       11       ",
+	"      1370      ",
+	"  101 1361 111  ",
+	"  247074432742  ",
+	"  134444444431  ",
+	"   24432734470  ",
+	"  1743744734310 ",
+	"1274424555144330",
+	"1344414555144630",
+	"111347355674611 ",
+	"   14471274470  ",
+	"   24444644431  ",
+	"  1463644677470 ",
+	"  171013410121  ",
+	"   0  0761      ",
+	"       101      "};
+
+static char *manage_x24[] = {
+	"24 24 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"           00           ",
+	"          1331          ",
+	"          2440          ",
+	"    11   02441   111    ",
+	"   173100164431102431   ",
+	"   144473444444334441   ",
+	"   134444444444444421   ",
+	"    1644444444444431    ",
+	"    1344462102644431    ",
+	"    14446745547644410   ",
+	" 11134442455554244447201",
+	"076644442555555764444461",
+	"134444462555555734444461",
+	"013344441455555244447101",
+	"  0024443755553344420   ",
+	"    1344431732344461    ",
+	"    0744444336444461    ",
+	"    16444444444444471   ",
+	"   134466444444634442   ",
+	"   164311164447112441   ",
+	"    171   14431   11    ",
+	"     0    14470         ",
+	"          13620         ",
+	"           111          "};
+
+static char *manage_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"                                ",
+	"             11221              ",
+	"             164430             ",
+	"             164430             ",
+	"      11     164431     11      ",
+	"     1331   02444410   2461     ",
+	"    164431112444444701244461    ",
+	"    144446364444444446444461    ",
+	"    13444444444444444444441     ",
+	"     134444444444444444441      ",
+	"      14444444373344444461      ",
+	"      14444431011003444441      ",
+	"     0744443074554707444431     ",
+	"    016444417555555306444421111 ",
+	" 1227644443045555555174444466620",
+	"02444444447255555555324444444430",
+	"07444444447255555555324444444430",
+	" 244444444305555555527444443332 ",
+	" 100074444603555555403444471000 ",
+	"     1344447065555412444431     ",
+	"      14444470233702444442      ",
+	"      13444443710234444440      ",
+	"      164444444444444444421     ",
+	"     13444444444444444444421    ",
+	"    174444444444444444444441    ",
+	"    164443123444444620164441    ",
+	"     14431  12444431   13471    ",
+	"     1121    174441     111     ",
+	"             074441             ",
+	"             074440             ",
+	"              13371             ",
+	"               000              "};
+
+static char **manage_xpm[3] = { manage_x16, manage_x24, manage_x32 };
+
diff --git a/app/bin/bitmaps/map.xpm b/app/bin/bitmaps/map.xpm
index 5d47930..e123f7f 100644
--- a/app/bin/bitmaps/map.xpm
+++ b/app/bin/bitmaps/map.xpm
@@ -1,24 +1,169 @@
-/* XPM */
-static char * map_xpm[] = {
-"16 16 5 1",
-"o	c None",
-" 	c #000000000000",
-".	c #FFFFFFFFFFFF",
-"X	c #0000FFFFFFFF",
-"Y	c #FFFF7DF70000",
-"................",
-".  ......  .....",
-". . .... .  ....",
-". .. .. .. . ...",
-". YY.  ... .. ..",
-". .YY. ... ... .",
-". X.YY ..X ... .",  
-". XX.Y YXX X.. .",
-". .XX. YYY YX. .",
-". ..XX XX. YYX .",
-". ...X X.. .YY .",
-".  ... ..  ... .",
-"..  .. . .  .. .",
-"...  .  ...  . .",
-"....   .....   .",
-"................"};
+static char *map_x16[] = {
+	"16 16 28 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#003366",
+	"3	c	#0099CC",
+	"4	c	#00CCFF",
+	"5	c	#330000",
+	"6	c	#330033",
+	"7	c	#333300",
+	"8	c	#333366",
+	"9	c	#660033",
+	"A	c	#663300",
+	"B	c	#666699",
+	"C	c	#990066",
+	"D	c	#993300",
+	"E	c	#993399",
+	"F	c	#996600",
+	"G	c	#CC0099",
+	"H	c	#CC3399",
+	"I	c	#CC6600",
+	"J	c	#CC9900",
+	"K	c	#CC9933",
+	"L	c	#CC99CC",
+	"M	c	#FF0099",
+	"N	c	#FF00CC",
+	"O	c	#FF33CC",
+	"P	c	#FF6699",
+	"Q	c	#FF9900",
+	"0         0     ",
+	"000     00000   ",
+	"00000 000 0 000 ",
+	"00  000   0QQ 00",
+	"0AQQ 0   Q0 QQ 0",
+	"DIQQQ7JQQ 0  Q70",
+	"50   7KP  0  QF0",
+	"00   5MNN 0  QJA",
+	"5CNNN9G NN044  0",
+	"6EN  0   N04 4B6",
+	"2344 1   40L OH8",
+	"00 4424 440NNN81",
+	"00   034  00   0",
+	"000  0  000000 0",
+	"   000000    000",
+	"     00       00"};
+
+static char *map_x24[] = {
+	"24 24 29 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#003366",
+	"3	c	#006666",
+	"4	c	#006699",
+	"5	c	#0099CC",
+	"6	c	#00CCFF",
+	"7	c	#330000",
+	"8	c	#330033",
+	"9	c	#333300",
+	"A	c	#336699",
+	"B	c	#660033",
+	"C	c	#660066",
+	"D	c	#663300",
+	"E	c	#6699CC",
+	"F	c	#66CCFF",
+	"G	c	#990066",
+	"H	c	#996600",
+	"I	c	#CC0099",
+	"J	c	#CC3399",
+	"K	c	#CC6600",
+	"L	c	#FF0099",
+	"M	c	#FF00CC",
+	"N	c	#FF3399",
+	"O	c	#FF33CC",
+	"P	c	#FF66CC",
+	"Q	c	#FF9900",
+	"R	c	#FF9933",
+	"                        ",
+	" 00           000       ",
+	" 0000       0000000     ",
+	" 0  000   000  0   00   ",
+	" 0    00000    DK   000 ",
+	" 0     00     QDKQQ   00",
+	" 0  QQ  0     Q7  QQ  00",
+	" 9QQQQQ 0    Q 0   QQ 00",
+	"HDQ   QQ9QQQQ  0    Q 00",
+	" 0      9QRN   0    Q 00",
+	" 0      0MMMM  0    QQD0",
+	" 0      8MMMMM 0    QQHD",
+	" 0 MMMMLBM  MMM0 666  00",
+	" BMMMM I0    MMC46 66 00",
+	" 1      0     MGE   6FB0",
+	" 3666   0     FGJ   MOG8",
+	" 0 666662    66CIMMMMMA2",
+	" 0    6516  66 0GMMM  00",
+	" 0      0 66   00     00",
+	" 00     0    00000    00",
+	"  000   0   00   000  00",
+	"    000 0 00       00000",
+	"      00000          000",
+	"        0               "};
+
+static char *map_x32[] = {
+	"32 32 29 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006666",
+	"2	c	#006699",
+	"3	c	#0099CC",
+	"4	c	#00CCCC",
+	"5	c	#00CCFF",
+	"6	c	#330000",
+	"7	c	#333300",
+	"8	c	#333366",
+	"9	c	#663300",
+	"A	c	#666699",
+	"B	c	#66CCFF",
+	"C	c	#990066",
+	"D	c	#993399",
+	"E	c	#996600",
+	"F	c	#996699",
+	"G	c	#9999CC",
+	"H	c	#9999FF",
+	"I	c	#CC0099",
+	"J	c	#CC6600",
+	"K	c	#CC66CC",
+	"L	c	#CC9900",
+	"M	c	#FF0099",
+	"N	c	#FF00CC",
+	"O	c	#FF33CC",
+	"P	c	#FF6699",
+	"Q	c	#FF9900",
+	"R	c	#FF9933",
+	"                                ",
+	" 0                  00          ",
+	" 000              000000        ",
+	" 0 000           00 00 000      ",
+	" 0   000       00   00   000    ",
+	" 0     000   00     EE     00   ",
+	" 0       00000      JJQQ     00 ",
+	" 0        00       QJEQQQQ    0 ",
+	" 0   QQQ   0      QQE0 QQQQ   0 ",
+	" 0 QQQQQQ  0     QQQ00   QQQ  0 ",
+	" 9QQQQQQQQJ0  QQQQQ 00    QQ  0 ",
+	" 7QQ    QQLEQQQQQQ  00    QQ  0 ",
+	" 0        LEQQRP    00    QQQ 0 ",
+	" 0         6 NNNN   00    QQQ 0 ",
+	" 0         6NNNNNN  00     QQQ0 ",
+	" 0        ICNN NNNN 00 55  QQQ0 ",
+	" 0  NNNNNNICN   NNNN00 555    0 ",
+	" 0MNNNNNNNI6     NNNC0555555  0 ",
+	" 0MNN      0      NNIA55 5555 0 ",
+	" 045       0       NIF5   55BK0 ",
+	" 055555    0       HIIB    KON0 ",
+	" 03555555531      55DIN  NNNOG0 ",
+	" 0   55555325   55558CNNNNNN  0 ",
+	" 0      55315555555 00NNNN    0 ",
+	" 0         055555   00        0 ",
+	" 00        0  55   0000       0 ",
+	"  000      0     000  000     0 ",
+	"    000    0    00      000   0 ",
+	"      000  0  00          000 0 ",
+	"        0000000             000 ",
+	"          000                 0 ",
+	"                                "};
+
+static char **map_xpm[3] = { map_x16, map_x24, map_x32 };
+
diff --git a/app/bin/bitmaps/move.xpm b/app/bin/bitmaps/move.xpm
index ab90555..5482a6b 100644
--- a/app/bin/bitmaps/move.xpm
+++ b/app/bin/bitmaps/move.xpm
@@ -1,23 +1,119 @@
-/* XPM */
-static char * move_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #0000FFFFFFFF",
-"X	c #000000000000",
-"o	c #FFFF00000000",
-" .  .     X  X  ",
-"......   XXXXXX ",
-" .  .     X  X  ",
-" .  .   o X  X  ",
-" .  .    oX  X  ",
-"......   XoXXXX ",
-" .  .     Xo X  ",
-" .  oooooooooXX ",
-" .  .     Xo X  ",
-"......   XoXXXX ",
-" .  .    oX  X  ",
-" .  .   o X  X  ",
-" .  .     X  X  ",
-"......   XXXXXX ",
-" .  .     X  X  ",
-"                "};
+static char *move_x16[] = {
+	"16 16 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#0099FF",
+	"3	c	#CC0000",
+	"4	c	#CCCCCC",
+	"5	c	#808080",
+	" 1 1        5 5 ",
+	"21212      45454",
+	" 1 1        5 5 ",
+	"21212      45454",
+	" 1 1        5 5 ",
+	"21212    3 45454",
+	" 1 1     33 5 5 ",
+	"21212 333333 454",
+	" 1 1     33 5 5 ",
+	"21212    3 45454",
+	" 1 1        5 5 ",
+	"21212      45454",
+	" 1 1        5 5 ",
+	"21212      45454",
+	" 1 1        5 5 ",
+	"                "};
+
+static char *move_x24[] = {
+	"24 24 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006699",
+	"2	c	#009999",
+	"3	c	#0099CC",
+	"4	c	#00CCCC",
+	"5	c	#666666",
+	"6	c	#996666",
+	"7	c	#999999",
+	"8	c	#CC0000",
+	"9	c	#CC3333",
+	"A	c	#CC6666",
+	"B	c	#CC9999",
+	"C	c	#C0C0C0",
+	"D	c	#808080",
+	"                        ",
+	"   1   1        55  5   ",
+	" 44144424      CD7CCD7C ",
+	"   1   1        55  5   ",
+	"   1   1        55  5   ",
+	" 44144424      CD7CCD7C ",
+	"  31  31        DD  5D  ",
+	"   1   1        55  5   ",
+	" 44144314      B6DCCD7C ",
+	"  4144314      A86CCD7  ",
+	"   1   1        98  5   ",
+	"  4147666888888AA89BD7  ",
+	" 44147666988889A698BD7C ",
+	"   1   1        988 5   ",
+	"  31  31       A89  5D  ",
+	" 44144424      B67CCD7C ",
+	"   1   1        55  5   ",
+	"   1   1        55  5   ",
+	" 44144424      CD7CCD7C ",
+	"   1   1        55  5   ",
+	"   1   1        55  5   ",
+	" 44144424      CD7CCD7C ",
+	"  31  31        DD  5D  ",
+	"   1   1            5   "};
+
+static char *move_x32[] = {
+	"32 32 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006699",
+	"2	c	#0099CC",
+	"3	c	#00CCCC",
+	"4	c	#666666",
+	"5	c	#996666",
+	"6	c	#999999",
+	"7	c	#CC0000",
+	"8	c	#CC3333",
+	"9	c	#CC6666",
+	"A	c	#CC9999",
+	"B	c	#C0C0C0",
+	"C	c	#808080",
+	"                                ",
+	"    1    1            4    4    ",
+	"    1    12           4    46   ",
+	"  3313333133        BB4BBBBC6B  ",
+	"    1    1            4    4    ",
+	"    1    1            4    4    ",
+	"    1    1            4    4    ",
+	"  3313333133        BB4BBBBC6B  ",
+	"    1    1            4    4    ",
+	"    1    1            4    4    ",
+	"    1    1            4    4    ",
+	"  3313333133        BA4BBBBC6B  ",
+	"    1    12         977A   46   ",
+	"    1    1           777   4    ",
+	"    1    1            877  4    ",
+	"  331368777777777777777779B46B  ",
+	"  331367777777777777777778B46B  ",
+	"    1    1            877  4    ",
+	"    1    1           777   4    ",
+	"    1    1           77    4    ",
+	"  3313333133        A95BBBBC6B  ",
+	"    1    1            4    4    ",
+	"    1    1            4    4    ",
+	"    1    1            4    4    ",
+	"  3313333133        BB4BBBBC6B  ",
+	"    1    12           4    46   ",
+	"    1    1            4    4    ",
+	"    1    1            4    4    ",
+	"  3313333133        BB4BBBB46B  ",
+	"  3313333133        BB4BBBB46B  ",
+	"    1    1            4    4    ",
+	"                                "};
+
+static char **move_xpm[3] = { move_x16, move_x24, move_x32 };
+
diff --git a/app/bin/bitmaps/movedesc.xpm b/app/bin/bitmaps/movedesc.xpm
deleted file mode 100644
index 520cfd6..0000000
--- a/app/bin/bitmaps/movedesc.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * movedesc_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"o	c #0000FFFFFFFF",
-"  ..  .. .. ..  ",
-"  . . .  .  .   ",
-"  . . .. .. .   ",
-"  . . .   . .   ",
-"  ..  ..X.. ..  ",
-"       XXX      ",
-"      X X X     ",
-"     X  X  X    ",
-"        X       ",
-" .   .  X    .  ",
-"..oo..ooX o.oo..",
-" .o o o Xo  o.  ",
-" .o o ooXoo o.  ",
-" .o o o X o o.  ",
-"..oo..oo.oo.oo..",
-" .   .   .   .  "};
diff --git a/app/bin/bitmaps/new-car.xpm b/app/bin/bitmaps/new-car.xpm
new file mode 100644
index 0000000..c2fd649
--- /dev/null
+++ b/app/bin/bitmaps/new-car.xpm
@@ -0,0 +1,100 @@
+static char *new_car_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#339900",
+	"2	c	#663300",
+	"3	c	#808080",
+	"    11          ",
+	"    11          ",
+	"  111111        ",
+	"  111111        ",
+	"    11          ",
+	"    11          ",
+	"                ",
+	" 22222222222222 ",
+	" 22222222222222 ",
+	" 22222222222222 ",
+	" 22222222222222 ",
+	" 22222222222222 ",
+	"  3 3      3 3  ",
+	" 30303    30303 ",
+	"  3 3      3 3  ",
+	"                "};
+
+static char *new_car_x24[] = {
+	"24 24 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#00CC33",
+	"3	c	#00FF66",
+	"4	c	#663300",
+	"                        ",
+	"    221                 ",
+	"    231                 ",
+	"   1231                 ",
+	" 222332221              ",
+	" 233333331              ",
+	" 11123111               ",
+	"   1231                 ",
+	"   1231                 ",
+	"    11                  ",
+	"                        ",
+	"444444444444444444444444",
+	"444444444444444444444444",
+	"444444444444444444444444",
+	"444444444444444444444444",
+	"444444444444444444444444",
+	"444444444444444444444444",
+	"444444444444444444444444",
+	"444444444444444444444444",
+	"444444444444444444444444",
+	"  00  0          00  0  ",
+	" 0000000        000 000 ",
+	" 000 000        000 000 ",
+	"                     0  "};
+
+static char *new_car_x32[] = {
+	"32 32 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#009933",
+	"2	c	#00CC33",
+	"3	c	#00FF66",
+	"4	c	#663300",
+	"                                ",
+	"    11111                       ",
+	"     2331                       ",
+	"     2331                       ",
+	"    12331                       ",
+	" 111123321111                   ",
+	" 233333333331                   ",
+	" 233333333331                   ",
+	" 111123311111                   ",
+	"    12331                       ",
+	"    12331                       ",
+	"     2221                       ",
+	"     1111                       ",
+	"                                ",
+	"                                ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"4444444444444444444444444444444 ",
+	"   00  000             00  00   ",
+	"  00000000            00000000  ",
+	"  00000000            00000000  ",
+	"  000  000            000  000  ",
+	"                                "};
+
+static char **new_car_xpm[3] = { new_car_x16, new_car_x24, new_car_x32 };
+
diff --git a/app/bin/bitmaps/newcar.xpm b/app/bin/bitmaps/newcar.xpm
deleted file mode 100644
index e1bc24a..0000000
--- a/app/bin/bitmaps/newcar.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * newcar_xpm[] = {
-"16 16 4 1",
-".	c None",
-"X	c #800080008000",
-"o	c #000000000000",
-" 	c #FFFFFFFF0000",
-"  ...X. X.X.... ",
-"oooo...  ..XX.  ",
-".. o...  ...X  .",
-"...o ..o ..X  ..",
-"...o  ooo. oo...",
-"...o. ooo  oo...",
-"oooooooooooooo  ",
-"oooooooooooooo  ",
-"oooooooooooooo..",
-"oooooooooooooooo",
-"oooooooooooooooo",
-"...oo.. oo  ...o",
-"..oooo.oooo  ..o",
-". oooo.oooo.  o.",
-"  .oo.. oo...oo.",
-" ......  .....  "};
diff --git a/app/bin/bitmaps/note.xpm b/app/bin/bitmaps/note.xpm
new file mode 100644
index 0000000..51bf8c7
--- /dev/null
+++ b/app/bin/bitmaps/note.xpm
@@ -0,0 +1,114 @@
+static char *note_x16[] = {
+	"16 16 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#999999",
+	"3	c	#CC9900",
+	"4	c	#CC9933",
+	"5	c	#CC9999",
+	"6	c	#FFCC00",
+	"7	c	#FFCC33",
+	"8	c	#FFCC66",
+	"                ",
+	"                ",
+	"                ",
+	" 444444444444   ",
+	" 46666666666344 ",
+	" 46888888886664 ",
+	" 47222222227664 ",
+	" 46522222566664 ",
+	" 46788888866664 ",
+	" 47111111117664 ",
+	" 46666666666664 ",
+	" 46666666666664 ",
+	" 47777777777774 ",
+	"                ",
+	"                ",
+	"                "};
+
+static char *note_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#999999",
+	"2	c	#CC9900",
+	"3	c	#CC9933",
+	"4	c	#CC9999",
+	"5	c	#CCCC66",
+	"6	c	#FFCC00",
+	"7	c	#FFCC33",
+	"8	c	#FFCC66",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"  37777777777333333     ",
+	"  3666666666666666233   ",
+	"  36666666666666662223  ",
+	"  36788888888888766663  ",
+	"  36411111111111566663  ",
+	"  36666666666666666663  ",
+	"  36611111111156666663  ",
+	"  36688888888876666663  ",
+	"  36844444444444866663  ",
+	"  36544444444444566663  ",
+	"  36666666666666666663  ",
+	"  36666666666666666663  ",
+	"  36666666666666666663  ",
+	"  37777777777777777773  ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *note_x32[] = {
+	"32 32 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#3399CC",
+	"3	c	#999999",
+	"4	c	#CC9900",
+	"5	c	#CC9933",
+	"6	c	#CCCC00",
+	"7	c	#FFCC00",
+	"8	c	#FFCC33",
+	"9	c	#FFCC66",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"   55555555                     ",
+	"   57777778888888888888855      ",
+	"   877777777777777777777445     ",
+	"   8777777777777777777774445    ",
+	"   87777777777777777777774465   ",
+	"   87799999999999999997777775   ",
+	"   87833333333333333337777775   ",
+	"   87777777777777777777777775   ",
+	"   87777777777777777777777775   ",
+	"   87782111111111128777777775   ",
+	"   87777777777777777777777775   ",
+	"   87777777777777777777777775   ",
+	"   87833333333333333337777775   ",
+	"   87799999999999999997777775   ",
+	"   87777777777777777777777775   ",
+	"   87777777777777777777777775   ",
+	"   87777777777777777777777775   ",
+	"   87777777777777777777777775   ",
+	"   58888887777777777777777775   ",
+	"         55555555555555555555   ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char *note_xpm[3] = { note_x16, note_x24, note_x32 };
+
diff --git a/app/bin/bitmaps/ok.xpm b/app/bin/bitmaps/ok.xpm
new file mode 100644
index 0000000..1671eae
--- /dev/null
+++ b/app/bin/bitmaps/ok.xpm
@@ -0,0 +1,92 @@
+static char *ok_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#008000",
+	"                ",
+	"              1 ",
+	"             11 ",
+	"            111 ",
+	"          1111  ",
+	"         1111   ",
+	"        1111    ",
+	"       1111     ",
+	" 1    1111      ",
+	" 11  1111       ",
+	" 1111111        ",
+	" 111111         ",
+	"  1111          ",
+	"  111           ",
+	"   1            ",
+	"                "};
+
+static char *ok_x24[] = {
+	"24 24 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#008000",
+	"                        ",
+	"                        ",
+	"                     1  ",
+	"                   1111 ",
+	"                  1111  ",
+	"                 1111   ",
+	"                1111    ",
+	"               11111    ",
+	"              11111     ",
+	"             11111      ",
+	"            11111       ",
+	"           11111        ",
+	"          11111         ",
+	"  11     11111          ",
+	" 1111   11111           ",
+	" 11111 11111            ",
+	"  111111111             ",
+	"  11111111              ",
+	"   111111               ",
+	"    1111                ",
+	"    111                 ",
+	"     1                  ",
+	"                        ",
+	"                        "};
+
+static char *ok_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#008000",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                           111  ",
+	"                          1111  ",
+	"                         11111  ",
+	"                        11111   ",
+	"                       11111    ",
+	"                      11111     ",
+	"                     11111      ",
+	"                    11111       ",
+	"                   11111        ",
+	"                  11111         ",
+	"                 11111          ",
+	"                111111          ",
+	"               111111           ",
+	"             1111111            ",
+	"   1        1111111             ",
+	"  111      1111111              ",
+	"  1111    1111111               ",
+	"  11111  1111111                ",
+	"   111111111111                 ",
+	"   11111111111                  ",
+	"    111111111                   ",
+	"    11111111                    ",
+	"     111111                     ",
+	"     11111                      ",
+	"      111                       ",
+	"      11                        ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **ok_xpm[3] = { ok_x16, ok_x24, ok_x32 };
+
diff --git a/app/bin/bitmaps/openbutt.xpm b/app/bin/bitmaps/openbutt.xpm
deleted file mode 100644
index 99b9666..0000000
--- a/app/bin/bitmaps/openbutt.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * openbutt_xpm[] = {
-"7 16 2 1",
-" 	c None",
-".	c #000000000000",
-"       ",
-"       ",
-"       ",
-"       ",
-"       ",
-"       ",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       ",
-"       ",
-"       ",
-"       ",
-"       "};
diff --git a/app/bin/bitmaps/pan-zoom.xpm b/app/bin/bitmaps/pan-zoom.xpm
new file mode 100644
index 0000000..a42beee
--- /dev/null
+++ b/app/bin/bitmaps/pan-zoom.xpm
@@ -0,0 +1,94 @@
+static char *pan_zoom_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#FF0000",
+	"2	c	#FF3333",
+	"                ",
+	"       11       ",
+	"      1211      ",
+	"     111111     ",
+	"       11       ",
+	"   1   11   1   ",
+	"  11   11   11  ",
+	" 11111111111111 ",
+	" 11111111111111 ",
+	"  11   11   11  ",
+	"   1   11   1   ",
+	"       11       ",
+	"     122111     ",
+	"      1111      ",
+	"       11       ",
+	"                "};
+
+static char *pan_zoom_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#FF0000",
+	"2	c	#FF3333",
+	"                        ",
+	"                        ",
+	"           11           ",
+	"          1111          ",
+	"         111111         ",
+	"        11111211        ",
+	"           11           ",
+	"           11           ",
+	"     1     11     1     ",
+	"    11     11     11    ",
+	"   111     11     111   ",
+	"  11111111111111111111  ",
+	"  11111111111111111111  ",
+	"   111     11     111   ",
+	"    11     11     11    ",
+	"     1     11     1     ",
+	"           11           ",
+	"           11           ",
+	"        11111111        ",
+	"         111111         ",
+	"          1111          ",
+	"           11           ",
+	"                        ",
+	"                        "};
+
+static char *pan_zoom_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"                                ",
+	"                                ",
+	"               11               ",
+	"             111111             ",
+	"           1111111111           ",
+	"          111111111111          ",
+	"          1111 111 111          ",
+	"               111              ",
+	"               111              ",
+	"               111              ",
+	"     11        111       11     ",
+	"    111        111       111    ",
+	"   1111        111       1111   ",
+	"   111         111        111   ",
+	"  1111111111111111111111111111  ",
+	"  11111111111111111111111111111 ",
+	"  1111111111111111111111111111  ",
+	"   111         111        111   ",
+	"   1111        111       1111   ",
+	"    111        111       111    ",
+	"     11        111      111     ",
+	"               111              ",
+	"               111              ",
+	"               111              ",
+	"          111  111   1          ",
+	"          1111 111 111          ",
+	"           11111111111          ",
+	"            111111111           ",
+	"              11111             ",
+	"               111              ",
+	"                                ",
+	"                                "};
+
+static char **pan_zoom_xpm[3] = { pan_zoom_x16, pan_zoom_x24, pan_zoom_x32 };
+
diff --git a/app/bin/bitmaps/pan.xpm b/app/bin/bitmaps/pan.xpm
deleted file mode 100644
index 9575ec5..0000000
--- a/app/bin/bitmaps/pan.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * pan_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"       XX       ",
-"      XXXX      ",
-"     XXXXXX.    ",
-"    XX XX XX    ",
-"       XX       ",
-"  XX   XX   XX  ",
-" XXXXXXXXXXXXXX ",
-" XXXXXXXXXXXXXX ",
-"  XX   XX   XX  ",
-"       XX       ",
-"    XX XX XX    ",
-"     XXXXXX     ",
-"      XXXX      ",
-"       XX       ",
-"                "};
diff --git a/app/bin/bitmaps/parallel-line.xpm b/app/bin/bitmaps/parallel-line.xpm
index 4ac471d..b490c84 100644
--- a/app/bin/bitmaps/parallel-line.xpm
+++ b/app/bin/bitmaps/parallel-line.xpm
@@ -1,22 +1,108 @@
-/* XPM */
-static char * parallel_line_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-"                ",
-"                ",
-"................",
-"       X        ",
-"      X X       ",
-"     X   X      ",
-"                ",
-"                ",
-"  .    .    .   ",
-"................",
-"  .    .    .   ",
-"  .    .    .   ",
-"  .    .    .   ",
-"................",
-"  .    .    .   "};
+static char *parallel_line_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"                ",
+	"000000000000000 ",
+	"                ",
+	"       1        ",
+	"      111       ",
+	"     11111      ",
+	"       1        ",
+	"       1        ",
+	"       1        ",
+	" 2 2 2   2 2 2  ",
+	"000000000000000 ",
+	" 2 2 2 2 2 2 2  ",
+	" 2 2 2 2 2 2 2  ",
+	"000000000000000 ",
+	" 2 2 2 2 2 2 2  ",
+	"                "};
+
+static char *parallel_line_x24[] = {
+	"24 24 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#666666",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC3300",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"                        ",
+	"                        ",
+	"                        ",
+	" 4444444444444444444444 ",
+	"                        ",
+	"           66           ",
+	"          6666          ",
+	"         6666 6         ",
+	"           66           ",
+	"           66           ",
+	"           66           ",
+	"           66           ",
+	"           66           ",
+	"            7           ",
+	"  9  9  99 99  9  9  9  ",
+	" 0000000000000000000000 ",
+	"  9  9  99 99  9  9  9  ",
+	"  9  9  99 99  9  9  9  ",
+	"  9  9  99 99  9  9  9  ",
+	" 0300320320230230130031 ",
+	"  8  85 85 58 58 38  83 ",
+	"  9  9  9   9  9  9  9  ",
+	"                        ",
+	"                        "};
+
+static char *parallel_line_x32[] = {
+	"32 32 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#666666",
+	"5	c	#996600",
+	"6	c	#CC0000",
+	"7	c	#CC6600",
+	"8	c	#CC9900",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	" 444444444444444444444444444444 ",
+	"                                ",
+	"                                ",
+	"               66               ",
+	"              6666              ",
+	"             66 6 66            ",
+	"             6  6  6            ",
+	"                6               ",
+	"                6               ",
+	"                6               ",
+	"                6               ",
+	"                6               ",
+	"                6               ",
+	"                6               ",
+	"                                ",
+	"  88   88  88  88  88   88  88  ",
+	" 000000000000000000000000000000 ",
+	"  88   88  88  88  88   88  88  ",
+	"  88   88  88  88  88   88  88  ",
+	"  88   88  88  88  88   88  88  ",
+	"  88   88  88  88  88   88  88  ",
+	"  575 575  77  77  573 575 377  ",
+	" 033202330033003300331023201330 ",
+	"  88   88  88  88  88   88  88  ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **parallel_line_xpm[3] = { parallel_line_x16, parallel_line_x24, parallel_line_x32 };
+
diff --git a/app/bin/bitmaps/parallel.xpm b/app/bin/bitmaps/parallel.xpm
index eb816dc..a19f797 100644
--- a/app/bin/bitmaps/parallel.xpm
+++ b/app/bin/bitmaps/parallel.xpm
@@ -1,22 +1,116 @@
-/* XPM */
-static char * parallel_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"................",
-"  .    .    .   ",
-"  .    .    .   ",
-"................",
-"  .    X    .   ",
-"      X X       ",
-"     X   X      ",
-"                ",
-"                ",
-"  .    .    .   ",
-"................",
-"  .    .    .   ",
-"  .    .    .   ",
-"  .    .    .   ",
-"................",
-"  .    .    .   "};
+static char *parallel_x16[] = {
+	"16 16 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#CC9966",
+	"3	c	#CCCCCC",
+	"4	c	#808080",
+	" 3 3 3 3 3 3 3  ",
+	"444444444444444 ",
+	" 3 3 3 3 3 3 3  ",
+	" 3 3 3 3 3 3 3  ",
+	"4444444 4444444 ",
+	" 3 3 3 1 3 3 3  ",
+	"      111       ",
+	"     11111      ",
+	"       1        ",
+	"       1        ",
+	" 2 2 2 1 2 2 2  ",
+	"0000000 0000000 ",
+	" 2 2 2 2 2 2 2  ",
+	" 2 2 2 2 2 2 2  ",
+	"000000000000000 ",
+	" 2 2 2 2 2 2 2  "};
+
+static char *parallel_x24[] = {
+	"24 24 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#663300",
+	"3	c	#666666",
+	"4	c	#996600",
+	"5	c	#999999",
+	"6	c	#CC0000",
+	"7	c	#CC3300",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"A	c	#CC9999",
+	"B	c	#C0C0C0",
+	"C	c	#808080",
+	"     B         B  B     ",
+	" 55  5  5C 55 C5  5C 55 ",
+	"3CC33C33C33CC33C33C33CC3",
+	" BB  B  B  BB  B  B  BB ",
+	" BB  B  B  BB  B  B  BB ",
+	" BB  B  B  BB  B  B  BB ",
+	"3CC33C33C33CC33C33C33CC3",
+	" 55  5  5C 55 C5  5C 55 ",
+	"  B  B  B  AA  B  B     ",
+	"           666          ",
+	"         666666         ",
+	"         666666         ",
+	"           66           ",
+	"           66           ",
+	"           66           ",
+	"           77           ",
+	" 99  9  9  99  9  9  99 ",
+	"000000000000000000000000",
+	" 99  9  9  99  9  9  99 ",
+	" 99  9  9  99  9  9  99 ",
+	" 99  9  9  99  9  9  99 ",
+	" 2400400420440140041044 ",
+	" 2400400420440140041044 ",
+	"  9  9  9  99  9  9  99 "};
+
+static char *parallel_x32[] = {
+	"32 32 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#666666",
+	"5	c	#996600",
+	"6	c	#999999",
+	"7	c	#CC0000",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"A	c	#C0C0C0",
+	"B	c	#808080",
+	"                                ",
+	"  AA  AA   AA  AA  AAA  AA  AA  ",
+	" 46B44B6B4B6B446644B6B446B44B6B ",
+	" 46B44B6B4B6B446644B6B446B44B6B ",
+	"  AA  AA   AA  AA  AAA  AA  AA  ",
+	"  AA  AA   AA  AA  AAA  AA  AA  ",
+	"  AA  AA   AA  AA  AAA  AA  AA  ",
+	"  AA  AA   AA  AA  AAA  AA  AA  ",
+	" 46B44B6B4B6B446644B6B446B44B6B ",
+	" 46B44B6B4B6B446644B6B446B44B6B ",
+	"  AA  AA   AA  AA  AAA  AA  AA  ",
+	"                                ",
+	"              7777              ",
+	"             777777             ",
+	"            77777777            ",
+	"            77 77 777           ",
+	"               77               ",
+	"               77               ",
+	"               77               ",
+	"               77               ",
+	"               77               ",
+	"  99  99   9   99   9   99  99  ",
+	"  88  883 585  88  585  88  883 ",
+	" 0330033102330033002320033003310",
+	"  99  99   99  99  999  99  99  ",
+	"  99  99   99  99  999  99  99  ",
+	"  99  99   99  99  999  99  99  ",
+	"  99  99   99  99  999  99  99  ",
+	"  88  883 585  88  585  88  883 ",
+	" 0330033102330033002320033003310",
+	"  99  99   99  99  999  99  99  ",
+	"                                "};
+
+static char **parallel_xpm[3] = { parallel_x16, parallel_x24, parallel_x32 };
+
diff --git a/app/bin/bitmaps/parameter.xpm b/app/bin/bitmaps/parameter.xpm
new file mode 100644
index 0000000..7a58a6f
--- /dev/null
+++ b/app/bin/bitmaps/parameter.xpm
@@ -0,0 +1,104 @@
+static char *parameter_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#999999",
+	" 11111111111    ",
+	" 1         11   ",
+	" 1          11  ",
+	" 1  00000000 11 ",
+	" 1            1 ",
+	" 1         0  1 ",
+	" 1       00   1 ",
+	" 1     00     1 ",
+	" 1  000       1 ",
+	" 1            1 ",
+	" 1  00000000  1 ",
+	" 1    00      1 ",
+	" 1      00    1 ",
+	" 1        00  1 ",
+	" 1            1 ",
+	" 11111111111111 "};
+
+static char *parameter_x24[] = {
+	"24 24 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"  7777777777777777      ",
+	" 234444444444444447     ",
+	" 2355555555555555537    ",
+	" 2355100000000000757    ",
+	" 23555555555555555557   ",
+	" 235555555555555445547  ",
+	" 2355555555555437455537 ",
+	" 2355555555432745555547 ",
+	" 2355377202765555555547 ",
+	" 2355544555555555555547 ",
+	" 2355455555555555555547 ",
+	" 2355323455555472455547 ",
+	" 2355554724532345555547 ",
+	"  355555562074555555547 ",
+	"  355556234547745555547 ",
+	"  355323555555432455547 ",
+	"  355455555555555555547 ",
+	"  355466336666666455547 ",
+	"  355666321366666655547 ",
+	"  355555555326555555547 ",
+	"  355555555553265555547 ",
+	"  355555555555562455547 ",
+	"  355555555555555555547 ",
+	"  222222222222222222227 "};
+
+static char *parameter_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#666666",
+	"3	c	#999999",
+	"4	c	#CCCCCC",
+	"5	c	#FFFFFF",
+	"6	c	#C0C0C0",
+	"7	c	#808080",
+	"   222222222222222222222        ",
+	"  73666666666666666666637       ",
+	"  74555555555555555555557       ",
+	"  745555555555555555555547      ",
+	"  7455500000000000000004547     ",
+	"  74555777777777777777745537    ",
+	"  74555555555555555555555557    ",
+	"  745555555555555555547555557   ",
+	"  7455555555555555547004555547  ",
+	"  7455555555555543100355555557  ",
+	"  7455554666637000265555555557  ",
+	"  7455530000001765555555555557  ",
+	"  7455546444455555555555555557  ",
+	"  7455555555555555555555555557  ",
+	"  7455537455555555554375555557  ",
+	"  7455531023555555420075555557  ",
+	"  7455555420074431013555555557  ",
+	"  7455555554300007455555555557  ",
+	"  7455555553101100345555555557  ",
+	"  7455554700245547002655555557  ",
+	"  7455570134555555532015555557  ",
+	"  7455544555555555555465555557  ",
+	"  7455555555555555555555555557  ",
+	"  7455537777227777777774555557  ",
+	"  7455570000000000000006555557  ",
+	"  7455555555531016555555555557  ",
+	"  7455555555555610135555555557  ",
+	"  7455555555555556200345555557  ",
+	"  7455555555555555542005555557  ",
+	"  7455555555555555555435555557  ",
+	"  7644444444444444444444444447  ",
+	"  7777777777777777777777777777  "};
+
+static char **parameter_xpm[3] = { parameter_x16, parameter_x24, parameter_x32 };
+
diff --git a/app/bin/bitmaps/paste.xpm b/app/bin/bitmaps/paste.xpm
new file mode 100644
index 0000000..c820a4e
--- /dev/null
+++ b/app/bin/bitmaps/paste.xpm
@@ -0,0 +1,107 @@
+static char *paste_x16[] = {
+	"16 16 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#999999",
+	"3	c	#CCCCCC",
+	"4	c	#FFFFFF",
+	"5	c	#C0C0C0",
+	"6	c	#808080",
+	"     6116       ",
+	" 666623326666   ",
+	"63333222233356  ",
+	"6444411111111111",
+	"6444144444444441",
+	"6444144444444441",
+	"6444144444444441",
+	"6444144444444441",
+	"6444144444444441",
+	"6444144444444441",
+	"6444144444444441",
+	"6444144444444441",
+	"6444144444444441",
+	"6444144444444441",
+	"6255144444444441",
+	" 111111111111111"};
+
+static char *paste_x24[] = {
+	"24 24 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#999999",
+	"3	c	#CCCCCC",
+	"4	c	#FFFFFF",
+	"5	c	#C0C0C0",
+	"6	c	#808080",
+	"        66666           ",
+	"       6533336          ",
+	" 6111111333336111166    ",
+	"12444444522224444441    ",
+	"15444444444444444446    ",
+	"15444441111111111111111 ",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"154444144444444444444441",
+	"124444144444444444444441",
+	" 61111144444444444444441",
+	"       1111111111111111 "};
+
+static char *paste_x32[] = {
+	"32 32 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#999999",
+	"3	c	#CCCCCC",
+	"4	c	#FFFFFF",
+	"5	c	#C0C0C0",
+	"6	c	#808080",
+	"           111111               ",
+	"          62555556              ",
+	"         6244444436             ",
+	" 6622222266333333662222266      ",
+	" 64444444442222223444444451     ",
+	" 64444444444444444444444436     ",
+	" 24444444444444444444444436     ",
+	" 244444441111111111111111111111 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 244444441444444444444444444441 ",
+	" 644444441444444444444444444441 ",
+	" 665555551444444444444444444441 ",
+	"   1111111444444444444444444441 ",
+	"         1111111111111111111111 "};
+
+static char **paste_xpm[3] = { paste_x16, paste_x24, paste_x32 };
+
diff --git a/app/bin/bitmaps/pause.xpm b/app/bin/bitmaps/pause.xpm
new file mode 100644
index 0000000..da61446
--- /dev/null
+++ b/app/bin/bitmaps/pause.xpm
@@ -0,0 +1,147 @@
+static char* pause_x16[] = {
+	"16 16 20 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003333",
+	"3	c	#006633",
+	"4	c	#009966",
+	"5	c	#333333",
+	"6	c	#336633",
+	"7	c	#336666",
+	"8	c	#339966",
+	"9	c	#33CC99",
+	"A	c	#666666",
+	"B	c	#66CC99",
+	"C	c	#99CC99",
+	"D	c	#99CCCC",
+	"E	c	#CCCCCC",
+	"F	c	#CCFFCC",
+	"G	c	#CCFFFF",
+	"H	c	#FFFFFF",
+	"I	c	#808080",
+	"        0       ",
+	"      00000     ",
+	"    01133300    ",
+	"  001688887210  ",
+	" 01688888888821 ",
+	" 07CCCCDDDDDDC5 ",
+	" 0AEEEEEEEEEEE5 ",
+	" 0IHHHHHHHHHHG5 ",
+	" 0IHHHHHHHHHHG5 ",
+	" 0AFFFFFFFFFFD5 ",
+	" 07DDDDDDDDDDC2 ",
+	" 05BBBBBBBBBBB2 ",
+	"  128BBBBBB9720 ",
+	"   0128999810   ",
+	"     0134210    ",
+	"       020      "};
+
+static char* pause_x24[] = {
+	"24 24 22 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003333",
+	"3	c	#006633",
+	"4	c	#009966",
+	"5	c	#333333",
+	"6	c	#336633",
+	"7	c	#336666",
+	"8	c	#339966",
+	"9	c	#33CC66",
+	"A	c	#33CC99",
+	"B	c	#666666",
+	"C	c	#669999",
+	"D	c	#66CC99",
+	"E	c	#99CCCC",
+	"F	c	#99FFCC",
+	"G	c	#CCCCCC",
+	"H	c	#CCFFCC",
+	"I	c	#CCFFFF",
+	"J	c	#FFFFFF",
+	"K	c	#808080",
+	"                        ",
+	"           000          ",
+	"         0012000        ",
+	"       0003333300       ",
+	"      0036777773210     ",
+	"    01278888888887100   ",
+	"  01278888888888888710  ",
+	"  05CCCCCCCCCCCCCCCCC0  ",
+	"  07EEEEEEEEEEEEEEEEE0  ",
+	"  0BGGGGGGGGGGGGGGGGG0  ",
+	"  0BIIIIIIIIIIIIIIIII0  ",
+	"  0KJJJJJJJJJJJJJJJJJ0  ",
+	"  0KJJJJJJJJJJJJJJJJJ0  ",
+	"  0BHHHHHHHHHHHHHHHHH0  ",
+	"  0BFFFFFFFFFFFFFFFFF0  ",
+	"  07EEEEEEEEEEEEEEEEE0  ",
+	"  07DDDDDDDDDDDDDDDDD0  ",
+	"  02DDDDDDDDDDDDDDDDC1  ",
+	"   027DDDDDDDDDDDDA620  ",
+	"     028AAAAAAAAA720    ",
+	"      0128AAAA9811      ",
+	"        013894110       ",
+	"          01210         ",
+	"            0           "};
+
+static char* pause_x32[] = {
+	"32 32 22 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003333",
+	"3	c	#006633",
+	"4	c	#009966",
+	"5	c	#333333",
+	"6	c	#336633",
+	"7	c	#336666",
+	"8	c	#339966",
+	"9	c	#339999",
+	"A	c	#33CC66",
+	"B	c	#33CC99",
+	"C	c	#669966",
+	"D	c	#66CC99",
+	"E	c	#99CC99",
+	"F	c	#99CCCC",
+	"G	c	#99FFCC",
+	"H	c	#CCCCCC",
+	"I	c	#CCFFCC",
+	"J	c	#CCFFFF",
+	"K	c	#FFFFFF",
+	"                                ",
+	"                                ",
+	"              00000             ",
+	"             0023300            ",
+	"           00233333200          ",
+	"         011333333333210        ",
+	"       0013777777777776100      ",
+	"      006888888888888888600     ",
+	"    0168888888888888888888210   ",
+	"   018CCCCCCCCCCCCCCCCCCCCC810  ",
+	"   05EEEEEEEEEEEEEEEEEEEEEEE50  ",
+	"   05FFFFFFFFFFFFFFFFFFFFFFF50  ",
+	"   05HHHHHHHHHHHHHHHHHHHHHHH50  ",
+	"   05IIIIIIIIIIIIIIIIIIIIIII50  ",
+	"   05KKKKKKKKKKKKKKKKKKKKKKK50  ",
+	"   05KKKKKKKKKKKKKKKKKKKKKKK50  ",
+	"   06KKKKKKKKKKKKKKKKKKKKKKK60  ",
+	"   05JJJJJJJJJJJJJJJJJJJJJJJ50  ",
+	"   05IIIIIIIIIIIIIIIIIIIIIII50  ",
+	"   05GGGGGGGGGGGGGGGGGGGGGGG50  ",
+	"   05FFFFFFFFFFFFFFFFFFFFFFF50  ",
+	"   05FFFFFFFFFFFFFFFFFFFFFFF50  ",
+	"   05DDDDDDDDDDDDDDDDDDDDDDD50  ",
+	"   028DDDDDDDDDDDDDDDDDDDDD820  ",
+	"    0228DDDDDDDDDDDDDDDDD9220   ",
+	"      026BBBBBBBBBBBBBBB620     ",
+	"        028BBBBBBBBBBB820       ",
+	"          128AAAAAAA821         ",
+	"           0128AAA4210          ",
+	"             0134310            ",
+	"               010              ",
+	"                                "};
+
+static char *pause_xpm[3] = { pause_x16, pause_x24, pause_x32 };
+
diff --git a/app/bin/bitmaps/polygon.xpm b/app/bin/bitmaps/polygon.xpm
new file mode 100644
index 0000000..cce796a
--- /dev/null
+++ b/app/bin/bitmaps/polygon.xpm
@@ -0,0 +1,89 @@
+static char *polygon_x16[] = {
+	"16 16 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                ",
+	"  000000000     ",
+	"  000     00    ",
+	" 00        00   ",
+	" 0          00  ",
+	" 0           00 ",
+	"00            00",
+	" 0            00",
+	" 0            00",
+	" 00           00",
+	"  0           00",
+	"  0           00",
+	"  000         00",
+	"    000      000",
+	"      000000000 ",
+	"        00      "};
+
+static char *polygon_x24[] = {
+	"24 24 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                        ",
+	"           00000        ",
+	"    0000000000 00       ",
+	"   000          00      ",
+	"   0             0      ",
+	"  00              0     ",
+	"  0                0    ",
+	" 00                 0   ",
+	" 00                  0  ",
+	" 0                    0 ",
+	" 0                    0 ",
+	" 00                   0 ",
+	"  0                   0 ",
+	"  0                   0 ",
+	"  00                  0 ",
+	"   0                  0 ",
+	"   0                  0 ",
+	"   00                 0 ",
+	"    00                0 ",
+	"      00              0 ",
+	"       000         0000 ",
+	"         000   000000   ",
+	"           000000       ",
+	"                        "};
+
+static char *polygon_x32[] = {
+	"32 32 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                                ",
+	"                  000           ",
+	"          000000000000          ",
+	"    00000000000000  000         ",
+	"    000000           000        ",
+	"   000                000       ",
+	"   00                  000      ",
+	"   00                   00      ",
+	"  000                   000     ",
+	"  00                     000    ",
+	"  00                      000   ",
+	" 00                        000  ",
+	" 00                         000 ",
+	" 00                          00 ",
+	" 000                         00 ",
+	"  00                         00 ",
+	"  00                         00 ",
+	"  000                        00 ",
+	"   00                        00 ",
+	"   00                        00 ",
+	"   000                       00 ",
+	"    00                       00 ",
+	"    00                       00 ",
+	"    000                      00 ",
+	"     0000                    00 ",
+	"      00000                  00 ",
+	"        0000                 00 ",
+	"          0000          0000000 ",
+	"            0000    0000000000  ",
+	"              00000000000       ",
+	"                0000            ",
+	"                                "};
+
+static char **polygon_xpm[3] = { polygon_x16, polygon_x24, polygon_x32 };
+
diff --git a/app/bin/bitmaps/polyline.xpm b/app/bin/bitmaps/polyline.xpm
new file mode 100644
index 0000000..6611f44
--- /dev/null
+++ b/app/bin/bitmaps/polyline.xpm
@@ -0,0 +1,92 @@
+static char *polyline_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0000FF",
+	"                ",
+	"            1   ",
+	" 1           1  ",
+	"11111        11 ",
+	" 1 1111      11 ",
+	" 1    11      1 ",
+	" 1            11",
+	" 11           11",
+	" 11           11",
+	"  1           1 ",
+	"  11         11 ",
+	"   11        1  ",
+	"    11      11  ",
+	"     1  11111   ",
+	"      11111     ",
+	"                "};
+
+static char *polyline_x24[] = {
+	"24 24 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0000FF",
+	"                        ",
+	"                        ",
+	"                   1    ",
+	"                   11   ",
+	" 111                1   ",
+	" 111111             11  ",
+	" 11  1111           11  ",
+	" 11     1111         1  ",
+	"  1        1         11 ",
+	"  1                  11 ",
+	"  1                   1 ",
+	"  11                  1 ",
+	"  11                  1 ",
+	"   1                 11 ",
+	"   1                 1  ",
+	"    1               11  ",
+	"     1              1   ",
+	"     11            11   ",
+	"      11           1    ",
+	"       11         1     ",
+	"        1    111111     ",
+	"         111111         ",
+	"                        ",
+	"                        "};
+
+static char *polyline_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0000FF",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                         11     ",
+	"                         111    ",
+	" 111                      11    ",
+	" 111111                   11    ",
+	" 111111111                 11   ",
+	"  11   11111               11   ",
+	"  11     111111             11  ",
+	"  11        1111            11  ",
+	"  11           1            11  ",
+	"  11                         11 ",
+	"   11                        11 ",
+	"   11                        11 ",
+	"   11                        11 ",
+	"   11                        11 ",
+	"   11                       11  ",
+	"   11                       11  ",
+	"    11                     111  ",
+	"     11                    11   ",
+	"     111                  111   ",
+	"      111                 11    ",
+	"       111               11     ",
+	"        11               11     ",
+	"         11             11      ",
+	"          11          1111      ",
+	"          111  1111111111       ",
+	"           1111111111           ",
+	"            11                  ",
+	"                                ",
+	"                                "};
+
+static char **polyline_xpm[3] = { polyline_x16, polyline_x24, polyline_x32 };
+
diff --git a/app/bin/bitmaps/profile.xpm b/app/bin/bitmaps/profile.xpm
index df22abe..d446bb4 100644
--- a/app/bin/bitmaps/profile.xpm
+++ b/app/bin/bitmaps/profile.xpm
@@ -1,24 +1,121 @@
-/* XPM */
-static char * profile_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #0000FFFFFFFF",
-"o	c #00000000FFFF",
-"O	c #000000000000",
-"                ",
-"   .            ",
-"  .Xo           ",
-"  .Xo           ",
-" .XXXo        o ",
-".XXXXo       .Xo",
-"OXXXXXo      .XO",
-"OXXXXXo     .XXO",
-"OXXXXXXo   .XXXO",
-"OXXXXXXXo .XXXXO",
-"OXXXXXXXXoXXXXXO",
-"OXXXXXXXXXXXXXXO",
-"OXXXXXXXXXXXXXXO",
-"OOOOOOOOOOOOOOOO",
-"   O     O    O ",
-"   O     O    O "};
+static char *profile_x16[] = {
+	"16 16 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#336666",
+	"4	c	#336699",
+	"5	c	#339999",
+	"6	c	#669999",
+	"7	c	#6699CC",
+	"8	c	#66CCCC",
+	"9	c	#66CCFF",
+	"A	c	#99CCFF",
+	"                ",
+	"   0            ",
+	"  262           ",
+	" 05A71          ",
+	" 05A92   20120  ",
+	"004AA82238A98300",
+	" 05AAA58AAAAA50 ",
+	"005AAAAAAAAAA500",
+	"004AAAAAAAAAA400",
+	" 05AAAAAAAAAA50 ",
+	"004AAAAAAAAAA400",
+	" 05AAAAAAAAAA50 ",
+	" 00000000000000 ",
+	"   0 00 0 0 0   ",
+	"   0    0   0   ",
+	"                "};
+
+static char *profile_x24[] = {
+	"24 24 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#336699",
+	"6	c	#339999",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#66CCCC",
+	"A	c	#66CCFF",
+	"B	c	#99CCFF",
+	"                        ",
+	"                        ",
+	"     0                  ",
+	"   1481                 ",
+	"  04AB81                ",
+	"  06BBA4                ",
+	"  06BBB92     11210     ",
+	" 006BBBB50  128AA8630000",
+	"0006BBBBA3128ABBBBBB5000",
+	"  06BBBBB87ABBBBBBBB60  ",
+	"  06BBBBBBBBBBBBBBBB60  ",
+	" 006BBBBBBBBBBBBBBBB5000",
+	" 006BBBBBBBBBBBBBBBB5000",
+	"  06BBBBBBBBBBBBBBBB60  ",
+	"  06BBBBBBBBBBBBBBBB60  ",
+	"0006BBBBBBBBBBBBBBBB5000",
+	"  06BBBBBBBBBBBBBBBB60  ",
+	"  06BBBBBBBBBBBBBBBB60  ",
+	"  01444444444444444410  ",
+	"   000000000000000000   ",
+	"     0  00  0  0  00    ",
+	"     0      0     00    ",
+	"                        ",
+	"                        "};
+
+static char *profile_x32[] = {
+	"32 32 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#336699",
+	"6	c	#339999",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#66CCCC",
+	"A	c	#66CCFF",
+	"B	c	#99CCFF",
+	"                                ",
+	"                                ",
+	"                                ",
+	"      00                        ",
+	"     2683                       ",
+	"   029BB82                      ",
+	"   06BBBB4                      ",
+	"   06BBBBA2                     ",
+	"   06BBBBB50       11200        ",
+	"   06BBBBBA1     017AA8511200   ",
+	" 0006BBBBBB83  016ABBBBBBA93000 ",
+	" 0006BBBBBBA2025ABBBBBBBBBB4000 ",
+	"   06BBBBBBB94ABBBBBBBBBBBB40   ",
+	"   06BBBBBBBBBBBBBBBBBBBBBB40   ",
+	"   06BBBBBBBBBBBBBBBBBBBBBB40   ",
+	" 0006BBBBBBBBBBBBBBBBBBBBBB4000 ",
+	" 0006BBBBBBBBBBBBBBBBBBBBBB4000 ",
+	"   06BBBBBBBBBBBBBBBBBBBBBB40   ",
+	"   06BBBBBBBBBBBBBBBBBBBBBB40   ",
+	"   06BBBBBBBBBBBBBBBBBBBBBB40   ",
+	" 0006BBBBBBBBBBBBBBBBBBBBBB4000 ",
+	" 0006BBBBBBBBBBBBBBBBBBBBBB4000 ",
+	"   06BBBBBBBBBBBBBBBBBBBBBB40   ",
+	"   06BBBBBBBBBBBBBBBBBBBBBB40   ",
+	"   04888888888888888888888830   ",
+	"   00000000000000000000000000   ",
+	"      00   00  00   00  00      ",
+	"      00   0   00   0   00      ",
+	"      00       00       00      ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **profile_xpm[3] = { profile_x16, profile_x24, profile_x32 };
+
diff --git a/app/bin/bitmaps/protractor.xpm b/app/bin/bitmaps/protractor.xpm
new file mode 100644
index 0000000..43fa250
--- /dev/null
+++ b/app/bin/bitmaps/protractor.xpm
@@ -0,0 +1,99 @@
+static char *protractor_x16[] = {
+	"16 16 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#660000",
+	"2	c	#990000",
+	"3	c	#CC0000",
+	"                ",
+	"            00  ",
+	"           00   ",
+	"          00    ",
+	"         0      ",
+	"        0       ",
+	"      01        ",
+	"     0033       ",
+	"    00  3       ",
+	"   00   33      ",
+	"  0      3      ",
+	" 000     3      ",
+	"  00000023      ",
+	"      000000    ",
+	"          00000 ",
+	"              0 "};
+
+static char *protractor_x24[] = {
+	"24 24 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#660000",
+	"3	c	#CC0000",
+	"4	c	#800000",
+	"                        ",
+	"                   00   ",
+	"                  000   ",
+	"                 000    ",
+	"                00      ",
+	"              000       ",
+	"             000        ",
+	"            000         ",
+	"           000          ",
+	"          010           ",
+	"        00033           ",
+	"       000  3           ",
+	"      000   33          ",
+	"     000     3          ",
+	"    000      3          ",
+	"  000        33         ",
+	" 000         33         ",
+	" 000000      33         ",
+	"   00000000  33         ",
+	"       00000042         ",
+	"           00000000     ",
+	"               0000000  ",
+	"                   0000 ",
+	"                        "};
+
+static char *protractor_x32[] = {
+	"32 32 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#990000",
+	"3	c	#CC0000",
+	"                                ",
+	"                          0     ",
+	"                         000    ",
+	"                        000     ",
+	"                       000      ",
+	"                     0000       ",
+	"                    0000        ",
+	"                   0000         ",
+	"                  000           ",
+	"                 000            ",
+	"               0000             ",
+	"              0000              ",
+	"             0001               ",
+	"            00033               ",
+	"           000 33               ",
+	"         0000   33              ",
+	"        0000    33              ",
+	"       0000     333             ",
+	"      0000       33             ",
+	"     000         33             ",
+	"    000          333            ",
+	"  0000           333            ",
+	" 00000            33            ",
+	" 000000000        33            ",
+	"    0000000000   333            ",
+	"        00000000023             ",
+	"            0000000000          ",
+	"                000000000       ",
+	"                    000000000   ",
+	"                        0000000 ",
+	"                            00  ",
+	"                                "};
+
+static char **protractor_xpm[3] = { protractor_x16, protractor_x24, protractor_x32 };
+
diff --git a/app/bin/bitmaps/pull.xpm b/app/bin/bitmaps/pull.xpm
deleted file mode 100644
index a25248e..0000000
--- a/app/bin/bitmaps/pull.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * pull_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #0000FFFFFFFF",
-"X	c #FFFF00000000",
-"o	c #000000000000",
-"  .  .    .  .  ",
-"......    ......",
-"  .  .    .  .  ",
-"  .  .    .  .  ",
-"......    ......",
-"  .  .    .  .  ",
-"    X      X    ",
-"    XX    XX    ",
-"XXXXXXX  XXXXXXX",
-"    XX    XX    ",
-"  o X  o   Xo   ",
-"ooo oooo oooo oo",
-"  o    o    o   ",
-"   o    o    o  ",
-"oo oooo oooo ooo",
-"   o    o    o  "};
diff --git a/app/bin/bitmaps/redo.xpm b/app/bin/bitmaps/redo.xpm
new file mode 100644
index 0000000..045a8f2
--- /dev/null
+++ b/app/bin/bitmaps/redo.xpm
@@ -0,0 +1,104 @@
+static char *redo_x16[] = {
+	"16 16 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006600",
+	"2	c	#009900",
+	"3	c	#00CC00",
+	"4	c	#00FF00",
+	"5	c	#008000",
+	"                ",
+	"         1      ",
+	"         151    ",
+	"        11425   ",
+	"     1553344355 ",
+	"    5244444435  ",
+	"   5344511425   ",
+	"   5435  151    ",
+	"  5345   1      ",
+	"  145           ",
+	" 1235           ",
+	" 135            ",
+	" 525            ",
+	" 521            ",
+	" 51             ",
+	"                "};
+
+static char *redo_x24[] = {
+	"24 24 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006600",
+	"2	c	#009900",
+	"3	c	#00CC00",
+	"4	c	#00FF00",
+	"5	c	#008000",
+	"                        ",
+	"                        ",
+	"              1         ",
+	"              151       ",
+	"              5425      ",
+	"            11544351    ",
+	"         552234444425   ",
+	"       553444444444425  ",
+	"      524444444444455   ",
+	"     52444421124435     ",
+	"     5444351  2455      ",
+	"    544425    55        ",
+	"    54421     5         ",
+	"   53435                ",
+	"   1445                 ",
+	"  12435                 ",
+	"  5345                  ",
+	"  5335                  ",
+	"  5421                  ",
+	"  545                   ",
+	"  141                   ",
+	"  155                   ",
+	"                        ",
+	"                        "};
+
+static char *redo_x32[] = {
+	"32 32 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006600",
+	"2	c	#009900",
+	"3	c	#00CC00",
+	"4	c	#00FF00",
+	"5	c	#008000",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                   1            ",
+	"                   151          ",
+	"                   2425         ",
+	"                   244351       ",
+	"                1152444425      ",
+	"             552233444444355    ",
+	"           553444444444444425   ",
+	"          534444444444444435    ",
+	"        1244444444444444425     ",
+	"       5244444435113444351      ",
+	"       544444211  134425        ",
+	"      53444451    13351         ",
+	"     1244445      155           ",
+	"     544445       15            ",
+	"     54442                      ",
+	"    534435                      ",
+	"    14445                       ",
+	"    54431                       ",
+	"   13441                        ",
+	"   53435                        ",
+	"   5445                         ",
+	"   1445                         ",
+	"   5435                         ",
+	"   5431                         ",
+	"   542                          ",
+	"   531                          ",
+	"   111                          ",
+	"                                ",
+	"                                "};
+
+static char **redo_xpm[3] = { redo_x16, redo_x24, redo_x32 };
+
diff --git a/app/bin/bitmaps/reflect.xpm b/app/bin/bitmaps/reflect.xpm
new file mode 100644
index 0000000..47adaad
--- /dev/null
+++ b/app/bin/bitmaps/reflect.xpm
@@ -0,0 +1,115 @@
+static char *reflect_x16[] = {
+	"16 16 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#006699",
+	"3	c	#0099CC",
+	"4	c	#333333",
+	"5	c	#3399CC",
+	"6	c	#33CCCC",
+	"7	c	#33CCFF",
+	"8	c	#666666",
+	"9	c	#66CCFF",
+	"A	c	#99CCFF",
+	"                ",
+	"       00       ",
+	"       00       ",
+	"33     00     00",
+	"3553   00   0040",
+	"36965  00  04840",
+	"36AA95 00 048840",
+	"36AAA95200888840",
+	"36AAA95100488840",
+	"36AA75 00 048840",
+	"36955  00  04840",
+	"3553   00    040",
+	"33     00     00",
+	"       00       ",
+	"       00       ",
+	"                "};
+
+static char *reflect_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0099CC",
+	"2	c	#333333",
+	"3	c	#3399CC",
+	"4	c	#33CCCC",
+	"5	c	#33CCFF",
+	"6	c	#666666",
+	"7	c	#66CCFF",
+	"8	c	#99CCFF",
+	"                        ",
+	"                        ",
+	"           00           ",
+	"           00           ",
+	" 1         00         0 ",
+	" 13        00        00 ",
+	" 1733      00      0060 ",
+	" 17753     00     02660 ",
+	" 178873    00    066660 ",
+	" 17888733  00  02666660 ",
+	" 178888773 00 026666660 ",
+	" 1788888873000266666660 ",
+	" 178888873 00 066666660 ",
+	" 17888873  00  02666660 ",
+	" 1788873   00   0266660 ",
+	" 178743    00    026660 ",
+	" 17731     00      0660 ",
+	" 173       00       060 ",
+	" 13        00        00 ",
+	" 1         00         0 ",
+	"           00           ",
+	"           00           ",
+	"                        ",
+	"                        "};
+
+static char *reflect_x32[] = {
+	"32 32 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0099CC",
+	"2	c	#333333",
+	"3	c	#3399CC",
+	"4	c	#33CCCC",
+	"5	c	#33CCFF",
+	"6	c	#666666",
+	"7	c	#66CCFF",
+	"8	c	#99CCFF",
+	"                                ",
+	"                                ",
+	"                                ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"  1            00            00 ",
+	" 133           00           020 ",
+	" 14733         00         02620 ",
+	" 148753        00        026620 ",
+	" 1488873       00       0666620 ",
+	" 148888733     00     026666620 ",
+	" 1488888773    00    0266666620 ",
+	" 14888888873   00  006666666620 ",
+	" 1488888888733 00 0266666666620 ",
+	" 1488888888871 0002666666666620 ",
+	" 148888888873  00 0266666666620 ",
+	" 14888888873   00   06666666620 ",
+	" 1488888873    00    0266666620 ",
+	" 148888873     00     026666620 ",
+	" 14888743      00      02666620 ",
+	" 1488731       00        266620 ",
+	" 14873         00         06620 ",
+	" 1473          00          0220 ",
+	" 133           00           000 ",
+	"  3            00            00 ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **reflect_xpm[3] = { reflect_x16, reflect_x24, reflect_x32 };
+
diff --git a/app/bin/bitmaps/rotate.xpm b/app/bin/bitmaps/rotate.xpm
index 00b6b5a..d41ca61 100644
--- a/app/bin/bitmaps/rotate.xpm
+++ b/app/bin/bitmaps/rotate.xpm
@@ -1,23 +1,148 @@
-/* XPM */
-static char * rotate_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #0000FFFFFFFF",
-"X	c #FFFF00000000",
-"o	c #000000000000",
-" .   .XX        ",
-"....... XX      ",
-" .   .    XX    ",
-" .   .      X  X",
-".......    o X X",
-" .   .        XX",
-" .   .   o  XXXX",
-".......         ",
-" .   . o        ",
-" .o  o  o  o  o ",
-".ooooooooooooooo",
-" .o  o  o  o  o ",
-" .oo o  o  o  o ",
-"..o..o. o  o  o ",
-" ooooooooooooooo",
-"  o  o  o  o  o "};
+static char *rotate_x16[] = {
+	"16 16 24 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#0099CC",
+	"3	c	#00CCCC",
+	"4	c	#00CCFF",
+	"5	c	#00FFFF",
+	"6	c	#336699",
+	"7	c	#3399CC",
+	"8	c	#33CCCC",
+	"9	c	#33CCFF",
+	"A	c	#6699CC",
+	"B	c	#66CCCC",
+	"C	c	#66CCFF",
+	"D	c	#996666",
+	"E	c	#999999",
+	"F	c	#99CCCC",
+	"G	c	#CC0000",
+	"H	c	#CC3333",
+	"I	c	#CC3366",
+	"J	c	#CC6666",
+	"K	c	#CC9999",
+	"L	c	#C0C0C0",
+	"M	c	#808080",
+	" 1              ",
+	"525435          ",
+	" 2437HG         ",
+	"52543KGGG       ",
+	" 1 11    GG     ",
+	"52543     GG    ",
+	" 2432    GGG    ",
+	"52543   GG  G   ",
+	" 2432  G    G   ",
+	"52543BGG   GGGG ",
+	" 298AH      GGJ ",
+	"52BAJEEMEMEMEDE ",
+	" 2BIAEEMEMEMEME ",
+	" 2CB7FLLL L L L ",
+	"  MMMMMMMMMMMMMM",
+	"   LLLL L L L L "};
+
+static char *rotate_x24[] = {
+	"24 24 19 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#0099CC",
+	"3	c	#00CCCC",
+	"4	c	#00CCFF",
+	"5	c	#00FFFF",
+	"6	c	#33CCFF",
+	"7	c	#33FFFF",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#66FFFF",
+	"B	c	#996699",
+	"C	c	#999999",
+	"D	c	#CC0000",
+	"E	c	#CC3333",
+	"F	c	#CC9999",
+	"G	c	#C0C0C0",
+	"H	c	#808080",
+	"                        ",
+	"  1   1                 ",
+	" 5155525                ",
+	"  1   1                 ",
+	"  1  32FDDDDD           ",
+	" 5155525   DDD          ",
+	"  1   1       DD        ",
+	"  1  32        DD       ",
+	" 5155525      DDDD      ",
+	"  1   1       DD D      ",
+	" 5155425          D     ",
+	" 5155425    DD    DD    ",
+	"  1   1           DD    ",
+	" 5155525 DD        D DD ",
+	"  1  32  DD     DD DDD  ",
+	"  1   1 D         DDD   ",
+	" 515752FD G  G  G FEDG  ",
+	"  18CCBCHHCHHCHCCHCHHCH ",
+	"  1HCEBCHHCHHCHCCHCHHCH ",
+	" 515562A  G GG GG GG G  ",
+	"  1 G91G  G GG GG GG G  ",
+	"   HHHHHHHHHHHHHHHHHHHH ",
+	"    CH C HC CC CC CC CC ",
+	"                        "};
+
+static char *rotate_x32[] = {
+	"32 32 22 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#0099CC",
+	"3	c	#00CCCC",
+	"4	c	#00CCFF",
+	"5	c	#00FFFF",
+	"6	c	#3399CC",
+	"7	c	#33FFFF",
+	"8	c	#66CCCC",
+	"9	c	#66FFFF",
+	"A	c	#996666",
+	"B	c	#996699",
+	"C	c	#999999",
+	"D	c	#99CCCC",
+	"E	c	#CC0000",
+	"F	c	#CC3333",
+	"G	c	#CC3366",
+	"H	c	#CC6666",
+	"I	c	#CC9999",
+	"J	c	#C0C0C0",
+	"K	c	#808080",
+	"                                ",
+	"   1    1                       ",
+	"  32   32                       ",
+	" 552555525                      ",
+	"   1    1                       ",
+	"   1    1 EEEEEE                ",
+	" 542555425FEEEEEEE              ",
+	" 542555425     EEEEE            ",
+	"   1    1        EEEE           ",
+	"   1    1          EEE          ",
+	" 552555525          EEE         ",
+	"  32   32          EEEEE        ",
+	"   1    1         EEE EEE       ",
+	"   1    1          E   EE       ",
+	" 552555525      EE     EEE      ",
+	"   1    1      EEE      EE      ",
+	"   1    1       E       EEE     ",
+	"   1    1    EE          EE  E  ",
+	" 552555525  EEE       EE EE EEE ",
+	"   1    1    E        EEEEEEEE  ",
+	"   1    1 EE           EEEEEE   ",
+	"  32  732CEE            EEEE    ",
+	" 552577567C  J   J   J  JIE JJ  ",
+	"   1KKCAGCCKKCKKKCKKKCKKKCKKCKK ",
+	"   1KKHEBCCKKCKKKCKKKCKKKCKKCK  ",
+	" 542598C29D  J   J   J  JJ  JJ  ",
+	" 542599429D  J   J   J  JJ  JJ  ",
+	"   1 JJ 1JJ  J   J   J  JJ  JJ  ",
+	"    KKKKKKKKKKKKKKKKKKKKKKKKKKK ",
+	"     CC  CC  CC  C  KC  CC  CC  ",
+	"      J  JJ  J   J   J  JJ  JJ  ",
+	"                                "};
+
+static char **rotate_xpm[3] = { rotate_x16, rotate_x24, rotate_x32 };
+
diff --git a/app/bin/bitmaps/ruler.xpm b/app/bin/bitmaps/ruler.xpm
index 55d4842..11dbde8 100644
--- a/app/bin/bitmaps/ruler.xpm
+++ b/app/bin/bitmaps/ruler.xpm
@@ -1,21 +1,89 @@
-/* XPM */
-static char * ruler_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000000000",
-"    ..          ",
-"     .          ",
-"     .          ",
-"  .  .          ",
-" .  ...         ",
-" .              ",
-".               ",
-".               ",
-" ..             ",
-"   ..  .      . ",
-"     ..      .  ",
-"       ..    .  ",
-"         .. .   ",
-"           ..   ",
-"             .. ",
-"               ."};
+static char *ruler_x16[] = {
+	"16 16 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                ",
+	"                ",
+	"              0 ",
+	"             00 ",
+	"              0 ",
+	"  0           0 ",
+	"  0           0 ",
+	" 00             ",
+	" 0  00  0     00",
+	" 0  00 00  0  0 ",
+	" 0000  00  0  0 ",
+	"   000000 00 00 ",
+	"      000000 00 ",
+	"          0000  ",
+	"                ",
+	"                "};
+
+static char *ruler_x24[] = {
+	"24 24 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                     0  ",
+	"                   000  ",
+	"                   000  ",
+	"                     0  ",
+	"                     0  ",
+	"   0                 0  ",
+	"   0                 0  ",
+	"  00                    ",
+	"  00                    ",
+	"  0    0              0 ",
+	"  0    0    0         0 ",
+	" 00   00   00   00   00 ",
+	" 000  00   00   00   0  ",
+	"   00000   0    0    0  ",
+	"       00000    0   00  ",
+	"          0000000   00  ",
+	"              0000000   ",
+	"                  000   ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *ruler_x32[] = {
+	"32 32 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                            00  ",
+	"                           000  ",
+	"                         00000  ",
+	"                         00000  ",
+	"                           000  ",
+	"                           000  ",
+	"    00                     000  ",
+	"    00                     000  ",
+	"   000                     000  ",
+	"   00                           ",
+	"   00                           ",
+	"   00     0                     ",
+	"  000     0                     ",
+	"  00     00     0            00 ",
+	"  00     0      0           000 ",
+	" 000     0     00     0     00  ",
+	" 0000   00     00     0     00  ",
+	"  00000000     0     00     00  ",
+	"     00000000  0     00    000  ",
+	"         00000000    0     00   ",
+	"             000000000     00   ",
+	"                 00000000 000   ",
+	"                     00000000   ",
+	"                         000    ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **ruler_xpm[3] = { ruler_x16, ruler_x24, ruler_x32 };
+
diff --git a/app/bin/bitmaps/select.xpm b/app/bin/bitmaps/select.xpm
index c630541..bd118c6 100644
--- a/app/bin/bitmaps/select.xpm
+++ b/app/bin/bitmaps/select.xpm
@@ -1,22 +1,106 @@
-/* XPM */
-static char * select_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"                ",
-" .   .    .   . ",
-"................",
-" .   .    .   . ",
-" .        .   . ",
-" .  XX        . ",
-"... XXXXXX    ..",
-" .   XXXXXXXX . ",
-"     XXXXXXXX   ",
-"     XXXXXXX    ",
-"     XXXXXX     ",
-"      XXXXXX    ",
-"      XXX XXX   ",
-"      XX   XXX  ",
-"            XXX ",
-"             X  "};
+static char *select_x16[] = {
+	"16 16 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#CC0000",
+	"3	c	#CC6600",
+	"4	c	#FF9999",
+	"                ",
+	"                ",
+	"                ",
+	" 3 3 3 3 3 3 3  ",
+	"000000000000000 ",
+	" 3 3 3     3 3  ",
+	" 3 3 3     3 3  ",
+	"010000 222 0000 ",
+	" 3 3 3 224 3 3  ",
+	"       2424     ",
+	"         424    ",
+	"          424   ",
+	"           424  ",
+	"            4   ",
+	"                ",
+	"                "};
+
+static char *select_x24[] = {
+	"24 24 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#663300",
+	"3	c	#996600",
+	"4	c	#CC0000",
+	"5	c	#CC3300",
+	"6	c	#CC6600",
+	"7	c	#CC9900",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"     7  7      7  7     ",
+	" 33 26  62 33 26  62 33 ",
+	"022012002102201200210220",
+	" 77  7  7  77  7  7  77 ",
+	" 77  7  7  56 56  7  77 ",
+	" 77  7  7 4444444 7  77 ",
+	"022012002144444440210220",
+	" 33 26  6344444   62 33 ",
+	"     7  7 44 444  7     ",
+	"          44  444       ",
+	"          44   444      ",
+	"           4    444     ",
+	"                 444    ",
+	"                  444   ",
+	"                   44   ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *select_x32[] = {
+	"32 32 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#663300",
+	"3	c	#996600",
+	"4	c	#CC0000",
+	"5	c	#CC6600",
+	"6	c	#CC9900",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"  6   66   6   66   6   66   6  ",
+	" 031002300030003300332003200130 ",
+	" 000000000000000000000000000000 ",
+	"  52  35   5   55  353  53  25  ",
+	"  6   66   6   66  666  66   6  ",
+	"  6   66   6  44444444  66   6  ",
+	"  6   66   6 4444444444 66   6  ",
+	" 031002300030444444444403200130 ",
+	" 000000000000444444    00000000 ",
+	"  6   66   6 4444444    53  25  ",
+	"  6    6   6 444 4444   6    6  ",
+	"             444  4444          ",
+	"             444   4444         ",
+	"              44    4444        ",
+	"              4      4444       ",
+	"                      4444      ",
+	"                       4444     ",
+	"                        4444    ",
+	"                         444    ",
+	"                          4     ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **select_xpm[3] = { select_x16, select_x24, select_x32 };
+
diff --git a/app/bin/bitmaps/sensor.xpm b/app/bin/bitmaps/sensor.xpm
index 6ed65a3..207f4c4 100644
--- a/app/bin/bitmaps/sensor.xpm
+++ b/app/bin/bitmaps/sensor.xpm
@@ -1,22 +1,138 @@
-/* XPM */
-static char * sensor_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #00FFFF",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"     .....      ",
-"   +.......+    ",
-"  +++.....+++   ",
-"  .+++...+++.   ",
-" ...+++.+++...  ",
-" ....+++++....  ",
-" .....+++.....  ",
-" ....+++++....  ",
-" ...+++.+++...  ",
-"  .+++...+++.   ",
-"  +++.....+++   ",
-"   +.......+    ",
-"     .....      ",
-"                "};
+static char *sensor_x16[] = {
+	"16 16 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CCCC",
+	"2	c	#336666",
+	"3	c	#339966",
+	"4	c	#339999",
+	"5	c	#33CC99",
+	"6	c	#33CCCC",
+	"7	c	#666666",
+	"8	c	#669966",
+	"9	c	#669999",
+	"A	c	#66CCCC",
+	"B	c	#999999",
+	"C	c	#99CCCC",
+	"D	c	#CCCCCC",
+	"E	c	#CCFFCC",
+	"F	c	#CCFFFF",
+	"G	c	#FFFFFF",
+	"       77       ",
+	"    27444478    ",
+	"   941111114B   ",
+	"  9GA111111AG9  ",
+	" 34AGA1111AGA43 ",
+	" 311AGA116GA114 ",
+	"74111AGA6GC11147",
+	"741111AGFC111143",
+	"7411111FGA111153",
+	"741111FCAGA11147",
+	" 3111EE11AGA1147",
+	" 341DF1111AGA53 ",
+	"  3CF111111AG9  ",
+	"  2D51111115BB  ",
+	"    34455443    ",
+	"     773377     "};
+
+static char *sensor_x24[] = {
+	"24 24 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CCCC",
+	"2	c	#336666",
+	"3	c	#339966",
+	"4	c	#339999",
+	"5	c	#33CC99",
+	"6	c	#33CCCC",
+	"7	c	#666666",
+	"8	c	#669999",
+	"9	c	#66CCCC",
+	"A	c	#999999",
+	"B	c	#99CCCC",
+	"C	c	#CCCCCC",
+	"D	c	#CCFFCC",
+	"E	c	#CCFFFF",
+	"F	c	#FFFFFF",
+	"                        ",
+	"        72777727        ",
+	"      734511115432      ",
+	"     34111111111143     ",
+	"    8D111111111111BC    ",
+	"   3BFE11111111119F63   ",
+	"  241BFE111111119F6143  ",
+	"  3111BFE1111119F91114  ",
+	" 741111BFE11116F9111153 ",
+	" 7111111BFE116F91111112 ",
+	" 71111111DFE6EB11111114 ",
+	" 311111111DFFB1111111147",
+	" 3111111111FFD1111111147",
+	" 311111111EBDFD111111147",
+	" 71111111DD11DFD1111113 ",
+	" 2411111DD1111DFD111152 ",
+	" 741111BE111111DFD11147 ",
+	"  3411BE11111111DFD153  ",
+	"   31BE6111111111DFD3   ",
+	"   7AE611111111111DC2   ",
+	"    8841111111111532    ",
+	"      345111111543      ",
+	"       7234444327       ",
+	"           77           "};
+
+static char *sensor_x32[] = {
+	"32 32 20 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CCCC",
+	"2	c	#336666",
+	"3	c	#339966",
+	"4	c	#339999",
+	"5	c	#33CC99",
+	"6	c	#33CCCC",
+	"7	c	#666666",
+	"8	c	#669999",
+	"9	c	#66CC99",
+	"A	c	#66CCCC",
+	"B	c	#999999",
+	"C	c	#99CC99",
+	"D	c	#99CCCC",
+	"E	c	#CCCCCC",
+	"F	c	#CCFFCC",
+	"G	c	#CCFFFF",
+	"H	c	#FFFFFF",
+	"I	c	#C0C0C0",
+	"                                ",
+	"           7777777777           ",
+	"         77777344477777         ",
+	"       777744111111543777       ",
+	"      77741111111111114377      ",
+	"     7B81111111111111111CB7     ",
+	"    77GHA11111111111111AHHB7    ",
+	"   774GHHA111111111111AHHG477   ",
+	"   7711GHHA1111111111AHHG11477  ",
+	"  774111GHHA111111116HHG111577  ",
+	"  7311111GHHA1111116HHG61111477 ",
+	" 774111111GHHA11116GHH611111577 ",
+	" 7751111116GHHA111GHH6111111177 ",
+	" 77111111116GHH61GHHA1111111147 ",
+	" 741111111116GHHGHHA11111111147 ",
+	" 7411111111116GHHHA1111111111477",
+	" 7411111111111DHHH61111111111477",
+	" 741111111111DHHHHH6111111111477",
+	" 73111111111DHHD6GHH61111111147 ",
+	" 7711111111DHHD116GHH6111111137 ",
+	" 774111111AHHE11116GHH611111577 ",
+	"  7411111AHHF1111116HHH61111477 ",
+	"  774111AHHG111111116HHG611177  ",
+	"  774116HHG11111111116HHG61477  ",
+	"   7746HHG6111111111116HHG577   ",
+	"    77GHG611111111111116HHB77   ",
+	"     7BG61111111111111119I77    ",
+	"     7774511111111111114777     ",
+	"       7774511111111547777      ",
+	"        7777344444437777        ",
+	"          777777777777          ",
+	"              7777              "};
+
+static char **sensor_xpm[3] = { sensor_x16, sensor_x24, sensor_x32 };
+
diff --git a/app/bin/bitmaps/signal.xpm b/app/bin/bitmaps/signal.xpm
index 521adad..66f55c7 100644
--- a/app/bin/bitmaps/signal.xpm
+++ b/app/bin/bitmaps/signal.xpm
@@ -1,25 +1,106 @@
-/* XPM */
-static char * signal_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #000000",
-"+	c #3A000B",
-"@	c #C90328",
-"#	c #D9032B",
-"$	c #F30431",
-"        ..      ",
-"       ....     ",
-"      .+$@+.    ",
-"      .#$$#.    ",
-"      .+$@+.    ",
-"       ....     ",
-"        ..      ",
-"        ..      ",
-"        ..      ",
-"        ..      ",
-"        ..      ",
-"        ..      ",
-"        ..      ",
-"        ..      ",
-"   ............ ",
-"   ............ "};
+static char *signal_x16[] = {
+	"16 16 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#660000",
+	"3	c	#CC0033",
+	"4	c	#FF0033",
+	"5	c	#800000",
+	"       00       ",
+	"      23321     ",
+	"     144441     ",
+	"     144445     ",
+	"     144441     ",
+	"      23321     ",
+	"       00       ",
+	"       00       ",
+	"       00       ",
+	"       00       ",
+	"       00       ",
+	"       00       ",
+	"       00       ",
+	"       00       ",
+	"       00       ",
+	"   0000000000   "};
+
+static char *signal_x24[] = {
+	"24 24 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#660000",
+	"3	c	#990033",
+	"4	c	#CC0033",
+	"5	c	#FF0033",
+	"6	c	#800000",
+	"                        ",
+	"          11110         ",
+	"        12555562        ",
+	"        15555552        ",
+	"       0655555541       ",
+	"       0355555541       ",
+	"        155555560       ",
+	"        13555541        ",
+	"         123321         ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"           00           ",
+	"     00000000000000     ",
+	"     00000000000000     "};
+
+static char *signal_x32[] = {
+	"32 32 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#660000",
+	"3	c	#990033",
+	"4	c	#CC0033",
+	"5	c	#FF0033",
+	"6	c	#800000",
+	"                                ",
+	"             000000             ",
+	"           0001662000           ",
+	"           00355554100          ",
+	"          003555555400          ",
+	"          015555555560          ",
+	"          0655555555400         ",
+	"          0655555555300         ",
+	"          005555555520          ",
+	"          006555555300          ",
+	"           0064554600           ",
+	"            00000000            ",
+	"             000000             ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"               00               ",
+	"       000000000000000000       ",
+	"       000000000000000000       ",
+	"       000000000000000000       "};
+
+static char **signal_xpm[3] = { signal_x16, signal_x24, signal_x32 };
+
diff --git a/app/bin/bitmaps/snap-curs.xpm b/app/bin/bitmaps/snap-curs.xpm
new file mode 100644
index 0000000..08b93d0
--- /dev/null
+++ b/app/bin/bitmaps/snap-curs.xpm
@@ -0,0 +1,102 @@
+static char *snap_curs_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CC00",
+	"2	c	#808080",
+	" 1   1   1   1  ",
+	"1 1 1 1 1 1 1 1 ",
+	" 10000   1   1  ",
+	"  002           ",
+	"  0202   1   1  ",
+	"1 0 202 1 1 1 1 ",
+	" 1   202 1   1  ",
+	"      202       ",
+	" 1   1 201   1  ",
+	"1 1 1 1 1 1 1 1 ",
+	" 1   1   1   1  ",
+	"                ",
+	" 1   1   1   1  ",
+	"1 1 1 1 1 1 1 1 ",
+	" 1   1   1   1  ",
+	"                "};
+
+static char *snap_curs_x24[] = {
+	"24 24 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CC00",
+	"2	c	#330033",
+	"3	c	#808080",
+	"                        ",
+	"                        ",
+	"                        ",
+	"    11   11   11   11   ",
+	"   1  1 1  1 1  1 1  1  ",
+	"   1  1 1  1 1  1 1  1  ",
+	"    11222222  11   11   ",
+	"      022223            ",
+	"      22223             ",
+	"      02223             ",
+	"    11023303  11   11   ",
+	"   1  031 3031  1 1  1  ",
+	"   1    1  303  1 1  1  ",
+	"    11   11 3031   11   ",
+	"             303        ",
+	"              30        ",
+	"                        ",
+	"    11   11   11   11   ",
+	"   1  1 1  1 1  1 1  1  ",
+	"   1  1 1  1 1  1 1  1  ",
+	"    11   11   11   11   ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *snap_curs_x32[] = {
+	"32 32 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#006600",
+	"2	c	#009900",
+	"3	c	#00CC00",
+	"4	c	#330000",
+	"5	c	#330033",
+	"6	c	#333300",
+	"7	c	#333333",
+	"8	c	#008000",
+	"                                ",
+	"   333         33         333   ",
+	"  33333      333333      33333  ",
+	" 33   33     3    3     33    3 ",
+	" 3  4413    33    33    33    3 ",
+	" 3  5555555555554 33    33    3 ",
+	" 33 455555555555  3      3    3 ",
+	"  33355555555583333      33333  ",
+	"    3555555555                  ",
+	"     55555555                   ",
+	"     555555554                  ",
+	"     5555555554                 ",
+	"     45555455551                ",
+	"  33335554  555583       33333  ",
+	" 33   554    155563      3   33 ",
+	" 3    68    33555513    33    3 ",
+	" 3    83    33 55556    33    3 ",
+	" 3    33     3  45555   33    3 ",
+	"  33 33      333327555   33 33  ",
+	"   333        3333455554  333   ",
+	"                    55554       ",
+	"                     55554      ",
+	"                      555       ",
+	"                       54       ",
+	"  3333        3333        3333  ",
+	" 33   3      33  33      33  33 ",
+	" 3     3     3    33    33    3 ",
+	" 3     3    33    33    33    3 ",
+	" 3     3     3    33    33    3 ",
+	"  3   3      33  33      33  33 ",
+	"   333        3333        3333  ",
+	"                                "};
+
+static char **snap_curs_xpm[3] = { snap_curs_x16, snap_curs_x24, snap_curs_x32 };
+
diff --git a/app/bin/bitmaps/snap-grid.xpm b/app/bin/bitmaps/snap-grid.xpm
new file mode 100644
index 0000000..1139051
--- /dev/null
+++ b/app/bin/bitmaps/snap-grid.xpm
@@ -0,0 +1,92 @@
+static char *snap_grid_x16[] = {
+	"16 16 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CC00",
+	"                ",
+	" 1111111111111  ",
+	" 1  1  1  1  1  ",
+	" 1  1  1  1  1  ",
+	" 1111111111111  ",
+	" 1  1  1  1  1  ",
+	" 1  1  1  1  1  ",
+	" 1111111111111  ",
+	" 1  1  1  1  1  ",
+	" 1  1  1  1  1  ",
+	" 1111111111111  ",
+	" 1  1  1  1  1  ",
+	" 1  1  1  1  1  ",
+	" 1111111111111  ",
+	"                ",
+	"                "};
+
+static char *snap_grid_x24[] = {
+	"24 24 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CC00",
+	"                        ",
+	" 111111111111111111111  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 111111111111111111111  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 111111111111111111111  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 111111111111111111111  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 1    1    1    1    1  ",
+	" 111111111111111111111  ",
+	"                        ",
+	"                        "};
+
+static char *snap_grid_x32[] = {
+	"32 32 3 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#00CC00",
+	"                                ",
+	" 1111111111111111111111111111111",
+	" 11     11     11     11      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 111111111111111111111111111111 ",
+	" 111111111111111111111111111111 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 11     11     11     11      1 ",
+	" 111111111111111111111111111111 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 11     11     11     11      1 ",
+	" 111111111111111111111111111111 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1      11     11      1      1 ",
+	" 1111111111111111111111111111111",
+	"                                "};
+
+static char **snap_grid_xpm[3] = { snap_grid_x16, snap_grid_x24, snap_grid_x32 };
+
diff --git a/app/bin/bitmaps/snapcurs.xbm b/app/bin/bitmaps/snapcurs.xbm
deleted file mode 100644
index 06db450..0000000
--- a/app/bin/bitmaps/snapcurs.xbm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define snapcurs_width 16
-#define snapcurs_height 16
-// static unsigned char snapcurs_bits[] = {
-static char snapcurs_bits[] = {
-   0x00, 0x00, 0x44, 0x44, 0xaa, 0xaa, 0xfc, 0x40, 0xf8, 0x07, 0xfc, 0x47,
-   0xfa, 0xab, 0xfc, 0x45, 0xf0, 0x03, 0x74, 0x47, 0xb2, 0xae, 0x44, 0x5c,
-   0x00, 0x08, 0x44, 0x44, 0xaa, 0xaa, 0x44, 0x44};
diff --git a/app/bin/bitmaps/snapvis.xbm b/app/bin/bitmaps/snapvis.xbm
deleted file mode 100644
index cab6ee5..0000000
--- a/app/bin/bitmaps/snapvis.xbm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define snapvis_width 16
-#define snapvis_height 16
-// static unsigned char snapvis_bits[] = {
-static char snapvis_bits[] = {
-   0x44, 0x44, 0x44, 0x44, 0xff, 0xff, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-   0xff, 0xff, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0xff, 0xff, 0x44, 0x44,
-   0x44, 0x44, 0x44, 0x44, 0xff, 0xff, 0x44, 0x44};
diff --git a/app/bin/bitmaps/split-draw.xpm b/app/bin/bitmaps/split-draw.xpm
new file mode 100644
index 0000000..3e94832
--- /dev/null
+++ b/app/bin/bitmaps/split-draw.xpm
@@ -0,0 +1,95 @@
+static char *split_draw_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#808080",
+	"                ",
+	"              2 ",
+	"             2  ",
+	"            2   ",
+	"       1   2    ",
+	"      11  2     ",
+	"      11 2      ",
+	"    111122      ",
+	"       2 111    ",
+	"      221111    ",
+	"     22 11      ",
+	"    22  11      ",
+	"   22           ",
+	"  22            ",
+	" 22             ",
+	"                "};
+
+static char *split_draw_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#808080",
+	"                        ",
+	"                     2  ",
+	"                    22  ",
+	"                   22   ",
+	"                   2    ",
+	"                  2     ",
+	"          11     2      ",
+	"          11    2       ",
+	"          11   2        ",
+	"          11  2         ",
+	"      111111 2          ",
+	"      11111             ",
+	"                11      ",
+	"          2  111111     ",
+	"         22  11         ",
+	"        22   1          ",
+	"       22    1          ",
+	"      22     1          ",
+	"     22      1          ",
+	"    22                  ",
+	"   22                   ",
+	"  22                    ",
+	"  2                     ",
+	"                        "};
+
+static char *split_draw_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#808080",
+	"                                ",
+	"                                ",
+	"                            2   ",
+	"                           222  ",
+	"                          222   ",
+	"                         222    ",
+	"                        222     ",
+	"                       222      ",
+	"             11       222       ",
+	"             11      222        ",
+	"             11     222         ",
+	"             11    222          ",
+	"             11   222           ",
+	"          11111  222            ",
+	"       11111111  22             ",
+	"        1111111                 ",
+	"                                ",
+	"             22  11111111       ",
+	"            222  11111111       ",
+	"           222   11             ",
+	"          222    11             ",
+	"          22     11             ",
+	"         222     11             ",
+	"        222      11             ",
+	"       222       11             ",
+	"      222                       ",
+	"     222                        ",
+	"    222                         ",
+	"   222                          ",
+	"   22                           ",
+	"                                ",
+	"                                "};
+
+static char **split_draw_xpm[3] = { split_draw_x16, split_draw_x24, split_draw_x32 };
+
diff --git a/app/bin/bitmaps/split.xpm b/app/bin/bitmaps/split.xpm
new file mode 100644
index 0000000..1e0386a
--- /dev/null
+++ b/app/bin/bitmaps/split.xpm
@@ -0,0 +1,107 @@
+static char *split_x16[] = {
+	"16 16 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#996666",
+	"3	c	#999999",
+	"4	c	#CC0000",
+	"5	c	#CC3333",
+	"6	c	#CC6666",
+	"7	c	#C0C0C0",
+	"8	c	#808080",
+	"                ",
+	"           781  ",
+	"          71371 ",
+	"      4   83 88 ",
+	"      4  887317 ",
+	"      47887887  ",
+	"   444418718    ",
+	"    562  38     ",
+	"     38  17     ",
+	"   7317314444   ",
+	"  7887 834      ",
+	"  88 38 74      ",
+	" 38 313  4      ",
+	" 13313          ",
+	"   83           ",
+	"    7           "};
+
+static char *split_x24[] = {
+	"24 24 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#999999",
+	"3	c	#CC0000",
+	"4	c	#C0C0C0",
+	"5	c	#808080",
+	"                        ",
+	"                 4 1    ",
+	"                 251    ",
+	"               4 124    ",
+	"         3     451 4211 ",
+	"         33  4 124  52  ",
+	"         33  451 44114  ",
+	"         334 154  55    ",
+	"         33451 44114    ",
+	"     333333154  52      ",
+	"    3333333  441144     ",
+	"       4      55        ",
+	"       421    144       ",
+	"        12      333     ",
+	"      21 44513333333    ",
+	"      12  55 33         ",
+	"    21  451 433         ",
+	"    12  55   33         ",
+	"  21  421 4  33         ",
+	"  12   52     3         ",
+	"  1 421 4               ",
+	"     52                 ",
+	"    1 4                 ",
+	"                        "};
+
+static char *split_x32[] = {
+	"32 32 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#999999",
+	"3	c	#CC0000",
+	"4	c	#C0C0C0",
+	"5	c	#808080",
+	"                                ",
+	"                                ",
+	"                      44 1      ",
+	"                       25       ",
+	"                       124      ",
+	"                    4411 44  1  ",
+	"            33       55   421   ",
+	"            33   4  1144   52   ",
+	"            33    451  44 1 44  ",
+	"            33    15    25      ",
+	"            33 4 11 44  124     ",
+	"            33 421   421  4     ",
+	"      33333333 114    52        ",
+	"      33333333 1  4  1 44       ",
+	"      33333        411          ",
+	"          4        12           ",
+	"          421     11 4          ",
+	"           52                   ",
+	"       4  1 44    333333333     ",
+	"        21   4411 33333333      ",
+	"        124   25  333           ",
+	"     4 11 44 1124 33            ",
+	"      55   421    33            ",
+	"  4  154   152    33            ",
+	"  4411  4  1 4    33            ",
+	"   55    21       33            ",
+	"  11 4   12                     ",
+	"      4 1  4                    ",
+	"      25                        ",
+	"      1 4                       ",
+	"     1                          ",
+	"                                "};
+
+static char **split_xpm[3] = { split_x16, split_x24, split_x32 };
+
diff --git a/app/bin/bitmaps/splittrk.xpm b/app/bin/bitmaps/splittrk.xpm
deleted file mode 100644
index 3a03c77..0000000
--- a/app/bin/bitmaps/splittrk.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * splittrk_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFF00000000",
-"           . .  ",
-"            .   ",
-"     X     . . .",
-"     X  . .   . ",
-"     X   .   . .",
-"  XXXX  . . .   ",
-"           .    ",
-"          . .   ",
-"   . .          ",
-"    .           ",
-"   . . .  XXXX  ",
-". .   .   X     ",
-" .   . .  X     ",
-". . .     X     ",
-"   .            ",
-"  . .           "};
diff --git a/app/bin/bitmaps/sticky-doc.xpm b/app/bin/bitmaps/sticky-doc.xpm
new file mode 100644
index 0000000..7b0e4cb
--- /dev/null
+++ b/app/bin/bitmaps/sticky-doc.xpm
@@ -0,0 +1,130 @@
+static char *sticky_doc_x16[] = {
+	"16 16 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#666699",
+	"3	c	#669999",
+	"4	c	#996633",
+	"5	c	#999999",
+	"6	c	#CC6633",
+	"7	c	#CC9900",
+	"8	c	#CC9933",
+	"9	c	#CC9999",
+	"A	c	#CCCC66",
+	"B	c	#FFCC00",
+	"C	c	#FFCC33",
+	"D	c	#FFCC66",
+	"                ",
+	"                ",
+	"4888888888884   ",
+	"4BBBBBBCBBBB764 ",
+	"4BBD59B99BBB7774",
+	"4BC2D95C95CBBBB4",
+	"4BC2CBA5CA5CBBB4",
+	"4BBC5ABD5CD5CBB4",
+	"4BBBC59BCABC3CB4",
+	"4BBBBB95CBBB5DB4",
+	"4BBBBBBA2ABD2CB4",
+	"4BBBBBBBC513DBB4",
+	"4BBBBBBBBBBBBBB4",
+	"4777777777777774",
+	" 444444444444444",
+	"                "};
+
+static char *sticky_doc_x24[] = {
+	"24 24 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#3366CC",
+	"3	c	#666699",
+	"4	c	#669999",
+	"5	c	#996633",
+	"6	c	#999999",
+	"7	c	#CC6633",
+	"8	c	#CC9900",
+	"9	c	#CC9933",
+	"A	c	#CC9966",
+	"B	c	#CC9999",
+	"C	c	#CCCC66",
+	"D	c	#FFCC00",
+	"E	c	#FFCC33",
+	"F	c	#FFCC66",
+	"                        ",
+	"                        ",
+	"                        ",
+	"5555555555555555555     ",
+	"58DDDDDDDDDDDDDDDD85    ",
+	"58DDDDDDDDDDEDDDDD8875  ",
+	"58DDDC26ADD64EDDDD88885 ",
+	"58DDA13216EB13FDDDDDDD85",
+	"58DD32EE616EC22CDDDDDD95",
+	"58DD42CDDB13EF21ADDDDD95",
+	"58DDF21BDDA12FE316EDDD95",
+	"58DDDE316EDC22EE616EDD95",
+	"58DDDDE614EDFBDDE616DD95",
+	"58DDDDDDB12FDDDDDD61ED95",
+	"58DDDDDDDC21BDDDDD61ED95",
+	"58DDDDDDDDE316EDDF16DD95",
+	"58DDDDDDDDDE612BB21FDD95",
+	"58DDDDDDDDDDDC3112CDDD95",
+	"58DDDDDDDDDDDDDFFDDDDD95",
+	"58DDDDDDDDDDDDDDDDDDDD95",
+	"579999999999999999999955",
+	" 5555555555555555555555 ",
+	"                        ",
+	"                        "};
+
+static char *sticky_doc_x32[] = {
+	"32 32 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#3366CC",
+	"3	c	#666699",
+	"4	c	#996633",
+	"5	c	#999999",
+	"6	c	#CC6633",
+	"7	c	#CC9900",
+	"8	c	#CC9966",
+	"9	c	#CC9999",
+	"A	c	#CCCC66",
+	"B	c	#FFCC00",
+	"C	c	#FFCC33",
+	"D	c	#FFCC66",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	" 444444444444444444444444       ",
+	" 4BBBBBBBBBBBBBBBBBBBBB764      ",
+	" 4BBBBBBBBBBBBBBBBBBBBBB7744    ",
+	" 4BBBBBBBBBBBBBCCBBBBBBB77744   ",
+	" 4BBBBBA315DBBB53DBBBBBB777774  ",
+	" 4BBBB511112ABC212ABBBBB7777774 ",
+	" 4BBBA115A3119BC3118BBBBBBBBBB4 ",
+	" 4BBB915BBC5115CC5119BBBBBBBBB4 ",
+	" 4BBB812DBBB5115CC5115CBBBBBBB4 ",
+	" 4BBBC3118BBB8113CB9115CBBBBBB4 ",
+	" 4BBBBC3119CBBA212DBA213DBBBBB4 ",
+	" 4BBBBBC5115CBBD313CBD212ABBBB4 ",
+	" 4BBBBBBB9113DBBC5DBBBC311CBBB4 ",
+	" 4BBBBBBBBA2128BBBBBBBBC319BBB4 ",
+	" 4BBBBBBBBBC3115CBBBBBBB915BBB4 ",
+	" 4BBBBBBBBBBC5115CBBBBBB915BBB4 ",
+	" 4BBBBBBBBBBBB9113DBBBBC219BBB4 ",
+	" 4BBBBBBBBBBBBBA2115CBA313CBBB4 ",
+	" 4BBBBBBBBBBBBBBC51111112DBBBB4 ",
+	" 4BBBBBBBBBBBBBBBBA31115CBBBBB4 ",
+	" 4BBBBBBBBBBBBBBBBBCDDCBBBBBBB4 ",
+	" 4BBBBBBBBBBBBBBBBBBBBBBBBBBBB4 ",
+	" 4BBBBBBBBBBBBBBBBBBBBBBBBBBBB4 ",
+	" 444444444444444444444444444444 ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **sticky_doc_xpm[3] = { sticky_doc_x16, sticky_doc_x24, sticky_doc_x32 };
+
diff --git a/app/bin/bitmaps/sticky-link.xpm b/app/bin/bitmaps/sticky-link.xpm
new file mode 100644
index 0000000..b2a027b
--- /dev/null
+++ b/app/bin/bitmaps/sticky-link.xpm
@@ -0,0 +1,138 @@
+static char *sticky_link_x16[] = {
+	"16 16 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#3366CC",
+	"2	c	#666699",
+	"3	c	#6666CC",
+	"4	c	#669999",
+	"5	c	#996600",
+	"6	c	#996633",
+	"7	c	#999999",
+	"8	c	#CC6633",
+	"9	c	#CC9900",
+	"A	c	#CC9933",
+	"B	c	#CC9966",
+	"C	c	#CC9999",
+	"D	c	#CCCC66",
+	"E	c	#FFCC00",
+	"F	c	#FFCC33",
+	"G	c	#FFCC66",
+	"                ",
+	"                ",
+	"68AAAAAAAAAA6   ",
+	"6EEEEEEEEEEE986 ",
+	"6EEEEEEEEEEE9996",
+	"6EEGCGEEEEFCGEE6",
+	"6ED7C4CEED2C7BE6",
+	"6E4GEEB777FEF1F6",
+	"6E1FEEF22GEEE3F6",
+	"6E77GC4FF77GB7E6",
+	"6EEC7BFEEEB77FE6",
+	"6EEEEEEEEEEEEEE6",
+	"6EEEEEEEEEEEEEE6",
+	"6A99999999999996",
+	" 666666666666666",
+	"                "};
+
+static char *sticky_link_x24[] = {
+	"24 24 19 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#3366CC",
+	"3	c	#666699",
+	"4	c	#6666CC",
+	"5	c	#669999",
+	"6	c	#996600",
+	"7	c	#996633",
+	"8	c	#999999",
+	"9	c	#CC6633",
+	"A	c	#CC9900",
+	"B	c	#CC9933",
+	"C	c	#CC9966",
+	"D	c	#CC9999",
+	"E	c	#CCCC66",
+	"F	c	#FFCC00",
+	"G	c	#FFCC33",
+	"H	c	#FFCC66",
+	"                        ",
+	"                        ",
+	"                        ",
+	"7777777777777777777     ",
+	"7BFFFFFFFFFFFFFFFFA7    ",
+	"7BFFFFFFFFFFFFFFFFAA97  ",
+	"7BFFFFFFFFFFFFFFFFAAAA7 ",
+	"7BFFFFFFFFFFFFFFFFFFFFA7",
+	"7BFFH888EFFFFFFG888HFFA7",
+	"7BFG228418GFFGD12822HFA7",
+	"7BFD2GFFC22HG818GFG38FA7",
+	"7BF88FFFFG3142EFFFFD2GA7",
+	"7BF3DFFFFFD118GFFFFE1GA7",
+	"7BF83FFFG818D13HFFF85FA7",
+	"7BFE18D822CFFE218D81DFA7",
+	"7BFFD1118HFFFFGD2118GFA7",
+	"7BFFFGHFFFFFFFFFFGGFFFA7",
+	"7BFFFFFFFFFFFFFFFFFFFFA7",
+	"7BFFFFFFFFFFFFFFFFFFFFA7",
+	"7BFFFFFFFFFFFFFFFFFFFFA7",
+	"77BBBBBBBBBBBBBBBBBBBB97",
+	" 7777777777777777777777 ",
+	"                        ",
+	"                        "};
+
+static char *sticky_link_x32[] = {
+	"32 32 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#3366CC",
+	"3	c	#666699",
+	"4	c	#6666CC",
+	"5	c	#669999",
+	"6	c	#996600",
+	"7	c	#996633",
+	"8	c	#999999",
+	"9	c	#CC9900",
+	"A	c	#CC9933",
+	"B	c	#CC9966",
+	"C	c	#CC9999",
+	"D	c	#CCCC66",
+	"E	c	#FFCC00",
+	"F	c	#FFCC33",
+	"G	c	#FFCC66",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	" 777777777777777777777777       ",
+	" 7EEEEEEEEEEEEEEEEEEEEEEA7      ",
+	" 7EEEEEEEEEEEEEEEEEEEEEE9977    ",
+	" 7EEEEEEEEEEEEEEEEEEEEEE99977   ",
+	" 7EEEEEEEEEEEEEEEEEEEEEE999997  ",
+	" 7EEEEEEEEEEEEEEEEEEEEEE9999997 ",
+	" 7EEEEEFFEEEEEEEEEEEEEEFFEEEEE7 ",
+	" 7EEEF82115DFEEEEEEEG81118FEEE7 ",
+	" 7EEF81111113FEEEEF81111115FEE7 ",
+	" 7EED12DEFB412BEEG3118GEG51CEE7 ",
+	" 7EE81DEEEEF811CD213GEEEEG12EE7 ",
+	" 7EE42EEEEEEEC11118FEEEEEE81FE7 ",
+	" 7EE22EEEEEEEF8112FEEEEEEE81GE7 ",
+	" 7EE51FEEEEEG312312DEEEEEE31FE7 ",
+	" 7EEC18EEEF8113GF8118FEEEB18EE7 ",
+	" 7EEF21488111CFEEEC21188811DEE7 ",
+	" 7EEEG411118GEEEEEEF811111BEEE7 ",
+	" 7EEEEFDCDFEEEEEEEEEEFCCCFEEEE7 ",
+	" 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ",
+	" 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ",
+	" 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ",
+	" 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ",
+	" 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ",
+	" 777777777777777777777777777777 ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **sticky_link_xpm[3] = { sticky_link_x16, sticky_link_x24, sticky_link_x32 };
+
diff --git a/app/bin/bitmaps/sticky-note-chain.xpm b/app/bin/bitmaps/sticky-note-chain.xpm
deleted file mode 100644
index aa9445a..0000000
--- a/app/bin/bitmaps/sticky-note-chain.xpm
+++ /dev/null
@@ -1,84 +0,0 @@
-/* XPM */
-static char * sticky_note_chain_bits[] = {
-"16 16 65 1",
-" 	c None",
-".	c #CCB301",
-"+	c #CAB101",
-"@	c #FBEF9C",
-"#	c #F9EB8F",
-"$	c #F8EA8D",
-"%	c #F8E98A",
-"&	c #F6E785",
-"*	c #F3E37C",
-"=	c #F0E074",
-"-	c #EEDD6F",
-";	c #D5C44D",
-">	c #C8AF01",
-",	c #FBED95",
-"'	c #F7E67E",
-")	c #F6E57C",
-"!	c #F5E47B",
-"~	c #F4E379",
-"{	c #F1E075",
-"]	c #ECDB70",
-"^	c #E8D76A",
-"/	c #E6D567",
-"(	c #CDBC45",
-"_	c #FFF6BB",
-":	c #C6AD01",
-"<	c #FCEB84",
-"[	c #B7A73A",
-"}	c #BFAE37",
-"|	c #AC9401",
-"1	c #C3AA01",
-"2	c #FBED97",
-"3	c #EEDD7B",
-"4	c #9D96F6",
-"5	c #E1D26F",
-"6	c #C0A701",
-"7	c #006E6E",
-"8	c #00FFFF",
-"9	c #BCA401",
-"0	c #AFA358",
-"a	c #ADA054",
-"b	c #B9A101",
-"c	c #B59E01",
-"d	c #FEF19E",
-"e	c #EDDD7C",
-"f	c #E5D575",
-"g	c #E5D571",
-"h	c #B29A01",
-"i	c #FFF2A1",
-"j	c #FEED87",
-"k	c #FDEC86",
-"l	c #FDEC85",
-"m	c #FBEA82",
-"n	c #FAE981",
-"o	c #F8E77F",
-"p	c #A89100",
-"q	c #FFF4AF",
-"r	c #FFF1A0",
-"s	c #FDF09C",
-"t	c #FDEF9B",
-"u	c #FCEE99",
-"v	c #FAEC92",
-"w	c #F9EA90",
-"x	c #FAEC96",
-"y	c #9D8600",
-"z	c #9C8500",
-"                ",
-"                ",
-" ...........    ",
-" +@#$%&*=--;+   ",
-" >,')!~{]^/(_>  ",
-" :<<<<<<<<<[}}| ",
-" 1234445444''-1 ",
-" 647887478874-6 ",
-" 94800878a084=9 ",
-" b47887478874*b ",
-" cde444f444g{&c ",
-" hijkl<mno')!%h ",
-" pqirdstu2,vwxp ",
-" yzzzzzzzzzzzzy ",
-"                ",
-"                "};
diff --git a/app/bin/bitmaps/sticky-note-clip.xpm b/app/bin/bitmaps/sticky-note-clip.xpm
deleted file mode 100644
index c74c64d..0000000
--- a/app/bin/bitmaps/sticky-note-clip.xpm
+++ /dev/null
@@ -1,99 +0,0 @@
-/* XPM */
-static char * sticky_note_clip_bits[] = {
-"16 16 80 1",
-" 	c None",
-".	c #CCB301",
-"+	c #CAB101",
-"@	c #FBEF9C",
-"#	c #F9EB8F",
-"$	c #F8EA8D",
-"%	c #F8E98A",
-"&	c #F7E992",
-"*	c #EDE1A3",
-"=	c #555753",
-"-	c #DFCF67",
-";	c #D5C44D",
-">	c #C8AF01",
-",	c #FBED95",
-"'	c #F7E67E",
-")	c #F6E57C",
-"!	c #F6E68A",
-"~	c #ECE0A0",
-"{	c #BABDB6",
-"]	c #EFE3A7",
-"^	c #CDBC45",
-"/	c #FFF6BB",
-"(	c #C6AD01",
-"_	c #FBED97",
-":	c #F8E77F",
-"<	c #F8E88D",
-"[	c #EDE0A0",
-"}	c #F5E68F",
-"|	c #F0E39B",
-"1	c #888A85",
-"2	c #BFAE37",
-"3	c #AC9401",
-"4	c #C3AA01",
-"5	c #FCEE99",
-"6	c #F7E78B",
-"7	c #EBDE9C",
-"8	c #F8EBA2",
-"9	c #ECDB70",
-"0	c #E8D76A",
-"a	c #E6D567",
-"b	c #EEDD6F",
-"c	c #C0A701",
-"d	c #FDF0A5",
-"e	c #DCD695",
-"f	c #EAE29B",
-"g	c #E8E098",
-"h	c #DACB69",
-"i	c #BCA401",
-"j	c #FDF3B6",
-"k	c #B9A101",
-"l	c #FEF4B7",
-"m	c #E0D986",
-"n	c #F5E47B",
-"o	c #F4E379",
-"p	c #F1E075",
-"q	c #F3E37C",
-"r	c #B59E01",
-"s	c #FFF3B4",
-"t	c #DECF6F",
-"u	c #F4E47D",
-"v	c #F5E47C",
-"w	c #F6E785",
-"x	c #B29A01",
-"y	c #FFF2A3",
-"z	c #FBEDA4",
-"A	c #F0E07C",
-"B	c #F3E27C",
-"C	c #F5E47D",
-"D	c #A89100",
-"E	c #FFF4AF",
-"F	c #FFF2A1",
-"G	c #FFF1A0",
-"H	c #FEF19E",
-"I	c #FDF09C",
-"J	c #FDEF9B",
-"K	c #FAEC92",
-"L	c #F9EA90",
-"M	c #FAEC96",
-"N	c #9D8600",
-"O	c #9C8500",
-"                ",
-"                ",
-" ...........    ",
-" +@#$%&*==-;+   ",
-" >,')!~={]=^/>  ",
-" (_:<[=}=|1{223 ",
-" 4567=8=8=90ab4 ",
-" cde=f=g=}h90bc ",
-" ij1818=8={)))i ",
-" kl=m=1f={nopqk ",
-" rs1t)8={uvnowr ",
-" xyz1=1{ABC)n%x ",
-" DEFGHIJ5_,KLMD ",
-" NOOOOOOOOOOOON ",
-"                ",
-"                "};
diff --git a/app/bin/bitmaps/sticky-note-text.xpm b/app/bin/bitmaps/sticky-note-text.xpm
deleted file mode 100644
index 119f39b..0000000
--- a/app/bin/bitmaps/sticky-note-text.xpm
+++ /dev/null
@@ -1,86 +0,0 @@
-/* XPM */
-static char * sticky_note_text_bits[] = {
-"16 16 67 1",
-" 	c None",
-".	c #CCB301",
-"+	c #CAB101",
-"@	c #FBEF9C",
-"#	c #F9EB8F",
-"$	c #F8EA8D",
-"%	c #F8E98A",
-"&	c #F6E785",
-"*	c #F3E37C",
-"=	c #F0E074",
-"-	c #EEDD6F",
-";	c #D5C44D",
-">	c #C8AF01",
-",	c #FBED95",
-"'	c #F7E67E",
-")	c #F6E57C",
-"!	c #F5E47B",
-"~	c #F4E379",
-"{	c #F1E075",
-"]	c #ECDB70",
-"^	c #E8D76A",
-"/	c #E6D567",
-"(	c #CDBC45",
-"_	c #FFF6BB",
-":	c #C6AD01",
-"<	c #FBED97",
-"[	c #F8E77F",
-"}	c #BFAE37",
-"|	c #AC9401",
-"1	c #C3AA01",
-"2	c #FCEE99",
-"3	c #7E7E7E",
-"4	c #979797",
-"5	c #C0A701",
-"6	c #FDEF9B",
-"7	c #E5DC75",
-"8	c #E4DB73",
-"9	c #E4DA70",
-"0	c #E3D86D",
-"a	c #E2D769",
-"b	c #EBDC70",
-"c	c #BCA401",
-"d	c #FDF09D",
-"e	c #B9A101",
-"f	c #FEF19E",
-"g	c #E5DD77",
-"h	c #EDDF75",
-"i	c #B59E01",
-"j	c #FFF1A0",
-"k	c #DED273",
-"l	c #E1D078",
-"m	c #B29A01",
-"n	c #FFF2A1",
-"o	c #FEED87",
-"p	c #FDEC86",
-"q	c #FDEC85",
-"r	c #FCEB84",
-"s	c #FBEA82",
-"t	c #FAE981",
-"u	c #A89100",
-"v	c #FFF4AF",
-"w	c #FDF09C",
-"x	c #FAEC92",
-"y	c #F9EA90",
-"z	c #FAEC96",
-"A	c #9D8600",
-"B	c #9C8500",
-"                ",
-"                ",
-" ...........    ",
-" +@#$%&*=--;+   ",
-" >,')!~{]^/(_>  ",
-" :<[')!~{]^}}}| ",
-" 12334344{]^/-1 ",
-" 567890ab~{]^-5 ",
-" cd3334333443=c ",
-" efgg789h)!~{*e ",
-" ij3343kl')!~&i ",
-" mnopqrst[')!%m ",
-" uvnjfw62<,xyzu ",
-" ABBBBBBBBBBBBA ",
-"                ",
-"                "};
diff --git a/app/bin/bitmaps/sticky-note.xpm b/app/bin/bitmaps/sticky-note.xpm
new file mode 100644
index 0000000..fbd12e1
--- /dev/null
+++ b/app/bin/bitmaps/sticky-note.xpm
@@ -0,0 +1,124 @@
+static char *sticky_note_x16[] = {
+	"16 16 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#996600",
+	"2	c	#996633",
+	"3	c	#999999",
+	"4	c	#CC6633",
+	"5	c	#CC9900",
+	"6	c	#CC9933",
+	"7	c	#CC9966",
+	"8	c	#CC9999",
+	"9	c	#CCCC66",
+	"A	c	#FFCC00",
+	"B	c	#FFCC33",
+	"C	c	#FFCC66",
+	"                ",
+	"                ",
+	"2466666666662   ",
+	"2AAAAAAAAAAA542 ",
+	"2733333333375552",
+	"2BCCCCCCCCCBAAA2",
+	"2B88888888888CA2",
+	"2B88888888888CA2",
+	"2BCCCCCCCCCCBAA2",
+	"2733333333338AA2",
+	"2AAAAAAAAAAAAAA2",
+	"2733333333333392",
+	"2BCCCCCCCCCCCCB2",
+	"2655555555555552",
+	" 222222222222222",
+	"                "};
+
+static char *sticky_note_x24[] = {
+	"24 24 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#996600",
+	"3	c	#996633",
+	"4	c	#999999",
+	"5	c	#CC6633",
+	"6	c	#CC9900",
+	"7	c	#CC9933",
+	"8	c	#CC9999",
+	"9	c	#CCCC66",
+	"A	c	#FFCC00",
+	"B	c	#FFCC33",
+	"C	c	#FFCC66",
+	"                        ",
+	"                        ",
+	"                        ",
+	"3333333333333333333     ",
+	"37AAAAAAAAAAAAAAAA63    ",
+	"37AAAAAAAAAAAAAAAA6653  ",
+	"37B11111111111114A66663 ",
+	"37B44444444444448AAAAA63",
+	"37AAAAAAAAAAAAAAAAAAAA63",
+	"37B88888888888888889AA63",
+	"37B11111111111111114AA63",
+	"37BCCCCCCCCCCCCCCCCCAA63",
+	"37AAAAAAAAAAAAAAAAAAAA63",
+	"37B1111111111111118AAA63",
+	"37B4444444444444449AAA63",
+	"37AAAAAAAAAAAAAAAAAAAA63",
+	"37B888888888888888888A63",
+	"37B111111111111111111A63",
+	"37BCCCCCCCCCCCCCCCCCCA63",
+	"37AAAAAAAAAAAAAAAAAAAA63",
+	"337777777777777777777753",
+	" 3333333333333333333333 ",
+	"                        ",
+	"                        "};
+
+static char *sticky_note_x32[] = {
+	"32 32 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#0066CC",
+	"2	c	#996600",
+	"3	c	#996633",
+	"4	c	#999999",
+	"5	c	#CC9900",
+	"6	c	#CC9933",
+	"7	c	#CC9999",
+	"8	c	#CCCC66",
+	"9	c	#FFCC00",
+	"A	c	#FFCC33",
+	"B	c	#FFCC66",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	" 333333333333333333333333       ",
+	" 3999999999999999999999963      ",
+	" 399999999999999999999995533    ",
+	" 3999999999999999999999955533   ",
+	" 39A111111111111111111B9555553  ",
+	" 39A111111111111111111B95555553 ",
+	" 39ABBBBBBBBBBBBBBBBBBA99999993 ",
+	" 399999999999999999999999999993 ",
+	" 39ABBBBBBBBBBBBBBBBBBBBBBA9993 ",
+	" 39A1111111111111111111111B9993 ",
+	" 39A1111111111111111111111B9993 ",
+	" 399999999999999999999999999993 ",
+	" 399999999999999999999999999993 ",
+	" 39A777777777777777777778999993 ",
+	" 39B111111111111111111114999993 ",
+	" 39B444444444444444444447999993 ",
+	" 399999999999999999999999999993 ",
+	" 399999999999999999999999999993 ",
+	" 39A111111111111111111111111993 ",
+	" 39A111111111111111111111111993 ",
+	" 39ABBBBBBBBBBBBBBBBBBBBBBBB993 ",
+	" 399999999999999999999999999993 ",
+	" 399999999999999999999999999993 ",
+	" 333333333333333333333333333333 ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **sticky_note_xpm[3] = { sticky_note_x16, sticky_note_x24, sticky_note_x32 };
+
diff --git a/app/bin/bitmaps/stop.xpm b/app/bin/bitmaps/stop.xpm
index 5c66ba1..78fb1fc 100644
--- a/app/bin/bitmaps/stop.xpm
+++ b/app/bin/bitmaps/stop.xpm
@@ -1,22 +1,128 @@
-/* XPM */
-static char * stop_xpm[] = {
-"16 16 3 1",
-" 	c None",
-"X	c #000000000000",
-"o	c #FFFF00000000",
-"    XXXXXXX     ",
-"   XXXXXXXXX    ",
-"  XXoooooooXX   ",
-" XXoooooooooXX  ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-"XXoooooooooooXX ",
-" XXoooooooooXX  ",
-"  XXoooooooXX   ",
-"   XXXXXXXXX    ",
-"    XXXXXXX     ",
-"                "};
+static char *stop_x16[] = {
+	"16 16 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#660000",
+	"3	c	#990000",
+	"4	c	#993300",
+	"5	c	#993333",
+	"6	c	#CC3333",
+	"7	c	#CC6633",
+	"8	c	#CC6666",
+	"9	c	#CC9966",
+	"A	c	#CC9999",
+	"B	c	#FF9999",
+	"C	c	#800000",
+	"       00       ",
+	"      1221      ",
+	"    11566511    ",
+	"  015788886510  ",
+	" 12678888886620 ",
+	" 13688AAA9876C0 ",
+	" 14689ABAA886C0 ",
+	" 1478AABBA886C0 ",
+	" 14789ABBA886C0 ",
+	" 14688AAAA886C0 ",
+	" 136788A98876C0 ",
+	" 11568888876410 ",
+	"   1C677776C1   ",
+	"    11566411    ",
+	"      1111      ",
+	"                "};
+
+static char *stop_x24[] = {
+	"24 24 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#660000",
+	"3	c	#990000",
+	"4	c	#993300",
+	"5	c	#993333",
+	"6	c	#CC3300",
+	"7	c	#CC3333",
+	"8	c	#CC6633",
+	"9	c	#CC6666",
+	"A	c	#CC9966",
+	"B	c	#CC9999",
+	"C	c	#FF9999",
+	"D	c	#800000",
+	"                        ",
+	"          0110          ",
+	"         1D7721         ",
+	"       1277777511       ",
+	"     11578888877410     ",
+	"   01D77899999987721    ",
+	"  12677899999999877310  ",
+	"  13778999ABA9999776D0  ",
+	"  1377899BBBBBA99877D0  ",
+	"  147899ABBBBBB99977D0  ",
+	"  147899BBCCCBBA9977D0  ",
+	"  147899BBCCCCBA9987D0  ",
+	"  147899BBCCCCBA9977D0  ",
+	"  147899ABBCCBB99977D0  ",
+	"  1377999BBBBBA99877D0  ",
+	"  13778999BBBA999876D0  ",
+	"  136779999999998776D0  ",
+	"   1D77789999998776D1   ",
+	"    1157788998877411    ",
+	"      127777777511      ",
+	"       014777721        ",
+	"         113D10         ",
+	"           10           ",
+	"                        "};
+
+static char *stop_x32[] = {
+	"32 32 16 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#660000",
+	"3	c	#990000",
+	"4	c	#993300",
+	"5	c	#993333",
+	"6	c	#CC0000",
+	"7	c	#CC3300",
+	"8	c	#CC3333",
+	"9	c	#CC6633",
+	"A	c	#CC6666",
+	"B	c	#CC9966",
+	"C	c	#CC9999",
+	"D	c	#FF9999",
+	"E	c	#800000",
+	"                                ",
+	"               11               ",
+	"             113E10             ",
+	"           014888821            ",
+	"          128888888511          ",
+	"        1158889999888411        ",
+	"      11488999AAA999888E1       ",
+	"    01E88899AAAAAAAA9888411     ",
+	"   12388899AAAAAAAAAA98887E1    ",
+	"   1378899AAAABBBAAAAA98886E0   ",
+	"   137889AAAABCCCCBAAAA9887E0   ",
+	"   138899AAACCCCCCCBAAA9887E0   ",
+	"   14889AAABCCCCCCCCAAA9888E0   ",
+	"   14889AAACCCDDDDCCBAAA988E0   ",
+	"   14889AABCCDDDDDCCCAAA988E0   ",
+	"   14889AABCCDDDDDCCCAAA988E0   ",
+	"   17889AABCCDDDDDCCCAAA988E0   ",
+	"   17889AAACCCDDDDCCBAAA988E0   ",
+	"   17889AAABCCCCCCCCBAA9888E0   ",
+	"   138899AAACCCCCCCBAAA9887E0   ",
+	"   137889AAABCCCCCBAAAA9887E0   ",
+	"   1378899AAAABBBAAAAA98887E0   ",
+	"   1E78889AAAAAAAAAAA98887620   ",
+	"    11488899AAAAAAAA99887311    ",
+	"      1E888999AAAA99888521      ",
+	"       11488899999888821        ",
+	"         11588888888410         ",
+	"           1288888411           ",
+	"            01E7411             ",
+	"              111               ",
+	"                                ",
+	"                                "};
+
+static char **stop_xpm[3] = { stop_x16, stop_x24, stop_x32 };
+
diff --git a/app/bin/bitmaps/straight-line.xpm b/app/bin/bitmaps/straight-line.xpm
new file mode 100644
index 0000000..9808d8d
--- /dev/null
+++ b/app/bin/bitmaps/straight-line.xpm
@@ -0,0 +1,96 @@
+static char *straight_line_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#CC0000",
+	"                ",
+	"            222 ",
+	"            222 ",
+	"            2 2 ",
+	"           22   ",
+	"          22    ",
+	"         22     ",
+	"        01      ",
+	"       00       ",
+	"      00        ",
+	"     00         ",
+	"    00          ",
+	"   00           ",
+	"  00            ",
+	" 00             ",
+	"                "};
+
+static char *straight_line_x24[] = {
+	"24 24 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#800000",
+	"                        ",
+	"                        ",
+	"                  2222  ",
+	"                    22  ",
+	"                   2 2  ",
+	"                  2  2  ",
+	"                 2      ",
+	"                22      ",
+	"               22       ",
+	"              22        ",
+	"             03         ",
+	"            00          ",
+	"           00           ",
+	"          00            ",
+	"         00             ",
+	"        00              ",
+	"       00               ",
+	"      00                ",
+	"     00                 ",
+	"    00                  ",
+	"   00                   ",
+	"  00                    ",
+	"                        ",
+	"                        "};
+
+static char *straight_line_x32[] = {
+	"32 32 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"                                ",
+	"                                ",
+	"                        22222   ",
+	"                       2222222  ",
+	"                          2222  ",
+	"                         22222  ",
+	"                        222 22  ",
+	"                       222  22  ",
+	"                      222   22  ",
+	"                     222        ",
+	"                    222         ",
+	"                   222          ",
+	"                  122           ",
+	"                 002            ",
+	"                000             ",
+	"               000              ",
+	"              000               ",
+	"             000                ",
+	"            000                 ",
+	"           000                  ",
+	"          000                   ",
+	"         000                    ",
+	"        000                     ",
+	"       000                      ",
+	"      000                       ",
+	"     000                        ",
+	"    000                         ",
+	"   000                          ",
+	"  000                           ",
+	"   0                            ",
+	"                                ",
+	"                                "};
+
+static char **straight_line_xpm[3] = { straight_line_x16, straight_line_x24, straight_line_x32 };
+
diff --git a/app/bin/bitmaps/straight.xpm b/app/bin/bitmaps/straight.xpm
index b5fc178..83e2f67 100644
--- a/app/bin/bitmaps/straight.xpm
+++ b/app/bin/bitmaps/straight.xpm
@@ -1,22 +1,133 @@
-/* XPM */
-static char * straight_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFF00000000",
-"X	c #000000000000",
-"           .....",
-"            X ..",
-"         X X . .",
-"          X . X.",
-"         X . X .",
-"      X X . X   ",
-"       X . X X  ",
-"      X . X     ",
-"   X X . X      ",
-"    X . X X     ",
-"   X X X        ",
-"X X   X         ",
-" X   X X        ",
-"X X X           ",
-"   X            ",
-"  X X           "};
+static char *straight_x16[] = {
+	"16 16 18 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#666666",
+	"5	c	#993333",
+	"6	c	#996600",
+	"7	c	#996633",
+	"8	c	#996666",
+	"9	c	#999999",
+	"A	c	#CC0000",
+	"B	c	#CC3333",
+	"C	c	#CC6600",
+	"D	c	#CC6666",
+	"E	c	#CC9900",
+	"F	c	#C0C0C0",
+	"G	c	#808080",
+	"            AAA ",
+	"            AAAA",
+	"          945AAA",
+	"          G9A8AA",
+	"         G8B94  ",
+	"       FG8D8GF  ",
+	"      E49B8G    ",
+	"      37A9G     ",
+	"     62EC49     ",
+	"   E32E 2E      ",
+	"  E13E 3        ",
+	"  63 E2 E       ",
+	" C1EE0C         ",
+	" 2E 2C          ",
+	"   33           ",
+	"  03E           "};
+
+static char *straight_x24[] = {
+	"24 24 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#333333",
+	"3	c	#663300",
+	"4	c	#666666",
+	"5	c	#996600",
+	"6	c	#999999",
+	"7	c	#CC0000",
+	"8	c	#CC3333",
+	"9	c	#CC6600",
+	"A	c	#CC9900",
+	"B	c	#CC9999",
+	"C	c	#C0C0C0",
+	"D	c	#808080",
+	"                        ",
+	"                  77777 ",
+	"                    777 ",
+	"               C 4 7777 ",
+	"               6D 77  7 ",
+	"             C 4DB7 4 7 ",
+	"             6D4 8B44   ",
+	"           C 4DB7 DD    ",
+	"           CD4 8B44CC   ",
+	"         A 4DB7 DD      ",
+	"         A52 8B44CC     ",
+	"       A 03A7 DD        ",
+	"       A50 AA246C       ",
+	"       03A  53          ",
+	"     A50 AA 0AA         ",
+	"      3A  93            ",
+	"   A90 AA 09A           ",
+	"    1A  93              ",
+	" A90 AA 05A             ",
+	"  39  A3                ",
+	" 0 AA 05A               ",
+	"    A30                 ",
+	"    05A                 ",
+	"    0                   "};
+
+static char *straight_x32[] = {
+	"32 32 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663300",
+	"5	c	#666666",
+	"6	c	#996600",
+	"7	c	#999999",
+	"8	c	#CC0000",
+	"9	c	#CC3333",
+	"A	c	#CC6600",
+	"B	c	#CC6666",
+	"C	c	#CC9900",
+	"D	c	#CC9999",
+	"E	c	#C0C0C0",
+	"F	c	#808080",
+	"                                ",
+	"                        888888  ",
+	"                       8888888  ",
+	"                           8888 ",
+	"                    E  5  88888 ",
+	"                    E75  888 88 ",
+	"                     F7 888  88 ",
+	"                 EE 5 D988 5 88 ",
+	"                  7F5 88D 5     ",
+	"                  57D8887F      ",
+	"               E 55 988 57E     ",
+	"               EF5 88D755 E     ",
+	"               5FD888 FF        ",
+	"            CC35 989 55EE       ",
+	"             64 889E55          ",
+	"            00CC 8 FF           ",
+	"          C40  CC 55 E          ",
+	"          44    C60             ",
+	"       C  0 C   04C             ",
+	"       CA0   C 00 CC            ",
+	"        2A    A2                ",
+	"    CC 0 CC   0C                ",
+	"     C2   CC 0  C               ",
+	"     0AC   64                   ",
+	"  C 00 CC  06C                  ",
+	"   44   CC0                     ",
+	"  04C    46                     ",
+	"  0  C  0 CC                    ",
+	"      C20                       ",
+	"      1A                        ",
+	"     00 C                       ",
+	"                                "};
+
+static char **straight_xpm[3] = { straight_x16, straight_x24, straight_x32 };
+
diff --git a/app/bin/bitmaps/switch-ai.xpm b/app/bin/bitmaps/switch-ai.xpm
new file mode 100644
index 0000000..34213ba
--- /dev/null
+++ b/app/bin/bitmaps/switch-ai.xpm
@@ -0,0 +1,96 @@
+static char *switch_ai_x16[] = {
+	"16 16 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"                ",
+	" 2              ",
+	"  2             ",
+	"  2222          ",
+	"   2222         ",
+	"   2222         ",
+	"   2221         ",
+	"    2 00        ",
+	"       00       ",
+	"        0       ",
+	"         0  000 ",
+	"          00000 ",
+	"          00 00 ",
+	"         00 000 ",
+	"         00 000 ",
+	"        00000000"};
+
+static char *switch_ai_x24[] = {
+	"24 24 4 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#CC0000",
+	"                        ",
+	"222                     ",
+	" 222                    ",
+	"  222                   ",
+	"   222                  ",
+	"    22222               ",
+	"    222222              ",
+	"    222222              ",
+	"    222222              ",
+	"    222222              ",
+	"     222210             ",
+	"         000            ",
+	"          000           ",
+	"           000          ",
+	"            000         ",
+	"             000   000  ",
+	"              00000000  ",
+	"               000  00  ",
+	"               000  00  ",
+	"              00000 00  ",
+	"              0  00000  ",
+	"              0   0000  ",
+	"            00000000000 ",
+	"             00     00  "};
+
+static char *switch_ai_x32[] = {
+	"32 32 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#800000",
+	"                                ",
+	" 22                             ",
+	" 222                            ",
+	"  222                           ",
+	"  2222                          ",
+	"   2222                         ",
+	"    2222                        ",
+	"     2222222                    ",
+	"      2222222                   ",
+	"      22222222                  ",
+	"      22222222                  ",
+	"      22222222                  ",
+	"      22222221                  ",
+	"       2222230                  ",
+	"        2221000                 ",
+	"            0000                ",
+	"             0000               ",
+	"              0000              ",
+	"               0000             ",
+	"                0000            ",
+	"                 0000    0000   ",
+	"                  000  000000   ",
+	"                   0000000000   ",
+	"                    0000   00   ",
+	"                    0000   00   ",
+	"                   000000  00   ",
+	"                  000 0000 00   ",
+	"                  000  000000   ",
+	"                  00    00000   ",
+	"                000000000000000 ",
+	"               00000000000000000",
+	"                000000000000000 "};
+
+static char **switch_ai_xpm[3] = { switch_ai_x16, switch_ai_x24, switch_ai_x32 };
+
diff --git a/app/bin/bitmaps/table-edge.xpm b/app/bin/bitmaps/table-edge.xpm
new file mode 100644
index 0000000..1983460
--- /dev/null
+++ b/app/bin/bitmaps/table-edge.xpm
@@ -0,0 +1,114 @@
+static char *table_edge_x16[] = {
+	"16 16 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#006600",
+	"3	c	#333333",
+	"4	c	#336633",
+	"5	c	#339933",
+	"6	c	#33CC33",
+	"7	c	#666666",
+	"8	c	#999999",
+	"9	c	#808080",
+	"                ",
+	"              5 ",
+	" 666666666666630",
+	" 666666666666430",
+	" 666666666664770",
+	" 666666666647970",
+	" 666666666479970",
+	" 666666664799970",
+	"122222222399993 ",
+	" 8888888979993  ",
+	" 888888897993   ",
+	" 88888889793    ",
+	" 8888888973     ",
+	" 888888870      ",
+	" 000000000      ",
+	"                "};
+
+static char *table_edge_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#336633",
+	"3	c	#339933",
+	"4	c	#33CC33",
+	"5	c	#666633",
+	"6	c	#666666",
+	"7	c	#999999",
+	"8	c	#808080",
+	"                        ",
+	"                        ",
+	"                      2 ",
+	" 4444444444444444444430 ",
+	" 4444444444444444444310 ",
+	" 4444444444444444443180 ",
+	" 4444444444444444431880 ",
+	" 4444444444444444318880 ",
+	" 4444444444444443188880 ",
+	" 4444444444444431888880 ",
+	" 4444444444444418888880 ",
+	" 4444444444444188888881 ",
+	" 333333333333188888881  ",
+	" 77777777777718888881   ",
+	" 7777777777771888881    ",
+	" 777777777777188881     ",
+	" 777777777777188810     ",
+	" 77777777777718851      ",
+	" 7777777777771861       ",
+	" 777777777777161        ",
+	" 77777777777701         ",
+	" 0000000000000          ",
+	"                        ",
+	"                        "};
+
+static char *table_edge_x32[] = {
+	"32 32 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#336633",
+	"3	c	#339933",
+	"4	c	#33CC33",
+	"5	c	#666633",
+	"6	c	#666666",
+	"7	c	#999999",
+	"8	c	#808080",
+	"                                ",
+	"                                ",
+	"                                ",
+	"  4444444444444444444444444443  ",
+	" 444444444444444444444444444310 ",
+	" 444444444444444444444444444110 ",
+	" 444444444444444444444444441860 ",
+	" 444444444444444444444444428860 ",
+	" 444444444444444444444444268860 ",
+	" 444444444444444444444442688860 ",
+	" 444444444444444444444426888860 ",
+	" 444444444444444444444268888860 ",
+	" 444444444444444444443588888860 ",
+	" 444444444444444444431888888860 ",
+	" 444444444444444444318888888860 ",
+	" 44444444444444444318888888881  ",
+	" 2333333333333333318888888881   ",
+	"  888888888888888668888888810   ",
+	"  77777777777777766888888851    ",
+	"  7777777777777776688888861     ",
+	"  777777777777777668888861      ",
+	"  77777777777777766888861       ",
+	"  7777777777777776688861        ",
+	"  777777777777777688881         ",
+	"  77777777777777768881          ",
+	"  7777777777777776881           ",
+	"  777777777777777661            ",
+	"  77777777777777711             ",
+	" 000000000000000000             ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **table_edge_xpm[3] = { table_edge_x16, table_edge_x24, table_edge_x32 };
+
diff --git a/app/bin/bitmaps/text.xpm b/app/bin/bitmaps/text.xpm
index 176621d..12bc092 100644
--- a/app/bin/bitmaps/text.xpm
+++ b/app/bin/bitmaps/text.xpm
@@ -1,21 +1,89 @@
-/* XPM */
-static char * text_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000000000",
-"       ..       ",
-"       ..       ",
-"      ....      ",
-"      ....      ",
-"     ..  ..     ",
-"     ..  ..     ",
-"    ..    ..    ",
-"    ..    ..    ",
-"   ..      ..   ",
-"   ..........   ",
-"  ............  ",
-"  ..        ..  ",
-" ..          .. ",
-" ..          .. ",
-"..            ..",
-"...          ..."};
+static char *text_x16[] = {
+	"16 16 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                ",
+	"      0000      ",
+	"     000000     ",
+	"     000000     ",
+	"     0000000    ",
+	"    00000000    ",
+	"    000  000    ",
+	"   0000  0000   ",
+	"   0000  0000   ",
+	"   0000  00000  ",
+	"  000000000000  ",
+	"  000000000000  ",
+	" 0000      0000 ",
+	" 0000      0000 ",
+	"0000        0000",
+	"0000        0000"};
+
+static char *text_x24[] = {
+	"24 24 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                        ",
+	"         000000         ",
+	"         000000         ",
+	"        00000000        ",
+	"        00000000        ",
+	"       0000000000       ",
+	"       0000000000       ",
+	"       0000000000       ",
+	"      00000  00000      ",
+	"      00000  00000      ",
+	"     000000  000000     ",
+	"     00000    00000     ",
+	"     00000    000000    ",
+	"    00000      00000    ",
+	"    0000000000000000    ",
+	"   000000000000000000   ",
+	"   000000000000000000   ",
+	"   0000000000000000000  ",
+	"  000000        000000  ",
+	"  00000          00000  ",
+	" 000000          000000 ",
+	" 00000            00000 ",
+	"000000            000000",
+	"                        "};
+
+static char *text_x32[] = {
+	"32 32 2 1",
+	" 	c	None",
+	"0	c	#000000",
+	"                                ",
+	"            00000000            ",
+	"            00000000            ",
+	"           000000000            ",
+	"           0000000000           ",
+	"           0000000000           ",
+	"          000000000000          ",
+	"          000000000000          ",
+	"         00000000000000         ",
+	"         00000000000000         ",
+	"         000000  000000         ",
+	"        0000000  0000000        ",
+	"        000000   0000000        ",
+	"       0000000    0000000       ",
+	"       0000000    0000000       ",
+	"       000000     0000000       ",
+	"      0000000      0000000      ",
+	"      0000000      0000000      ",
+	"     0000000        0000000     ",
+	"     0000000000000000000000     ",
+	"     00000000000000000000000    ",
+	"    000000000000000000000000    ",
+	"    000000000000000000000000    ",
+	"   00000000000000000000000000   ",
+	"   0000000            0000000   ",
+	"  0000000             00000000  ",
+	"  0000000              0000000  ",
+	"  0000000              0000000  ",
+	" 0000000                0000000 ",
+	" 0000000                0000000 ",
+	"00000000                00000000",
+	"                                "};
+
+static char **text_xpm[3] = { text_x16, text_x24, text_x32 };
+
diff --git a/app/bin/bitmaps/top.xpm b/app/bin/bitmaps/top.xpm
new file mode 100644
index 0000000..84d2152
--- /dev/null
+++ b/app/bin/bitmaps/top.xpm
@@ -0,0 +1,111 @@
+static char *top_x16[] = {
+	"16 16 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#660000",
+	"2	c	#990000",
+	"3	c	#993333",
+	"4	c	#996666",
+	"5	c	#CC0000",
+	"6	c	#FF0000",
+	"7	c	#808080",
+	"                ",
+	"                ",
+	"      000000000 ",
+	"    214777777770",
+	"  22555377777770",
+	" 256666637777770",
+	" 566666663777770",
+	"2566666662777770",
+	"2566666662777770",
+	"2566666662777770",
+	" 266666654777770",
+	"  26666537777770",
+	"   2222477777770",
+	"      0000000000",
+	"                ",
+	"                "};
+
+static char *top_x24[] = {
+	"24 24 10 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#990000",
+	"3	c	#993333",
+	"4	c	#996666",
+	"5	c	#CC0000",
+	"6	c	#FF0000",
+	"7	c	#808080",
+	"8	c	#800000",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"        000000000000000 ",
+	"     222847777777777770 ",
+	"    2556552377777777770 ",
+	"   26666666537777777770 ",
+	"  266666666663777777770 ",
+	" 2666666666665477777770 ",
+	" 2666666666666377777770 ",
+	" 2666666666666277777770 ",
+	"25666666666666277777770 ",
+	" 2666666666666377777770 ",
+	" 2666666666665377777770 ",
+	" 2566666666662777777770 ",
+	"  256666666654777777770 ",
+	"   25666666247777777770 ",
+	"    2225223777777777770 ",
+	"        100000000000000 ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *top_x32[] = {
+	"32 32 9 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#660000",
+	"2	c	#990000",
+	"3	c	#993333",
+	"4	c	#996666",
+	"5	c	#CC0000",
+	"6	c	#FF0000",
+	"7	c	#808080",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"           00000000000000000000 ",
+	"           07777777777777777770 ",
+	"       222223477777777777777770 ",
+	"      2556666537777777777777770 ",
+	"    226666666662477777777777770 ",
+	"   2566666666666547777777777770 ",
+	"  25666666666666654777777777770 ",
+	"  26666666666666663777777777770 ",
+	" 256666666666666665477777777770 ",
+	" 266666666666666666377777777770 ",
+	" 266666666666666666377777777770 ",
+	" 266666666666666666377777777770 ",
+	" 266666666666666666377777777770 ",
+	" 256666666666666665377777777770 ",
+	" 256666666666666665477777777770 ",
+	"  26666666666666663777777777770 ",
+	"   2666666666666637777777777770 ",
+	"   2566666666666347777777777770 ",
+	"    225666666653777777777777770 ",
+	"      2225552247777777777777770 ",
+	"         2217777777777777777770 ",
+	"           00000000000000000000 ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **top_xpm[3] = { top_x16, top_x24, top_x32 };
+
diff --git a/app/bin/bitmaps/train.xpm b/app/bin/bitmaps/train.xpm
index c94593e..bc9a846 100644
--- a/app/bin/bitmaps/train.xpm
+++ b/app/bin/bitmaps/train.xpm
@@ -1,22 +1,118 @@
-/* XPM */
-static char * train_xpm[]={
-"16 16 3 1",
-".	c None",
-"#	c #800080008000",
-"a	c #000000000000",
-".....#..#.#.....",
-"aaaa.......##...",
-"...a........#...",
-"...a...a...#....",
-"...a..aaa..aa...",
-"...a..aaa..aa...",
-"aaaaaaaaaaaaaa..",
-"aaaaaaaaaaaaaa..",
-"aaaaaaaaaaaaaa..",
-"aaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaa",
-"...aa...aa.....a",
-"..aaaa.aaaa....a",
-"..aaaa.aaaa..aa.",
-"...aa...aa...aa.",
-"................"};
+static char *train_x16[] = {
+	"16 16 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003333",
+	"3	c	#006633",
+	"4	c	#006666",
+	"5	c	#009966",
+	"6	c	#669933",
+	"7	c	#999933",
+	"8	c	#99CC33",
+	"9	c	#CCCC33",
+	"A	c	#808080",
+	"                ",
+	"  AAAAAAAAA     ",
+	" AAAAAAAAAAA    ",
+	" AAAAAAAAAAAA   ",
+	" AAAAAAAAAAAA   ",
+	"   AAAAA    A   ",
+	"    0       A   ",
+	" 0000       0   ",
+	"    0   0   0   ",
+	" 3761111111111  ",
+	" 3985555555555  ",
+	" 3984444444444  ",
+	" 3971221221221  ",
+	"   000000000 00 ",
+	" 0000000000000 0",
+	"    0  0  0     "};
+
+static char *train_x24[] = {
+	"24 24 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003333",
+	"3	c	#006633",
+	"4	c	#009966",
+	"5	c	#669933",
+	"6	c	#999933",
+	"7	c	#99CC33",
+	"8	c	#FFFF33",
+	"9	c	#808080",
+	"                        ",
+	"     9999999999         ",
+	"  999999999999999       ",
+	" 99999999999999999      ",
+	" 999999999999999999     ",
+	" 999999999999999999     ",
+	"  99999999999999999     ",
+	"   99999999999    99    ",
+	"        99        99    ",
+	"                  99    ",
+	" 0000000          00    ",
+	"      0           00    ",
+	"      0     00    00    ",
+	"      0     00    00    ",
+	" 33573322222222222222   ",
+	" 33683344444444444444   ",
+	" 33683344444444444444   ",
+	" 33683333333333333333   ",
+	" 33683322222222222222   ",
+	" 333521000000000000000  ",
+	"     00000000 0000   00 ",
+	"  00 00000000 0000 00 00",
+	"  00 000  000 000  00   ",
+	"                        "};
+
+static char *train_x32[] = {
+	"32 32 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003300",
+	"2	c	#003333",
+	"3	c	#006633",
+	"4	c	#009966",
+	"5	c	#336633",
+	"6	c	#669933",
+	"7	c	#999933",
+	"8	c	#CCCC33",
+	"9	c	#FFFF33",
+	"A	c	#808080",
+	"                                ",
+	"                                ",
+	"     AAAAAAAAAAAAAAAA           ",
+	"   AAAAAAAAAAAAAAAAAAAA         ",
+	" AAAAAAAAAAAAAAAAAAAAAAA        ",
+	" AAAAAAAAAAAAAAAAAAAAAAAA       ",
+	" AAAAAAAAAAAAAAAAAAAAAAAA       ",
+	" AAAAAAAAAAAAAAAAAAAAAAAAA      ",
+	"  AAAAAAAAAAAAAAAAAAAAAAAA      ",
+	"    AAAAAAAAAAAAAAAAA  AAA      ",
+	"      AAAAAAAAAAA       AA      ",
+	"                        AA      ",
+	"                        AA      ",
+	"                       0000     ",
+	"  00000000             0000     ",
+	"        00             0000     ",
+	"        00      000    0000     ",
+	"        00      000    0000     ",
+	"  33333330000000000000000000    ",
+	"  33587332222222222222222222    ",
+	"  33698333333333333333333333    ",
+	"  33698334444444444444444444    ",
+	"  33698334444444444444444444    ",
+	"  33698333333333333333333333    ",
+	"  33698332222222222222222222    ",
+	"  33333320011000011000011100    ",
+	"       0000  0000  0000    00   ",
+	"   0  000000000000000000  0 00  ",
+	"  000 000000000000000000 000 00 ",
+	"  000 00000  0000  0000  000    ",
+	"       000    00    00    0     ",
+	"                                "};
+
+static char **train_xpm[3] = { train_x16, train_x24, train_x32 };
+
diff --git a/app/bin/bitmaps/trim.xpm b/app/bin/bitmaps/trim.xpm
new file mode 100644
index 0000000..ac679d6
--- /dev/null
+++ b/app/bin/bitmaps/trim.xpm
@@ -0,0 +1,99 @@
+static char *trim_x16[] = {
+	"16 16 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#666666",
+	"2	c	#CC0000",
+	"3	c	#808080",
+	"4	c	#800000",
+	"                ",
+	"              3 ",
+	" 22          3  ",
+	"  22        3   ",
+	"   22 2    3    ",
+	"    222   3     ",
+	"     22  3      ",
+	"   222221       ",
+	"       42222    ",
+	"      0 2222    ",
+	"     0  222     ",
+	"    00  2  2    ",
+	"   00       2   ",
+	"  00         2  ",
+	" 00           2 ",
+	"                "};
+
+static char *trim_x24[] = {
+	"24 24 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#990000",
+	"2	c	#CC0000",
+	"3	c	#808080",
+	"                        ",
+	"                        ",
+	"                     3  ",
+	"  2                 3   ",
+	"   2               3    ",
+	"    2     2       3     ",
+	"     22  22      3      ",
+	"      22 22     3       ",
+	"       2222    3        ",
+	"        222   3         ",
+	"     222222  3          ",
+	"     2222222            ",
+	"           122 222      ",
+	"          0 2222222     ",
+	"         0  2222        ",
+	"        0   22 2        ",
+	"       0    22  2       ",
+	"      00    22   2      ",
+	"     00     22    2     ",
+	"    00             22   ",
+	"   00               22  ",
+	"  00                 2  ",
+	"  0                     ",
+	"                        "};
+
+static char *trim_x32[] = {
+	"32 32 5 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#CC0000",
+	"2	c	#808080",
+	"3	c	#800000",
+	"                                ",
+	"                                ",
+	"                            2   ",
+	"                           222  ",
+	"   11                     222   ",
+	"   111                   222    ",
+	"    111                 222     ",
+	"     111     1         222      ",
+	"      111   111       222       ",
+	"       111  111      222        ",
+	"        111 111     222         ",
+	"         111111    222          ",
+	"          11111   222           ",
+	"       11111111  222            ",
+	"      1111111111  2             ",
+	"       111   1111               ",
+	"              3111              ",
+	"             003111111111       ",
+	"            000 11111111        ",
+	"           000  11111           ",
+	"          000   111111          ",
+	"         000    111 111         ",
+	"        000     111  111        ",
+	"       000      111   111       ",
+	"      000        11    111      ",
+	"     0000               111     ",
+	"    0000                 111    ",
+	"   0000                   1111  ",
+	"   000                     11   ",
+	"   00                           ",
+	"                                ",
+	"                                "};
+
+static char **trim_xpm[3] = { trim_x16, trim_x24, trim_x32 };
+
diff --git a/app/bin/bitmaps/tunnel.xpm b/app/bin/bitmaps/tunnel.xpm
index 449080e..9b70b28 100644
--- a/app/bin/bitmaps/tunnel.xpm
+++ b/app/bin/bitmaps/tunnel.xpm
@@ -1,22 +1,118 @@
-/* XPM */
-static char * tunnel_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #00FFFF",
-"+	c #000000",
-"      ..        ",
-"       ..       ",
-"        ..      ",
-"        ..      ",
-"+   +   ..      ",
-"++++++++.. +  + ",
-"+   +   ..      ",
-"+   +   ..      ",
-"+   +   ..      ",
-"++++++++.. +  + ",
-"+   +   ..      ",
-"        ..      ",
-"        ..      ",
-"       ..       ",
-"      ..        ",
-"                "};
+static char *tunnel_x16[] = {
+	"16 16 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333333",
+	"3	c	#663300",
+	"4	c	#666666",
+	"5	c	#993300",
+	"6	c	#996600",
+	"7	c	#999999",
+	"8	c	#CC6600",
+	"9	c	#808080",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"    00          ",
+	" 8 8 007  7 7 7 ",
+	"0303102999949499",
+	" 6 63027797 7 79",
+	" 8 8 0077 7 7 7 ",
+	"0000002444444444",
+	" 8 8 0077 7 7 7 ",
+	"    00          ",
+	"    0           ",
+	"                ",
+	"                ",
+	"                "};
+
+static char *tunnel_x24[] = {
+	"24 24 11 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333300",
+	"2	c	#333333",
+	"3	c	#663300",
+	"4	c	#666666",
+	"5	c	#993300",
+	"6	c	#996600",
+	"7	c	#999999",
+	"8	c	#CC6600",
+	"9	c	#808080",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"      00                ",
+	"       00               ",
+	"  8  8  00 7   7  7  77 ",
+	" 35006000449949944994994",
+	" 35006000449949944994994",
+	" 88  8  0  77  7  7  77 ",
+	" 88  8  0  77  7  7  77 ",
+	" 66  6  02 79 97  79 77 ",
+	"013003000449949944994994",
+	" 88  8  0  77  7  7  77 ",
+	"       00               ",
+	"      00                ",
+	"      0                 ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *tunnel_x32[] = {
+	"32 32 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663300",
+	"5	c	#663333",
+	"6	c	#666666",
+	"7	c	#993300",
+	"8	c	#996600",
+	"9	c	#999999",
+	"A	c	#CC6600",
+	"B	c	#808080",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"        00                      ",
+	"        000                     ",
+	"          00                    ",
+	"  AA  AA   00  99  99   99  99  ",
+	" 488  884 003  99  99B  99  99B ",
+	" 14400441000566BB66BBB66BB66BBB6",
+	"  AA  AA   00  99  99   99  99  ",
+	"  AA  AA   00  99  99   99  99  ",
+	"  AA  AA   00  99  99   99  99  ",
+	"  AA  AA   00  99  99   99  99  ",
+	" 28700782000366BB66BBB66BB66BBB ",
+	" 28700782000366BB66BBB66BB66BBB ",
+	"  AA  AA   00  99  99   99  99  ",
+	"          000                   ",
+	"         000                    ",
+	"       0000                     ",
+	"        0                       ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **tunnel_xpm[3] = { tunnel_x16, tunnel_x24, tunnel_x32 };
+
diff --git a/app/bin/bitmaps/turnout-designer.xpm b/app/bin/bitmaps/turnout-designer.xpm
new file mode 100644
index 0000000..00db9be
--- /dev/null
+++ b/app/bin/bitmaps/turnout-designer.xpm
@@ -0,0 +1,129 @@
+static char *turnout_designer_x16[] = {
+	"16 16 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663300",
+	"5	c	#666666",
+	"6	c	#996600",
+	"7	c	#999999",
+	"8	c	#CC6600",
+	"9	c	#CC9900",
+	"A	c	#CC9966",
+	"B	c	#CCCCCC",
+	"C	c	#C0C0C0",
+	"D	c	#808080",
+	"                ",
+	"                ",
+	"     BBBBBBB    ",
+	"    B777777CB   ",
+	"   BC5500557B   ",
+	"   BBBBD3BBBB   ",
+	"      BD3B99640 ",
+	"      BD3B64169 ",
+	"      CD3B669 60",
+	" 9 9667D3B9 6168",
+	"10000077DB000000",
+	" 9 999ACC76 9 9 ",
+	"4424101244414240",
+	" 86646866684868 ",
+	"                ",
+	"                "};
+
+static char *turnout_designer_x24[] = {
+	"24 24 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663300",
+	"5	c	#666666",
+	"6	c	#996600",
+	"7	c	#999966",
+	"8	c	#999999",
+	"9	c	#CC6600",
+	"A	c	#CC9900",
+	"B	c	#CC9999",
+	"C	c	#CCCC99",
+	"D	c	#CCCCCC",
+	"E	c	#C0C0C0",
+	"F	c	#808080",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"      DDEEEEEEEEEDD     ",
+	"      D50000000008D     ",
+	"     DE00000000008D     ",
+	"     DDEEE8005EEEDD     ",
+	"         DD008D         ",
+	"          D008D    A40  ",
+	"          D008DAAA016   ",
+	"          D008D9424 AA  ",
+	"          D008846AA  A0 ",
+	"       A  D008EAA AA024 ",
+	" AA A  925D008DAA 4409A ",
+	"0000000003D0088000000000",
+	" AA A  A  DEED826 AA A  ",
+	" AA A  A  7FF7 AA AA A  ",
+	" 66 96040040 9 66 66 96 ",
+	"044041041140040440440420",
+	" AA A  A  A  A AA AA A  ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *turnout_designer_x32[] = {
+	"32 32 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663300",
+	"5	c	#666666",
+	"6	c	#993300",
+	"7	c	#996600",
+	"8	c	#999999",
+	"9	c	#CC6600",
+	"A	c	#CC9900",
+	"B	c	#CCCCCC",
+	"C	c	#C0C0C0",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"        BBBBBBBBBBBBBBBBB       ",
+	"        BB5555555555555BB       ",
+	"        B80000000000000BB       ",
+	"       BB30000000000000BB       ",
+	"       BC55555500355555BB       ",
+	"      BBBBBBBB8003BBBBBBB       ",
+	"             B8003BB            ",
+	"             B8003BB      A00   ",
+	"             B8003BB AA  044    ",
+	"             B8003BB A97007A    ",
+	"             B8003BB76077  AA   ",
+	"             B8003B827 AA   A   ",
+	"             B8003BC A  A   920 ",
+	"         AA  B8003BB A  AA 019  ",
+	"  A   A  9700B8003BB A  0410AA  ",
+	" 041014000200B8003B824000440440 ",
+	"  94 490079  BC888B8210079  77  ",
+	"  A   A  AA  BBBBCC87A   A  AA  ",
+	"  A   A  AA  74007A  A   A  AA  ",
+	"  A   A  770047  AA  A   A  AA  ",
+	" 000000000000000000000000000000 ",
+	"  A   A  AA  AA  AA  A   A  AA  ",
+	"  A   A   A  A   A   A   A   A  ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **turnout_designer_xpm[3] = { turnout_designer_x16, turnout_designer_x24, turnout_designer_x32 };
+
diff --git a/app/bin/bitmaps/turnout.xpm b/app/bin/bitmaps/turnout.xpm
index 91d7af5..dc60fdb 100644
--- a/app/bin/bitmaps/turnout.xpm
+++ b/app/bin/bitmaps/turnout.xpm
@@ -1,21 +1,107 @@
-/* XPM */
-static char * turnout_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000000000",
-"                ",
-"                ",
-"          .  .  ",
-"           ..   ",
-"       .  ...   ",
-"        ..  . . ",
-"    . ...   ..  ",
-" .  ..  . .. .  ",
-"............... ",
-" .   .  ..   .  ",
-" .   ... .   .  ",
-"............... ",
-" .   .   .   .  ",
-"                ",
-"                ",
-"                "};
+static char *turnout_x16[] = {
+	"16 16 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#996600",
+	"5	c	#CC6600",
+	"6	c	#CC9900",
+	"                ",
+	"                ",
+	"                ",
+	"                ",
+	"            64  ",
+	"          6414  ",
+	"        53236650",
+	"     541346 5234",
+	"2323002232301231",
+	" 54545543133535 ",
+	" 54533124453535 ",
+	"2323123232313130",
+	"                ",
+	"                ",
+	"                ",
+	"                "};
+
+static char *turnout_x24[] = {
+	"24 24 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#996600",
+	"5	c	#CC6600",
+	"6	c	#CC9900",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                   6    ",
+	"                 6 32   ",
+	"               643036   ",
+	"            6602346 66  ",
+	"          6 32056 6  40 ",
+	"       6 33046 66 64035 ",
+	" 3404302014034043003243 ",
+	" 3404304224034030043043 ",
+	" 66 66 6  6 32046 66 6  ",
+	" 66 66 6322035 66 66 6  ",
+	"02303200003023032032032 ",
+	" 45 5405335 45 54 54 54 ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        ",
+	"                        "};
+
+static char *turnout_x32[] = {
+	"32 32 8 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#663300",
+	"4	c	#996600",
+	"5	c	#CC6600",
+	"6	c	#CC9900",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                          6     ",
+	"                          50    ",
+	"                     6660035    ",
+	"                    66121  6    ",
+	"                 6  32056  66   ",
+	"             6   50046  6   6 0 ",
+	"             64004  66  66  32  ",
+	"  6   6  66 0310 6  66   62046  ",
+	"  54  500320044  5  45 0113054  ",
+	" 032003001300320030022002320320 ",
+	"  6   6  66  6   63014  66  66  ",
+	"  6   6  66  6  021066  66  66  ",
+	"  6   6  66  41006  66  66  66  ",
+	"  54  500330044  53 45  45  54  ",
+	" 032003001300320031023002300320 ",
+	"  6   6  66  6   6  66  66  66  ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                ",
+	"                                "};
+
+static char **turnout_xpm[3] = { turnout_x16, turnout_x24, turnout_x32 };
+
diff --git a/app/bin/bitmaps/turntable.xpm b/app/bin/bitmaps/turntable.xpm
new file mode 100644
index 0000000..c6e6375
--- /dev/null
+++ b/app/bin/bitmaps/turntable.xpm
@@ -0,0 +1,133 @@
+static char *turntable_x16[] = {
+	"16 16 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663300",
+	"5	c	#663333",
+	"6	c	#666633",
+	"7	c	#666666",
+	"8	c	#996600",
+	"9	c	#999999",
+	"A	c	#CC6600",
+	"B	c	#CC9900",
+	"C	c	#CCCCCC",
+	"D	c	#FFFFFF",
+	"E	c	#C0C0C0",
+	"F	c	#808080",
+	"    1B          ",
+	"  0 82B 000     ",
+	"  84 85033303   ",
+	"  B446FF397793  ",
+	"   B39DF3977DC3 ",
+	"    7DDF3977DDF3",
+	"88A5EDDF3977DDC3",
+	"4443CDDF3977DDD0",
+	"BBB3CDDF3977DDD3",
+	"1000EDDF3977DDC3",
+	"BBB49DDF3977DDE3",
+	"   B3CDF3977DD3 ",
+	"  B483CF3977CF3 ",
+	"  84 837373330  ",
+	"  0B82B03330    ",
+	"   04B          "};
+
+static char *turntable_x24[] = {
+	"24 24 17 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663300",
+	"5	c	#666600",
+	"6	c	#666633",
+	"7	c	#666666",
+	"8	c	#996600",
+	"9	c	#999999",
+	"A	c	#CC6600",
+	"B	c	#CC9900",
+	"C	c	#CCCCCC",
+	"D	c	#FFFFFF",
+	"E	c	#C0C0C0",
+	"F	c	#808080",
+	"      0 B               ",
+	"      48                ",
+	"    0 B20B   000        ",
+	"    2A  48300000030     ",
+	"    B1 B8397799939F3    ",
+	"      467CD779993EDE3   ",
+	"     B83CDD779993EDDC3  ",
+	"      3CDDD779993EDDD93 ",
+	"     0FDDDD779993EDDDD3 ",
+	" B  B3EDDDD779993EDDDD90",
+	"040243CDDDD779993EDDDDC3",
+	" A 8A0DDDDD779993EDDDDC3",
+	" B BB3DDDDD779993EDDDDC3",
+	" A 8A3CDDDD779993EDDDDE3",
+	"040243CDDDD779993EDDDD90",
+	" B  B39DDDD779993EDDDD7 ",
+	"      3CDDD779993EDDDC3 ",
+	"     B2FDDD779993EDDD3  ",
+	"     443EDD779993EDDF3  ",
+	"   B40 B37C779993EC73   ",
+	"   24  B41333777073     ",
+	"   0 B 08B 0300330      ",
+	"      48                ",
+	"     04B                "};
+
+static char *turntable_x32[] = {
+	"32 32 16 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#330000",
+	"2	c	#333300",
+	"3	c	#333333",
+	"4	c	#663300",
+	"5	c	#663333",
+	"6	c	#666666",
+	"7	c	#996600",
+	"8	c	#999999",
+	"9	c	#CC6600",
+	"A	c	#CC9900",
+	"B	c	#CCCCCC",
+	"C	c	#FFFFFF",
+	"D	c	#C0C0C0",
+	"E	c	#808080",
+	"        0                       ",
+	"        04A                     ",
+	"         72                     ",
+	"     0 AA 00AA   0000           ",
+	"     04A   47 3000000033        ",
+	"     A71  A903D668888E3D33      ",
+	"     A 02AA38BC668888E3CC83     ",
+	"        443BCCC668888E3CCCB6    ",
+	"       A 08CCCC668888E3CCCCB3   ",
+	"        3ECCCCC668888E3CCCCCD3  ",
+	"        3BCCCCC668888E3CCCCCC6  ",
+	"       08CCCCCC668888E3CCCCCCD3 ",
+	" AA  A 3BCCCCCC668888E3CCCCCCB3 ",
+	" 77  903CCCCCCC668888E3CCCCCCC6 ",
+	"04400403CCCCCCC668888E3CCCCCCC80",
+	" AA  A0ECCCCCCC668888E3CCCCCCC83",
+	" AA  A0ECCCCCCC668888E3CCCCCCCD3",
+	" AA  A 6CCCCCCC668888E3CCCCCCC80",
+	"04400403CCCCCCC668888E3CCCCCCC80",
+	" 77  9 3BCCCCCC668888E3CCCCCCC6 ",
+	" AA  A 3DCCCCCC668888E3CCCCCCB3 ",
+	"        6CCCCCC668888E3CCCCCC83 ",
+	"        3BCCCCC668888E3CCCCCB3  ",
+	"       A13BCCCC668888E3CCCCC6   ",
+	"       743ECCCC668888E3CCCC83   ",
+	"    A  09A5EBCC668888E3CCC86    ",
+	"     91  AA33DC668888E3CB63     ",
+	"     2A   74 363366666363       ",
+	"    0  A  09A  03000033         ",
+	"        90                      ",
+	"        29                      ",
+	"       0 AA                     "};
+
+static char **turntable_xpm[3] = { turntable_x16, turntable_x24, turntable_x32 };
+
diff --git a/app/bin/bitmaps/turntbl.xpm b/app/bin/bitmaps/turntbl.xpm
deleted file mode 100644
index ca6f359..0000000
--- a/app/bin/bitmaps/turntbl.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * turntbl_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000000000",
-"  .             ",
-".  ..           ",
-" . ..  .....    ",
-"  .  .. . . .   ",
-" . . .  . .  .  ",
-"    .   . .   . ",
-" . .    . .    .",
-"....    . .    .",
-" . .    . .    .",
-"....    . .    .",
-" . .    . .    .",
-"    .   . .   . ",
-" . . .  . .  .  ",
-"  .  .. . . .   ",
-" . ..  .....    ",
-"   ..           "};
diff --git a/app/bin/bitmaps/undo.xpm b/app/bin/bitmaps/undo.xpm
new file mode 100644
index 0000000..2450967
--- /dev/null
+++ b/app/bin/bitmaps/undo.xpm
@@ -0,0 +1,103 @@
+static char *undo_x16[] = {
+	"16 16 6 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#996600",
+	"2	c	#CC6600",
+	"3	c	#CC9900",
+	"4	c	#FFCC00",
+	"                ",
+	"      1         ",
+	"     11         ",
+	"   13411        ",
+	"  134443311     ",
+	"  1344444432    ",
+	"   1342114431   ",
+	"     11  1443   ",
+	"      1   1441  ",
+	"           141  ",
+	"           1331 ",
+	"            131 ",
+	"            131 ",
+	"            131 ",
+	"             11 ",
+	"                "};
+
+static char *undo_x24[] = {
+	"24 24 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#996600",
+	"2	c	#CC6600",
+	"3	c	#CC9900",
+	"4	c	#FF9900",
+	"5	c	#FFCC00",
+	"                        ",
+	"                        ",
+	"         1              ",
+	"        11              ",
+	"      12531             ",
+	"     1355311            ",
+	"   135555533311         ",
+	"   15555555555411       ",
+	"    13555555555531      ",
+	"     13553113555531     ",
+	"       2531  135552     ",
+	"        111   135551    ",
+	"         1      3553    ",
+	"                13551   ",
+	"                 1551   ",
+	"                 1353   ",
+	"                  1531  ",
+	"                  1551  ",
+	"                  1351  ",
+	"                   151  ",
+	"                   151  ",
+	"                   131  ",
+	"                    11  ",
+	"                        "};
+
+static char *undo_x32[] = {
+	"32 32 7 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#996600",
+	"2	c	#CC6600",
+	"3	c	#CC9900",
+	"4	c	#FF9900",
+	"5	c	#FFCC00",
+	"                                ",
+	"                                ",
+	"                                ",
+	"            1                   ",
+	"           121                  ",
+	"         12531                  ",
+	"        135531                  ",
+	"      13555551111               ",
+	"     135555555433211            ",
+	"    15555555555555531           ",
+	"    1355555555555555531         ",
+	"      255555555555555531        ",
+	"       135555112355555531       ",
+	"        125551  113555552       ",
+	"          1351    12555551      ",
+	"           121      2555531     ",
+	"            11       255551     ",
+	"                      35552     ",
+	"                      135531    ",
+	"                       15551    ",
+	"                       13551    ",
+	"                        15531   ",
+	"                        14531   ",
+	"                         3551   ",
+	"                         1551   ",
+	"                         1551   ",
+	"                         1351   ",
+	"                         1351   ",
+	"                          151   ",
+	"                          111   ",
+	"                                ",
+	"                                "};
+
+static char **undo_xpm[3] = { undo_x16, undo_x24, undo_x32 };
+
diff --git a/app/bin/bitmaps/zoom-choose.xpm b/app/bin/bitmaps/zoom-choose.xpm
new file mode 100644
index 0000000..4066455
--- /dev/null
+++ b/app/bin/bitmaps/zoom-choose.xpm
@@ -0,0 +1,127 @@
+static char *zoom_choose_x16[] = {
+	"16 16 13 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#333366",
+	"3	c	#336666",
+	"4	c	#666666",
+	"5	c	#669999",
+	"6	c	#6699CC",
+	"7	c	#9999CC",
+	"8	c	#99CCCC",
+	"9	c	#99CCFF",
+	"A	c	#99FFFF",
+	"B	c	#CCFFFF",
+	"                ",
+	"    13421       ",
+	"  249BBB93      ",
+	"  3BBBBBB92     ",
+	" 18500000650    ",
+	" 19934443981    ",
+	" 19B73438B81    ",
+	" 18BB415BB50    ",
+	"  3BBA5BBA3     ",
+	"  15ABBB931     ",
+	"   014431141    ",
+	"         0140   ",
+	"          0140  ",
+	"           0110 ",
+	"            010 ",
+	"                "};
+
+static char *zoom_choose_x24[] = {
+	"24 24 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#9999CC",
+	"A	c	#99CCCC",
+	"B	c	#99CCFF",
+	"C	c	#99FFFF",
+	"D	c	#CCFFFF",
+	"                        ",
+	"       02220            ",
+	"     227ABA832          ",
+	"    37DDDDDDC93         ",
+	"   29DDDDDDDDDA3        ",
+	"   4DDDDDDDDDDD72       ",
+	"  2AD755555556CB2       ",
+	"  2CD725555525DD2       ",
+	"  0DDD4555554BDD4       ",
+	"  2DDDB45554ADDD4       ",
+	"  2BDDDA4557DDDD1       ",
+	"  2ADDDD754CDDDB2       ",
+	"   4DDDDC4BDDDD72       ",
+	"   27DDDDDDDDDA2        ",
+	"    37CDDDDDD7350       ",
+	"     0279AA6222520      ",
+	"       00220  05520     ",
+	"               05520    ",
+	"                2552    ",
+	"                 2552   ",
+	"                 02550  ",
+	"                  0220  ",
+	"                   0    ",
+	"                        "};
+
+static char *zoom_choose_x32[] = {
+	"32 32 16 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003333",
+	"3	c	#333333",
+	"4	c	#333366",
+	"5	c	#336666",
+	"6	c	#666666",
+	"7	c	#666699",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#9999CC",
+	"B	c	#99CCCC",
+	"C	c	#99CCFF",
+	"D	c	#99FFFF",
+	"E	c	#CCFFFF",
+	"                                ",
+	"                                ",
+	"         31560130               ",
+	"       36BEEEEEC83              ",
+	"      3AEEEEEEEEEC64            ",
+	"     4CEEEEEEEEEEEE83           ",
+	"    4BEEEEEEEEEEEEED5           ",
+	"    5EEEEEEEEEEEEEEEC3          ",
+	"   3CEDAAAAAAAAAAABEE5          ",
+	"   2EED333333333339EEB3         ",
+	"   4EEEC4666666666EEEB3         ",
+	"   6EEEE956666665CEEEC3         ",
+	"  08EEEEE6666665BEEEEC3         ",
+	"   5EEEEEC566668EEEEEB3         ",
+	"   3EEEEEEB5665EEEEEE80         ",
+	"   3BEEEEEE865CEEEEEE5          ",
+	"    5EEEEEEE5AEEEEEEB3          ",
+	"    38EEEEEEDEEEEEED3           ",
+	"     4BEEEEEEEEEEED530          ",
+	"      38DEEEEEEEEB36630         ",
+	"       33BCCEECB7336663         ",
+	"         33300330 036660        ",
+	"                   036660       ",
+	"                    036663      ",
+	"                     066630     ",
+	"                      066630    ",
+	"                       366630   ",
+	"                        36660   ",
+	"                        03630   ",
+	"                         000    ",
+	"                                ",
+	"                                "};
+
+static char **zoom_choose_xpm[3] = { zoom_choose_x16, zoom_choose_x24, zoom_choose_x32 };
+
diff --git a/app/bin/bitmaps/zoom-extent.xpm b/app/bin/bitmaps/zoom-extent.xpm
new file mode 100644
index 0000000..17688da
--- /dev/null
+++ b/app/bin/bitmaps/zoom-extent.xpm
@@ -0,0 +1,125 @@
+static char *zoom_extent_x16[] = {
+	"16 16 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#669999",
+	"7	c	#990000",
+	"8	c	#9999CC",
+	"9	c	#99CCCC",
+	"A	c	#99CCFF",
+	"B	c	#CC0000",
+	"C	c	#CCFFFF",
+	"D	c	#800000",
+	" B          BBB ",
+	"BBBBB      BBBBB",
+	"BBB          BBB",
+	"BB B        B BB",
+	" B  B      B  BB",
+	"     D2523      ",
+	"     2ACC60     ",
+	"    06CCC92     ",
+	"     4CCC81     ",
+	"     36A93      ",
+	"      2220      ",
+	"    B   00 B    ",
+	"BB BB   000 B BB",
+	"BBBB     00  BBB",
+	"BBB          BBB",
+	"BBBBB      BBBBB"};
+
+static char *zoom_extent_x24[] = {
+	"24 24 12 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#333333",
+	"2	c	#336666",
+	"3	c	#666666",
+	"4	c	#666699",
+	"5	c	#669999",
+	"6	c	#99CCCC",
+	"7	c	#99CCFF",
+	"8	c	#99FFFF",
+	"9	c	#CC0000",
+	"A	c	#CCFFFF",
+	"                        ",
+	" 999999          999999 ",
+	" 999                 99 ",
+	" 999                9 9 ",
+	" 9  9              9  9 ",
+	" 9   9            9   9 ",
+	" 9    9          9    9 ",
+	"       9  111   9       ",
+	"        1267621         ",
+	"        28AAA82         ",
+	"       16AAAAA61        ",
+	"       17AAAAA71        ",
+	"       16AAAAA61        ",
+	"        3AAAAA50        ",
+	"        147A752         ",
+	"         01010          ",
+	"            010         ",
+	" 9    99    010  9    9 ",
+	" 9   99      01   9   9 ",
+	" 9  99       010   9  9 ",
+	" 9 99        000    9 9 ",
+	" 999                 99 ",
+	" 999999          999999 ",
+	"                        "};
+
+static char *zoom_extent_x32[] = {
+	"32 32 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#99CCCC",
+	"A	c	#99CCFF",
+	"B	c	#99FFFF",
+	"C	c	#CC0000",
+	"D	c	#CCFFFF",
+	"                                ",
+	" CCCCCCCC              CCCCCCCC ",
+	" CCCCCCCC              CCCCCCCC ",
+	" CCCCC                     CCCC ",
+	" CCCCC                    CCCCC ",
+	" CCCCCC                  CCC CC ",
+	" CC  CCC                CCC  CC ",
+	" CC   CCC              CCC   CC ",
+	" CC    CCC            CCC    CC ",
+	"        CC            CC        ",
+	"             20012              ",
+	"           369DDD94             ",
+	"          06DDDDDDA4            ",
+	"          2ADDDDDDD82           ",
+	"          4DDDDDDDDA2           ",
+	"          5DDDDDDDDA2           ",
+	"          3DDDDDDDDA2           ",
+	"          2ADDDDDDD72           ",
+	"           4BDDDDDA3            ",
+	"            49DDA84             ",
+	"             210210             ",
+	"                050             ",
+	"        CC      0220  CC        ",
+	" CC    CCC       050  CCC    CC ",
+	" CC   CCC        050   CCC   CC ",
+	" CC  CCC         0220   CCC  CC ",
+	" CC CCC           020    CCC CC ",
+	" CCCCC            00      CCCCC ",
+	" CCCC                      CCCC ",
+	" CCCCCCCC              CCCCCCCC ",
+	" CCCCCCCC              CCCCCCCC ",
+	"                                "};
+
+static char **zoom_extent_xpm[3] = { zoom_extent_x16, zoom_extent_x24, zoom_extent_x32 };
+
diff --git a/app/bin/bitmaps/zoom-in.xpm b/app/bin/bitmaps/zoom-in.xpm
new file mode 100644
index 0000000..8f66a29
--- /dev/null
+++ b/app/bin/bitmaps/zoom-in.xpm
@@ -0,0 +1,128 @@
+static char *zoom_in_x16[] = {
+	"16 16 15 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#6699CC",
+	"9	c	#9999CC",
+	"A	c	#99CCCC",
+	"B	c	#99CCFF",
+	"C	c	#99FFFF",
+	"D	c	#CCFFFF",
+	"     00         ",
+	"   227752       ",
+	"  37DB9CB5      ",
+	"  5DDA0BDC3     ",
+	" 2ADDA0BDD70    ",
+	" 2B6000007A2    ",
+	" 2BA97089AA1    ",
+	" 2ADDA0BDD70    ",
+	"  4CDA0BDB2     ",
+	"   4ADDCA22     ",
+	"    20022252    ",
+	"         0250   ",
+	"          0250  ",
+	"           0520 ",
+	"            022 ",
+	"             0  "};
+
+static char *zoom_in_x24[] = {
+	"24 24 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#9999CC",
+	"9	c	#99CCCC",
+	"A	c	#99CCFF",
+	"B	c	#99FFFF",
+	"C	c	#CCFFFF",
+	"                        ",
+	"      0220220           ",
+	"     379BCA962          ",
+	"    39CCAAACC93         ",
+	"   2ACCC706CCC93        ",
+	"  27CCCC706CCCC70       ",
+	"  2ACCCC706CCCC92       ",
+	"  0CA888504888AB1       ",
+	"  3CA0000000009C3       ",
+	"  2CA6664026669C1       ",
+	"  2ACCCC706CCCCA2       ",
+	"  29CCCC706CCCC93       ",
+	"   3ACCC706CCCB4        ",
+	"    5CCCAAACCB52        ",
+	"    329CCCCB93250       ",
+	"      225541205520      ",
+	"              05520     ",
+	"               2552     ",
+	"                2552    ",
+	"                02550   ",
+	"                 02550  ",
+	"                  0520  ",
+	"                   00   ",
+	"                        "};
+
+static char *zoom_in_x32[] = {
+	"32 32 16 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003333",
+	"3	c	#333333",
+	"4	c	#333366",
+	"5	c	#336666",
+	"6	c	#666666",
+	"7	c	#666699",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#9999CC",
+	"B	c	#99CCCC",
+	"C	c	#99CCFF",
+	"D	c	#99FFFF",
+	"E	c	#CCFFFF",
+	"                                ",
+	"          0000                  ",
+	"        338AA9653               ",
+	"       4BEEEEEEEB53             ",
+	"     35CEEEEEEEEEEB4            ",
+	"    07EEEEE700CEEEE83           ",
+	"    3CEEEEE700CEEEEE7           ",
+	"   38EEEEEE700CEEEEEC3          ",
+	"   1EEEEEEE700CEEEEEE5          ",
+	"   4EEEEEEE700CEEEEEE90         ",
+	"   6EE8000000000000CEB3         ",
+	"  08EE8000000000000CEB3         ",
+	"  08EE8000000000000CEB3         ",
+	"   5EEEEEEE700CEEEEEEA2         ",
+	"   3DEEEEEE700CEEEEEE6          ",
+	"   3BEEEEEE700CEEEEEC4          ",
+	"    4CEEEEE700CEEEEE5           ",
+	"     6EEEEE977CEEEEB3           ",
+	"     38DEEEEEEEEEE8330          ",
+	"      33BEEEEEEEC63663          ",
+	"        3469AA853036663         ",
+	"           0000   036660        ",
+	"                   036660       ",
+	"                    066630      ",
+	"                     066630     ",
+	"                      36663     ",
+	"                       36660    ",
+	"                       036660   ",
+	"                        03660   ",
+	"                         030    ",
+	"                          0     ",
+	"                                "};
+
+static char **zoom_in_xpm[3] = { zoom_in_x16, zoom_in_x24, zoom_in_x32 };
+
diff --git a/app/bin/bitmaps/zoom-out.xpm b/app/bin/bitmaps/zoom-out.xpm
new file mode 100644
index 0000000..c37242d
--- /dev/null
+++ b/app/bin/bitmaps/zoom-out.xpm
@@ -0,0 +1,127 @@
+static char *zoom_out_x16[] = {
+	"16 16 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#9999CC",
+	"9	c	#99CCCC",
+	"A	c	#99CCFF",
+	"B	c	#99FFFF",
+	"C	c	#CCFFFF",
+	"     00         ",
+	"   227752       ",
+	"  37CCCCA5      ",
+	"  5CCCCCCB3     ",
+	" 29CCCCCCC70    ",
+	" 2A600000792    ",
+	" 2A988888991    ",
+	" 29CCCCCCC70    ",
+	"  4BCCCCCA2     ",
+	"   49CCB922     ",
+	"    20022252    ",
+	"         0250   ",
+	"          0250  ",
+	"           0520 ",
+	"            022 ",
+	"             0  "};
+
+static char *zoom_out_x24[] = {
+	"24 24 14 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#003333",
+	"2	c	#333333",
+	"3	c	#333366",
+	"4	c	#336666",
+	"5	c	#666666",
+	"6	c	#666699",
+	"7	c	#669999",
+	"8	c	#9999CC",
+	"9	c	#99CCCC",
+	"A	c	#99CCFF",
+	"B	c	#99FFFF",
+	"C	c	#CCFFFF",
+	"                        ",
+	"      0220220           ",
+	"     379BCA962          ",
+	"    39CCCCCCC93         ",
+	"   2ACCCCCCCCC93        ",
+	"  27CCCCCCCCCCC70       ",
+	"  2ACCCCCCCCCCC92       ",
+	"  0CA888888888AB1       ",
+	"  3CA0000000009C3       ",
+	"  2CA6666666669C1       ",
+	"  2ACCCCCCCCCCCA2       ",
+	"  29CCCCCCCCCCC93       ",
+	"   3ACCCCCCCCCB4        ",
+	"    5CCCCCCCCB52        ",
+	"    329CCCCB93250       ",
+	"      225541205520      ",
+	"              05520     ",
+	"               2552     ",
+	"                2552    ",
+	"                02550   ",
+	"                 02550  ",
+	"                  0520  ",
+	"                   00   ",
+	"                        "};
+
+static char *zoom_out_x32[] = {
+	"32 32 16 1",
+	" 	c	None",
+	"0	c	#000000",
+	"1	c	#000033",
+	"2	c	#003333",
+	"3	c	#333333",
+	"4	c	#333366",
+	"5	c	#336666",
+	"6	c	#666666",
+	"7	c	#666699",
+	"8	c	#669999",
+	"9	c	#6699CC",
+	"A	c	#9999CC",
+	"B	c	#99CCCC",
+	"C	c	#99CCFF",
+	"D	c	#99FFFF",
+	"E	c	#CCFFFF",
+	"                                ",
+	"          0000                  ",
+	"        338AA9653               ",
+	"       4BEEEEEEEB53             ",
+	"     35CEEEEEEEEEEB4            ",
+	"    07EEEEEEEEEEEEE83           ",
+	"    3CEEEEEEEEEEEEEE7           ",
+	"   38EEEEEEEEEEEEEEEC3          ",
+	"   1EEEEEEEEEEEEEEEEE5          ",
+	"   4EEEEEEEEEEEEEEEEE90         ",
+	"   6EE8000000000000CEB3         ",
+	"  08EE8000000000000CEB3         ",
+	"  08EE8000000000000CEB3         ",
+	"   5EEEEEEEEEEEEEEEEEA2         ",
+	"   3DEEEEEEEEEEEEEEEE6          ",
+	"   3BEEEEEEEEEEEEEEEC4          ",
+	"    4CEEEEEEEEEEEEEE5           ",
+	"     6EEEEEEEEEEEEEB3           ",
+	"     38DEEEEEEEEEE8330          ",
+	"      33BEEEEEEEC63663          ",
+	"        3469AA853036663         ",
+	"           0000   036660        ",
+	"                   036660       ",
+	"                    066630      ",
+	"                     066630     ",
+	"                      36663     ",
+	"                       36660    ",
+	"                       036660   ",
+	"                        03660   ",
+	"                         030    ",
+	"                          0     ",
+	"                                "};
+
+static char **zoom_out_xpm[3] = { zoom_out_x16, zoom_out_x24, zoom_out_x32 };
+
diff --git a/app/bin/bitmaps/zoom.xpm b/app/bin/bitmaps/zoom.xpm
deleted file mode 100644
index 6b845a5..0000000
--- a/app/bin/bitmaps/zoom.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * zoom_xpm[] = {
-"16 16 5 1",
-" 	c None",
-"-	c #FFFFFFFFFFFF",
-".	c #000000000000",
-"X	c #0000FFFFFFFF",
-"o	c #FFFF7DF70000",
-"   .....        ",
-" ..-XXXX..      ",
-" .----XXX.      ",
-".--.---.--.     ",
-".-...-.---.     ",
-".--.-.----.     ",
-".---.-...-.     ",
-".XX.------.     ",
-" .XXX----.      ",
-" ..XXX--...     ",
-"   ..... .o.    ",
-"          .o.   ",
-"           .o.  ",
-"            .o. ",
-"             .. ",
-"                "};
diff --git a/app/bin/bitmaps/zoomin.xpm b/app/bin/bitmaps/zoomin.xpm
deleted file mode 100644
index 4b6f8d5..0000000
--- a/app/bin/bitmaps/zoomin.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * zoomin_xpm[] = {
-"16 16 5 1",
-" 	c None",
-"-	c #FFFFFFFFFFFF",
-".	c #000000000000",
-"X	c #0000FFFFFFFF",
-"o	c #FFFF7DF70000",
-"   .....        ",
-" ..-XXXX..      ",
-" .----XXX.      ",
-".-.--.--.-.     ",
-"...........  .  ",
-".-.--.--.-. ....",
-"...........  .  ",
-".X.--.--.-.     ",
-" .XXX----.      ",
-" ..XXX--.o.     ",
-"   ..... .o.    ",
-"          .o.   ",
-"           .o.  ",
-"            .o. ",
-"             .. ",
-"                "};
diff --git a/app/bin/bitmaps/zoomout.xpm b/app/bin/bitmaps/zoomout.xpm
deleted file mode 100644
index 8d8d442..0000000
--- a/app/bin/bitmaps/zoomout.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * zoomout_xpm[] = {
-"16 16 5 1",
-" 	c None",
-"-	c #FFFFFFFFFFFF",
-".	c #000000000000",
-"X	c #0000FFFFFFFF",
-"o	c #FFFF7DF70000",
-"   .....        ",
-" ..-XXXX..      ",
-" .----XXX.      ",
-".---------.  .  ",
-".-.--.--.-. ....",
-"...........  .  ",
-".-.--.--.-. ....",
-".XX-------.  .  ",
-" .XXX----.      ",
-" ..XXX--...     ",
-"   ..... .o.    ",
-"          .o.   ",
-"           .o.  ",
-"            .o. ",
-"             .. ",
-"                "};
-- 
cgit v1.2.3