From bcbbe34583413915ca37a2f26e5b53833ceea3c1 Mon Sep 17 00:00:00 2001
From: ducdat0507 <62660527+ducdat0507@users.noreply.github.com>
Date: Thu, 22 Dec 2022 19:06:39 +0700
Subject: [PATCH] Merge branch 'day-20-factory' of
 https://github.com/thepaperpilot/Advent-Incremental into day-20-factory

---
 src/components/Hotkey.vue                     |  28 +-
 src/data/layers/cloth.tsx                     |   6 +-
 src/data/layers/dyes.tsx                      |   4 +-
 src/data/layers/factory-components/bear.svg   | 192 +++++++++++++
 .../layers/factory-components/bearmaker.svg   | 200 +++++++++++++
 src/data/layers/factory-components/block.svg  |  66 +++++
 .../layers/factory-components/blockmaker.svg  | 107 +++++++
 src/data/layers/factory-components/bucket.svg | 118 ++++++++
 .../layers/factory-components/bucketblue.svg  | 100 +++++++
 .../layers/factory-components/bucketgreen.svg | 100 +++++++
 .../layers/factory-components/bucketmaker.svg | 126 +++++++++
 .../factory-components/bucketorange.svg       | 100 +++++++
 .../factory-components/bucketpurple.svg       | 100 +++++++
 .../layers/factory-components/bucketred.svg   | 100 +++++++
 .../factory-components/bucketshovel.svg       | 122 ++++++++
 .../factory-components/bucketshovelmaker.svg  | 134 +++++++++
 .../factory-components/bucketyellow.svg       | 100 +++++++
 .../layers/factory-components/clothes.svg     |  51 ++++
 .../factory-components/clothesmaker.svg       |  59 ++++
 .../layers/factory-components/flaskblue.svg   |  55 ++++
 .../layers/factory-components/flaskgreen.svg  |  55 ++++
 .../layers/factory-components/flaskorange.svg |  55 ++++
 .../layers/factory-components/flaskpurple.svg |  55 ++++
 .../layers/factory-components/flaskred.svg    |  55 ++++
 .../layers/factory-components/flaskyellow.svg |  55 ++++
 src/data/layers/factory-components/log.svg    |  76 +++++
 src/data/layers/factory-components/mixer.svg  | 263 ++++++++++++++++++
 .../layers/factory-components/paintmaker.svg  | 112 ++++++++
 src/data/layers/factory-components/plank.svg  |  50 ++++
 .../layers/factory-components/sawmill.svg     |  86 ++++++
 src/data/layers/factory-components/shed.svg   |  76 +++++
 src/data/layers/factory-components/shovel.svg |  50 ++++
 .../layers/factory-components/shovelmaker.svg |  58 ++++
 src/data/layers/factory-components/thread.svg |  91 ++++++
 .../layers/factory-components/threadmaker.svg |  99 +++++++
 src/data/layers/factory-components/truck.svg  | 125 +++++++++
 .../layers/factory-components/truckmaker.svg  | 133 +++++++++
 src/data/layers/factory-components/wheel.svg  |  54 ++++
 .../layers/factory-components/wheelmaker.svg  |  66 +++++
 src/data/layers/factory.tsx                   | 125 +++++++--
 src/data/layers/letters.tsx                   |   4 +-
 src/data/layers/trees.tsx                     |   4 +-
 src/data/layers/workshop.tsx                  |   2 +-
 src/data/projEntry.tsx                        |  10 +-
 src/features/hotkey.tsx                       |   6 +-
 45 files changed, 3592 insertions(+), 41 deletions(-)
 create mode 100644 src/data/layers/factory-components/bear.svg
 create mode 100644 src/data/layers/factory-components/bearmaker.svg
 create mode 100644 src/data/layers/factory-components/block.svg
 create mode 100644 src/data/layers/factory-components/blockmaker.svg
 create mode 100644 src/data/layers/factory-components/bucket.svg
 create mode 100644 src/data/layers/factory-components/bucketblue.svg
 create mode 100644 src/data/layers/factory-components/bucketgreen.svg
 create mode 100644 src/data/layers/factory-components/bucketmaker.svg
 create mode 100644 src/data/layers/factory-components/bucketorange.svg
 create mode 100644 src/data/layers/factory-components/bucketpurple.svg
 create mode 100644 src/data/layers/factory-components/bucketred.svg
 create mode 100644 src/data/layers/factory-components/bucketshovel.svg
 create mode 100644 src/data/layers/factory-components/bucketshovelmaker.svg
 create mode 100644 src/data/layers/factory-components/bucketyellow.svg
 create mode 100644 src/data/layers/factory-components/clothes.svg
 create mode 100644 src/data/layers/factory-components/clothesmaker.svg
 create mode 100644 src/data/layers/factory-components/flaskblue.svg
 create mode 100644 src/data/layers/factory-components/flaskgreen.svg
 create mode 100644 src/data/layers/factory-components/flaskorange.svg
 create mode 100644 src/data/layers/factory-components/flaskpurple.svg
 create mode 100644 src/data/layers/factory-components/flaskred.svg
 create mode 100644 src/data/layers/factory-components/flaskyellow.svg
 create mode 100644 src/data/layers/factory-components/log.svg
 create mode 100644 src/data/layers/factory-components/mixer.svg
 create mode 100644 src/data/layers/factory-components/paintmaker.svg
 create mode 100644 src/data/layers/factory-components/plank.svg
 create mode 100644 src/data/layers/factory-components/sawmill.svg
 create mode 100644 src/data/layers/factory-components/shed.svg
 create mode 100644 src/data/layers/factory-components/shovel.svg
 create mode 100644 src/data/layers/factory-components/shovelmaker.svg
 create mode 100644 src/data/layers/factory-components/thread.svg
 create mode 100644 src/data/layers/factory-components/threadmaker.svg
 create mode 100644 src/data/layers/factory-components/truck.svg
 create mode 100644 src/data/layers/factory-components/truckmaker.svg
 create mode 100644 src/data/layers/factory-components/wheel.svg
 create mode 100644 src/data/layers/factory-components/wheelmaker.svg

diff --git a/src/components/Hotkey.vue b/src/components/Hotkey.vue
index c5790e3..7e9c876 100644
--- a/src/components/Hotkey.vue
+++ b/src/components/Hotkey.vue
@@ -13,22 +13,34 @@
 
 <script setup lang="ts">
 import { GenericHotkey } from "features/hotkey";
-import { reactive } from "vue";
+import { watchEffect } from "vue";
 
 const props = defineProps<{
     hotkey: GenericHotkey;
 }>();
 
-let key = reactive(props.hotkey).key;
+let key = "";
+let isCtrl = false;
+let isShift = false;
+let isAlpha = false;
+watchEffect(() => {
+    key = props.hotkey.key;
 
-let isCtrl = key.startsWith("ctrl+");
-if (isCtrl) key = key.slice(5);
+    isCtrl = key.startsWith("ctrl+");
+    if (isCtrl) {
+        key = key.slice(5);
+    }
 
-let isShift = key.startsWith("shift+");
-if (isShift) key = key.slice(6);
+    isShift = key.startsWith("shift+");
+    if (isShift) {
+        key = key.slice(6);
+    }
 
-let isAlpha = key.length == 1 && key.toLowerCase() != key.toUpperCase();
-if (isAlpha) key = key.toUpperCase();
+    isAlpha = key.length == 1 && key.toLowerCase() != key.toUpperCase();
+    if (isAlpha) {
+        key = key.toUpperCase();
+    }
+});
 </script>
 
 <style scoped>
diff --git a/src/data/layers/cloth.tsx b/src/data/layers/cloth.tsx
index 9f572a7..8f4f227 100644
--- a/src/data/layers/cloth.tsx
+++ b/src/data/layers/cloth.tsx
@@ -213,7 +213,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         onPress: () => {
             if (breeding.canClick.value) breeding.onClick();
         },
-        enabled: main.days[day - 1].opened
+        enabled: noPersist(main.days[day - 1].opened)
     }));
 
     const shearSheepHK = createHotkey(() => ({
@@ -222,7 +222,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         onPress: () => {
             if (shearing.canClick.value) shearing.onClick();
         },
-        enabled: main.days[day - 1].opened
+        enabled: noPersist(main.days[day - 1].opened)
     }));
 
     const spinWoolHK = createHotkey(() => ({
@@ -231,7 +231,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         onPress: () => {
             if (spinning.canClick.value) spinning.onClick();
         },
-        enabled: main.days[day - 1].opened
+        enabled: noPersist(main.days[day - 1].opened)
     }));
 
     const buildPens = createBuyable(() => ({
diff --git a/src/data/layers/dyes.tsx b/src/data/layers/dyes.tsx
index 2582071..6d94dff 100644
--- a/src/data/layers/dyes.tsx
+++ b/src/data/layers/dyes.tsx
@@ -20,7 +20,7 @@ import {
     createSequentialModifier,
     Modifier
 } from "game/modifiers";
-import { persistent } from "game/persistence";
+import { noPersist, persistent } from "game/persistence";
 import Decimal, { DecimalSource, format, formatWhole } from "util/bignum";
 import { WithRequired } from "util/common";
 import { Computable, convertComputable } from "util/computed";
@@ -371,7 +371,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
             onPress: () => {
                 if (unref(buyable.canClick)) buyable.onClick();
             },
-            enabled: main.days[day - 1].opened
+            enabled: noPersist(main.days[day - 1].opened)
         }));
 
         const visibility = convertComputable(options.visibility ?? Visibility.Visible);
diff --git a/src/data/layers/factory-components/bear.svg b/src/data/layers/factory-components/bear.svg
new file mode 100644
index 0000000..2823136
--- /dev/null
+++ b/src/data/layers/factory-components/bear.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/thread.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect15601"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.3963047,0.065112988"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect15599"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect15592"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="0.44012005,0.065112988"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect15590"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect15564"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="0.5,0.065112988"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect15562"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g15614"
+       transform="matrix(0.76357596,0,0,0.76357596,3.7735683,12.026389)">
+      <path
+         id="path12906"
+         style="fill:#b96b00;fill-opacity:1;stroke:#000000;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 6.1991048,-13.637927 c -0.7488708,2.1e-5 -1.3559497,0.572397 -1.3559896,1.278475 1.476e-4,0.0884 0.010019,0.176551 0.029456,0.263033 -0.4285764,-0.09038 -0.8790609,-0.136492 -1.3327352,-0.136426 -0.4552069,1.51e-4 -0.9071312,0.04679 -1.3368693,0.137976 0.00356,-0.03643 0.00545,-0.07298 0.00568,-0.109554 -3.99e-5,-0.706268 -0.6074337,-1.278723 -1.35650633,-1.278475 -0.7488708,2.1e-5 -1.35594969,0.572397 -1.35598958,1.278475 1.8399e-4,0.44446 0.24516693,0.856939 0.64698893,1.089339 -0.43207364,0.400735 -0.66263689,0.869224 -0.66352539,1.3482383 2.7683e-4,1.0259392 1.04632979,1.9446054 2.62671307,2.3068359 -0.3910576,0.2319721 -0.7373924,0.5559684 -1.017509,0.9518799 -0.28322749,-0.019365 -1.11864431,0.097223 -1.4302264,0.3198062 -0.31158209,0.2225836 -0.52972809,0.9707876 -0.52972809,0.9707876 -0.14553981,0.3859609 -0.41301931,1.1586119 -0.41040231,1.6968204 0.011421,1.1660168 -0.097989,2.2018547 0.1908427,2.1991717 0.28885048,-0.0029 0.58800704,-0.9134274 0.57656721,-2.0795305 l 0.31562124,-1.3204216 0.1370083,-0.8311369 c 0.29018783,-0.104068 0.5681672,-0.2256952 0.79840087,-0.3493327 -0.25473025,0.5509696 -0.38814592,1.1681281 -0.38809,1.7952392 1.0888e-4,2.0753956 1.43103118,3.7577994 3.19618738,3.75791018 1.7651561,-1.1083e-4 3.1960784,-1.68251458 3.1961873,-3.75791018 1.282e-4,-0.6438816 -0.1404469,-1.2770034 -0.4082438,-1.8386474 0.223588,0.1032128 0.490077,0.2022507 0.7689453,0.2857706 0.2847878,0.085095 0.4147766,0.6560015 0.4147766,0.6560015 0,0 0.1078943,0.6293964 0.1159403,1.4637658 0.011421,1.166017 -0.377,2.1951698 -0.088169,2.1924866 0.2888505,-0.0029 0.743482,-0.9218453 0.7320421,-2.0879483 0.074314,-0.7372913 0.1066731,-0.6536515 -0.2137636,-1.926522 0,0 -0.1367334,-0.6764585 -0.957403,-0.9217385 C 6.5650619,-6.4449374 6.2873001,-6.5577643 5.9867147,-6.531901 5.7090524,-6.9183446 5.3678903,-7.2348995 4.9836751,-7.4625936 6.5585359,-7.8265359 7.5996366,-8.7434365 7.6000529,-9.7668457 7.6000222,-10.290041 7.3260225,-10.799673 6.8176717,-11.222054 c 0.452576,-0.218751 0.7372815,-0.65788 0.7374227,-1.137398 -3.99e-5,-0.706078 -0.6071188,-1.278454 -1.3559896,-1.278475 z"
+         sodipodi:nodetypes="cccccccccccczcccccccccccccccccccccccc" />
+      <path
+         id="path15140"
+         style="fill:#b96b00;fill-opacity:1;stroke:#000000;stroke-width:0.913892;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="M 1.7349323,-2.9962097 A 0.31315112,0.32066478 0 0 0 1.4218372,-2.6756025 0.31315112,0.32066478 0 0 0 1.7349323,-2.3549954 0.31315112,0.32066478 0 0 0 2.0480275,-2.6756025 0.31315112,0.32066478 0 0 0 1.7349323,-2.9962097 Z M 0.41993412,-2.5902578 A 0.31315112,0.32066478 0 0 0 0.10683898,-2.269199 0.31315112,0.32066478 0 0 0 0.41993412,-1.9485919 0.31315112,0.32066478 0 0 0 0.7330284,-2.269199 0.31315112,0.32066478 0 0 0 0.41993412,-2.5902578 Z m 2.44258038,0.2781606 a 0.31315112,0.32066478 0 0 0 -0.3130943,0.3206071 0.31315112,0.32066478 0 0 0 0.3130943,0.3206072 0.31315112,0.32066478 0 0 0 0.3130951,-0.3206072 0.31315112,0.32066478 0 0 0 -0.3130951,-0.3206071 z m -1.2634041,0.068185 A 1.0594307,1.0622494 0 0 0 0.53943922,-1.1813925 1.0594307,1.0622494 0 0 0 1.5991104,-0.11932481 1.0594307,1.0622494 0 0 0 2.6583412,-1.1813925 1.0594307,1.0622494 0 0 0 1.5991104,-2.2439122 Z" />
+      <path
+         id="path15140-0"
+         style="fill:#b96b00;fill-opacity:1;stroke:#000000;stroke-width:0.880702;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 5.5219329,-3.0226419 a 0.30511184,0.3056432 0 0 0 -0.3050573,0.3055883 0.30511184,0.3056432 0 0 0 0.3050573,0.3055882 0.30511184,0.3056432 0 0 0 0.3050573,-0.3055882 0.30511184,0.3056432 0 0 0 -0.3050573,-0.3055883 z m -1.2812393,0.386935 A 0.30511184,0.3056432 0 0 0 3.9356363,-2.3296882 0.30511184,0.3056432 0 0 0 4.2406936,-2.0241 0.30511184,0.3056432 0 0 0 4.54575,-2.3296882 0.30511184,0.3056432 0 0 0 4.2406936,-2.6357069 Z m 2.3798739,0.2651301 A 0.30511184,0.3056432 0 0 0 6.315511,-2.0649885 0.30511184,0.3056432 0 0 0 6.6205675,-1.7594002 0.30511184,0.3056432 0 0 0 6.9256248,-2.0649885 0.30511184,0.3056432 0 0 0 6.6205675,-2.3705768 Z m -1.2309697,0.064991 A 1.0322328,1.0124882 0 0 0 4.3571307,-1.29284 1.0322328,1.0124882 0 0 0 5.3895978,-0.28052497 1.0322328,1.0124882 0 0 0 6.4216358,-1.29284 1.0322328,1.0124882 0 0 0 5.3895978,-2.3055858 Z" />
+      <circle
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.743329;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path15420"
+         cx="1.7971185"
+         cy="-10.834802"
+         r="0.36586219" />
+      <circle
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.743329;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path15420-3"
+         cx="5.0267229"
+         cy="-10.704576"
+         r="0.36586219" />
+      <path
+         sodipodi:type="star"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path15496"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="-5.5215816"
+         sodipodi:cy="-11.095254"
+         sodipodi:r1="0.36556175"
+         sodipodi:r2="0.18278088"
+         sodipodi:arg1="1.5707963"
+         sodipodi:arg2="2.6179939"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -5.5215816,-10.729692 -0.3165858,-0.548343 0.6331715,0 z"
+         inkscape:transform-center-y="0.04012582"
+         transform="matrix(0.43905897,0,0,0.43905897,5.6944856,-4.8781147)" />
+      <path
+         d="m 3.2165817,-9.2199995 c 0,0.088988 0,0.355951 0,0.5339265 0,0.1779755 0,0.4449387 0,0.5339265 a 0.06511299,0.06511299 90 0 0 0.130226,0 c 0,-0.088988 0,-0.355951 0,-0.5339265 0,-0.1779755 0,-0.4449388 0,-0.5339265 a 0.06511299,0.06511299 90 0 0 -0.130226,0 z"
+         id="path-1-2"
+         inkscape:path-effect="#path-effect15562;#path-effect15564"
+         inkscape:original-d="m 3.2816947,-9.2199995 c 0,0.355951 0,0.711902 0,1.067853"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+      <path
+         d="m 3.293027,-8.0880272 c 0.031325,-0.00554 0.07917,-0.011358 0.1557943,-0.00849 0.038317,0.00144 0.076038,0.00455 0.1260912,0.00911 0.011457,0.00104 0.027264,0.0025 0.040964,0.00371 0.043519,0.00386 0.1111312,0.00969 0.1770412,0.00829 0.054653,-0.00116 0.1186067,-0.00717 0.1853795,-0.027078 0.1972935,-0.058373 0.4074776,-0.1518003 0.6209555,-0.2894377 0.052134,-0.035975 0.1071565,-0.074493 0.1568795,-0.1193978 0.052261,-0.047197 0.097723,-0.1005566 0.1295368,-0.1644867 0.019536,-0.043253 0.023865,-0.077152 0.02385,-0.1014722 a 0.06511299,0.06511299 90 0 0 -0.130226,7.9e-5 c 4.7e-6,0.00775 -0.00115,0.023143 -0.011287,0.045643 -0.021454,0.043003 -0.055103,0.083806 -0.099156,0.1235899 -0.04264,0.038508 -0.091093,0.072657 -0.1418895,0.1077472 -0.2015655,0.1299178 -0.4004585,0.2180795 -0.5857397,0.272899 -0.052088,0.015529 -0.1035742,0.020711 -0.1510635,0.021718 -0.057818,0.00123 -0.1187504,-0.00391 -0.1627694,-0.00781 -0.013499,-0.0012 -0.028997,-0.00263 -0.040663,-0.00369 -0.050296,-0.00458 -0.09098,-0.00798 -0.1330303,-0.00956 -0.086237,-0.00323 -0.1433145,0.00331 -0.1833326,0.010384 a 0.06511299,0.06511299 90 0 0 0.022665,0.1282386 z"
+         id="path-1-7"
+         inkscape:path-effect="#path-effect15590;#path-effect15592"
+         inkscape:original-d="m 3.2816947,-8.1521465 c 0.2009731,-0.036907 0.4247417,0.040069 0.6250848,0 0.2571987,-0.05144 0.937627,-0.3731163 0.937627,-0.6250847"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+      <path
+         d="m 3.333964,-8.2693496 c -0.088274,-2.426e-4 -0.2492194,0.00985 -0.4320056,0.018679 -0.1344961,0.0065 -0.2757638,0.00885 -0.4152432,-0.011855 -0.052105,-0.00802 -0.1004252,-0.020257 -0.1435243,-0.036753 -0.011471,-0.00439 -0.023118,-0.00929 -0.034764,-0.014771 -0.025889,-0.012181 -0.051412,-0.027048 -0.074993,-0.045284 -0.0222,-0.017168 -0.042323,-0.037044 -0.059525,-0.060156 -0.029675,-0.039212 -0.048387,-0.083603 -0.060025,-0.1288178 -0.015797,-0.061377 -0.017306,-0.1201467 -0.017246,-0.1506597 a 0.06511299,0.06511299 90 0 0 -0.1302258,-2.564e-4 c -6.76e-5,0.034346 0.00146,0.1060643 0.021356,0.1833761 0.01482,0.05758 0.039821,0.1188147 0.081989,0.1745305 0.024663,0.033139 0.053402,0.061327 0.084011,0.084998 0.032381,0.025041 0.06635,0.04464 0.099219,0.060104 0.014829,0.00698 0.029463,0.013126 0.043652,0.018557 0.053183,0.020357 0.1106942,0.034676 0.1706116,0.043895 0.1529236,0.022706 0.3046385,0.019756 0.4409946,0.013167 0.1868374,-0.00903 0.3416617,-0.018757 0.4253616,-0.018527 a 0.06511299,0.06511299 90 0 0 3.578e-4,-0.1302254 z"
+         id="path-1-79"
+         inkscape:path-effect="#path-effect15599;#path-effect15601"
+         inkscape:original-d="M 3.3337851,-8.2042369 C 2.8348486,-8.2078183 2.0315253,-8.011999 2.0315253,-8.6990956"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bearmaker.svg b/src/data/layers/factory-components/bearmaker.svg
new file mode 100644
index 0000000..7c10710
--- /dev/null
+++ b/src/data/layers/factory-components/bearmaker.svg
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/sawmill.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect15562-1-1"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect15564-2-8"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="0.5,0.065112988"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect15590-6-2"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect15592-1-6"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="0.44012005,0.065112988"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect15599-7-0"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect15601-6-3"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.3963047,0.065112988"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202825"
+       y="0.38202825"
+       rx="1.246511" />
+    <g
+       id="g15614-5"
+       transform="matrix(0.76357596,0,0,0.76357596,3.8142741,12.071883)">
+      <path
+         id="path12906-0"
+         style="fill:#b96b00;fill-opacity:1;stroke:#000000;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 6.1991048,-13.637927 c -0.7488708,2.1e-5 -1.3559497,0.572397 -1.3559896,1.278475 1.476e-4,0.0884 0.010019,0.176551 0.029456,0.263033 -0.4285764,-0.09038 -0.8790609,-0.136492 -1.3327352,-0.136426 -0.4552069,1.51e-4 -0.9071312,0.04679 -1.3368693,0.137976 0.00356,-0.03643 0.00545,-0.07298 0.00568,-0.109554 -3.99e-5,-0.706268 -0.6074337,-1.278723 -1.35650633,-1.278475 -0.7488708,2.1e-5 -1.35594969,0.572397 -1.35598958,1.278475 1.8399e-4,0.44446 0.24516693,0.856939 0.64698893,1.089339 -0.43207364,0.400735 -0.66263689,0.869224 -0.66352539,1.3482383 2.7683e-4,1.0259392 1.04632979,1.9446054 2.62671307,2.3068359 -0.3910576,0.2319721 -0.7373924,0.5559684 -1.017509,0.9518799 -0.28322749,-0.019365 -1.11864431,0.097223 -1.4302264,0.3198062 -0.31158209,0.2225836 -0.52972809,0.9707876 -0.52972809,0.9707876 -0.14553981,0.3859609 -0.41301931,1.1586119 -0.41040231,1.6968204 0.011421,1.1660168 -0.097989,2.2018547 0.1908427,2.1991717 0.28885048,-0.0029 0.58800704,-0.9134274 0.57656721,-2.0795305 l 0.31562124,-1.3204216 0.1370083,-0.8311369 c 0.29018783,-0.104068 0.5681672,-0.2256952 0.79840087,-0.3493327 -0.25473025,0.5509696 -0.38814592,1.1681281 -0.38809,1.7952392 1.0888e-4,2.0753956 1.43103118,3.7577994 3.19618738,3.75791018 1.7651561,-1.1083e-4 3.1960784,-1.68251458 3.1961873,-3.75791018 1.282e-4,-0.6438816 -0.1404469,-1.2770034 -0.4082438,-1.8386474 0.223588,0.1032128 0.490077,0.2022507 0.7689453,0.2857706 0.2847878,0.085095 0.4147766,0.6560015 0.4147766,0.6560015 0,0 0.1078943,0.6293964 0.1159403,1.4637658 0.011421,1.166017 -0.377,2.1951698 -0.088169,2.1924866 0.2888505,-0.0029 0.743482,-0.9218453 0.7320421,-2.0879483 0.074314,-0.7372913 0.1066731,-0.6536515 -0.2137636,-1.926522 0,0 -0.1367334,-0.6764585 -0.957403,-0.9217385 C 6.5650619,-6.4449374 6.2873001,-6.5577643 5.9867147,-6.531901 5.7090524,-6.9183446 5.3678903,-7.2348995 4.9836751,-7.4625936 6.5585359,-7.8265359 7.5996366,-8.7434365 7.6000529,-9.7668457 7.6000222,-10.290041 7.3260225,-10.799673 6.8176717,-11.222054 c 0.452576,-0.218751 0.7372815,-0.65788 0.7374227,-1.137398 -3.99e-5,-0.706078 -0.6071188,-1.278454 -1.3559896,-1.278475 z"
+         sodipodi:nodetypes="cccccccccccczcccccccccccccccccccccccc" />
+      <path
+         id="path15140-4"
+         style="fill:#b96b00;fill-opacity:1;stroke:#000000;stroke-width:0.913892;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="M 1.7349323,-2.9962097 A 0.31315112,0.32066478 0 0 0 1.4218372,-2.6756025 0.31315112,0.32066478 0 0 0 1.7349323,-2.3549954 0.31315112,0.32066478 0 0 0 2.0480275,-2.6756025 0.31315112,0.32066478 0 0 0 1.7349323,-2.9962097 Z M 0.41993412,-2.5902578 A 0.31315112,0.32066478 0 0 0 0.10683898,-2.269199 0.31315112,0.32066478 0 0 0 0.41993412,-1.9485919 0.31315112,0.32066478 0 0 0 0.7330284,-2.269199 0.31315112,0.32066478 0 0 0 0.41993412,-2.5902578 Z m 2.44258038,0.2781606 a 0.31315112,0.32066478 0 0 0 -0.3130943,0.3206071 0.31315112,0.32066478 0 0 0 0.3130943,0.3206072 0.31315112,0.32066478 0 0 0 0.3130951,-0.3206072 0.31315112,0.32066478 0 0 0 -0.3130951,-0.3206071 z m -1.2634041,0.068185 A 1.0594307,1.0622494 0 0 0 0.53943922,-1.1813925 1.0594307,1.0622494 0 0 0 1.5991104,-0.11932481 1.0594307,1.0622494 0 0 0 2.6583412,-1.1813925 1.0594307,1.0622494 0 0 0 1.5991104,-2.2439122 Z" />
+      <path
+         id="path15140-0-5"
+         style="fill:#b96b00;fill-opacity:1;stroke:#000000;stroke-width:0.880702;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 5.5219329,-3.0226419 a 0.30511184,0.3056432 0 0 0 -0.3050573,0.3055883 0.30511184,0.3056432 0 0 0 0.3050573,0.3055882 0.30511184,0.3056432 0 0 0 0.3050573,-0.3055882 0.30511184,0.3056432 0 0 0 -0.3050573,-0.3055883 z m -1.2812393,0.386935 A 0.30511184,0.3056432 0 0 0 3.9356363,-2.3296882 0.30511184,0.3056432 0 0 0 4.2406936,-2.0241 0.30511184,0.3056432 0 0 0 4.54575,-2.3296882 0.30511184,0.3056432 0 0 0 4.2406936,-2.6357069 Z m 2.3798739,0.2651301 A 0.30511184,0.3056432 0 0 0 6.315511,-2.0649885 0.30511184,0.3056432 0 0 0 6.6205675,-1.7594002 0.30511184,0.3056432 0 0 0 6.9256248,-2.0649885 0.30511184,0.3056432 0 0 0 6.6205675,-2.3705768 Z m -1.2309697,0.064991 A 1.0322328,1.0124882 0 0 0 4.3571307,-1.29284 1.0322328,1.0124882 0 0 0 5.3895978,-0.28052497 1.0322328,1.0124882 0 0 0 6.4216358,-1.29284 1.0322328,1.0124882 0 0 0 5.3895978,-2.3055858 Z" />
+      <circle
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.743329;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path15420-1"
+         cx="1.7971185"
+         cy="-10.834802"
+         r="0.36586219" />
+      <circle
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.743329;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path15420-3-2"
+         cx="5.0267229"
+         cy="-10.704576"
+         r="0.36586219" />
+      <path
+         sodipodi:type="star"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path15496-3"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="-5.5215816"
+         sodipodi:cy="-11.095254"
+         sodipodi:r1="0.36556175"
+         sodipodi:r2="0.18278088"
+         sodipodi:arg1="1.5707963"
+         sodipodi:arg2="2.6179939"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -5.5215816,-10.729692 -0.3165858,-0.548343 0.6331715,0 z"
+         inkscape:transform-center-y="0.04012582"
+         transform="matrix(0.43905897,0,0,0.43905897,5.6944856,-4.8781147)" />
+      <path
+         d="m 3.2165817,-9.2199995 c 0,0.088988 0,0.355951 0,0.5339265 0,0.1779755 0,0.4449387 0,0.5339265 a 0.06511299,0.06511299 90 0 0 0.130226,0 c 0,-0.088988 0,-0.355951 0,-0.5339265 0,-0.1779755 0,-0.4449388 0,-0.5339265 a 0.06511299,0.06511299 90 0 0 -0.130226,0 z"
+         id="path-1-2-7"
+         inkscape:path-effect="#path-effect15562-1-1;#path-effect15564-2-8"
+         inkscape:original-d="m 3.2816947,-9.2199995 c 0,0.355951 0,0.711902 0,1.067853"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+      <path
+         d="m 3.293027,-8.0880272 c 0.031325,-0.00554 0.07917,-0.011358 0.1557943,-0.00849 0.038317,0.00144 0.076038,0.00455 0.1260912,0.00911 0.011457,0.00104 0.027264,0.0025 0.040964,0.00371 0.043519,0.00386 0.1111312,0.00969 0.1770412,0.00829 0.054653,-0.00116 0.1186067,-0.00717 0.1853795,-0.027078 0.1972935,-0.058373 0.4074776,-0.1518003 0.6209555,-0.2894377 0.052134,-0.035975 0.1071565,-0.074493 0.1568795,-0.1193978 0.052261,-0.047197 0.097723,-0.1005566 0.1295368,-0.1644867 0.019536,-0.043253 0.023865,-0.077152 0.02385,-0.1014722 a 0.06511299,0.06511299 90 0 0 -0.130226,7.9e-5 c 4.7e-6,0.00775 -0.00115,0.023143 -0.011287,0.045643 -0.021454,0.043003 -0.055103,0.083806 -0.099156,0.1235899 -0.04264,0.038508 -0.091093,0.072657 -0.1418895,0.1077472 -0.2015655,0.1299178 -0.4004585,0.2180795 -0.5857397,0.272899 -0.052088,0.015529 -0.1035742,0.020711 -0.1510635,0.021718 -0.057818,0.00123 -0.1187504,-0.00391 -0.1627694,-0.00781 -0.013499,-0.0012 -0.028997,-0.00263 -0.040663,-0.00369 -0.050296,-0.00458 -0.09098,-0.00798 -0.1330303,-0.00956 -0.086237,-0.00323 -0.1433145,0.00331 -0.1833326,0.010384 a 0.06511299,0.06511299 90 0 0 0.022665,0.1282386 z"
+         id="path-1-7-2"
+         inkscape:path-effect="#path-effect15590-6-2;#path-effect15592-1-6"
+         inkscape:original-d="m 3.2816947,-8.1521465 c 0.2009731,-0.036907 0.4247417,0.040069 0.6250848,0 0.2571987,-0.05144 0.937627,-0.3731163 0.937627,-0.6250847"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+      <path
+         d="m 3.333964,-8.2693496 c -0.088274,-2.426e-4 -0.2492194,0.00985 -0.4320056,0.018679 -0.1344961,0.0065 -0.2757638,0.00885 -0.4152432,-0.011855 -0.052105,-0.00802 -0.1004252,-0.020257 -0.1435243,-0.036753 -0.011471,-0.00439 -0.023118,-0.00929 -0.034764,-0.014771 -0.025889,-0.012181 -0.051412,-0.027048 -0.074993,-0.045284 -0.0222,-0.017168 -0.042323,-0.037044 -0.059525,-0.060156 -0.029675,-0.039212 -0.048387,-0.083603 -0.060025,-0.1288178 -0.015797,-0.061377 -0.017306,-0.1201467 -0.017246,-0.1506597 a 0.06511299,0.06511299 90 0 0 -0.1302258,-2.564e-4 c -6.76e-5,0.034346 0.00146,0.1060643 0.021356,0.1833761 0.01482,0.05758 0.039821,0.1188147 0.081989,0.1745305 0.024663,0.033139 0.053402,0.061327 0.084011,0.084998 0.032381,0.025041 0.06635,0.04464 0.099219,0.060104 0.014829,0.00698 0.029463,0.013126 0.043652,0.018557 0.053183,0.020357 0.1106942,0.034676 0.1706116,0.043895 0.1529236,0.022706 0.3046385,0.019756 0.4409946,0.013167 0.1868374,-0.00903 0.3416617,-0.018757 0.4253616,-0.018527 a 0.06511299,0.06511299 90 0 0 3.578e-4,-0.1302254 z"
+         id="path-1-79-4"
+         inkscape:path-effect="#path-effect15599-7-0;#path-effect15601-6-3"
+         inkscape:original-d="M 3.3337851,-8.2042369 C 2.8348486,-8.2078183 2.0315253,-8.011999 2.0315253,-8.6990956"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/block.svg b/src/data/layers/factory-components/block.svg
new file mode 100644
index 0000000..5c41966
--- /dev/null
+++ b/src/data/layers/factory-components/block.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <g
+     id="layer1">
+    <g
+       id="g3038-4"
+       transform="matrix(0.72151136,0,0,0.72151136,-15.136702,-32.285353)">
+      <path
+         style="fill:#c68000;fill-opacity:1;stroke:#ff0000;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 23.906542,51.953545 v 6.784524 l 7.17471,2.411957 V 54.36577 Z"
+         id="path2172-9" />
+      <path
+         style="fill:#c68000;fill-opacity:1;stroke:#ffff00;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 36.727057,50.379178 -4.703952,4.474278 v 6.267975 l 4.703952,-3.957997 z"
+         id="path2170-1" />
+      <path
+         style="fill:#c68000;fill-opacity:1;stroke:#007cff;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 29.050764,46.632495 -4.703465,4.474547 7.295877,2.478984 4.703952,-4.474546 z"
+         id="rect341-6-7" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.72581px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ff0000;fill-opacity:1;stroke:#a96625;stroke-width:2.01773;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         x="25.790016"
+         y="47.090862"
+         id="text1338-5"
+         transform="matrix(0.97261523,0.37895849,-6.3090413e-4,1.02791,0,0)"><tspan
+           id="tspan1336-5"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.72581px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2.01773"
+           x="25.790016"
+           y="47.090862">A</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.9566px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffff00;fill-opacity:1;stroke:#a96625;stroke-width:1.48697;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         x="34.563576"
+         y="89.317398"
+         id="text1338-3-4"
+         transform="matrix(0.9557019,-0.98598613,-0.00537662,1.0518984,0,0)"><tspan
+           id="tspan1336-2-1"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.9566px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1.48697"
+           x="34.563576"
+           y="89.317398">B</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.29399px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#007cff;fill-opacity:1;stroke:#a96625;stroke-width:1.88819;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         x="57.188141"
+         y="40.191666"
+         id="text1338-3-1-8"
+         transform="matrix(0.97874676,0.36894071,-0.74321005,0.74156012,0,0)"><tspan
+           id="tspan1336-2-3-8"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.29399px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#007cff;fill-opacity:1;stroke:none;stroke-width:1.88819"
+           x="57.188141"
+           y="40.191666">C</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/blockmaker.svg b/src/data/layers/factory-components/blockmaker.svg
new file mode 100644
index 0000000..cb14709
--- /dev/null
+++ b/src/data/layers/factory-components/blockmaker.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bearmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202825"
+       y="0.38202825"
+       rx="1.246511" />
+    <g
+       id="g3038-4-0"
+       transform="matrix(0.72151136,0,0,0.72151136,-15.399228,-32.2731)">
+      <path
+         style="fill:#c68000;fill-opacity:1;stroke:#ff0000;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 23.906542,51.953545 v 6.784524 l 7.17471,2.411957 V 54.36577 Z"
+         id="path2172-9-0" />
+      <path
+         style="fill:#c68000;fill-opacity:1;stroke:#ffff00;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 36.727057,50.379178 -4.703952,4.474278 v 6.267975 l 4.703952,-3.957997 z"
+         id="path2170-1-3"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#c68000;fill-opacity:1;stroke:#007cff;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 29.050764,46.632495 -4.703465,4.474547 7.295877,2.478984 4.703952,-4.474546 z"
+         id="rect341-6-7-9" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.72581px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ff0000;fill-opacity:1;stroke:#a96625;stroke-width:2.01773;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         x="25.790016"
+         y="47.090862"
+         id="text1338-5-5"
+         transform="matrix(0.97261523,0.37895849,-6.3090413e-4,1.02791,0,0)"><tspan
+           sodipodi:role="line"
+           id="tspan1336-5-3"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.72581px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2.01773"
+           x="25.790016"
+           y="47.090862">A</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.9566px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffff00;fill-opacity:1;stroke:#a96625;stroke-width:1.48697;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         x="34.563576"
+         y="89.317398"
+         id="text1338-3-4-1"
+         transform="matrix(0.9557019,-0.98598613,-0.00537662,1.0518984,0,0)"><tspan
+           sodipodi:role="line"
+           id="tspan1336-2-1-1"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.9566px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1.48697"
+           x="34.563576"
+           y="89.317398">B</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.29399px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#007cff;fill-opacity:1;stroke:#a96625;stroke-width:1.88819;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         x="57.188141"
+         y="40.191666"
+         id="text1338-3-1-8-2"
+         transform="matrix(0.97874676,0.36894071,-0.74321005,0.74156012,0,0)"><tspan
+           sodipodi:role="line"
+           id="tspan1336-2-3-8-6"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.29399px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#007cff;fill-opacity:1;stroke:none;stroke-width:1.88819"
+           x="57.188141"
+           y="40.191666">C</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucket.svg b/src/data/layers/factory-components/bucket.svg
new file mode 100644
index 0000000..3f0fa8c
--- /dev/null
+++ b/src/data/layers/factory-components/bucket.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/shed.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect44523-4-0"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect44525-0-9"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.2688037,0.52530595"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g45369-0-8"
+       transform="matrix(0.74985522,0,0,0.74985522,53.961339,-9.0608758)">
+      <path
+         id="rect41826-8-0"
+         style="fill:#ff0000;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+         d="m -70.368804,15.616909 12.292699,-0.140082 -2.311347,9.527354 h -8.020209 z"
+         sodipodi:nodetypes="ccccc" />
+      <ellipse
+         style="fill:#ff0000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path43697-7-5"
+         cx="-64.437531"
+         cy="25.109625"
+         rx="3.9923253"
+         ry="1.5058771" />
+      <rect
+         style="fill:#e40000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect43699-3-3"
+         width="13.23771"
+         height="1.3307751"
+         x="-70.811249"
+         y="14.638526" />
+      <path
+         d="m -64.447322,18.313004 c 0.479085,0.450823 2.318241,2.250651 4.238041,3.308584 0.213407,0.113366 0.437801,0.225397 0.673719,0.327549 0.178643,0.07735 0.389296,0.160101 0.619911,0.231224 0.403144,0.124331 0.915928,0.228924 1.481901,0.181277 0.05328,-0.0045 0.135469,-0.01167 0.221258,-0.02597 0.08096,-0.01349 0.187368,-0.03672 0.295802,-0.0823 0.05393,-0.02267 0.112658,-0.05262 0.171158,-0.09281 0.05794,-0.0398 0.116997,-0.09069 0.169961,-0.154628 0.05295,-0.06392 0.09741,-0.137875 0.129504,-0.221381 0.03165,-0.08235 0.04886,-0.16766 0.05387,-0.253345 0.0086,-0.158239 -0.004,-0.307694 -0.02986,-0.449392 -0.02551,-0.139874 -0.06389,-0.271885 -0.107326,-0.394586 -0.08394,-0.237144 -0.199045,-0.469942 -0.281697,-0.64641 -0.0031,-0.0066 -0.0063,-0.01311 -0.0097,-0.01956 -0.270648,-0.520417 -0.546162,-0.993623 -0.88926,-1.421449 -0.02868,-0.04098 -0.0645,-0.08275 -0.109364,-0.12121 -0.06335,-0.05431 -0.134871,-0.09349 -0.210224,-0.117527 -0.07588,-0.0242 -0.142203,-0.02875 -0.186353,-0.02888 -0.04216,-1.26e-4 -0.07976,0.0043 -0.08399,0.0047 -0.01041,0.0011 -0.0014,-7.07e-4 0.02414,-7.81e-4 0.02873,-8.3e-5 0.07497,0.0029 0.129462,0.0199 0.06327,0.01967 0.116431,0.05144 0.157937,0.08694 0.04547,0.03889 0.07068,0.07677 0.08172,0.09511 a 0.52530595,0.52530595 90 0 0 -0.8999,0.542186 c 0.02684,0.04454 0.0697,0.105016 0.135305,0.161125 0.05849,0.05002 0.129782,0.092 0.212979,0.117869 0.07225,0.02247 0.136907,0.02762 0.185539,0.02748 0.03993,-1.16e-4 0.07523,-0.0042 0.08081,-0.0048 0.0086,-8.92e-4 9.82e-4,9.48e-4 -0.02713,8.65e-4 -0.02579,-7.7e-5 -0.07305,-0.0027 -0.129759,-0.02079 -0.05702,-0.01819 -0.109792,-0.0476 -0.154315,-0.08577 -0.04072,-0.03491 -0.06565,-0.06948 -0.07935,-0.09197 l 0.04031,0.05722 c 0.28351,0.350306 0.52412,0.755253 0.784383,1.254978 0.09499,0.202522 0.177115,0.369246 0.238027,0.541334 0.02955,0.08349 0.05099,0.160283 0.06416,0.232511 0.01319,0.07235 0.01787,0.13893 0.01447,0.201941 9.55e-4,-0.01645 0.0044,-0.03844 0.01442,-0.06463 0.01028,-0.02674 0.02496,-0.05122 0.04209,-0.07189 0.01665,-0.0201 0.03318,-0.03354 0.04423,-0.04113 0.01123,-0.0077 0.01693,-0.0099 0.01665,-0.0098 -5.83e-4,2.45e-4 -0.02578,0.0086 -0.06142,0.01452 -0.03981,0.0066 -0.08423,0.01091 -0.137225,0.01542 -0.386155,0.03251 -0.757222,-0.0377 -1.08362,-0.138365 -0.184535,-0.05691 -0.358222,-0.124767 -0.512076,-0.191386 -0.202696,-0.08777 -0.400982,-0.186435 -0.591329,-0.287486 -1.770418,-0.975687 -3.5036,-2.665688 -4.017904,-3.149653 a 0.52530595,0.52530595 90 0 0 -0.719984,0.76512 z"
+         id="path-1-21-8-5"
+         inkscape:path-effect="#path-effect44523-4-0;#path-effect44525-0-9"
+         inkscape:original-d="m -64.08733,17.930444 c 1.341321,1.261767 4.674365,4.417163 6.934039,3.852244 0.837969,-0.209492 -0.744734,-2.635836 -0.980571,-2.871673 -0.161876,-0.161876 -0.06287,0.05803 -0.222764,-0.101865"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         sodipodi:nodetypes="cssc" />
+      <circle
+         style="fill:#ffff00;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path45307-4-5"
+         cx="-64.15789"
+         cy="17.975683"
+         r="1.0517688" />
+      <rect
+         style="fill:#ffff00;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect45361-5-4"
+         width="0.95615339"
+         height="0.81273037"
+         x="-32.877365"
+         y="-52.515896"
+         transform="rotate(-75.935313)" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketblue.svg b/src/data/layers/factory-components/bucketblue.svg
new file mode 100644
index 0000000..4b06745
--- /dev/null
+++ b/src/data/layers/factory-components/bucketblue.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketblue.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.42672839"
+     inkscape:cx="1135.3826"
+     inkscape:cy="691.30625"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-7"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-0"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.12676762"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.704952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect3382-3"
+       width="6.7919598"
+       height="10.838026"
+       x="3.3546793"
+       y="1.2499634"
+       ry="2.4192021"
+       rx="4.9954476" />
+    <ellipse
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.656483;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="path8637-9"
+       cx="6.7369957"
+       cy="2.9371867"
+       rx="3.2694898"
+       ry="1.7482785" />
+    <path
+       id="path8637-3-8"
+       style="fill:#56a4ff;fill-opacity:1;stroke:none;stroke-width:0.675255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 6.7116266,1.1128488 A 3.2694899,1.8496926 0 0 0 3.4421547,2.9625293 3.2694899,1.8496926 0 0 0 6.7116266,4.8122522 3.2694899,1.8496926 0 0 0 7.2694413,4.7840142 v 0.862736 c 0,0.2265359 0.1823477,0.4089273 0.4088809,0.4089273 0.071251,0 0.1381382,-0.018088 0.1963501,-0.049877 v 0.274787 c 0,0.2265359 0.1823543,0.4088849 0.4088875,0.4088849 0.2265333,0 0.4089287,-0.182349 0.4089287,-0.4088849 v -0.099144 c 0.058967,0.032902 0.1269715,0.051679 0.1995568,0.051679 0.2265399,0 0.4089286,-0.1823913 0.4089286,-0.4089273 V 4.2588117 c 0,-0.052289 -0.00981,-0.1022054 -0.027549,-0.1480858 A 3.2694899,1.8496926 0 0 0 9.9811435,2.9625094 3.2694899,1.8496926 0 0 0 6.7116305,1.1128289 Z" />
+    <path
+       d="M 6.5929776,4.8331033 C 6.3522234,4.9860027 6.1451885,5.1038286 5.6704207,5.3660291 5.408882,5.5104694 5.0581124,5.7037301 4.7367548,5.913731 4.6549793,5.9642433 4.565568,6.019571 4.4776002,6.0736356 4.1357805,6.2837161 3.5334764,6.6547379 2.9246354,6.9127027 2.8268934,6.9503609 2.7154864,6.9948788 2.6071683,7.0246179 2.5060107,7.0523911 2.404727,7.0683263 2.3037078,7.059244 c -0.018698,-0.00198 -0.036506,-0.00879 -0.053066,-0.019905 -0.01686,-0.01132 -0.033824,-0.028117 -0.050036,-0.05126 -0.01605,-0.022912 -0.030247,-0.050479 -0.042042,-0.081197 C 2.1468746,6.8764401 2.1381557,6.8444898 2.1323398,6.8137306 2.109561,6.6678024 2.1233923,6.5146847 2.1594486,6.3614708 2.1963813,6.2045328 2.2560766,6.0493214 2.3195475,5.9008594 2.3936094,5.741298 2.4728481,5.5897292 2.5624899,5.4504466 c 0.09734,-0.1512445 0.2017013,-0.2796673 0.316787,-0.3870291 0.039159,-0.033889 0.066371,-0.050679 0.086562,-0.060893 A 0.12676762,0.12676762 90 0 0 2.8513932,4.7762888 C 2.8095302,4.797466 2.7651731,4.8268352 2.709698,4.8749963 2.5732849,5.0021432 2.4559037,5.1475858 2.3492932,5.313234 2.2513449,5.465423 2.1666394,5.628087 2.0879832,5.7976927 2.0210661,5.954068 1.9546136,6.1250985 1.9126552,6.3033922 c -0.041308,0.1755315 -0.06003,0.3624109 -0.030119,0.553495 0.00904,0.048148 0.021683,0.094893 0.039342,0.1408792 0.017722,0.046153 0.040991,0.092831 0.071071,0.135773 0.030445,0.043463 0.068735,0.084313 0.1163679,0.1162931 0.049061,0.032939 0.1059851,0.055035 0.1697847,0.061743 0.1439786,0.012959 0.2775986,-0.010184 0.3951911,-0.042469 C 2.7979358,7.2351593 2.9236891,7.1847652 3.0197412,7.1476881 3.6528017,6.8795338 4.2710335,6.4981814 4.6103536,6.2896371 4.6986813,6.2353513 4.7884462,6.1798047 4.8727649,6.1276732 5.1875615,5.9220074 5.5299182,5.733255 5.7929909,5.5879676 6.2684567,5.3253815 6.4812047,5.2044325 6.7288996,5.0471251 A 0.12676762,0.12676762 90 0 0 6.5929776,4.8331033 Z"
+       id="path-1-6"
+       inkscape:path-effect="#path-effect9795-7;#path-effect9797-0"
+       inkscape:original-d="M 6.6609386,4.9401142 C 6.1962589,5.2331929 5.7137883,5.4813426 5.2411393,5.7514268 4.8062386,5.9999409 2.559085,7.5315937 2.1480124,7.120517 1.6461011,6.6186058 2.4919049,5.0977619 2.9086158,4.8894065"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.47278;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketgreen.svg b/src/data/layers/factory-components/bucketgreen.svg
new file mode 100644
index 0000000..7ec5d63
--- /dev/null
+++ b/src/data/layers/factory-components/bucketgreen.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketyellow.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.42672839"
+     inkscape:cx="1135.3826"
+     inkscape:cy="691.30625"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-7"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-0"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.12676762"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.704952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect3382-3"
+       width="6.7919598"
+       height="10.838026"
+       x="3.3546793"
+       y="1.2499634"
+       ry="2.4192021"
+       rx="4.9954476" />
+    <ellipse
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.656483;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="path8637-9"
+       cx="6.7369957"
+       cy="2.9371867"
+       rx="3.2694898"
+       ry="1.7482785" />
+    <path
+       id="path8637-3-8"
+       style="fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:0.675255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 6.7116266,1.1128488 A 3.2694899,1.8496926 0 0 0 3.4421547,2.9625293 3.2694899,1.8496926 0 0 0 6.7116266,4.8122522 3.2694899,1.8496926 0 0 0 7.2694413,4.7840142 v 0.862736 c 0,0.2265359 0.1823477,0.4089273 0.4088809,0.4089273 0.071251,0 0.1381382,-0.018088 0.1963501,-0.049877 v 0.274787 c 0,0.2265359 0.1823543,0.4088849 0.4088875,0.4088849 0.2265333,0 0.4089287,-0.182349 0.4089287,-0.4088849 v -0.099144 c 0.058967,0.032902 0.1269715,0.051679 0.1995568,0.051679 0.2265399,0 0.4089286,-0.1823913 0.4089286,-0.4089273 V 4.2588117 c 0,-0.052289 -0.00981,-0.1022054 -0.027549,-0.1480858 A 3.2694899,1.8496926 0 0 0 9.9811435,2.9625094 3.2694899,1.8496926 0 0 0 6.7116305,1.1128289 Z" />
+    <path
+       d="M 6.5929776,4.8331033 C 6.3522234,4.9860027 6.1451885,5.1038286 5.6704207,5.3660291 5.408882,5.5104694 5.0581124,5.7037301 4.7367548,5.913731 4.6549793,5.9642433 4.565568,6.019571 4.4776002,6.0736356 4.1357805,6.2837161 3.5334764,6.6547379 2.9246354,6.9127027 2.8268934,6.9503609 2.7154864,6.9948788 2.6071683,7.0246179 2.5060107,7.0523911 2.404727,7.0683263 2.3037078,7.059244 c -0.018698,-0.00198 -0.036506,-0.00879 -0.053066,-0.019905 -0.01686,-0.01132 -0.033824,-0.028117 -0.050036,-0.05126 -0.01605,-0.022912 -0.030247,-0.050479 -0.042042,-0.081197 C 2.1468746,6.8764401 2.1381557,6.8444898 2.1323398,6.8137306 2.109561,6.6678024 2.1233923,6.5146847 2.1594486,6.3614708 2.1963813,6.2045328 2.2560766,6.0493214 2.3195475,5.9008594 2.3936094,5.741298 2.4728481,5.5897292 2.5624899,5.4504466 c 0.09734,-0.1512445 0.2017013,-0.2796673 0.316787,-0.3870291 0.039159,-0.033889 0.066371,-0.050679 0.086562,-0.060893 A 0.12676762,0.12676762 90 0 0 2.8513932,4.7762888 C 2.8095302,4.797466 2.7651731,4.8268352 2.709698,4.8749963 2.5732849,5.0021432 2.4559037,5.1475858 2.3492932,5.313234 2.2513449,5.465423 2.1666394,5.628087 2.0879832,5.7976927 2.0210661,5.954068 1.9546136,6.1250985 1.9126552,6.3033922 c -0.041308,0.1755315 -0.06003,0.3624109 -0.030119,0.553495 0.00904,0.048148 0.021683,0.094893 0.039342,0.1408792 0.017722,0.046153 0.040991,0.092831 0.071071,0.135773 0.030445,0.043463 0.068735,0.084313 0.1163679,0.1162931 0.049061,0.032939 0.1059851,0.055035 0.1697847,0.061743 0.1439786,0.012959 0.2775986,-0.010184 0.3951911,-0.042469 C 2.7979358,7.2351593 2.9236891,7.1847652 3.0197412,7.1476881 3.6528017,6.8795338 4.2710335,6.4981814 4.6103536,6.2896371 4.6986813,6.2353513 4.7884462,6.1798047 4.8727649,6.1276732 5.1875615,5.9220074 5.5299182,5.733255 5.7929909,5.5879676 6.2684567,5.3253815 6.4812047,5.2044325 6.7288996,5.0471251 A 0.12676762,0.12676762 90 0 0 6.5929776,4.8331033 Z"
+       id="path-1-6"
+       inkscape:path-effect="#path-effect9795-7;#path-effect9797-0"
+       inkscape:original-d="M 6.6609386,4.9401142 C 6.1962589,5.2331929 5.7137883,5.4813426 5.2411393,5.7514268 4.8062386,5.9999409 2.559085,7.5315937 2.1480124,7.120517 1.6461011,6.6186058 2.4919049,5.0977619 2.9086158,4.8894065"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.47278;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketmaker.svg b/src/data/layers/factory-components/bucketmaker.svg
new file mode 100644
index 0000000..0d8e2b8
--- /dev/null
+++ b/src/data/layers/factory-components/bucketmaker.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/shovelmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="3.4785843"
+     inkscape:cx="65.687643"
+     inkscape:cy="46.57067"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect44523-4-0"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect44525-0-9"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.2688037,0.52530595"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545-6"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202849"
+       y="0.38202849"
+       rx="1.246511" />
+    <g
+       id="g45369-0-8"
+       transform="matrix(0.74985522,0,0,0.74985522,54.261944,-9.0927826)">
+      <path
+         id="rect41826-8-0"
+         style="fill:#ff0000;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+         d="m -70.368804,15.616909 12.292699,-0.140082 -2.311347,9.527354 h -8.020209 z"
+         sodipodi:nodetypes="ccccc" />
+      <ellipse
+         style="fill:#ff0000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path43697-7-5"
+         cx="-64.437531"
+         cy="25.109625"
+         rx="3.9923253"
+         ry="1.5058771" />
+      <rect
+         style="fill:#e40000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect43699-3-3"
+         width="13.23771"
+         height="1.3307751"
+         x="-70.811249"
+         y="14.638526" />
+      <path
+         d="m -64.447322,18.313004 c 0.479085,0.450823 2.318241,2.250651 4.238041,3.308584 0.213407,0.113366 0.437801,0.225397 0.673719,0.327549 0.178643,0.07735 0.389296,0.160101 0.619911,0.231224 0.403144,0.124331 0.915928,0.228924 1.481901,0.181277 0.05328,-0.0045 0.135469,-0.01167 0.221258,-0.02597 0.08096,-0.01349 0.187368,-0.03672 0.295802,-0.0823 0.05393,-0.02267 0.112658,-0.05262 0.171158,-0.09281 0.05794,-0.0398 0.116997,-0.09069 0.169961,-0.154628 0.05295,-0.06392 0.09741,-0.137875 0.129504,-0.221381 0.03165,-0.08235 0.04886,-0.16766 0.05387,-0.253345 0.0086,-0.158239 -0.004,-0.307694 -0.02986,-0.449392 -0.02551,-0.139874 -0.06389,-0.271885 -0.107326,-0.394586 -0.08394,-0.237144 -0.199045,-0.469942 -0.281697,-0.64641 -0.0031,-0.0066 -0.0063,-0.01311 -0.0097,-0.01956 -0.270648,-0.520417 -0.546162,-0.993623 -0.88926,-1.421449 -0.02868,-0.04098 -0.0645,-0.08275 -0.109364,-0.12121 -0.06335,-0.05431 -0.134871,-0.09349 -0.210224,-0.117527 -0.07588,-0.0242 -0.142203,-0.02875 -0.186353,-0.02888 -0.04216,-1.26e-4 -0.07976,0.0043 -0.08399,0.0047 -0.01041,0.0011 -0.0014,-7.07e-4 0.02414,-7.81e-4 0.02873,-8.3e-5 0.07497,0.0029 0.129462,0.0199 0.06327,0.01967 0.116431,0.05144 0.157937,0.08694 0.04547,0.03889 0.07068,0.07677 0.08172,0.09511 a 0.52530595,0.52530595 90 0 0 -0.8999,0.542186 c 0.02684,0.04454 0.0697,0.105016 0.135305,0.161125 0.05849,0.05002 0.129782,0.092 0.212979,0.117869 0.07225,0.02247 0.136907,0.02762 0.185539,0.02748 0.03993,-1.16e-4 0.07523,-0.0042 0.08081,-0.0048 0.0086,-8.92e-4 9.82e-4,9.48e-4 -0.02713,8.65e-4 -0.02579,-7.7e-5 -0.07305,-0.0027 -0.129759,-0.02079 -0.05702,-0.01819 -0.109792,-0.0476 -0.154315,-0.08577 -0.04072,-0.03491 -0.06565,-0.06948 -0.07935,-0.09197 l 0.04031,0.05722 c 0.28351,0.350306 0.52412,0.755253 0.784383,1.254978 0.09499,0.202522 0.177115,0.369246 0.238027,0.541334 0.02955,0.08349 0.05099,0.160283 0.06416,0.232511 0.01319,0.07235 0.01787,0.13893 0.01447,0.201941 9.55e-4,-0.01645 0.0044,-0.03844 0.01442,-0.06463 0.01028,-0.02674 0.02496,-0.05122 0.04209,-0.07189 0.01665,-0.0201 0.03318,-0.03354 0.04423,-0.04113 0.01123,-0.0077 0.01693,-0.0099 0.01665,-0.0098 -5.83e-4,2.45e-4 -0.02578,0.0086 -0.06142,0.01452 -0.03981,0.0066 -0.08423,0.01091 -0.137225,0.01542 -0.386155,0.03251 -0.757222,-0.0377 -1.08362,-0.138365 -0.184535,-0.05691 -0.358222,-0.124767 -0.512076,-0.191386 -0.202696,-0.08777 -0.400982,-0.186435 -0.591329,-0.287486 -1.770418,-0.975687 -3.5036,-2.665688 -4.017904,-3.149653 a 0.52530595,0.52530595 90 0 0 -0.719984,0.76512 z"
+         id="path-1-21-8-5"
+         inkscape:path-effect="#path-effect44523-4-0;#path-effect44525-0-9"
+         inkscape:original-d="m -64.08733,17.930444 c 1.341321,1.261767 4.674365,4.417163 6.934039,3.852244 0.837969,-0.209492 -0.744734,-2.635836 -0.980571,-2.871673 -0.161876,-0.161876 -0.06287,0.05803 -0.222764,-0.101865"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         sodipodi:nodetypes="cssc" />
+      <circle
+         style="fill:#ffff00;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path45307-4-5"
+         cx="-64.15789"
+         cy="17.975683"
+         r="1.0517688" />
+      <rect
+         style="fill:#ffff00;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect45361-5-4"
+         width="0.95615339"
+         height="0.81273037"
+         x="-32.877365"
+         y="-52.515896"
+         transform="rotate(-75.935313)" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketorange.svg b/src/data/layers/factory-components/bucketorange.svg
new file mode 100644
index 0000000..18a13c1
--- /dev/null
+++ b/src/data/layers/factory-components/bucketorange.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketred.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.42672839"
+     inkscape:cx="1135.3826"
+     inkscape:cy="691.30625"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-7"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-0"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.12676762"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.704952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect3382-3"
+       width="6.7919598"
+       height="10.838026"
+       x="3.3546793"
+       y="1.2499634"
+       ry="2.4192021"
+       rx="4.9954476" />
+    <ellipse
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.656483;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="path8637-9"
+       cx="6.7369957"
+       cy="2.9371867"
+       rx="3.2694898"
+       ry="1.7482785" />
+    <path
+       id="path8637-3-8"
+       style="fill:#ff8300;fill-opacity:1;stroke:none;stroke-width:0.675255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 6.7116266,1.1128488 A 3.2694899,1.8496926 0 0 0 3.4421547,2.9625293 3.2694899,1.8496926 0 0 0 6.7116266,4.8122522 3.2694899,1.8496926 0 0 0 7.2694413,4.7840142 v 0.862736 c 0,0.2265359 0.1823477,0.4089273 0.4088809,0.4089273 0.071251,0 0.1381382,-0.018088 0.1963501,-0.049877 v 0.274787 c 0,0.2265359 0.1823543,0.4088849 0.4088875,0.4088849 0.2265333,0 0.4089287,-0.182349 0.4089287,-0.4088849 v -0.099144 c 0.058967,0.032902 0.1269715,0.051679 0.1995568,0.051679 0.2265399,0 0.4089286,-0.1823913 0.4089286,-0.4089273 V 4.2588117 c 0,-0.052289 -0.00981,-0.1022054 -0.027549,-0.1480858 A 3.2694899,1.8496926 0 0 0 9.9811435,2.9625094 3.2694899,1.8496926 0 0 0 6.7116305,1.1128289 Z" />
+    <path
+       d="M 6.5929776,4.8331033 C 6.3522234,4.9860027 6.1451885,5.1038286 5.6704207,5.3660291 5.408882,5.5104694 5.0581124,5.7037301 4.7367548,5.913731 4.6549793,5.9642433 4.565568,6.019571 4.4776002,6.0736356 4.1357805,6.2837161 3.5334764,6.6547379 2.9246354,6.9127027 2.8268934,6.9503609 2.7154864,6.9948788 2.6071683,7.0246179 2.5060107,7.0523911 2.404727,7.0683263 2.3037078,7.059244 c -0.018698,-0.00198 -0.036506,-0.00879 -0.053066,-0.019905 -0.01686,-0.01132 -0.033824,-0.028117 -0.050036,-0.05126 -0.01605,-0.022912 -0.030247,-0.050479 -0.042042,-0.081197 C 2.1468746,6.8764401 2.1381557,6.8444898 2.1323398,6.8137306 2.109561,6.6678024 2.1233923,6.5146847 2.1594486,6.3614708 2.1963813,6.2045328 2.2560766,6.0493214 2.3195475,5.9008594 2.3936094,5.741298 2.4728481,5.5897292 2.5624899,5.4504466 c 0.09734,-0.1512445 0.2017013,-0.2796673 0.316787,-0.3870291 0.039159,-0.033889 0.066371,-0.050679 0.086562,-0.060893 A 0.12676762,0.12676762 90 0 0 2.8513932,4.7762888 C 2.8095302,4.797466 2.7651731,4.8268352 2.709698,4.8749963 2.5732849,5.0021432 2.4559037,5.1475858 2.3492932,5.313234 2.2513449,5.465423 2.1666394,5.628087 2.0879832,5.7976927 2.0210661,5.954068 1.9546136,6.1250985 1.9126552,6.3033922 c -0.041308,0.1755315 -0.06003,0.3624109 -0.030119,0.553495 0.00904,0.048148 0.021683,0.094893 0.039342,0.1408792 0.017722,0.046153 0.040991,0.092831 0.071071,0.135773 0.030445,0.043463 0.068735,0.084313 0.1163679,0.1162931 0.049061,0.032939 0.1059851,0.055035 0.1697847,0.061743 0.1439786,0.012959 0.2775986,-0.010184 0.3951911,-0.042469 C 2.7979358,7.2351593 2.9236891,7.1847652 3.0197412,7.1476881 3.6528017,6.8795338 4.2710335,6.4981814 4.6103536,6.2896371 4.6986813,6.2353513 4.7884462,6.1798047 4.8727649,6.1276732 5.1875615,5.9220074 5.5299182,5.733255 5.7929909,5.5879676 6.2684567,5.3253815 6.4812047,5.2044325 6.7288996,5.0471251 A 0.12676762,0.12676762 90 0 0 6.5929776,4.8331033 Z"
+       id="path-1-6"
+       inkscape:path-effect="#path-effect9795-7;#path-effect9797-0"
+       inkscape:original-d="M 6.6609386,4.9401142 C 6.1962589,5.2331929 5.7137883,5.4813426 5.2411393,5.7514268 4.8062386,5.9999409 2.559085,7.5315937 2.1480124,7.120517 1.6461011,6.6186058 2.4919049,5.0977619 2.9086158,4.8894065"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.47278;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketpurple.svg b/src/data/layers/factory-components/bucketpurple.svg
new file mode 100644
index 0000000..3a8336d
--- /dev/null
+++ b/src/data/layers/factory-components/bucketpurple.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketpurple.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.42672839"
+     inkscape:cx="1135.3826"
+     inkscape:cy="691.30625"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-7"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-0"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.12676762"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.704952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect3382-3"
+       width="6.7919598"
+       height="10.838026"
+       x="3.3546793"
+       y="1.2499634"
+       ry="2.4192021"
+       rx="4.9954476" />
+    <ellipse
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.656483;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="path8637-9"
+       cx="6.7369957"
+       cy="2.9371867"
+       rx="3.2694898"
+       ry="1.7482785" />
+    <path
+       id="path8637-3-8"
+       style="fill:#cc00fd;fill-opacity:1;stroke:none;stroke-width:0.675255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 6.7116266,1.1128488 A 3.2694899,1.8496926 0 0 0 3.4421547,2.9625293 3.2694899,1.8496926 0 0 0 6.7116266,4.8122522 3.2694899,1.8496926 0 0 0 7.2694413,4.7840142 v 0.862736 c 0,0.2265359 0.1823477,0.4089273 0.4088809,0.4089273 0.071251,0 0.1381382,-0.018088 0.1963501,-0.049877 v 0.274787 c 0,0.2265359 0.1823543,0.4088849 0.4088875,0.4088849 0.2265333,0 0.4089287,-0.182349 0.4089287,-0.4088849 v -0.099144 c 0.058967,0.032902 0.1269715,0.051679 0.1995568,0.051679 0.2265399,0 0.4089286,-0.1823913 0.4089286,-0.4089273 V 4.2588117 c 0,-0.052289 -0.00981,-0.1022054 -0.027549,-0.1480858 A 3.2694899,1.8496926 0 0 0 9.9811435,2.9625094 3.2694899,1.8496926 0 0 0 6.7116305,1.1128289 Z" />
+    <path
+       d="M 6.5929776,4.8331033 C 6.3522234,4.9860027 6.1451885,5.1038286 5.6704207,5.3660291 5.408882,5.5104694 5.0581124,5.7037301 4.7367548,5.913731 4.6549793,5.9642433 4.565568,6.019571 4.4776002,6.0736356 4.1357805,6.2837161 3.5334764,6.6547379 2.9246354,6.9127027 2.8268934,6.9503609 2.7154864,6.9948788 2.6071683,7.0246179 2.5060107,7.0523911 2.404727,7.0683263 2.3037078,7.059244 c -0.018698,-0.00198 -0.036506,-0.00879 -0.053066,-0.019905 -0.01686,-0.01132 -0.033824,-0.028117 -0.050036,-0.05126 -0.01605,-0.022912 -0.030247,-0.050479 -0.042042,-0.081197 C 2.1468746,6.8764401 2.1381557,6.8444898 2.1323398,6.8137306 2.109561,6.6678024 2.1233923,6.5146847 2.1594486,6.3614708 2.1963813,6.2045328 2.2560766,6.0493214 2.3195475,5.9008594 2.3936094,5.741298 2.4728481,5.5897292 2.5624899,5.4504466 c 0.09734,-0.1512445 0.2017013,-0.2796673 0.316787,-0.3870291 0.039159,-0.033889 0.066371,-0.050679 0.086562,-0.060893 A 0.12676762,0.12676762 90 0 0 2.8513932,4.7762888 C 2.8095302,4.797466 2.7651731,4.8268352 2.709698,4.8749963 2.5732849,5.0021432 2.4559037,5.1475858 2.3492932,5.313234 2.2513449,5.465423 2.1666394,5.628087 2.0879832,5.7976927 2.0210661,5.954068 1.9546136,6.1250985 1.9126552,6.3033922 c -0.041308,0.1755315 -0.06003,0.3624109 -0.030119,0.553495 0.00904,0.048148 0.021683,0.094893 0.039342,0.1408792 0.017722,0.046153 0.040991,0.092831 0.071071,0.135773 0.030445,0.043463 0.068735,0.084313 0.1163679,0.1162931 0.049061,0.032939 0.1059851,0.055035 0.1697847,0.061743 0.1439786,0.012959 0.2775986,-0.010184 0.3951911,-0.042469 C 2.7979358,7.2351593 2.9236891,7.1847652 3.0197412,7.1476881 3.6528017,6.8795338 4.2710335,6.4981814 4.6103536,6.2896371 4.6986813,6.2353513 4.7884462,6.1798047 4.8727649,6.1276732 5.1875615,5.9220074 5.5299182,5.733255 5.7929909,5.5879676 6.2684567,5.3253815 6.4812047,5.2044325 6.7288996,5.0471251 A 0.12676762,0.12676762 90 0 0 6.5929776,4.8331033 Z"
+       id="path-1-6"
+       inkscape:path-effect="#path-effect9795-7;#path-effect9797-0"
+       inkscape:original-d="M 6.6609386,4.9401142 C 6.1962589,5.2331929 5.7137883,5.4813426 5.2411393,5.7514268 4.8062386,5.9999409 2.559085,7.5315937 2.1480124,7.120517 1.6461011,6.6186058 2.4919049,5.0977619 2.9086158,4.8894065"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.47278;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketred.svg b/src/data/layers/factory-components/bucketred.svg
new file mode 100644
index 0000000..88fbdfc
--- /dev/null
+++ b/src/data/layers/factory-components/bucketred.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="bucketred.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.42672839"
+     inkscape:cx="1135.3826"
+     inkscape:cy="691.30625"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-7"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-0"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.12676762"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.704952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect3382-3"
+       width="6.7919598"
+       height="10.838026"
+       x="3.3546793"
+       y="1.2499634"
+       ry="2.4192021"
+       rx="4.9954476" />
+    <ellipse
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.656483;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="path8637-9"
+       cx="6.7369957"
+       cy="2.9371867"
+       rx="3.2694898"
+       ry="1.7482785" />
+    <path
+       id="path8637-3-8"
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.675255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 6.7116266,1.1128488 A 3.2694899,1.8496926 0 0 0 3.4421547,2.9625293 3.2694899,1.8496926 0 0 0 6.7116266,4.8122522 3.2694899,1.8496926 0 0 0 7.2694413,4.7840142 v 0.862736 c 0,0.2265359 0.1823477,0.4089273 0.4088809,0.4089273 0.071251,0 0.1381382,-0.018088 0.1963501,-0.049877 v 0.274787 c 0,0.2265359 0.1823543,0.4088849 0.4088875,0.4088849 0.2265333,0 0.4089287,-0.182349 0.4089287,-0.4088849 v -0.099144 c 0.058967,0.032902 0.1269715,0.051679 0.1995568,0.051679 0.2265399,0 0.4089286,-0.1823913 0.4089286,-0.4089273 V 4.2588117 c 0,-0.052289 -0.00981,-0.1022054 -0.027549,-0.1480858 A 3.2694899,1.8496926 0 0 0 9.9811435,2.9625094 3.2694899,1.8496926 0 0 0 6.7116305,1.1128289 Z" />
+    <path
+       d="M 6.5929776,4.8331033 C 6.3522234,4.9860027 6.1451885,5.1038286 5.6704207,5.3660291 5.408882,5.5104694 5.0581124,5.7037301 4.7367548,5.913731 4.6549793,5.9642433 4.565568,6.019571 4.4776002,6.0736356 4.1357805,6.2837161 3.5334764,6.6547379 2.9246354,6.9127027 2.8268934,6.9503609 2.7154864,6.9948788 2.6071683,7.0246179 2.5060107,7.0523911 2.404727,7.0683263 2.3037078,7.059244 c -0.018698,-0.00198 -0.036506,-0.00879 -0.053066,-0.019905 -0.01686,-0.01132 -0.033824,-0.028117 -0.050036,-0.05126 -0.01605,-0.022912 -0.030247,-0.050479 -0.042042,-0.081197 C 2.1468746,6.8764401 2.1381557,6.8444898 2.1323398,6.8137306 2.109561,6.6678024 2.1233923,6.5146847 2.1594486,6.3614708 2.1963813,6.2045328 2.2560766,6.0493214 2.3195475,5.9008594 2.3936094,5.741298 2.4728481,5.5897292 2.5624899,5.4504466 c 0.09734,-0.1512445 0.2017013,-0.2796673 0.316787,-0.3870291 0.039159,-0.033889 0.066371,-0.050679 0.086562,-0.060893 A 0.12676762,0.12676762 90 0 0 2.8513932,4.7762888 C 2.8095302,4.797466 2.7651731,4.8268352 2.709698,4.8749963 2.5732849,5.0021432 2.4559037,5.1475858 2.3492932,5.313234 2.2513449,5.465423 2.1666394,5.628087 2.0879832,5.7976927 2.0210661,5.954068 1.9546136,6.1250985 1.9126552,6.3033922 c -0.041308,0.1755315 -0.06003,0.3624109 -0.030119,0.553495 0.00904,0.048148 0.021683,0.094893 0.039342,0.1408792 0.017722,0.046153 0.040991,0.092831 0.071071,0.135773 0.030445,0.043463 0.068735,0.084313 0.1163679,0.1162931 0.049061,0.032939 0.1059851,0.055035 0.1697847,0.061743 0.1439786,0.012959 0.2775986,-0.010184 0.3951911,-0.042469 C 2.7979358,7.2351593 2.9236891,7.1847652 3.0197412,7.1476881 3.6528017,6.8795338 4.2710335,6.4981814 4.6103536,6.2896371 4.6986813,6.2353513 4.7884462,6.1798047 4.8727649,6.1276732 5.1875615,5.9220074 5.5299182,5.733255 5.7929909,5.5879676 6.2684567,5.3253815 6.4812047,5.2044325 6.7288996,5.0471251 A 0.12676762,0.12676762 90 0 0 6.5929776,4.8331033 Z"
+       id="path-1-6"
+       inkscape:path-effect="#path-effect9795-7;#path-effect9797-0"
+       inkscape:original-d="M 6.6609386,4.9401142 C 6.1962589,5.2331929 5.7137883,5.4813426 5.2411393,5.7514268 4.8062386,5.9999409 2.559085,7.5315937 2.1480124,7.120517 1.6461011,6.6186058 2.4919049,5.0977619 2.9086158,4.8894065"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.47278;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketshovel.svg b/src/data/layers/factory-components/bucketshovel.svg
new file mode 100644
index 0000000..57c71c5
--- /dev/null
+++ b/src/data/layers/factory-components/bucketshovel.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/shovel.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="3.4785843"
+     inkscape:cx="65.687643"
+     inkscape:cy="46.57067"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect44523-4-3-6"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect44525-0-1-1"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.2688037,0.52530595"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g45369-0-0"
+       transform="matrix(0.86109026,0,0,0.86109026,62.004748,-10.621594)">
+      <path
+         id="rect41826-8-08"
+         style="fill:#ff0000;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+         d="m -70.368804,15.616909 12.292699,-0.140082 -2.311347,9.527354 h -8.020209 z"
+         sodipodi:nodetypes="ccccc" />
+      <ellipse
+         style="fill:#ff0000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path43697-7-0"
+         cx="-64.437531"
+         cy="25.109625"
+         rx="3.9923253"
+         ry="1.5058771" />
+      <rect
+         style="fill:#e40000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect43699-3-4"
+         width="13.23771"
+         height="1.3307751"
+         x="-70.811249"
+         y="14.638526" />
+      <path
+         d="m -64.447488,18.312848 c 0.449919,0.423745 2.259412,2.193077 4.140886,3.255396 0.209075,0.114109 0.431268,0.228735 0.665535,0.334561 0.175969,0.07949 0.383567,0.165294 0.611065,0.240927 0.394824,0.131262 0.899455,0.249284 1.461476,0.227565 0.01159,-4.48e-4 0.02316,-0.0013 0.03469,-0.0025 0.03774,-0.004 0.21089,-0.01661 0.322597,-0.03499 0.06605,-0.01087 0.143456,-0.02736 0.224883,-0.05489 0.07947,-0.02687 0.165594,-0.06517 0.251165,-0.121384 0.03069,-0.02016 0.05919,-0.0435 0.08502,-0.0696 0.109473,-0.110663 0.181088,-0.239075 0.221917,-0.371888 0.03892,-0.12662 0.0473,-0.24834 0.04378,-0.352172 -0.0035,-0.102255 -0.0189,-0.197117 -0.03515,-0.275695 -0.01591,-0.07695 -0.03547,-0.151071 -0.04886,-0.203089 -0.0024,-0.0094 -0.0051,-0.01872 -0.008,-0.02797 -0.237326,-0.747249 -0.641527,-1.409903 -1.022972,-1.979653 -0.02636,-0.04116 -0.05844,-0.09015 -0.09482,-0.139693 -0.03899,-0.0531 -0.08684,-0.112292 -0.144529,-0.168914 -0.06021,-0.0591 -0.136068,-0.120274 -0.2298,-0.168666 -0.10151,-0.05241 -0.217316,-0.08623 -0.343775,-0.09036 l 0.34464,0.14415 c -0.01163,-0.01104 -0.02118,-0.02012 -0.02707,-0.02571 a 0.52530595,0.52530595 90 0 0 -0.723544,0.761754 c 0.0059,0.0056 0.01545,0.01467 0.02707,0.02571 0.04663,0.04429 0.09632,0.08712 0.155649,0.111934 0.05933,0.02482 0.124716,0.03012 0.188991,0.03222 -0.0425,-0.0014 -0.07868,-0.01312 -0.10393,-0.02616 -0.02187,-0.01129 -0.02827,-0.01911 -0.02415,-0.01507 0.0049,0.0048 0.01594,0.01686 0.03363,0.04095 0.01722,0.02346 0.03575,0.05135 0.05946,0.08845 0.002,0.0032 0.0041,0.0063 0.0062,0.0095 0.367553,0.548694 0.701478,1.107381 0.893339,1.704194 0.01386,0.05377 0.02481,0.09634 0.03365,0.139141 0.0095,0.04575 0.01327,0.07723 0.014,0.09866 7.26e-4,0.0214 -0.0021,0.02115 0.002,0.0078 0.0054,-0.01741 0.01728,-0.03993 0.03542,-0.05826 0.02583,-0.02611 0.05432,-0.04944 0.08502,-0.0696 0.0018,-0.0012 -9.7e-5,5.74e-4 -0.01078,0.0042 -0.01175,0.004 -0.03028,0.0088 -0.05898,0.01349 -0.05652,0.0093 -0.142852,0.01475 -0.24326,0.02489 -0.387296,0.01239 -0.754286,-0.06914 -1.073488,-0.17526 -0.184316,-0.06128 -0.357275,-0.132431 -0.509998,-0.201421 -0.202907,-0.09166 -0.400519,-0.193308 -0.588225,-0.295696 -1.739209,-0.98206 -3.447312,-2.646636 -3.930394,-3.101616 a 0.52530595,0.52530595 90 0 0 -0.720316,0.764808 z"
+         id="path-1-21-8-7"
+         inkscape:path-effect="#path-effect44523-4-3-6;#path-effect44525-0-1-1"
+         inkscape:original-d="m -64.08733,17.930444 c 1.341321,1.261767 4.674365,4.417163 6.934039,3.852244 0.837969,-0.209492 -0.744734,-2.635836 -0.980571,-2.871673 -0.161876,-0.161876 -0.06287,0.05803 -0.222764,-0.101865"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         sodipodi:nodetypes="cssc" />
+      <circle
+         style="fill:#ffff00;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path45307-4-6"
+         cx="-64.15789"
+         cy="17.975683"
+         r="1.0517688" />
+      <rect
+         style="fill:#ffff00;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect45361-5-1"
+         width="0.95615339"
+         height="0.81273037"
+         x="-32.877365"
+         y="-52.515896"
+         transform="rotate(-75.935313)" />
+    </g>
+    <path
+       id="path48232"
+       style="fill:#006fff;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 1.7965119,12.430215 c 1.1777985,0.367751 2.4050532,-0.274807 2.7413647,-1.435105 0,0 0.5548817,-2.4288791 0.63304,-2.4572193 L 3.5777095,8.040556 4.4834606,4.9138466 C 5.094309,4.9055395 5.6470031,4.5125924 5.8242191,3.9011051 L 6.2439787,2.2847312 3.4838493,1.4231277 3.0387605,2.9596042 l 0.00268,8.377e-4 c -0.00781,0.021536 -0.015039,0.043287 -0.021776,0.065201 -0.171278,0.5915274 0.059409,1.2136405 0.531835,1.5765229 L 2.6402308,7.7479254 0.97796149,7.2290305 0.30171086,9.5634919 l 0.004025,0.00126 c -0.0117809,0.032753 -0.0227913,0.065654 -0.0329914,0.098965 -0.33596273,1.1602861 0.3462564,2.3988321 1.52388804,2.7665881 z m 3.3743773,-3.8923739 0.00476,0.00142 c -0.00123,-0.00182 -0.00307,-0.00217 -0.00476,-0.00142 z M 4.1902969,4.0949865 C 3.7478182,3.9568145 3.4915918,3.4911032 3.6179569,3.0547144 c 0.00392,-0.012532 0.00807,-0.025 0.012549,-0.037347 l -0.00157,-4.814e-4 0.254295,-0.8778376 1.5770645,0.4922964 c 0,0 -0.2015046,0.9705667 -0.2398514,0.9236055 C 5.0939929,3.9913105 4.6328229,4.2330797 4.1903193,4.0949948 Z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketshovelmaker.svg b/src/data/layers/factory-components/bucketshovelmaker.svg
new file mode 100644
index 0000000..8fee29b
--- /dev/null
+++ b/src/data/layers/factory-components/bucketshovelmaker.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="3.4785843"
+     inkscape:cx="65.687643"
+     inkscape:cy="46.57067"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect44523-4-3-6-8"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect44525-0-1-1-1"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.2688037,0.52530595"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545-6"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202849"
+       y="0.38202849"
+       rx="1.246511" />
+    <g
+       id="g53021"
+       transform="matrix(0.8413303,0,0,0.8413303,-3.702147,-31.120076)">
+      <g
+         id="g45369-0-0"
+         transform="matrix(0.86109026,0,0,0.86109026,67.965619,27.667077)">
+        <path
+           id="rect41826-8-08"
+           style="fill:#ff0000;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+           d="m -70.368804,15.616909 12.292699,-0.140082 -2.311347,9.527354 h -8.020209 z"
+           sodipodi:nodetypes="ccccc" />
+        <ellipse
+           style="fill:#ff0000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="path43697-7-0"
+           cx="-64.437531"
+           cy="25.109625"
+           rx="3.9923253"
+           ry="1.5058771" />
+        <rect
+           style="fill:#e40000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="rect43699-3-4"
+           width="13.23771"
+           height="1.3307751"
+           x="-70.811249"
+           y="14.638526" />
+        <path
+           d="m -64.447245,18.313076 c 0.479799,0.451313 2.335486,2.268677 4.270477,3.326014 0.215651,0.113531 0.442676,0.225604 0.681478,0.327255 0.180813,0.07697 0.394194,0.159014 0.627798,0.228588 0.399883,0.119097 0.906836,0.216663 1.465057,0.163184 0.105859,7.16e-4 0.215706,-0.01322 0.323512,-0.04374 0.115791,-0.03278 0.239756,-0.08782 0.352962,-0.174399 0.109948,-0.08409 0.215677,-0.202983 0.281718,-0.361529 0.03219,-0.07728 0.05327,-0.160232 0.06151,-0.247175 0.0073,-0.07749 0.0042,-0.155005 -0.0082,-0.231335 -0.03782,-0.339513 -0.141247,-0.650163 -0.264496,-0.932059 -0.12269,-0.280615 -0.273923,-0.551043 -0.39912,-0.780692 -0.0041,-0.0075 -0.0084,-0.01492 -0.01283,-0.02222 -0.09856,-0.161499 -0.199859,-0.339422 -0.3142,-0.516699 -0.124039,-0.192312 -0.260245,-0.378547 -0.425499,-0.548145 -0.0365,-0.03746 -0.0784,-0.06927 -0.124295,-0.09435 -0.05765,-0.03151 -0.11706,-0.05205 -0.175656,-0.06343 -0.05952,-0.01156 -0.110917,-0.01227 -0.148256,-0.01045 -0.03648,0.0018 -0.06678,0.0065 -0.07489,0.0078 -0.01656,0.0025 -0.0033,3.42e-4 0.0091,-8.13e-4 0.01829,-0.0017 0.05355,-0.0037 0.09819,0.0023 0.05128,0.0069 0.103363,0.02276 0.152627,0.0485 0.05335,0.02787 0.09109,0.06085 0.115342,0.08622 0.02748,0.02875 0.04299,0.05334 0.04901,0.0634 a 0.52530595,0.52530595 90 0 0 -0.901306,0.539844 c 0.01943,0.03243 0.04948,0.07735 0.09283,0.122702 0.03763,0.03937 0.08934,0.08334 0.157597,0.119001 0.06253,0.03267 0.128258,0.05276 0.194028,0.06159 0.05794,0.0078 0.10673,0.0056 0.13945,0.0025 0.03065,-0.0029 0.04798,-0.0061 0.05089,-0.0065 0.0027,-4.18e-4 -0.0075,0.0017 -0.03178,0.0029 -0.02304,0.0011 -0.05936,9.2e-4 -0.103163,-0.0076 -0.04346,-0.0084 -0.08694,-0.02364 -0.127865,-0.04601 -0.04589,-0.02508 -0.0878,-0.05689 -0.124295,-0.09435 0.09903,0.101638 0.192497,0.225371 0.295074,0.384408 0.09188,0.142446 0.186294,0.307315 0.293573,0.483512 0.132047,0.242079 0.254324,0.462187 0.352842,0.687517 0.09893,0.226281 0.162962,0.434477 0.184167,0.638623 0.0015,0.01459 0.0036,0.02912 0.0064,0.04353 -0.0013,-0.0069 -0.0028,-0.02035 -0.0011,-0.03871 0.0018,-0.01872 0.0066,-0.03851 0.01459,-0.05773 0.01663,-0.03992 0.03991,-0.06139 0.04988,-0.06902 0.0093,-0.0071 0.01021,-0.0051 -9.28e-4,-0.002 -0.01107,0.0031 -0.02363,0.0044 -0.03359,0.0039 -0.02668,-0.0012 -0.05341,-4.16e-4 -0.07997,0.0024 -0.387243,0.04141 -0.760171,-0.02392 -1.088925,-0.121836 -0.18588,-0.05536 -0.360997,-0.122297 -0.516197,-0.188361 -0.204464,-0.08704 -0.404516,-0.185446 -0.596489,-0.286445 -1.783104,-0.974417 -3.530918,-2.679856 -4.047122,-3.165412 a 0.52530595,0.52530595 90 0 0 -0.71983,0.765264 z"
+           id="path-1-21-8-7"
+           inkscape:path-effect="#path-effect44523-4-3-6-8;#path-effect44525-0-1-1-1"
+           inkscape:original-d="m -64.08733,17.930444 c 1.341321,1.261767 4.674365,4.417163 6.934039,3.852244 0.837969,-0.209492 -0.744734,-2.635836 -0.980571,-2.871673 -0.161876,-0.161876 -0.06287,0.05803 -0.222764,-0.101865"
+           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           sodipodi:nodetypes="cssc" />
+        <circle
+           style="fill:#ffff00;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="path45307-4-6"
+           cx="-64.15789"
+           cy="17.975683"
+           r="1.0517688" />
+        <rect
+           style="fill:#ffff00;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="rect45361-5-1"
+           width="0.95615339"
+           height="0.81273037"
+           x="-32.877365"
+           y="-52.515896"
+           transform="rotate(-75.935313)" />
+      </g>
+      <path
+         id="path48232"
+         style="fill:#006fff;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 7.757383,50.718886 c 1.1777985,0.367751 2.405053,-0.274807 2.741365,-1.435105 0,0 0.554881,-2.428879 0.63304,-2.457219 L 9.5385806,46.329227 10.444332,43.202518 c 0.610848,-0.0083 1.163542,-0.401255 1.340758,-1.012742 l 0.41976,-1.616374 -2.7601296,-0.861603 -0.4450888,1.536476 0.00268,8.38e-4 c -0.00781,0.02154 -0.015039,0.04329 -0.021776,0.0652 -0.171278,0.591527 0.059409,1.21364 0.531835,1.576523 l -0.9112687,3.145759 -1.6622693,-0.518894 -0.6762506,2.334461 0.00402,0.0013 c -0.011781,0.03275 -0.022791,0.06565 -0.032991,0.09896 -0.3359628,1.160286 0.3462564,2.398832 1.523888,2.766588 z m 3.374377,-3.892374 0.0048,0.0014 c -0.0012,-0.0018 -0.0031,-0.0022 -0.0048,-0.0014 z m -0.980592,-4.442855 c -0.4424787,-0.138171 -0.6987051,-0.603883 -0.57234,-1.040272 0.00392,-0.01253 0.00807,-0.025 0.012549,-0.03735 l -0.00157,-4.81e-4 0.254295,-0.877838 1.577064,0.492297 c 0,0 -0.201504,0.970567 -0.239851,0.923605 -0.126451,0.43636 -0.587621,0.67813 -1.030125,0.540045 z" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/bucketyellow.svg b/src/data/layers/factory-components/bucketyellow.svg
new file mode 100644
index 0000000..16713ad
--- /dev/null
+++ b/src/data/layers/factory-components/bucketyellow.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketorange.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.42672839"
+     inkscape:cx="1135.3826"
+     inkscape:cy="691.30625"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-7"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-0"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.12676762"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.704952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect3382-3"
+       width="6.7919598"
+       height="10.838026"
+       x="3.3546793"
+       y="1.2499634"
+       ry="2.4192021"
+       rx="4.9954476" />
+    <ellipse
+       style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.656483;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="path8637-9"
+       cx="6.7369957"
+       cy="2.9371867"
+       rx="3.2694898"
+       ry="1.7482785" />
+    <path
+       id="path8637-3-8"
+       style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.675255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 6.7116266,1.1128488 A 3.2694899,1.8496926 0 0 0 3.4421547,2.9625293 3.2694899,1.8496926 0 0 0 6.7116266,4.8122522 3.2694899,1.8496926 0 0 0 7.2694413,4.7840142 v 0.862736 c 0,0.2265359 0.1823477,0.4089273 0.4088809,0.4089273 0.071251,0 0.1381382,-0.018088 0.1963501,-0.049877 v 0.274787 c 0,0.2265359 0.1823543,0.4088849 0.4088875,0.4088849 0.2265333,0 0.4089287,-0.182349 0.4089287,-0.4088849 v -0.099144 c 0.058967,0.032902 0.1269715,0.051679 0.1995568,0.051679 0.2265399,0 0.4089286,-0.1823913 0.4089286,-0.4089273 V 4.2588117 c 0,-0.052289 -0.00981,-0.1022054 -0.027549,-0.1480858 A 3.2694899,1.8496926 0 0 0 9.9811435,2.9625094 3.2694899,1.8496926 0 0 0 6.7116305,1.1128289 Z" />
+    <path
+       d="M 6.5929776,4.8331033 C 6.3522234,4.9860027 6.1451885,5.1038286 5.6704207,5.3660291 5.408882,5.5104694 5.0581124,5.7037301 4.7367548,5.913731 4.6549793,5.9642433 4.565568,6.019571 4.4776002,6.0736356 4.1357805,6.2837161 3.5334764,6.6547379 2.9246354,6.9127027 2.8268934,6.9503609 2.7154864,6.9948788 2.6071683,7.0246179 2.5060107,7.0523911 2.404727,7.0683263 2.3037078,7.059244 c -0.018698,-0.00198 -0.036506,-0.00879 -0.053066,-0.019905 -0.01686,-0.01132 -0.033824,-0.028117 -0.050036,-0.05126 -0.01605,-0.022912 -0.030247,-0.050479 -0.042042,-0.081197 C 2.1468746,6.8764401 2.1381557,6.8444898 2.1323398,6.8137306 2.109561,6.6678024 2.1233923,6.5146847 2.1594486,6.3614708 2.1963813,6.2045328 2.2560766,6.0493214 2.3195475,5.9008594 2.3936094,5.741298 2.4728481,5.5897292 2.5624899,5.4504466 c 0.09734,-0.1512445 0.2017013,-0.2796673 0.316787,-0.3870291 0.039159,-0.033889 0.066371,-0.050679 0.086562,-0.060893 A 0.12676762,0.12676762 90 0 0 2.8513932,4.7762888 C 2.8095302,4.797466 2.7651731,4.8268352 2.709698,4.8749963 2.5732849,5.0021432 2.4559037,5.1475858 2.3492932,5.313234 2.2513449,5.465423 2.1666394,5.628087 2.0879832,5.7976927 2.0210661,5.954068 1.9546136,6.1250985 1.9126552,6.3033922 c -0.041308,0.1755315 -0.06003,0.3624109 -0.030119,0.553495 0.00904,0.048148 0.021683,0.094893 0.039342,0.1408792 0.017722,0.046153 0.040991,0.092831 0.071071,0.135773 0.030445,0.043463 0.068735,0.084313 0.1163679,0.1162931 0.049061,0.032939 0.1059851,0.055035 0.1697847,0.061743 0.1439786,0.012959 0.2775986,-0.010184 0.3951911,-0.042469 C 2.7979358,7.2351593 2.9236891,7.1847652 3.0197412,7.1476881 3.6528017,6.8795338 4.2710335,6.4981814 4.6103536,6.2896371 4.6986813,6.2353513 4.7884462,6.1798047 4.8727649,6.1276732 5.1875615,5.9220074 5.5299182,5.733255 5.7929909,5.5879676 6.2684567,5.3253815 6.4812047,5.2044325 6.7288996,5.0471251 A 0.12676762,0.12676762 90 0 0 6.5929776,4.8331033 Z"
+       id="path-1-6"
+       inkscape:path-effect="#path-effect9795-7;#path-effect9797-0"
+       inkscape:original-d="M 6.6609386,4.9401142 C 6.1962589,5.2331929 5.7137883,5.4813426 5.2411393,5.7514268 4.8062386,5.9999409 2.559085,7.5315937 2.1480124,7.120517 1.6461011,6.6186058 2.4919049,5.0977619 2.9086158,4.8894065"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.47278;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/clothes.svg b/src/data/layers/factory-components/clothes.svg
new file mode 100644
index 0000000..8341c6e
--- /dev/null
+++ b/src/data/layers/factory-components/clothes.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/plank.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect26869-0"
+       style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1.57447;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 8.9568575,2.8688672 H 8.2538855 C 8.0495925,3.4583436 7.4943565,3.8537437 6.8704826,3.8540297 6.246762,3.853566 5.6917407,3.458199 5.4874975,2.8688672 H 4.7494603 C 4.4662894,2.9756729 2.5610989,5.8144429 1.6495357,7.3947727 L 3.3067803,8.2755755 4.7494603,5.679504 V 8.9864795 H 8.9568575 V 5.3301048 L 10.67338,8.3169025 12.283036,7.3513591 C 11.28295,5.5599036 9.4517975,3.1529857 8.9568575,2.8688672 Z"
+       sodipodi:nodetypes="cccccccccccccc" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/clothesmaker.svg b/src/data/layers/factory-components/clothesmaker.svg
new file mode 100644
index 0000000..7427a89
--- /dev/null
+++ b/src/data/layers/factory-components/clothesmaker.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/wheelmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202825"
+       y="0.38202825"
+       rx="1.246511" />
+    <path
+       id="rect26869-0-1"
+       style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1.42336;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 8.3324321,3.8052463 H 7.6969286 C 7.5122429,4.3381476 7.0102962,4.6955987 6.4462993,4.6958572 5.882441,4.6954377 5.3806884,4.3380165 5.1960477,3.8052463 H 4.5288445 C 4.2728512,3.9018015 2.5505135,6.4681174 1.7264386,7.8967734 L 3.2246273,8.6930392 4.5288445,6.3461293 V 9.3357134 H 8.3324321 V 6.0302643 L 9.8842098,8.7303998 11.339377,7.8575261 C 10.435276,6.238008 8.7798697,4.0620967 8.3324321,3.8052463 Z"
+       sodipodi:nodetypes="cccccccccccccc" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/flaskblue.svg b/src/data/layers/factory-components/flaskblue.svg
new file mode 100644
index 0000000..46a0010
--- /dev/null
+++ b/src/data/layers/factory-components/flaskblue.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/flaskgreen.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect4857"
+       style="fill:#cccccc;fill-opacity:1;stroke:#848383;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 5.4794527,1.1798515 v 2.7016064 c 0.064384,0.017399 -2.2193737,4.0633 -3.2207105,5.7683648 -0.046133,0.1324156 -0.2725833,0.4579943 -0.2781492,0.6801933 -6.57e-5,0.915122 1.9722242,1.656975 4.4051093,1.656929 2.432759,-2.1e-5 4.4048507,-0.741855 4.4047847,-1.656929 C 10.616727,9.9051913 10.616594,9.8824307 10.427923,9.6142668 L 7.1223313,3.8814792 c 0,0 0.0079,-2.0686624 0.0079,-2.7016065 z"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="rect4857-6"
+       style="fill:#56a4ff;fill-opacity:1;stroke:none;stroke-width:0.662;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 4.1421454,6.3703412 C 3.4837464,7.5411247 2.7372981,8.847803 2.2685183,9.6460355 2.2223851,9.7784505 1.9959351,10.104008 1.9903692,10.326207 c -6.57e-5,0.915121 1.9722267,1.656976 4.4051091,1.65693 2.432757,-2.1e-5 4.4048517,-0.741856 4.4047857,-1.65693 C 10.626504,9.9013834 10.626371,9.8786216 10.4377,9.6104577 L 8.5692483,6.3703412 Z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/flaskgreen.svg b/src/data/layers/factory-components/flaskgreen.svg
new file mode 100644
index 0000000..0091961
--- /dev/null
+++ b/src/data/layers/factory-components/flaskgreen.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/flaskyellow.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect4857"
+       style="fill:#cccccc;fill-opacity:1;stroke:#848383;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 5.4794527,1.1798515 v 2.7016064 c 0.064384,0.017399 -2.2193737,4.0633 -3.2207105,5.7683648 -0.046133,0.1324156 -0.2725833,0.4579943 -0.2781492,0.6801933 -6.57e-5,0.915122 1.9722242,1.656975 4.4051093,1.656929 2.432759,-2.1e-5 4.4048507,-0.741855 4.4047847,-1.656929 C 10.616727,9.9051913 10.616594,9.8824307 10.427923,9.6142668 L 7.1223313,3.8814792 c 0,0 0.0079,-2.0686624 0.0079,-2.7016065 z"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="rect4857-6"
+       style="fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:0.662;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 4.1421454,6.3703412 C 3.4837464,7.5411247 2.7372981,8.847803 2.2685183,9.6460355 2.2223851,9.7784505 1.9959351,10.104008 1.9903692,10.326207 c -6.57e-5,0.915121 1.9722267,1.656976 4.4051091,1.65693 2.432757,-2.1e-5 4.4048517,-0.741856 4.4047857,-1.65693 C 10.626504,9.9013834 10.626371,9.8786216 10.4377,9.6104577 L 8.5692483,6.3703412 Z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/flaskorange.svg b/src/data/layers/factory-components/flaskorange.svg
new file mode 100644
index 0000000..8d94706
--- /dev/null
+++ b/src/data/layers/factory-components/flaskorange.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/flaskred.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="2.0488544"
+     inkscape:cx="57.837199"
+     inkscape:cy="47.34353"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect4857"
+       style="fill:#cccccc;fill-opacity:1;stroke:#848383;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 5.4794527,1.1798515 v 2.7016064 c 0.064384,0.017399 -2.2193737,4.0633 -3.2207105,5.7683648 -0.046133,0.1324156 -0.2725833,0.4579943 -0.2781492,0.6801933 -6.57e-5,0.915122 1.9722242,1.656975 4.4051093,1.656929 2.432759,-2.1e-5 4.4048507,-0.741855 4.4047847,-1.656929 C 10.616727,9.9051913 10.616594,9.8824307 10.427923,9.6142668 L 7.1223313,3.8814792 c 0,0 0.0079,-2.0686624 0.0079,-2.7016065 z"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="rect4857-6"
+       style="fill:#ff8300;fill-opacity:1;stroke:none;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 4.1421454,6.3703412 C 3.4837464,7.5411247 2.7372981,8.847803 2.2685183,9.6460355 2.2223851,9.7784505 1.9959351,10.104008 1.9903692,10.326207 c -6.57e-5,0.915121 1.9722267,1.656976 4.4051091,1.65693 2.432757,-2.1e-5 4.4048517,-0.741856 4.4047857,-1.65693 C 10.626504,9.9013834 10.626371,9.8786216 10.4377,9.6104577 L 8.5692483,6.3703412 Z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/flaskpurple.svg b/src/data/layers/factory-components/flaskpurple.svg
new file mode 100644
index 0000000..2eaac6a
--- /dev/null
+++ b/src/data/layers/factory-components/flaskpurple.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/flaskblue.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect4857"
+       style="fill:#cccccc;fill-opacity:1;stroke:#848383;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 5.4794527,1.1798515 v 2.7016064 c 0.064384,0.017399 -2.2193737,4.0633 -3.2207105,5.7683648 -0.046133,0.1324156 -0.2725833,0.4579943 -0.2781492,0.6801933 -6.57e-5,0.915122 1.9722242,1.656975 4.4051093,1.656929 2.432759,-2.1e-5 4.4048507,-0.741855 4.4047847,-1.656929 C 10.616727,9.9051913 10.616594,9.8824307 10.427923,9.6142668 L 7.1223313,3.8814792 c 0,0 0.0079,-2.0686624 0.0079,-2.7016065 z"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="rect4857-6"
+       style="fill:#cc00fd;fill-opacity:1;stroke:none;stroke-width:0.662;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 4.1421454,6.3703412 C 3.4837464,7.5411247 2.7372981,8.847803 2.2685183,9.6460355 2.2223851,9.7784505 1.9959351,10.104008 1.9903692,10.326207 c -6.57e-5,0.915121 1.9722267,1.656976 4.4051091,1.65693 2.432757,-2.1e-5 4.4048517,-0.741856 4.4047857,-1.65693 C 10.626504,9.9013834 10.626371,9.8786216 10.4377,9.6104577 L 8.5692483,6.3703412 Z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/flaskred.svg b/src/data/layers/factory-components/flaskred.svg
new file mode 100644
index 0000000..ba11755
--- /dev/null
+++ b/src/data/layers/factory-components/flaskred.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/block.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="2.0488544"
+     inkscape:cx="57.837199"
+     inkscape:cy="47.34353"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect4857"
+       style="fill:#cccccc;fill-opacity:1;stroke:#848383;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 5.4794527,1.1798515 v 2.7016064 c 0.064384,0.017399 -2.2193737,4.0633 -3.2207105,5.7683648 -0.046133,0.1324156 -0.2725833,0.4579943 -0.2781492,0.6801933 -6.57e-5,0.915122 1.9722242,1.656975 4.4051093,1.656929 2.432759,-2.1e-5 4.4048507,-0.741855 4.4047847,-1.656929 C 10.616727,9.9051913 10.616594,9.8824307 10.427923,9.6142668 L 7.1223313,3.8814792 c 0,0 0.0079,-2.0686624 0.0079,-2.7016065 z"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="rect4857-6"
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 4.1421454,6.3703412 C 3.4837464,7.5411247 2.7372981,8.847803 2.2685183,9.6460355 2.2223851,9.7784505 1.9959351,10.104008 1.9903692,10.326207 c -6.57e-5,0.915121 1.9722267,1.656976 4.4051091,1.65693 2.432757,-2.1e-5 4.4048517,-0.741856 4.4047857,-1.65693 C 10.626504,9.9013834 10.626371,9.8786216 10.4377,9.6104577 L 8.5692483,6.3703412 Z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/flaskyellow.svg b/src/data/layers/factory-components/flaskyellow.svg
new file mode 100644
index 0000000..6a81d57
--- /dev/null
+++ b/src/data/layers/factory-components/flaskyellow.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/flaskorange.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect4857"
+       style="fill:#cccccc;fill-opacity:1;stroke:#848383;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 5.4794527,1.1798515 v 2.7016064 c 0.064384,0.017399 -2.2193737,4.0633 -3.2207105,5.7683648 -0.046133,0.1324156 -0.2725833,0.4579943 -0.2781492,0.6801933 -6.57e-5,0.915122 1.9722242,1.656975 4.4051093,1.656929 2.432759,-2.1e-5 4.4048507,-0.741855 4.4047847,-1.656929 C 10.616727,9.9051913 10.616594,9.8824307 10.427923,9.6142668 L 7.1223313,3.8814792 c 0,0 0.0079,-2.0686624 0.0079,-2.7016065 z"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="rect4857-6"
+       style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.662382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 4.1421454,6.3703412 C 3.4837464,7.5411247 2.7372981,8.847803 2.2685183,9.6460355 2.2223851,9.7784505 1.9959351,10.104008 1.9903692,10.326207 c -6.57e-5,0.915121 1.9722267,1.656976 4.4051091,1.65693 2.432757,-2.1e-5 4.4048517,-0.741856 4.4047857,-1.65693 C 10.626504,9.9013834 10.626371,9.8786216 10.4377,9.6104577 L 8.5692483,6.3703412 Z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/log.svg b/src/data/layers/factory-components/log.svg
new file mode 100644
index 0000000..0296114
--- /dev/null
+++ b/src/data/layers/factory-components/log.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketpurple.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.42672839"
+     inkscape:cx="1135.3826"
+     inkscape:cy="691.30625"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#784421;stroke:#00a7ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+       id="rect524-7"
+       width="6.3454332"
+       height="12.690866"
+       x="3.5424182"
+       y="0.36970145"
+       ry="1.9036299"
+       rx="3.1727166" />
+    <ellipse
+       style="fill:#ffbf81;fill-opacity:1;stroke:#00a7ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+       id="path526-5"
+       cx="6.7776937"
+       cy="2.3647912"
+       rx="2.3006427"
+       ry="1.2401904" />
+    <ellipse
+       style="fill:#d67f39;fill-opacity:1;stroke:#00a7ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+       id="path526-7-3"
+       cx="6.8136473"
+       cy="2.3468168"
+       rx="1.5457444"
+       ry="0.80881977" />
+    <ellipse
+       style="fill:#a05a2c;fill-opacity:1;stroke:#00a7ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+       id="path526-7-2-9"
+       cx="6.849597"
+       cy="2.3468173"
+       rx="0.75489843"
+       ry="0.44934434" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/mixer.svg b/src/data/layers/factory-components/mixer.svg
new file mode 100644
index 0000000..4854461
--- /dev/null
+++ b/src/data/layers/factory-components/mixer.svg
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/clothes.svg"
+   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:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient31398">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop31394" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0.14363144"
+         id="stop31458" />
+      <stop
+         style="stop-color:#ffff00;stop-opacity:1;"
+         offset="0.8888889"
+         id="stop31460" />
+      <stop
+         style="stop-color:#ffff00;stop-opacity:1;"
+         offset="1"
+         id="stop31396" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-4-8"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-1-4"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.05208203"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-8-0-5"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-7-4-1"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.053926744"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient31398"
+       id="linearGradient31400"
+       x1="5.4082642"
+       y1="8.9375391"
+       x2="8.1899395"
+       y2="8.9375391"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-4-8-9"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-1-4-75"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.05208203"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202825"
+       y="0.38202825"
+       rx="1.246511" />
+    <g
+       id="g31483">
+      <g
+         id="g31466">
+        <rect
+           style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.299885;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="rect3382-8-0"
+           width="2.8892887"
+           height="4.6104794"
+           x="5.3710508"
+           y="7.8097229"
+           ry="1.0291246"
+           rx="2.1250556" />
+        <ellipse
+           style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.279267;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="path8637-7-6"
+           cx="6.8098826"
+           cy="8.5274649"
+           rx="1.3908358"
+           ry="0.74371487" />
+        <path
+           id="path8637-3-7-53"
+           style="fill:url(#linearGradient31400);fill-opacity:1;stroke:none;stroke-width:0.287252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="M 6.7990919,7.751395 A 1.3908358,0.78685628 0 0 0 5.4082641,8.5382461 1.3908358,0.78685628 0 0 0 6.7990919,9.3251152 1.3908358,0.78685628 0 0 0 7.0363855,9.3131046 v 0.3670065 c 0,0.096368 0.07757,0.173957 0.17394,0.173957 0.030308,0 0.058764,-0.0077 0.083527,-0.021215 v 0.116894 c 0,0.096368 0.07757,0.1739389 0.1739375,0.1739389 0.09637,0 0.1739575,-0.07757 0.1739575,-0.1739389 V 9.90757 c 0.025086,0.013997 0.054014,0.021987 0.084894,0.021987 0.096367,0 0.173955,-0.077589 0.173955,-0.173957 V 9.0896886 c 0,-0.022245 -0.00417,-0.043476 -0.011718,-0.062996 A 1.3908358,0.78685628 0 0 0 8.1899397,8.5382439 1.3908358,0.78685628 0 0 0 6.7990944,7.7513928 Z" />
+        <path
+           d="M 6.7486188,9.333985 C 6.6462026,9.399028 6.5581305,9.449151 6.3561658,9.5606909 6.2449081,9.6221357 6.0956919,9.7043486 5.9589873,9.7936823 5.9242001,9.8151702 5.8861646,9.8387065 5.8487432,9.8617055 5.7033336,9.9510733 5.447114,10.108906 5.1881138,10.218643 c -0.041579,0.01602 -0.088972,0.03496 -0.1350504,0.04761 -0.043032,0.01182 -0.086119,0.01859 -0.1290922,0.01473 -0.00795,-8.42e-4 -0.01553,-0.0037 -0.022575,-0.0085 -0.00717,-0.0048 -0.014389,-0.01196 -0.021285,-0.02181 -0.00683,-0.0097 -0.012867,-0.02147 -0.017885,-0.03454 -0.00497,-0.01295 -0.00868,-0.02654 -0.011156,-0.03963 -0.00969,-0.06208 -0.00381,-0.127214 0.011532,-0.1923908 0.015711,-0.066761 0.041105,-0.1327877 0.068106,-0.1959431 0.031506,-0.067877 0.065214,-0.1323544 0.1033471,-0.1916049 0.041408,-0.064339 0.085803,-0.11897 0.1347607,-0.1646416 0.016658,-0.014416 0.028234,-0.021559 0.036823,-0.025904 a 0.05392674,0.05392674 90 0 0 -0.048685,-0.09624 c -0.017808,0.00901 -0.036678,0.021502 -0.060277,0.04199 -0.05803,0.054088 -0.1079635,0.115959 -0.1533154,0.1864255 -0.041667,0.064741 -0.077701,0.1339379 -0.1111607,0.2060879 -0.028466,0.066522 -0.056735,0.1392778 -0.074584,0.2151236 -0.017572,0.07467 -0.025537,0.1541693 -0.012812,0.2354563 0.00385,0.02048 0.00922,0.04037 0.016736,0.05993 0.00754,0.01963 0.017438,0.03949 0.030234,0.05776 0.012951,0.01849 0.02924,0.03587 0.049503,0.04947 0.020871,0.01401 0.045086,0.02341 0.072226,0.02627 0.061248,0.0055 0.1180902,-0.0043 0.168114,-0.01807 0.052598,-0.01444 0.106093,-0.03588 0.1469536,-0.05165 0.269303,-0.114073 0.5322983,-0.276299 0.6766445,-0.3650138 0.037574,-0.023093 0.07576,-0.046722 0.1116295,-0.068899 C 6.1507595,9.7972033 6.296397,9.7169082 6.4083072,9.6551031 6.6105688,9.5433992 6.7010712,9.4919476 6.8064398,9.4250294 A 0.05392674,0.05392674 90 0 0 6.7486188,9.333985 Z"
+           id="path-1-4-8"
+           inkscape:path-effect="#path-effect9795-8-0-5;#path-effect9797-7-4-1"
+           inkscape:original-d="M 6.7775293,9.3795072 C 6.5798555,9.504183 6.3746135,9.6097448 6.1735516,9.7246385 5.9885455,9.8303559 5.0326101,10.481918 4.8577381,10.307047 4.6442259,10.093535 5.004029,9.4465709 5.1812971,9.3579366"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.05192;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+      </g>
+      <g
+         id="g31406">
+        <rect
+           style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.289627;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="rect3382-0"
+           width="2.7904527"
+           height="4.452765"
+           x="0.96495974"
+           y="-6.5074677"
+           ry="0.99392062"
+           rx="2.0523622"
+           transform="rotate(107.52776)" />
+        <ellipse
+           style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.269714;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="path8637-8"
+           cx="2.3545725"
+           cy="-5.8142786"
+           rx="1.3432583"
+           ry="0.718274"
+           transform="rotate(107.52776)" />
+        <path
+           d="M 4.1102647,3.7053288 C 4.0799182,3.591075 4.0593981,3.4952618 4.015045,3.2751331 3.9906292,3.153955 3.9580731,2.9916991 3.9151397,2.8388066 3.9055039,2.8005754 3.8948923,2.7586318 3.8846118,2.7174678 3.8446617,2.5575042 3.773831,2.275305 3.7489356,2.0047612 3.7465,1.9617731 3.7429274,1.9124884 3.7450638,1.8665287 c 0.00101,-0.02176 0.00329,-0.043105 0.00754,-0.063725 0.00411,-0.019949 0.010073,-0.039221 0.018545,-0.057649 0.00283,-0.0053 0.00823,-0.01133 0.015237,-0.016307 0.0071,-0.00505 0.016315,-0.00932 0.027809,-0.012421 0.011373,-0.00307 0.02424,-0.00479 0.037967,-0.0052 0.013605,-4.056e-4 0.027396,4.992e-4 0.040387,0.00232 0.06321,0.011261 0.1243684,0.038487 0.1823478,0.07471 0.059369,0.037091 0.1148171,0.083185 0.1668704,0.1298198 0.050231,0.048048 0.096998,0.096368 0.1379145,0.147255 0.044366,0.055177 0.078945,0.1098534 0.1038105,0.1661899 0.00568,0.014513 0.00804,0.024733 0.00917,0.031723 A 0.05208203,0.05208203 90 0 0 4.5954957,2.2466007 C 4.5930545,2.2315142 4.5885429,2.214063 4.5795901,2.1913712 4.5495397,2.123186 4.509705,2.0607994 4.4608618,2.0000544 4.415974,1.9442286 4.3656357,1.8924079 4.3125095,1.84163 4.2577309,1.7925175 4.1970523,1.7417449 4.1300908,1.6999107 4.0641818,1.6587341 3.9906796,1.6252096 3.9088773,1.6106829 c -0.020011,-0.00284 -0.039701,-0.00418 -0.059817,-0.00358 -0.020189,6.019e-4 -0.041332,0.00317 -0.062015,0.00876 -0.021007,0.00567 -0.041954,0.014545 -0.060994,0.028075 -0.019594,0.013924 -0.036365,0.032268 -0.048413,0.055403 -0.013396,0.028987 -0.021594,0.055974 -0.027049,0.082423 -0.00562,0.02723 -0.00838,0.054193 -0.00958,0.079927 -0.00245,0.052776 0.00166,0.1089198 0.00406,0.1508252 0.025879,0.2815728 0.098828,0.5714399 0.1384756,0.7301901 0.010322,0.041331 0.020976,0.083443 0.030949,0.1229318 0.042052,0.1498207 0.073879,0.3082042 0.098433,0.4300685 0.044412,0.2204196 0.065447,0.3188531 0.096658,0.4363608 a 0.05208203,0.05208203 90 0 0 0.1006734,-0.026739 z"
+           id="path-1-48"
+           inkscape:path-effect="#path-effect9795-4-8;#path-effect9797-1-4"
+           inkscape:original-d="M 4.059928,3.7186985 C 4.0026041,3.5003867 3.9650846,3.2806644 3.9177558,3.0620753 3.8742071,2.860944 3.5521982,1.7910567 3.7641095,1.6808743 4.0228471,1.5463432 4.5140158,2.0658841 4.5440824,2.2549201"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.01593;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+        <path
+           id="path8637-3-1"
+           style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.277426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="M 4.1224763,3.7574131 C 4.3553488,3.053056 4.8671631,2.5888621 5.2656504,2.7206024 5.6641464,2.8523379 5.7984123,3.5301399 5.5655406,4.2345098 5.5412779,4.3074165 5.5135257,4.3789963 5.4825893,4.4484615 L 5.8331694,5.1408484 C 6.0755456,5.4239042 6.0783209,6.517716 6.1689264,7.1865034 6.371388,7.9195264 5.9533018,8.7888916 5.603292,8.2800928 5.4260952,7.2037479 5.4926366,5.5956107 5.0157239,5.1731914 4.9953269,5.1664514 4.9771239,5.1561854 4.9615099,5.1433484 4.7750269,5.279835 4.5850323,5.3249352 4.4223432,5.2713339 4.0238555,5.1395831 3.8895999,4.461779 4.1224749,3.7574161 Z"
+           sodipodi:nodetypes="scccccccccss" />
+      </g>
+      <g
+         id="g31406-3"
+         transform="matrix(-1,0,0,1,13.677851,0.39177625)">
+        <rect
+           style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.289627;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="rect3382-0-9"
+           width="2.7904527"
+           height="4.452765"
+           x="0.96495974"
+           y="-6.5074677"
+           ry="0.99392062"
+           rx="2.0523622"
+           transform="rotate(107.52776)" />
+        <ellipse
+           style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:0.269714;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           id="path8637-8-9"
+           cx="2.3545725"
+           cy="-5.8142786"
+           rx="1.3432583"
+           ry="0.718274"
+           transform="rotate(107.52776)" />
+        <path
+           d="M 4.1102647,3.7053288 C 4.0799182,3.591075 4.0593981,3.4952618 4.015045,3.2751331 3.9906292,3.153955 3.9580731,2.9916991 3.9151397,2.8388066 3.9055039,2.8005754 3.8948923,2.7586318 3.8846118,2.7174678 3.8446617,2.5575042 3.773831,2.275305 3.7489356,2.0047612 3.7465,1.9617731 3.7429274,1.9124884 3.7450638,1.8665287 c 0.00101,-0.02176 0.00329,-0.043105 0.00754,-0.063725 0.00411,-0.019949 0.010073,-0.039221 0.018545,-0.057649 0.00283,-0.0053 0.00823,-0.01133 0.015237,-0.016307 0.0071,-0.00505 0.016315,-0.00932 0.027809,-0.012421 0.011373,-0.00307 0.02424,-0.00479 0.037967,-0.0052 0.013605,-4.056e-4 0.027396,4.992e-4 0.040387,0.00232 0.06321,0.011261 0.1243684,0.038487 0.1823478,0.07471 0.059369,0.037091 0.1148171,0.083185 0.1668704,0.1298198 0.050231,0.048048 0.096998,0.096368 0.1379145,0.147255 0.044366,0.055177 0.078945,0.1098534 0.1038105,0.1661899 0.00568,0.014513 0.00804,0.024733 0.00917,0.031723 A 0.05208203,0.05208203 90 0 0 4.5954957,2.2466007 C 4.5930545,2.2315142 4.5885429,2.214063 4.5795901,2.1913712 4.5495397,2.123186 4.509705,2.0607994 4.4608618,2.0000544 4.415974,1.9442286 4.3656357,1.8924079 4.3125095,1.84163 4.2577309,1.7925175 4.1970523,1.7417449 4.1300908,1.6999107 4.0641818,1.6587341 3.9906796,1.6252096 3.9088773,1.6106829 c -0.020011,-0.00284 -0.039701,-0.00418 -0.059817,-0.00358 -0.020189,6.019e-4 -0.041332,0.00317 -0.062015,0.00876 -0.021007,0.00567 -0.041954,0.014545 -0.060994,0.028075 -0.019594,0.013924 -0.036365,0.032268 -0.048413,0.055403 -0.013396,0.028987 -0.021594,0.055974 -0.027049,0.082423 -0.00562,0.02723 -0.00838,0.054193 -0.00958,0.079927 -0.00245,0.052776 0.00166,0.1089198 0.00406,0.1508252 0.025879,0.2815728 0.098828,0.5714399 0.1384756,0.7301901 0.010322,0.041331 0.020976,0.083443 0.030949,0.1229318 0.042052,0.1498207 0.073879,0.3082042 0.098433,0.4300685 0.044412,0.2204196 0.065447,0.3188531 0.096658,0.4363608 a 0.05208203,0.05208203 90 0 0 0.1006734,-0.026739 z"
+           id="path-1-48-4"
+           inkscape:path-effect="#path-effect9795-4-8-9;#path-effect9797-1-4-75"
+           inkscape:original-d="M 4.059928,3.7186985 C 4.0026041,3.5003867 3.9650846,3.2806644 3.9177558,3.0620753 3.8742071,2.860944 3.5521982,1.7910567 3.7641095,1.6808743 4.0228471,1.5463432 4.5140158,2.0658841 4.5440824,2.2549201"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.01593;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+        <path
+           id="path8637-3-1-9"
+           style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.277426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="M 4.1224763,3.7574131 C 4.3553488,3.053056 4.8671631,2.5888621 5.2656504,2.7206024 5.6641464,2.8523379 5.7984123,3.5301399 5.5655406,4.2345098 5.5412779,4.3074165 5.5135257,4.3789963 5.4825893,4.4484615 L 5.8331694,5.1408484 C 6.0755456,5.4239042 6.0783209,6.517716 6.1689264,7.1865034 6.371388,7.9195264 5.9533018,8.7888916 5.603292,8.2800928 5.4260952,7.2037479 5.4926366,5.5956107 5.0157239,5.1731914 4.9953269,5.1664514 4.9771239,5.1561854 4.9615099,5.1433484 4.7750269,5.279835 4.5850323,5.3249352 4.4223432,5.2713339 4.0238555,5.1395831 3.8895999,4.461779 4.1224749,3.7574161 Z"
+           sodipodi:nodetypes="scccccccccss" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/paintmaker.svg b/src/data/layers/factory-components/paintmaker.svg
new file mode 100644
index 0000000..fd1afe4
--- /dev/null
+++ b/src/data/layers/factory-components/paintmaker.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketshovelmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="3.4785843"
+     inkscape:cx="65.687643"
+     inkscape:cy="46.57067"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect9795-77-2"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect9797-9-1"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1.1471791,0.215831"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545-6"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202849"
+       y="0.38202849"
+       rx="1.246511" />
+    <g
+       id="g53752"
+       transform="matrix(0.58062347,0,0,0.58062347,-0.00204081,4.2029884)">
+      <rect
+         style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:1.20023;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect3382-6"
+         width="11.5638"
+         height="18.45252"
+         x="5.6434703"
+         y="-5.0663691"
+         ry="4.1188655"
+         rx="8.5051098" />
+      <ellipse
+         style="fill:#b6b7b7;fill-opacity:1;stroke:#6f6f78;stroke-width:1.11771;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path8637-0"
+         cx="11.402106"
+         cy="-2.1937525"
+         rx="5.5665417"
+         ry="2.9765699" />
+      <path
+         id="path8637-3-1"
+         style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.14967;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 11.358912,-5.2998176 a 5.5665419,3.1492348 0 0 0 -5.5665102,3.149214 5.5665419,3.1492348 0 0 0 5.5665102,3.14928639 5.5665419,3.1492348 0 0 0 0.94972,-0.048065 V 2.4194883 c 0,0.3856934 0.31046,0.6962277 0.69615,0.6962277 0.12131,0 0.23519,-0.030799 0.3343,-0.084906 v 0.4678453 c 0,0.3856934 0.31047,0.6961557 0.69616,0.6961557 0.38569,0 0.69623,-0.3104623 0.69623,-0.6961557 V 3.329851 c 0.1004,0.056019 0.21618,0.088 0.33976,0.088 0.3857,0 0.69623,-0.3105342 0.69623,-0.6962277 V 0.05644439 c 0,-0.089032 -0.0167,-0.1740027 -0.0469,-0.2521277 a 5.5665419,3.1492348 0 0 0 1.20494,-1.95492029 5.5665419,3.1492348 0 0 0 -5.56658,-3.149214 z" />
+      <path
+         d="M 11.157473,1.0338223 C 10.716074,1.3122178 10.359476,1.5133992 9.5009023,1.9895371 9.0201177,2.2561649 8.4024629,2.5994777 7.8301181,2.9777658 7.7104002,3.0503405 7.4879154,3.1863437 7.3612816,3.2633033 7.0522579,3.4513859 6.6326615,3.7055896 6.2154132,3.9363162 5.7311576,4.204096 5.1593456,4.4923577 4.537776,4.7133546 4.4586055,4.7355569 4.377061,4.760408 4.2955962,4.7818356 4.2150012,4.8030345 4.1363591,4.8203679 4.0615757,4.8287305 3.9892202,4.8368217 3.9248794,4.8359892 3.8683561,4.824637 3.8199981,4.8149248 3.7759834,4.797302 3.7352188,4.7684897 3.667774,4.6916069 3.6206441,4.6052577 3.5894851,4.5103626 3.5563948,4.4095858 3.5409632,4.2979311 3.5401228,4.1774847 c -8.41e-4,-0.1205144 0.012944,-0.2464375 0.03596,-0.3736774 0.023156,-0.1280139 0.05517,-0.2547537 0.08928,-0.37534 C 3.7854646,3.0531623 3.9399059,2.6911233 4.1269575,2.360412 4.3274784,2.0058867 4.5585229,1.6995378 4.8158285,1.442555 4.8949484,1.3722555 4.9443003,1.3414524 4.9815645,1.3225707 A 0.215831,0.215831 90 0 0 4.7864591,0.93751752 C 4.7086578,0.9769392 4.6275547,1.0318121 4.5238199,1.1245875 c -0.00287,0.00257 -0.00567,0.00521 -0.0084,0.00792 C 4.2261534,1.420506 3.9704239,1.7603614 3.7512308,2.1478996 3.5479974,2.5072207 3.3822414,2.8968824 3.2520984,3.3040017 3.213779,3.4390178 3.1778448,3.5803005 3.1513139,3.7269715 c -0.026322,0.1455161 -0.04392,0.2991278 -0.042843,0.4535252 0.00108,0.154788 0.020855,0.3121342 0.070894,0.4645295 0.050717,0.1544604 0.1316427,0.3006465 0.2510678,0.4300323 0.00791,0.00858 0.016513,0.016495 0.025708,0.02368 0.1031778,0.080622 0.2152004,0.1266121 0.3272159,0.1491094 0.1130728,0.02271 0.2246307,0.021228 0.3261892,0.00987 0.1048221,-0.011722 0.2064409,-0.034902 0.2958541,-0.058421 0.095176,-0.025034 0.1813554,-0.051478 0.2555909,-0.072178 0.00477,-0.00133 0.00949,-0.00282 0.014152,-0.00448 0.655778,-0.2324981 1.253247,-0.53435 1.7491563,-0.808574 C 6.8503431,4.0784808 7.276948,3.8199595 7.5857066,3.6320383 7.795573,3.5043063 7.8513498,3.4699956 8.0612162,3.3422636 8.6243541,2.970247 9.2276362,2.6346785 9.710251,2.3670357 10.569118,1.8907352 10.935108,1.6844182 11.387751,1.3989305 A 0.215831,0.215831 90 0 0 11.157473,1.0338223 Z"
+         id="path-1-23"
+         inkscape:path-effect="#path-effect9795-77-2;#path-effect9797-9-1"
+         inkscape:original-d="m 11.272612,1.2163764 c -0.79115,0.4989896 -1.6125902,0.92148 -2.4173102,1.3813185 -0.74045,0.4231127 -4.56639,3.0308616 -5.26627,2.3309749 -0.85454,-0.8545395 0.5855,-3.443885 1.29498,-3.7986257"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.21008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/plank.svg b/src/data/layers/factory-components/plank.svg
new file mode 100644
index 0000000..19d825a
--- /dev/null
+++ b/src/data/layers/factory-components/plank.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/truck.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect341-2-7-9-7"
+       style="fill:#ffc56c;fill-opacity:0.979522;stroke:#a96625;stroke-width:0.327983;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="M 9.0178676,4.8149692 0.62785729,6.7333036 4.0522443,7.8968386 12.442484,5.9785036 Z M 12.499583,6.0886154 4.1093442,8.0068239 V 9.7365214 L 12.499583,7.8181874 Z M 0.54220732,6.827559 V 8.5572569 L 3.9097229,9.6893312 V 7.9597594 Z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/sawmill.svg b/src/data/layers/factory-components/sawmill.svg
new file mode 100644
index 0000000..e757d82
--- /dev/null
+++ b/src/data/layers/factory-components/sawmill.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/mixer.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202825"
+       y="0.38202825"
+       rx="1.246511" />
+    <g
+       id="g35244-0"
+       transform="matrix(0.74583387,0,0,0.74583387,33.258384,6.1193729)">
+      <path
+         id="path32127-9"
+         style="fill:#adb0b2;fill-opacity:1;stroke:#838390;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -9.7525081,-8.0417446 -0.3136759,1.2474691 -0.559656,-1.1585856 -0.115238,1.2810587 -0.733806,-1.0562663 0.08682,1.2831258 -0.889868,-0.9286254 0.286287,1.254187 -1.024227,-0.7777303 0.479041,1.1937255 -1.133264,-0.6082316 0.659908,1.1038086 -1.214913,-0.4232299 0.824756,0.9870198 -1.266073,-0.2278931 0.968933,0.8459432 -1.286226,-0.026872 1.089339,0.6836792 -1.274341,0.1746663 1.182874,0.5048788 -1.23145,0.3715535 1.247469,0.3141927 -1.158585,0.5596558 1.281575,0.1147217 -1.056783,0.73380532 1.283643,-0.0868164 -0.928626,0.89038493 1.25367,-0.2868042 -0.77773,1.02474365 1.193726,-0.47904053 -0.608232,1.13326413 1.103809,-0.65990801 -0.42323,1.21439611 0.987536,-0.8242391 -0.228409,1.2655559 0.84646,-0.9684164 -0.02739,1.2857097 0.684196,-1.0893392 0.17415,1.2743408 0.5053951,-1.1828735 0.3710368,1.2319661 0.3141927,-1.2474691 0.5596557,1.1580689 0.1147217,-1.2810588 0.7338053,1.0562663 -0.0863,-1.2831258 0.8898682,0.9286255 -0.2862875,-1.254187 1.0242269,0.778247 -0.4790405,-1.19372554 1.1332642,0.60823164 -0.6599081,-1.10432539 1.2143962,0.42322998 -0.8242391,-0.98701986 1.2655558,0.22789307 -0.9684163,-0.8459432 1.2857096,0.0273885 -1.0893392,-0.684196 1.2748576,-0.1741495 -1.1828735,-0.5053956 1.2314493,-0.3715535 -1.247469,-0.3141927 1.1580688,-0.559139 -1.2810587,-0.1152384 1.0562662,-0.7338054 -1.2831258,0.086816 0.9286255,-0.8898681 -1.254187,0.2862874 0.7782471,-1.0242269 -1.1937256,0.4790405 0.6082316,-1.1337809 -1.1043254,0.659908 0.42323,-1.2143961 -0.9870199,0.8247558 0.2278931,-1.2660725 -0.8459432,0.9689331 0.027388,-1.2862264 -0.6841959,1.0893392 -0.1741496,-1.2743409 -0.5053955,1.1828736 z m 0.1576131,4.3707926 a 1.3627795,1.3627795 0 0 1 1.3627076,1.3627075 1.3627795,1.3627795 0 0 1 -1.3627076,1.36270757 1.3627795,1.3627795 0 0 1 -1.363224,-1.36270757 1.3627795,1.3627795 0 0 1 1.363224,-1.3627075 z"
+         transform="translate(-26.031871,2.5030646)" />
+      <rect
+         style="fill:#985800;fill-opacity:1;stroke:none;stroke-width:0.515458;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect32962-5"
+         width="15.129635"
+         height="3.8936555"
+         x="-43.442078"
+         y="0.16687097" />
+      <rect
+         style="fill:#985800;fill-opacity:1;stroke:none;stroke-width:0.17927;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect32962-7-72"
+         width="2.6143119"
+         height="2.7255597"
+         x="-43.386452"
+         y="-6.674839"
+         transform="scale(1,-1)" />
+      <rect
+         style="fill:#985800;fill-opacity:1;stroke:none;stroke-width:0.17927;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect32962-7-7-9"
+         width="2.6143119"
+         height="2.7255597"
+         x="-30.954567"
+         y="-6.6470275"
+         transform="scale(1,-1)" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/shed.svg b/src/data/layers/factory-components/shed.svg
new file mode 100644
index 0000000..83d9da5
--- /dev/null
+++ b/src/data/layers/factory-components/shed.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/threadmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g40446"
+       transform="matrix(0.87900271,0,0,0.87900271,5.4933369,-36.404496)">
+      <path
+         id="path39713-5"
+         style="fill:#c68000;fill-opacity:1;stroke:#a96625;stroke-width:1.12129;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -4.5288074,47.752893 v 5.989299 l 8.130769,1.072803 0.167432,-5.988782 z m 1.465543,1.217497 h 4.688086 v 4.797123 h -4.688086 z" />
+      <path
+         style="fill:#c68000;fill-opacity:1;stroke:#a96625;stroke-width:1.05833;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 6.7134066,45.546433 -1.809733,0.12527 -0.67945,3.31545 1e-6,5.308012 2.489182,-2.112127 z"
+         id="path39711-3"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:#008000;fill-opacity:1;stroke:#016625;stroke-width:1.19855;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 0.0318616,43.511282 -3.958814,0.364032 -1.368426,3.468355 8.787392,1.816976 0.866615,-3.913416 1.456508,-0.150687 z"
+         id="rect341-6-6-1"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="rect39773-9"
+         style="fill:#ff0000;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+         d="m 4.7871916,49.936269 1.429115,-1.005312 v 4.122687 l -1.429115,1.005313 z"
+         sodipodi:nodetypes="ccccc" />
+      <ellipse
+         style="fill:#000000;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="path40241-3"
+         cx="5.753943"
+         cy="51.28479"
+         rx="0.37829503"
+         ry="0.42032781" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/shovel.svg b/src/data/layers/factory-components/shovel.svg
new file mode 100644
index 0000000..da96136
--- /dev/null
+++ b/src/data/layers/factory-components/shovel.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/shovel.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path48232"
+       style="fill:#006fff;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 11.472188,11.515818 c 1.053826,-1.053675 1.054718,-2.7611877 0.0022,-3.8140228 0,0 -2.2868717,-2.0428324 -2.2733578,-2.1440999 L 7.7756562,6.983072 4.9391095,4.1465238 C 5.2727621,3.4817647 5.1623779,2.6512336 4.6076825,2.0964072 L 3.114127,0.68239473 0.64475397,3.1517676 2.0386441,4.5456577 l 0.00237,-0.00237 c 0.018656,0.021229 0.037865,0.041969 0.057531,0.062266 0.5366737,0.5365474 1.3314707,0.6570836 1.9845421,0.3624402 l 2.8538296,2.8538297 -1.4871631,1.4871632 2.1178218,2.1178212 0.00363,-0.0036 c 0.028426,0.03218 0.057452,0.06364 0.087362,0.09445 1.0526946,1.052448 2.7600535,1.051593 3.8137865,-0.0019 z m -2.2712261,-5.9581227 0.00426,-0.00426 c -0.00268,2.652e-4 -0.00395,0.00205 -0.00426,0.00426 z M 3.8988288,3.9765487 c -0.3959172,0.3958383 -1.0377428,0.3958383 -1.4336616,0 -0.011206,-0.01168 -0.022207,-0.023581 -0.032909,-0.03575 l -0.00143,0.00142 -0.796369,-0.7963722 1.4109331,-1.4109347 c 0,0 0.9251616,0.7944608 0.8534267,0.8079731 0.3958383,0.3959188 0.3958383,1.0377444 0,1.4336616 z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/shovelmaker.svg b/src/data/layers/factory-components/shovelmaker.svg
new file mode 100644
index 0000000..2903bbf
--- /dev/null
+++ b/src/data/layers/factory-components/shovelmaker.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bucketshovel.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="3.4785843"
+     inkscape:cx="65.687643"
+     inkscape:cy="46.57067"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545-6"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202849"
+       y="0.38202849"
+       rx="1.246511" />
+    <path
+       id="path48232-4"
+       style="fill:#006fff;fill-opacity:1;stroke:#016625;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 11.506864,11.597003 c 1.053826,-1.053675 1.054718,-2.7611884 0.0022,-3.8140234 0,0 -2.2868715,-2.042833 -2.2733575,-2.1441 l -1.425374,1.425377 -2.836547,-2.836549 c 0.333653,-0.664759 0.223269,-1.49529 -0.331427,-2.050116 L 3.1488035,0.76357864 0.67943049,3.2329516 l 1.39389001,1.39389 0.0024,-0.0024 c 0.01866,0.02123 0.03787,0.04197 0.05753,0.06227 0.536674,0.536548 1.331471,0.657084 1.984542,0.36244 l 2.85383,2.85383 -1.487163,1.487163 2.117821,2.1178224 0.0036,-0.0036 c 0.02843,0.03218 0.05745,0.06364 0.08736,0.09445 1.052695,1.052448 2.7600535,1.051593 3.8137865,-0.0019 z m -2.2712255,-5.9581234 0.0043,-0.0043 c -0.0027,2.65e-4 -0.0039,0.002 -0.0043,0.0043 z m -5.302133,-1.581147 c -0.395918,0.395839 -1.037743,0.395839 -1.433662,0 -0.01121,-0.01168 -0.02221,-0.02358 -0.03291,-0.03575 l -0.0014,0.0014 -0.796369,-0.796372 1.410933,-1.410934 c 0,0 0.925162,0.79446 0.853427,0.807973 0.395838,0.395918 0.395838,1.037744 0,1.433661 z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/thread.svg b/src/data/layers/factory-components/thread.svg
new file mode 100644
index 0000000..b12a9ca
--- /dev/null
+++ b/src/data/layers/factory-components/thread.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/flaskpurple.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g12610"
+       transform="matrix(0.5414695,0,0,0.5414695,0.80759611,0.67637776)">
+      <path
+         id="path8653-4-3"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:#848383;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 11.038957,13.578825 a 8.6547346,4.1054511 0 0 0 -8.6542531,4.105693 8.6547346,4.1054511 0 0 0 8.6542531,4.105175 8.6547346,4.1054511 0 0 0 8.654769,-4.105175 8.6547346,4.1054511 0 0 0 -8.654769,-4.105693 z m 0.111621,3.304191 a 1.8506517,0.8778733 0 0 1 1.850533,0.877983 1.8506517,0.8778733 0 0 1 -1.850533,0.877982 1.8506517,0.8778733 0 0 1 -1.8510504,-0.877982 1.8506517,0.8778733 0 0 1 1.8510504,-0.877983 z" />
+      <rect
+         style="fill:#ff0000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect10624-0-3"
+         width="12.672419"
+         height="16.901011"
+         x="4.7750044"
+         y="3.6540871"
+         rx="6.3362093"
+         ry="3.9148395" />
+      <path
+         id="rect10624-0-9-8-7"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.8646387,15.40327 v 0.413903 c 0,1.849962 2.8263081,3.339427 6.3365643,3.339427 3.510257,0 6.336047,-1.489465 6.336047,-3.339427 V 15.40327 c 0,1.849963 -2.82579,3.339429 -6.336047,3.339429 -3.5102562,0 -6.3365643,-1.489466 -6.3365643,-3.339429 z" />
+      <path
+         id="rect10624-0-9-8-9-7"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.7837741,13.86684 v 0.413903 c 0,1.849962 2.8263081,3.339427 6.3365639,3.339427 3.510257,0 6.336047,-1.489465 6.336047,-3.339427 V 13.86684 c 0,1.849963 -2.82579,3.339429 -6.336047,3.339429 -3.5102558,0 -6.3365639,-1.489466 -6.3365639,-3.339429 z" />
+      <path
+         id="rect10624-0-9-8-5-3"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.7837737,12.573005 v 0.378233 c 0,1.690535 2.8263084,3.051638 6.3365643,3.051638 3.510257,0 6.336047,-1.361103 6.336047,-3.051638 v -0.378233 c 0,1.690535 -2.82579,3.05164 -6.336047,3.05164 -3.5102559,0 -6.3365643,-1.361105 -6.3365643,-3.05164 z" />
+      <path
+         id="rect10624-0-9-8-5-8-2"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.8646386,11.077008 v 0.369315 c 0,1.650678 2.8263084,2.979692 6.3365644,2.979692 3.510257,0 6.336047,-1.329014 6.336047,-2.979692 v -0.369315 c 0,1.650678 -2.82579,2.979692 -6.336047,2.979692 -3.510256,0 -6.3365644,-1.329014 -6.3365644,-2.979692 z" />
+      <path
+         id="rect10624-0-9-8-5-8-9-5"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.8646386,9.6214426 v 0.333645 c 0,1.4912504 2.8263084,2.6919034 6.3365644,2.6919034 3.510257,0 6.336047,-1.200653 6.336047,-2.6919034 v -0.333645 c 0,1.4912504 -2.82579,2.6919034 -6.336047,2.6919034 -3.510256,0 -6.3365644,-1.200653 -6.3365644,-2.6919034 z" />
+      <path
+         id="rect10624-0-9-8-5-8-9-9-6"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.8646386,8.0041486 v 0.333645 c 0,1.49125 2.8263084,2.6919034 6.3365644,2.6919034 3.510257,0 6.336047,-1.2006534 6.336047,-2.6919034 v -0.333645 c 0,1.49125 -2.82579,2.6919034 -6.336047,2.6919034 -3.510256,0 -6.3365644,-1.2006534 -6.3365644,-2.6919034 z" />
+      <path
+         id="path8653-3"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:#848383;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="M 11.119821,0.72133655 A 8.6547346,4.1054511 0 0 0 2.4655689,4.8270296 8.6547346,4.1054511 0 0 0 11.119821,8.9322046 8.6547346,4.1054511 0 0 0 19.77459,4.8270296 8.6547346,4.1054511 0 0 0 11.119821,0.72133655 Z m 0.111621,3.30419105 a 1.8506517,0.8778733 0 0 1 1.850533,0.877983 1.8506517,0.8778733 0 0 1 -1.850533,0.877982 1.8506517,0.8778733 0 0 1 -1.8510497,-0.877982 1.8506517,0.8778733 0 0 1 1.8510497,-0.877983 z" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/threadmaker.svg b/src/data/layers/factory-components/threadmaker.svg
new file mode 100644
index 0000000..50a12ea
--- /dev/null
+++ b/src/data/layers/factory-components/threadmaker.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/truckmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202825"
+       y="0.38202825"
+       rx="1.246511" />
+    <g
+       id="g12610-3"
+       transform="matrix(0.5414695,0,0,0.5414695,0.64501457,0.54978754)">
+      <path
+         id="path8653-4-3-7"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:#848383;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 11.038957,13.578825 a 8.6547346,4.1054511 0 0 0 -8.6542531,4.105693 8.6547346,4.1054511 0 0 0 8.6542531,4.105175 8.6547346,4.1054511 0 0 0 8.654769,-4.105175 8.6547346,4.1054511 0 0 0 -8.654769,-4.105693 z m 0.111621,3.304191 a 1.8506517,0.8778733 0 0 1 1.850533,0.877983 1.8506517,0.8778733 0 0 1 -1.850533,0.877982 1.8506517,0.8778733 0 0 1 -1.8510504,-0.877982 1.8506517,0.8778733 0 0 1 1.8510504,-0.877983 z" />
+      <rect
+         style="fill:#ff0000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         id="rect10624-0-3-9"
+         width="12.672419"
+         height="16.901011"
+         x="4.7750044"
+         y="3.6540871"
+         rx="6.3362093"
+         ry="3.9148395" />
+      <path
+         id="rect10624-0-9-8-7-63"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.8646387,15.40327 v 0.413903 c 0,1.849962 2.8263081,3.339427 6.3365643,3.339427 3.510257,0 6.336047,-1.489465 6.336047,-3.339427 V 15.40327 c 0,1.849963 -2.82579,3.339429 -6.336047,3.339429 -3.5102562,0 -6.3365643,-1.489466 -6.3365643,-3.339429 z" />
+      <path
+         id="rect10624-0-9-8-9-7-1"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.7837741,13.86684 v 0.413903 c 0,1.849962 2.8263081,3.339427 6.3365639,3.339427 3.510257,0 6.336047,-1.489465 6.336047,-3.339427 V 13.86684 c 0,1.849963 -2.82579,3.339429 -6.336047,3.339429 -3.5102558,0 -6.3365639,-1.489466 -6.3365639,-3.339429 z" />
+      <path
+         id="rect10624-0-9-8-5-3-58"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.7837737,12.573005 v 0.378233 c 0,1.690535 2.8263084,3.051638 6.3365643,3.051638 3.510257,0 6.336047,-1.361103 6.336047,-3.051638 v -0.378233 c 0,1.690535 -2.82579,3.05164 -6.336047,3.05164 -3.5102559,0 -6.3365643,-1.361105 -6.3365643,-3.05164 z" />
+      <path
+         id="rect10624-0-9-8-5-8-2-0"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.8646386,11.077008 v 0.369315 c 0,1.650678 2.8263084,2.979692 6.3365644,2.979692 3.510257,0 6.336047,-1.329014 6.336047,-2.979692 v -0.369315 c 0,1.650678 -2.82579,2.979692 -6.336047,2.979692 -3.510256,0 -6.3365644,-1.329014 -6.3365644,-2.979692 z" />
+      <path
+         id="rect10624-0-9-8-5-8-9-5-9"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.8646386,9.6214426 v 0.333645 c 0,1.4912504 2.8263084,2.6919034 6.3365644,2.6919034 3.510257,0 6.336047,-1.200653 6.336047,-2.6919034 v -0.333645 c 0,1.4912504 -2.82579,2.6919034 -6.336047,2.6919034 -3.510256,0 -6.3365644,-1.200653 -6.3365644,-2.6919034 z" />
+      <path
+         id="rect10624-0-9-8-5-8-9-9-6-2"
+         style="fill:#000000;fill-opacity:1;stroke:#848383;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m 4.8646386,8.0041486 v 0.333645 c 0,1.49125 2.8263084,2.6919034 6.3365644,2.6919034 3.510257,0 6.336047,-1.2006534 6.336047,-2.6919034 v -0.333645 c 0,1.49125 -2.82579,2.6919034 -6.336047,2.6919034 -3.510256,0 -6.3365644,-1.2006534 -6.3365644,-2.6919034 z" />
+      <path
+         id="path8653-3-4"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:#848383;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="M 11.119821,0.72133655 A 8.6547346,4.1054511 0 0 0 2.4655689,4.8270296 8.6547346,4.1054511 0 0 0 11.119821,8.9322046 8.6547346,4.1054511 0 0 0 19.77459,4.8270296 8.6547346,4.1054511 0 0 0 11.119821,0.72133655 Z m 0.111621,3.30419105 a 1.8506517,0.8778733 0 0 1 1.850533,0.877983 1.8506517,0.8778733 0 0 1 -1.850533,0.877982 1.8506517,0.8778733 0 0 1 -1.8510497,-0.877982 1.8506517,0.8778733 0 0 1 1.8510497,-0.877983 z" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/truck.svg b/src/data/layers/factory-components/truck.svg
new file mode 100644
index 0000000..e788c26
--- /dev/null
+++ b/src/data/layers/factory-components/truck.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="adventwheel.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect20235-0"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect20237-8"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="0.52240775,0.10199491"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g26023-4"
+       transform="matrix(0.61165172,0,0,0.61165172,28.298079,18.449863)">
+      <g
+         id="g17224-0-0-9"
+         transform="matrix(0.4171486,0,0,0.4171486,-9.1474259,-11.042004)">
+        <path
+           id="path16690-2-0-1-3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="m -51.129633,-14.43988 a 5.2124038,5.2124038 0 0 0 -5.212601,5.2126018 5.2124038,5.2124038 0 0 0 5.212601,5.2120846 5.2124038,5.2124038 0 0 0 5.212602,-5.2120846 5.2124038,5.2124038 0 0 0 -5.212602,-5.2126018 z m -0.124023,2.117184 a 3.095253,3.095253 0 0 1 3.094901,3.0954178 3.095253,3.095253 0 0 1 -3.094901,3.095418 3.095253,3.095253 0 0 1 -3.095418,-3.095418 3.095253,3.095253 0 0 1 3.095418,-3.0954178 z" />
+        <path
+           id="path16692-4-3-9-0"
+           style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="m -51.286578,-12.355545 a 3.095253,3.095253 0 0 0 -3.095419,3.0954188 3.095253,3.095253 0 0 0 3.095419,3.095418 3.095253,3.095253 0 0 0 3.095418,-3.095418 3.095253,3.095253 0 0 0 -3.095418,-3.0954188 z m 0.295589,0.922425 a 2.1939828,2.1939828 0 0 1 1.627808,1.145666 l -1.200444,0.3550168 a 0.99959075,0.99959075 0 0 0 -0.427364,-0.2899048 z m -0.720886,0.01757 v 1.219563 a 0.99959075,0.99959075 0 0 0 -0.368453,0.2718178 l -1.097091,-0.4733558 a 2.1939828,2.1939828 0 0 1 1.465544,-1.018025 z m -1.732194,1.6882688 1.127063,0.486275 a 0.99959075,0.99959075 0 0 0 0.10852,0.417029 l -0.788065,0.95498 a 2.1939828,2.1939828 0 0 1 -0.499711,-1.392163 2.1939828,2.1939828 0 0 1 0.05219,-0.466121 z m 4.308781,0.124023 a 2.1939828,2.1939828 0 0 1 0.02687,0.342098 2.1939828,2.1939828 0 0 1 -0.451135,1.328601 l -0.878499,-0.873848 a 0.99959075,0.99959075 0 0 0 0.117822,-0.446485 z m -2.535763,1.260388 a 0.99959075,0.99959075 0 0 0 0.352433,0.0646 0.99959075,0.99959075 0 0 0 0.331246,-0.05736 l 0.902271,0.89762 a 2.1939828,2.1939828 0 0 1 -1.21698,0.37052 2.1939828,2.1939828 0 0 1 -1.149801,-0.327629 z" />
+      </g>
+      <path
+         id="rect17292-5"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -42.756047,-18.563208 v 3.875732 h 1.423686 a 2.5077715,2.4277363 0 0 1 -0.01499,-0.258382 2.5077715,2.4277363 0 0 1 2.507857,-2.427759 2.5077715,2.4277363 0 0 1 2.507341,2.427759 2.5077715,2.4277363 0 0 1 -0.01499,0.258382 h 3.38739 a 2.5077715,2.4277363 0 0 1 -0.02429,-0.326078 2.5077715,2.4277363 0 0 1 2.507857,-2.427759 2.5077715,2.4277363 0 0 1 2.507857,2.427759 2.5077715,2.4277363 0 0 1 -0.02377,0.326078 h 1.840715 v -3.875732 z" />
+      <g
+         id="g17224-0-2"
+         transform="matrix(0.4171486,0,0,0.4171486,-17.511009,-11.042004)">
+        <path
+           id="path16690-2-0-3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="m -51.129633,-14.43988 a 5.2124038,5.2124038 0 0 0 -5.212601,5.2126018 5.2124038,5.2124038 0 0 0 5.212601,5.2120846 5.2124038,5.2124038 0 0 0 5.212602,-5.2120846 5.2124038,5.2124038 0 0 0 -5.212602,-5.2126018 z m -0.124023,2.117184 a 3.095253,3.095253 0 0 1 3.094901,3.0954178 3.095253,3.095253 0 0 1 -3.094901,3.095418 3.095253,3.095253 0 0 1 -3.095418,-3.095418 3.095253,3.095253 0 0 1 3.095418,-3.0954178 z" />
+        <path
+           id="path16692-4-3-8"
+           style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="m -51.286578,-12.355545 a 3.095253,3.095253 0 0 0 -3.095419,3.0954188 3.095253,3.095253 0 0 0 3.095419,3.095418 3.095253,3.095253 0 0 0 3.095418,-3.095418 3.095253,3.095253 0 0 0 -3.095418,-3.0954188 z m 0.295589,0.922425 a 2.1939828,2.1939828 0 0 1 1.627808,1.145666 l -1.200444,0.3550168 a 0.99959075,0.99959075 0 0 0 -0.427364,-0.2899048 z m -0.720886,0.01757 v 1.219563 a 0.99959075,0.99959075 0 0 0 -0.368453,0.2718178 l -1.097091,-0.4733558 a 2.1939828,2.1939828 0 0 1 1.465544,-1.018025 z m -1.732194,1.6882688 1.127063,0.486275 a 0.99959075,0.99959075 0 0 0 0.10852,0.417029 l -0.788065,0.95498 a 2.1939828,2.1939828 0 0 1 -0.499711,-1.392163 2.1939828,2.1939828 0 0 1 0.05219,-0.466121 z m 4.308781,0.124023 a 2.1939828,2.1939828 0 0 1 0.02687,0.342098 2.1939828,2.1939828 0 0 1 -0.451135,1.328601 l -0.878499,-0.873848 a 0.99959075,0.99959075 0 0 0 0.117822,-0.446485 z m -2.535763,1.260388 a 0.99959075,0.99959075 0 0 0 0.352433,0.0646 0.99959075,0.99959075 0 0 0 0.331246,-0.05736 l 0.902271,0.89762 a 2.1939828,2.1939828 0 0 1 -1.21698,0.37052 2.1939828,2.1939828 0 0 1 -1.149801,-0.327629 z" />
+      </g>
+      <g
+         id="g20243-7"
+         transform="matrix(1.6363512,0,0,1.6363512,18.121301,15.24319)">
+        <path
+           id="rect17356-8"
+           style="fill:#0041ff;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+           d="m -30.720817,-25.172186 v 4.936649 h 3.671611 c -0.09459,-1.223735 -0.09058,-2.537503 -0.775146,-3.957897 -0.546744,-0.355028 -0.822384,-0.661706 -1.305347,-0.774113 -0.44203,-0.102881 -1.090714,-0.01618 -1.591118,-0.204639 z m 0.448552,0.713651 c 0.311362,0.07165 0.71508,0.03892 0.99012,0.07803 0.300511,0.04273 0.472158,0.159587 0.812354,0.294556 0.425951,0.539984 0.423285,1.039078 0.482141,1.5043 h -2.284615 z" />
+        <path
+           d="m -30.243376,-21.929625 c 0.05764,0.0069 0.19896,0.028 0.348693,0.04844 0.0053,7.24e-4 0.01062,0.0014 0.01594,0.0022 0.08122,0.0109 0.212633,0.02747 0.347539,0.03064 0.03229,9.33e-4 0.05887,0.0011 0.07507,0.0011 a 0.10199491,0.10199491 90 0 0 0,-0.20399 c -0.01494,0 -0.03945,-1.32e-4 -0.06973,-0.001 -0.12347,-0.0029 -0.245441,-0.01812 -0.325746,-0.0289 -0.0052,-6.92e-4 -0.01032,-0.0014 -0.01548,-0.0021 -0.14568,-0.01989 -0.291702,-0.04167 -0.352122,-0.04888 a 0.10199491,0.10199491 90 0 0 -0.02417,0.202554 z"
+           id="path-1-44-0"
+           inkscape:path-effect="#path-effect20235-0;#path-effect20237-8"
+           inkscape:original-d="m -30.231293,-22.030902 c 0.271427,0.03235 0.487435,0.0816 0.775161,0.0816"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+      </g>
+      <path
+         id="rect20971-4"
+         style="fill:#ffe700;stroke:#e8cc00;stroke-width:0.506118;stroke-linecap:round;stroke-miterlimit:6;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -41.600233,-23.842629 0.727597,5.359722 2.743637,-0.03023 -0.931587,-5.686105 z m 5.743424,-0.780913 0.849902,6.052659 2.498847,-0.152627 -0.115539,-6.297446 z m -8.730559,1.227846 c 0.06844,0.12154 3.188063,4.275104 3.188063,4.275104 l -0.602659,-4.638141 z m 5.867472,-0.775962 0.849991,5.686104 2.539648,0.01056 -0.849991,-6.053286 z"
+         sodipodi:nodetypes="ccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/truckmaker.svg b/src/data/layers/factory-components/truckmaker.svg
new file mode 100644
index 0000000..9fbc328
--- /dev/null
+++ b/src/data/layers/factory-components/truckmaker.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/clothesmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="simplify"
+       id="path-effect20235-07-0"
+       is_visible="true"
+       lpeversion="1"
+       steps="1"
+       threshold="0.0047745358"
+       smooth_angles="0"
+       helper_size="0"
+       simplify_individual_paths="false"
+       simplify_just_coalesce="false"
+       step="1" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect20237-1-1"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="0.52240775,0.10199491"
+       not_jump="true"
+       sort_points="true"
+       interpolator_type="CentripetalCatmullRom"
+       interpolator_beta="0.75"
+       start_linecap_type="round"
+       linejoin_type="spiro"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="round" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202825"
+       y="0.38202825"
+       rx="1.246511" />
+    <g
+       id="g26023-6"
+       transform="matrix(0.55350165,0,0,0.55350165,26.329747,17.935283)">
+      <g
+         id="g17224-0-0-0"
+         transform="matrix(0.4171486,0,0,0.4171486,-9.1474259,-11.042004)">
+        <path
+           id="path16690-2-0-1-9"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="m -51.129633,-14.43988 a 5.2124038,5.2124038 0 0 0 -5.212601,5.2126018 5.2124038,5.2124038 0 0 0 5.212601,5.2120846 5.2124038,5.2124038 0 0 0 5.212602,-5.2120846 5.2124038,5.2124038 0 0 0 -5.212602,-5.2126018 z m -0.124023,2.117184 a 3.095253,3.095253 0 0 1 3.094901,3.0954178 3.095253,3.095253 0 0 1 -3.094901,3.095418 3.095253,3.095253 0 0 1 -3.095418,-3.095418 3.095253,3.095253 0 0 1 3.095418,-3.0954178 z" />
+        <path
+           id="path16692-4-3-9-2"
+           style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="m -51.286578,-12.355545 a 3.095253,3.095253 0 0 0 -3.095419,3.0954188 3.095253,3.095253 0 0 0 3.095419,3.095418 3.095253,3.095253 0 0 0 3.095418,-3.095418 3.095253,3.095253 0 0 0 -3.095418,-3.0954188 z m 0.295589,0.922425 a 2.1939828,2.1939828 0 0 1 1.627808,1.145666 l -1.200444,0.3550168 a 0.99959075,0.99959075 0 0 0 -0.427364,-0.2899048 z m -0.720886,0.01757 v 1.219563 a 0.99959075,0.99959075 0 0 0 -0.368453,0.2718178 l -1.097091,-0.4733558 a 2.1939828,2.1939828 0 0 1 1.465544,-1.018025 z m -1.732194,1.6882688 1.127063,0.486275 a 0.99959075,0.99959075 0 0 0 0.10852,0.417029 l -0.788065,0.95498 a 2.1939828,2.1939828 0 0 1 -0.499711,-1.392163 2.1939828,2.1939828 0 0 1 0.05219,-0.466121 z m 4.308781,0.124023 a 2.1939828,2.1939828 0 0 1 0.02687,0.342098 2.1939828,2.1939828 0 0 1 -0.451135,1.328601 l -0.878499,-0.873848 a 0.99959075,0.99959075 0 0 0 0.117822,-0.446485 z m -2.535763,1.260388 a 0.99959075,0.99959075 0 0 0 0.352433,0.0646 0.99959075,0.99959075 0 0 0 0.331246,-0.05736 l 0.902271,0.89762 a 2.1939828,2.1939828 0 0 1 -1.21698,0.37052 2.1939828,2.1939828 0 0 1 -1.149801,-0.327629 z" />
+      </g>
+      <path
+         id="rect17292-9"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -42.756047,-18.563208 v 3.875732 h 1.423686 a 2.5077715,2.4277363 0 0 1 -0.01499,-0.258382 2.5077715,2.4277363 0 0 1 2.507857,-2.427759 2.5077715,2.4277363 0 0 1 2.507341,2.427759 2.5077715,2.4277363 0 0 1 -0.01499,0.258382 h 3.38739 a 2.5077715,2.4277363 0 0 1 -0.02429,-0.326078 2.5077715,2.4277363 0 0 1 2.507857,-2.427759 2.5077715,2.4277363 0 0 1 2.507857,2.427759 2.5077715,2.4277363 0 0 1 -0.02377,0.326078 h 1.840715 v -3.875732 z" />
+      <g
+         id="g17224-0-6"
+         transform="matrix(0.4171486,0,0,0.4171486,-17.511009,-11.042004)">
+        <path
+           id="path16690-2-0-0"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="m -51.129633,-14.43988 a 5.2124038,5.2124038 0 0 0 -5.212601,5.2126018 5.2124038,5.2124038 0 0 0 5.212601,5.2120846 5.2124038,5.2124038 0 0 0 5.212602,-5.2120846 5.2124038,5.2124038 0 0 0 -5.212602,-5.2126018 z m -0.124023,2.117184 a 3.095253,3.095253 0 0 1 3.094901,3.0954178 3.095253,3.095253 0 0 1 -3.094901,3.095418 3.095253,3.095253 0 0 1 -3.095418,-3.095418 3.095253,3.095253 0 0 1 3.095418,-3.0954178 z" />
+        <path
+           id="path16692-4-3-2"
+           style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+           d="m -51.286578,-12.355545 a 3.095253,3.095253 0 0 0 -3.095419,3.0954188 3.095253,3.095253 0 0 0 3.095419,3.095418 3.095253,3.095253 0 0 0 3.095418,-3.095418 3.095253,3.095253 0 0 0 -3.095418,-3.0954188 z m 0.295589,0.922425 a 2.1939828,2.1939828 0 0 1 1.627808,1.145666 l -1.200444,0.3550168 a 0.99959075,0.99959075 0 0 0 -0.427364,-0.2899048 z m -0.720886,0.01757 v 1.219563 a 0.99959075,0.99959075 0 0 0 -0.368453,0.2718178 l -1.097091,-0.4733558 a 2.1939828,2.1939828 0 0 1 1.465544,-1.018025 z m -1.732194,1.6882688 1.127063,0.486275 a 0.99959075,0.99959075 0 0 0 0.10852,0.417029 l -0.788065,0.95498 a 2.1939828,2.1939828 0 0 1 -0.499711,-1.392163 2.1939828,2.1939828 0 0 1 0.05219,-0.466121 z m 4.308781,0.124023 a 2.1939828,2.1939828 0 0 1 0.02687,0.342098 2.1939828,2.1939828 0 0 1 -0.451135,1.328601 l -0.878499,-0.873848 a 0.99959075,0.99959075 0 0 0 0.117822,-0.446485 z m -2.535763,1.260388 a 0.99959075,0.99959075 0 0 0 0.352433,0.0646 0.99959075,0.99959075 0 0 0 0.331246,-0.05736 l 0.902271,0.89762 a 2.1939828,2.1939828 0 0 1 -1.21698,0.37052 2.1939828,2.1939828 0 0 1 -1.149801,-0.327629 z" />
+      </g>
+      <g
+         id="g20243-8"
+         transform="matrix(1.6363512,0,0,1.6363512,18.121301,15.24319)">
+        <path
+           id="rect17356-4"
+           style="fill:#0041ff;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:6;paint-order:markers stroke fill"
+           d="m -30.720817,-25.172186 v 4.936649 h 3.671611 c -0.09459,-1.223735 -0.09058,-2.537503 -0.775146,-3.957897 -0.546744,-0.355028 -0.822384,-0.661706 -1.305347,-0.774113 -0.44203,-0.102881 -1.090714,-0.01618 -1.591118,-0.204639 z m 0.448552,0.713651 c 0.311362,0.07165 0.71508,0.03892 0.99012,0.07803 0.300511,0.04273 0.472158,0.159587 0.812354,0.294556 0.425951,0.539984 0.423285,1.039078 0.482141,1.5043 h -2.284615 z" />
+        <path
+           d="m -30.24339,-21.929627 c 0.05818,0.0069 0.200813,0.02832 0.351976,0.04888 0.0054,7.28e-4 0.01072,0.0015 0.01609,0.0022 0.08205,0.01096 0.214627,0.02756 0.350896,0.03038 0.02933,7.73e-4 0.05354,8.92e-4 0.06829,8.92e-4 a 0.10199491,0.10199491 90 0 0 0,-0.20399 c -0.0136,0 -0.03593,-1.1e-4 -0.0635,-8.35e-4 -0.124632,-0.0026 -0.247598,-0.0178 -0.328666,-0.02864 -0.0052,-6.96e-4 -0.01041,-0.0014 -0.01562,-0.0021 -0.146982,-0.01999 -0.294314,-0.04202 -0.355276,-0.0493 a 0.10199491,0.10199491 90 0 0 -0.02419,0.20255 z"
+           id="path-1-44-4"
+           inkscape:path-effect="#path-effect20235-07-0;#path-effect20237-1-1"
+           inkscape:original-d="m -30.231293,-22.030902 c 0.271427,0.03235 0.487435,0.0816 0.775161,0.0816"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+      </g>
+      <path
+         id="rect20971-8"
+         style="fill:#ffe700;stroke:#e8cc00;stroke-width:0.506118;stroke-linecap:round;stroke-miterlimit:6;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -41.600233,-23.842629 0.727597,5.359722 2.743637,-0.03023 -0.931587,-5.686105 z m 5.743424,-0.780913 0.849902,6.052659 2.498847,-0.152627 -0.115539,-6.297446 z m -8.730559,1.227846 c 0.06844,0.12154 3.188063,4.275104 3.188063,4.275104 l -0.602659,-4.638141 z m 5.867472,-0.775962 0.849991,5.686104 2.539648,0.01056 -0.849991,-6.053286 z"
+         sodipodi:nodetypes="ccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/wheel.svg b/src/data/layers/factory-components/wheel.svg
new file mode 100644
index 0000000..75c01f5
--- /dev/null
+++ b/src/data/layers/factory-components/wheel.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/bear.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path16690-2"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 6.8071988,1.4435854 a 5.2124038,5.2124038 0 0 0 -5.212601,5.212602 5.2124038,5.2124038 0 0 0 5.212601,5.2120846 5.2124038,5.2124038 0 0 0 5.2126022,-5.2120846 5.2124038,5.2124038 0 0 0 -5.2126022,-5.212602 z m -0.124023,2.117184 a 3.095253,3.095253 0 0 1 3.094901,3.095418 3.095253,3.095253 0 0 1 -3.094901,3.095418 3.095253,3.095253 0 0 1 -3.095418,-3.095418 3.095253,3.095253 0 0 1 3.095418,-3.095418 z" />
+    <path
+       id="path16692-4"
+       style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       d="m 6.6502538,3.5279204 a 3.095253,3.095253 0 0 0 -3.095419,3.095419 3.095253,3.095253 0 0 0 3.095419,3.095418 3.095253,3.095253 0 0 0 3.095418,-3.095418 3.095253,3.095253 0 0 0 -3.095418,-3.095419 z m 0.295589,0.922425 a 2.1939828,2.1939828 0 0 1 1.627808,1.145666 l -1.200444,0.355017 a 0.99959075,0.99959075 0 0 0 -0.427364,-0.289905 z m -0.720886,0.01757 v 1.219563 a 0.99959075,0.99959075 0 0 0 -0.368453,0.271818 l -1.097091,-0.473356 a 2.1939828,2.1939828 0 0 1 1.465544,-1.018025 z m -1.732194,1.688269 1.127063,0.486275 a 0.99959075,0.99959075 0 0 0 0.10852,0.417029 l -0.788065,0.95498 a 2.1939828,2.1939828 0 0 1 -0.499711,-1.392163 2.1939828,2.1939828 0 0 1 0.05219,-0.466121 z m 4.308781,0.124023 a 2.1939828,2.1939828 0 0 1 0.02687,0.342098 2.1939828,2.1939828 0 0 1 -0.451135,1.328601 l -0.878499,-0.873848 a 0.99959075,0.99959075 0 0 0 0.117822,-0.446485 z m -2.535763,1.260388 a 0.99959075,0.99959075 0 0 0 0.352433,0.0646 0.99959075,0.99959075 0 0 0 0.331246,-0.05736 l 0.902271,0.89762 a 2.1939828,2.1939828 0 0 1 -1.21698,0.37052 2.1939828,2.1939828 0 0 1 -1.149801,-0.327629 z" />
+  </g>
+</svg>
diff --git a/src/data/layers/factory-components/wheelmaker.svg b/src/data/layers/factory-components/wheelmaker.svg
new file mode 100644
index 0000000..594639e
--- /dev/null
+++ b/src/data/layers/factory-components/wheelmaker.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50"
+   height="50"
+   viewBox="0 0 13.229166 13.229167"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="advent.svg"
+   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+   inkscape:export-filename="advent/blockmaker.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.9158497"
+     inkscape:cx="92.648188"
+     inkscape:cy="-32.361621"
+     inkscape:window-width="1309"
+     inkscape:window-height="804"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#838390;stroke-width:0.764057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       id="rect28545"
+       width="12.46511"
+       height="12.46511"
+       x="0.38202825"
+       y="0.38202825"
+       rx="1.246511" />
+    <g
+       id="g37125"
+       transform="translate(53.449746,54.483305)">
+      <path
+         id="path16690-0"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -46.805441,-53.198994 a 5.2124038,5.2124038 0 0 0 -5.212601,5.212602 5.2124038,5.2124038 0 0 0 5.212601,5.212085 5.2124038,5.2124038 0 0 0 5.212602,-5.212085 5.2124038,5.2124038 0 0 0 -5.212602,-5.212602 z m -0.124023,2.117184 a 3.095253,3.095253 0 0 1 3.094901,3.095418 3.095253,3.095253 0 0 1 -3.094901,3.095418 3.095253,3.095253 0 0 1 -3.095418,-3.095418 3.095253,3.095253 0 0 1 3.095418,-3.095418 z" />
+      <path
+         id="path16692-2"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+         d="m -46.962386,-51.114659 a 3.095253,3.095253 0 0 0 -3.095419,3.095419 3.095253,3.095253 0 0 0 3.095419,3.095418 3.095253,3.095253 0 0 0 3.095418,-3.095418 3.095253,3.095253 0 0 0 -3.095418,-3.095419 z m 0.295589,0.922425 a 2.1939828,2.1939828 0 0 1 1.627808,1.145666 l -1.200444,0.355017 a 0.99959075,0.99959075 0 0 0 -0.427364,-0.289905 z m -0.720886,0.01757 v 1.219563 a 0.99959075,0.99959075 0 0 0 -0.368453,0.271818 l -1.097091,-0.473356 a 2.1939828,2.1939828 0 0 1 1.465544,-1.018025 z m -1.732194,1.688269 1.127063,0.486275 a 0.99959075,0.99959075 0 0 0 0.10852,0.417029 l -0.788065,0.95498 a 2.1939828,2.1939828 0 0 1 -0.499711,-1.392163 2.1939828,2.1939828 0 0 1 0.05219,-0.466121 z m 4.308781,0.124023 a 2.1939828,2.1939828 0 0 1 0.02687,0.342098 2.1939828,2.1939828 0 0 1 -0.451135,1.328601 l -0.878499,-0.873848 a 0.99959075,0.99959075 0 0 0 0.117822,-0.446485 z m -2.535763,1.260388 a 0.99959075,0.99959075 0 0 0 0.352433,0.0646 0.99959075,0.99959075 0 0 0 0.331246,-0.05736 l 0.902271,0.89762 a 2.1939828,2.1939828 0 0 1 -1.21698,0.37052 2.1939828,2.1939828 0 0 1 -1.149801,-0.327629 z" />
+    </g>
+  </g>
+</svg>
diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx
index 7ae2172..09b4b86 100644
--- a/src/data/layers/factory.tsx
+++ b/src/data/layers/factory.tsx
@@ -7,7 +7,7 @@ import Spacer from "components/layout/Spacer.vue";
 import { jsx } from "features/feature";
 import { globalBus } from "game/events";
 import { createLayer } from "game/layers";
-import { Persistent, persistent, State } from "game/persistence";
+import { noPersist, Persistent, persistent, State } from "game/persistence";
 import Decimal, { format, formatWhole } from "util/bignum";
 import { Direction } from "util/common";
 import { computed, ComputedRef, reactive, ref, watchEffect } from "vue";
@@ -27,10 +27,16 @@ import _truck from "./factory-components/rotate_rectangle.png";
 import Factory from "./Factory.vue";
 import "./styles/factory.css";
 import coal from "./coal";
-import { createBar } from "features/bars/bar";
 import { render } from "util/vue";
 import { createTab } from "features/tabs/tab";
 import { createTabFamily } from "features/tabs/tabFamily";
+import { createAdditiveModifier, createSequentialModifier } from "game/modifiers";
+import { main } from "data/projEntry";
+import { createCollapsibleModifierSections } from "data/common";
+import Modal from "components/Modal.vue";
+import { createBar, GenericBar } from "features/bars/bar";
+import HotkeyVue from "components/Hotkey.vue";
+import { createHotkey, GenericHotkey } from "features/hotkey";
 
 const id = "factory";
 
@@ -89,19 +95,22 @@ const factory = createLayer(id, () => {
     const name = "The Factory";
     const color = "grey";
 
-    // ---------------------------------------------- Energy
-
-    const energy = computed(() => Decimal.add(1, coal.coal.value).log10());
+    const energy = createSequentialModifier(() => [
+        createAdditiveModifier(() => ({
+            addend: () => Decimal.add(1, coal.coal.value).log10(),
+            description: "Coal Energy Production"
+        }))
+    ]);
+    const computedEnergy = computed(() => energy.apply(0));
     const energyConsumption = computed(() =>
         Object.values(components.value)
             .map(c => FACTORY_COMPONENTS[c.type]?.energyCost ?? 0)
             .reduce((a, b) => a + b, 0)
     );
     const tickRate = computed(() =>
-        Decimal.div(energyConsumption.value || 1, energy.value)
-            .recip()
-            .pow(2)
-            .min(1)
+        Decimal.eq(energyConsumption.value, 0)
+            ? 1
+            : Decimal.div(energyConsumption.value, computedEnergy.value).recip().pow(2).min(1)
     );
 
     const energyBar = createBar(() => ({
@@ -112,15 +121,18 @@ const factory = createLayer(id, () => {
         style: { borderRadius: "var(--border-radius) var(--border-radius) 0 0" },
         borderStyle: { borderRadius: "var(--border-radius) var(--border-radius) 0 0" },
         fillStyle: () => ({
-            backgroundColor: Decimal.gt(energyConsumption.value, energy.value) ? "red" : "yellow"
+            backgroundColor: Decimal.gt(energyConsumption.value, computedEnergy.value)
+                ? "red"
+                : "yellow"
         }),
         progress: () =>
-            Decimal.gt(energyConsumption.value, energy.value)
-                ? Decimal.sub(1, Decimal.div(energy.value, energyConsumption.value))
-                : Decimal.sub(1, Decimal.div(energyConsumption.value, energy.value)),
+            Decimal.gt(energyConsumption.value, computedEnergy.value)
+                ? Decimal.sub(1, Decimal.div(computedEnergy.value, energyConsumption.value))
+                : Decimal.sub(1, Decimal.div(energyConsumption.value, computedEnergy.value)),
         display: jsx(() => (
             <>
-                {formatWhole(energyConsumption.value)} / {formatWhole(energy.value)} energy used
+                {formatWhole(energyConsumption.value)} / {formatWhole(computedEnergy.value)} energy
+                used
                 {Decimal.lt(tickRate.value, 1) ? (
                     <>{" (" + format(Decimal.mul(tickRate.value, 100))}% efficiency)</>
                 ) : (
@@ -135,6 +147,7 @@ const factory = createLayer(id, () => {
     const FACTORY_COMPONENTS = {
         cursor: {
             imageSrc: _cursor,
+            key: "Escape",
             name: "Cursor",
             type: "command",
             description: "Drag to move around.",
@@ -142,6 +155,7 @@ const factory = createLayer(id, () => {
         },
         delete: {
             imageSrc: _delete,
+            key: "Backspace",
             name: "Delete",
             type: "command",
             description: "Remove components from the board.",
@@ -149,6 +163,7 @@ const factory = createLayer(id, () => {
         },
         rotateLeft: {
             imageSrc: _rotateLeft,
+            key: "t",
             name: "Rotate Left",
             type: "command",
             description: "Use this to rotate components counter-clockwise.",
@@ -156,6 +171,7 @@ const factory = createLayer(id, () => {
         },
         rotateRight: {
             imageSrc: _rotateRight,
+            key: "shift+t",
             name: "Rotate Right",
             type: "command",
             description: "Use this to rotate components clockwise.",
@@ -163,6 +179,7 @@ const factory = createLayer(id, () => {
         },
         conveyor: {
             imageSrc: _conveyor,
+            key: "0",
             name: "Conveyor",
             type: "conveyor",
             description: "Moves items at 1 block per second.",
@@ -179,6 +196,7 @@ const factory = createLayer(id, () => {
         },
         wood: {
             imageSrc: _wood,
+            key: "1",
             name: "Wood Machine",
             type: "processor",
             description: "Produces 1 wood every 1 second.",
@@ -192,6 +210,7 @@ const factory = createLayer(id, () => {
         },
         cloth: {
             imageSrc: _cloth,
+            key: "2",
             name: "Cloth Machine",
             type: "processor",
             description: "Produces 1 cloth every 1 second.",
@@ -205,6 +224,7 @@ const factory = createLayer(id, () => {
         },
         dye: {
             imageSrc: _dye,
+            key: "3",
             name: "Dye Machine",
             type: "processor",
             description: "Produces 1 dye every 1 second.",
@@ -218,6 +238,7 @@ const factory = createLayer(id, () => {
         },
         metal: {
             imageSrc: _metal,
+            key: "4",
             name: "Metal Machine",
             type: "processor",
             description: "Produces 1 metal every 1 second.",
@@ -231,6 +252,7 @@ const factory = createLayer(id, () => {
         },
         plastic: {
             imageSrc: _plastic,
+            key: "5",
             name: "Plastic Machine",
             type: "processor",
             description: "Produces 1 plastic every 1 second.",
@@ -244,6 +266,7 @@ const factory = createLayer(id, () => {
         },
         blocks: {
             imageSrc: _block,
+            key: "shift+1",
             name: "Wooden Block Maker",
             type: "processor",
             description: "Turns 2 wood into 1 wooden block every second.",
@@ -262,6 +285,7 @@ const factory = createLayer(id, () => {
         },
         clothes: {
             imageSrc: _clothes,
+            key: "shift+2",
             name: "Clothes Maker",
             type: "processor",
             description: "Turns 2 cloth and 1 dye into 1 clothe every second.",
@@ -283,6 +307,7 @@ const factory = createLayer(id, () => {
         },
         trucks: {
             imageSrc: _truck,
+            key: "shift+3",
             name: "Trucks Maker",
             type: "processor",
             description: "Turns 2 metal and 1 plastic into 1 truck every second.",
@@ -313,6 +338,18 @@ const factory = createLayer(id, () => {
         metal: _metal
     } as Record<string, string>;
 
+    const hotkeys = (Object.keys(FACTORY_COMPONENTS) as FactoryCompNames[]).reduce((acc, comp) => {
+        acc[comp] = createHotkey(() => ({
+            key: FACTORY_COMPONENTS[comp].key,
+            description: "Select " + FACTORY_COMPONENTS[comp].name,
+            onPress() {
+                compSelected.value = comp;
+            },
+            enabled: noPersist(main.days[day - 1].opened)
+        }));
+        return acc;
+    }, {} as Record<FactoryCompNames, GenericHotkey>);
+
     type FactoryCompNames =
         | "cursor"
         | "delete"
@@ -351,6 +388,7 @@ const factory = createLayer(id, () => {
 
     interface FactoryComponentDeclaration {
         tick: number;
+        key: string;
         imageSrc: string;
         name: string;
         type: "command" | "conveyor" | "processor";
@@ -481,6 +519,7 @@ const factory = createLayer(id, () => {
         updateGraphics();
 
         loaded = true;
+        watchEffect(updateGraphics);
     });
     (window as any).internal = compInternalData;
     (window as any).comp = components;
@@ -489,7 +528,7 @@ const factory = createLayer(id, () => {
     globalBus.on("update", diff => {
         if (!loaded) return;
 
-        const factoryTicks = tickRate.value.times(diff).toNumber();
+        const factoryTicks = Decimal.times(tickRate.value, diff).toNumber();
 
         //debugger
         // make them produce
@@ -796,10 +835,10 @@ const factory = createLayer(id, () => {
             hoverSprite.y = roundDownTo(mouseCoords.y - ty, blockSize) + ty - blockSize / 2;
             hoverSprite.width = blockSize;
             hoverSprite.height = blockSize;
+            hoverSprite.alpha = 0.5;
             graphicContainer.addChild(hoverSprite);
         }
     }
-    watchEffect(updateGraphics);
 
     const pointerDown = ref(false),
         pointerDrag = ref(false),
@@ -937,7 +976,24 @@ const factory = createLayer(id, () => {
         {
             dashboard: () => ({
                 tab: createTab(() => ({
-                    display: jsx(() => <>You have 20 energy</>)
+                    display: jsx(() => (
+                        <>
+                            <div>
+                                {main.day.value === day
+                                    ? `Do something to complete the day`
+                                    : `${name} Complete!`}{" "}
+                                -{" "}
+                                <button
+                                    class="button"
+                                    style="display: inline-block;"
+                                    onClick={() => (showModifiersModal.value = true)}
+                                >
+                                    Check Modifiers
+                                </button>
+                            </div>
+                            {render(dayProgress)}
+                        </>
+                    ))
                 })),
                 display: "Dashboard"
             }),
@@ -1126,6 +1182,39 @@ const factory = createLayer(id, () => {
         })
     );
 
+    const [generalTab, generalTabCollapsed] = createCollapsibleModifierSections(() => [
+        {
+            title: "Energy",
+            modifier: energy,
+            base: 0
+        }
+    ]);
+    const showModifiersModal = ref(false);
+    const modifiersModal = jsx(() => (
+        <Modal
+            modelValue={showModifiersModal.value}
+            onUpdate:modelValue={(value: boolean) => (showModifiersModal.value = value)}
+            v-slots={{
+                header: () => <h2>{name} Modifiers</h2>,
+                body: generalTab
+            }}
+        />
+    ));
+
+    const dayProgress = createBar(() => ({
+        direction: Direction.Right,
+        width: 600,
+        height: 25,
+        progress: () => (main.day.value === day ? 0 : 1),
+        display: jsx(() => (main.day.value === day ? <>Requirement progress here</> : ""))
+    })) as GenericBar;
+
+    watchEffect(() => {
+        if (main.day.value === day && false) {
+            main.completeDay();
+        }
+    });
+
     return {
         name,
         day,
@@ -1135,6 +1224,8 @@ const factory = createLayer(id, () => {
         style: { overflow: "hidden" },
         components,
         tabs,
+        generalTabCollapsed,
+        modifiersModal,
         display: jsx(() => <>{render(tabs)}</>)
     };
 });
diff --git a/src/data/layers/letters.tsx b/src/data/layers/letters.tsx
index 49485fd..62b8e13 100644
--- a/src/data/layers/letters.tsx
+++ b/src/data/layers/letters.tsx
@@ -15,7 +15,7 @@ import { createMilestone } from "features/milestones/milestone";
 import { createResource } from "features/resources/resource";
 import { BaseLayer, createLayer } from "game/layers";
 import { createMultiplicativeModifier, createSequentialModifier } from "game/modifiers";
-import { persistent } from "game/persistence";
+import { noPersist, persistent } from "game/persistence";
 import Decimal, { DecimalSource, format, formatWhole } from "util/bignum";
 import { Direction } from "util/common";
 import { render, renderRow } from "util/vue";
@@ -93,7 +93,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         onPress: () => {
             if (process.canClick.value) process.onClick();
         },
-        enabled: main.days[day - 1].opened
+        enabled: noPersist(main.days[day - 1].opened)
     }));
 
     const metalBuyable = createBuyable(() => ({
diff --git a/src/data/layers/trees.tsx b/src/data/layers/trees.tsx
index 84f32f6..c96fb80 100644
--- a/src/data/layers/trees.tsx
+++ b/src/data/layers/trees.tsx
@@ -814,7 +814,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         onPress: () => {
             if (cutTree.canClick.value) cutTree.onClick();
         },
-        enabled: main.days[day - 1].opened
+        enabled: noPersist(main.days[day - 1].opened)
     }));
     const plantTreeHK = createHotkey(() => ({
         key: "p",
@@ -822,7 +822,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         onPress: () => {
             if (plantTree.canClick.value) plantTree.onClick();
         },
-        enabled: main.days[day - 1].opened
+        enabled: noPersist(main.days[day - 1].opened)
     }));
 
     const { total: totalLogs, trackerDisplay } = setUpDailyProgressTracker({
diff --git a/src/data/layers/workshop.tsx b/src/data/layers/workshop.tsx
index 5c49a8a..c74b97d 100644
--- a/src/data/layers/workshop.tsx
+++ b/src/data/layers/workshop.tsx
@@ -149,7 +149,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         onPress: () => {
             if (buildFoundation.canClick.value) buildFoundation.onClick();
         },
-        enabled: main.days[day - 1].opened
+        enabled: noPersist(main.days[day - 1].opened)
     }));
 
     const shouldShowPopups = computed(() => !elves.milestones[6].earned.value);
diff --git a/src/data/projEntry.tsx b/src/data/projEntry.tsx
index e9690be..ecaa3d3 100644
--- a/src/data/projEntry.tsx
+++ b/src/data/projEntry.tsx
@@ -7,10 +7,10 @@ import {
     jsx
 } from "features/feature";
 import { BaseLayer, createLayer, GenericLayer, layers } from "game/layers";
-import { isPersistent, persistent } from "game/persistence";
-import type { LayerData, PlayerData } from "game/player";
+import { isPersistent, Persistent, persistent } from "game/persistence";
+import type { PlayerData } from "game/player";
 import player from "game/player";
-import Decimal, { format, formatTime } from "util/bignum";
+import { format, formatTime } from "util/bignum";
 import { Computable, convertComputable, ProcessedComputable } from "util/computed";
 import { createLazyProxy } from "util/proxies";
 import { save } from "util/save";
@@ -49,8 +49,8 @@ import paperSymbol from "./symbols/paperStacks.png";
 import plasticSymbol from "./symbols/plastic.png";
 import ribbonsSymbol from "./symbols/ribbons.png";
 import workshopSymbol from "./symbols/sws.png";
-import toysSymbol from "./symbols/truck.png";
 import treeSymbol from "./symbols/tree.png";
+import toysSymbol from "./symbols/truck.png";
 import advManagementSymbol from "./symbols/workshopMansion.png";
 import wrappingPaperSymbol from "./symbols/wrappingPaper.png";
 
@@ -61,7 +61,7 @@ export interface Day extends VueFeature {
     story: string;
     completedStory: string;
     masteredStory: string;
-    opened: Ref<boolean>;
+    opened: Persistent<boolean>;
     recentlyUpdated: Ref<boolean>; // Has the tab recieved an update since the player last opened it?
     shouldNotify: ProcessedComputable<boolean>;
 }
diff --git a/src/features/hotkey.tsx b/src/features/hotkey.tsx
index bd66b8e..65e9ae3 100644
--- a/src/features/hotkey.tsx
+++ b/src/features/hotkey.tsx
@@ -44,6 +44,8 @@ export type GenericHotkey = Replace<
     }
 >;
 
+const uppercaseNumbers = [")", "!", "@", "#", "$", "5", "^", "&", "*", "("];
+
 export function createHotkey<T extends HotkeyOptions>(
     optionsFunc: OptionsFunc<T, BaseHotkey, GenericHotkey>
 ): Hotkey<T> {
@@ -79,7 +81,9 @@ document.onkeydown = function (e) {
         return;
     }
     let key = e.key;
-    if (e.shiftKey) {
+    if (uppercaseNumbers.includes(key)) {
+        key = "shift+" + uppercaseNumbers.indexOf(key);
+    } else if (e.shiftKey) {
         key = "shift+" + key;
     }
     if (e.ctrlKey) {