Add some candies

Also adjust Rose's mass

media/food/Candies/Candy Corn-Front.svg

@@ -39,7 +39,7 @@ Created by potrace 1.16, written by Peter Selinger 2001-2019
      transform="matrix(0.1,0,0,-0.1,-219.30439,959.29937)">
     <path
        id="path8"
-       d="m 4795,9539 c -882,-33 -1688,-273 -2135,-634 -80,-64 -207,-193 -262,-266 -62,-81 -124,-221 -144,-321 -17,-87 -17,-89 9,-270 105,-728 391,-2133 628,-3083 421,-1686 890,-3010 1337,-3775 210,-359 429,-607 612,-694 58,-28 75,-31 160,-31 85,0 102,3 160,31 592,281 1319,1948 1949,4469 236,948 523,2357 628,3083 26,181 26,183 9,270 -20,100 -82,240 -144,321 -55,73 -182,202 -262,266 -437,353 -1264,603 -2080,630 -91,3 -190,7 -220,8 -30,2 -140,0 -245,-4 z" />
+       d="m 4795,9539 c -882,-33 -1688,-273 -2135,-634 -80,-64 -207,-193 -262,-266 -62,-81 -124,-221 -144,-321 -17,-87 -17,-89 9,-270 68,-474 240,-1372 411,-2153 416,-1899 939,-3539 1423,-4465 267,-512 518,-828 743,-934 58,-28 75,-31 160,-31 85,0 102,3 160,31 225,106 476,422 743,934 440,842 925,2314 1317,3995 202,869 433,2037 517,2623 26,181 26,183 9,270 -20,100 -82,240 -144,321 -55,73 -182,202 -262,266 -437,353 -1264,603 -2080,630 -91,3 -190,7 -220,8 -30,2 -140,0 -245,-4 z" />
   </g>
   <g
      style="fill:#333333;stroke:none"

media/food/Candies/Candy Corn-Side.svg

@@ -39,7 +39,7 @@ Created by potrace 1.16, written by Peter Selinger 2001-2019
      transform="matrix(0.1,0,0,-0.1,-337,959.43331)">
     <path
        id="path8"
-       d="m 4885,9538 c -340,-20 -664,-133 -907,-316 -314,-236 -504,-540 -549,-879 -23,-176 34,-1018 151,-2208 107,-1089 261,-2207 421,-3055 28,-146 57,-303 65,-350 62,-358 243,-1063 359,-1400 142,-412 266,-650 412,-792 108,-105 218,-105 326,0 146,142 270,380 412,792 116,337 297,1042 359,1400 8,47 37,204 65,350 209,1108 389,2540 516,4105 30,378 65,918 65,1017 0,385 -200,750 -558,1020 -299,225 -718,342 -1137,316 z" />
+       d="m 4885,9538 c -340,-20 -664,-133 -907,-316 -321,-241 -512,-553 -550,-898 -14,-117 3,-458 52,-1069 136,-1686 307,-3042 536,-4255 24,-129 49,-262 55,-295 6,-33 33,-161 60,-284 181,-820 384,-1429 574,-1722 60,-94 159,-197 210,-220 51,-24 119,-24 170,0 51,23 150,126 210,220 190,293 393,902 574,1722 27,123 54,251 60,284 6,33 31,166 55,295 229,1210 401,2583 536,4255 50,623 66,950 52,1068 -39,346 -229,657 -550,899 -299,225 -718,342 -1137,316 z" />
   </g>
   <g
      style="fill:#333333;stroke:none"
@@ -47,9 +47,9 @@ Created by potrace 1.16, written by Peter Selinger 2001-2019
      transform="matrix(0.1,0,0,-0.1,-337,959.43331)">
     <path
        id="path12"
-       d="m 4813,9529 c -45,-4 -131,-17 -190,-29 -521,-105 -961,-459 -1130,-909 -69,-182 -77,-365 -43,-878 24,-346 47,-663 56,-745 l 6,-58 h 1488 1488 l 6,58 c 3,31 13,145 21,252 61,803 68,1054 36,1212 -49,235 -167,445 -361,638 -342,342 -847,511 -1377,459 z" />
+       d="m 4813,9529 c -211,-20 -411,-77 -598,-170 -399,-198 -687,-547 -766,-927 -33,-161 -23,-459 41,-1264 11,-136 20,-250 20,-253 0,-3 671,-5 1490,-5 820,0 1490,2 1490,5 0,3 9,117 20,253 64,805 74,1103 41,1264 -49,235 -167,445 -361,638 -342,342 -847,511 -1377,459 z" />
     <path
        id="path14"
-       d="m 4070,2731 c 0,-28 98,-463 161,-714 211,-844 440,-1373 656,-1516 40,-27 55,-31 112,-31 75,0 106,15 174,83 204,203 404,695 596,1464 63,251 161,686 161,714 0,5 -371,9 -930,9 -559,0 -930,-4 -930,-9 z" />
+       d="m 4070,2734 c 0,-35 109,-514 180,-789 206,-804 427,-1305 637,-1444 40,-27 55,-31 112,-31 78,0 109,16 184,93 192,197 383,662 567,1382 71,275 180,754 180,789 0,3 -418,6 -930,6 -511,0 -930,-3 -930,-6 z" />
   </g>
 </svg>

media/food/Candies/M&M-Front.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg16"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 918.20001 479.21356"
+   height="479.21356pt"
+   width="918.20001pt"
+   version="1.0">
+  <defs
+     id="defs20" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-40.9,739.73854)">
+    <path
+       id="path4"
+       d="m 4600,7394 c -419,-27 -556,-40 -835,-80 -182,-26 -428,-69 -564,-100 -64,-15 -75,-20 -84,-44 -10,-25 -22,-30 -191,-75 -235,-61 -609,-186 -807,-268 C 1626,6621 1246,6383 951,6096 756,5905 642,5755 550,5565 450,5361 409,5189 409,4975 c 0,-386 155,-725 485,-1064 252,-257 529,-453 911,-644 715,-356 1564,-568 2595,-649 219,-17 981,-17 1200,0 1271,99 2314,413 3060,920 377,256 643,543 795,857 97,201 136,366 136,580 0,150 -19,270 -62,400 -220,662 -950,1233 -2039,1595 -129,43 -316,99 -416,125 -169,45 -181,50 -191,75 -9,24 -20,29 -84,44 -302,68 -699,126 -1109,162 -173,14 -944,28 -1090,18 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g10"
+     transform="matrix(0.1,0,0,-0.1,-40.9,739.73854)">
+    <path
+       id="path8"
+       d="m 4434,7283 c -58,-4 -61,-5 -56,-28 5,-30 9,-29 -228,-56 -256,-28 -502,-64 -649,-94 -68,-14 -134,-25 -147,-25 -38,0 -29,29 14,46 20,8 46,19 57,24 18,8 17,9 -5,5 -14,-2 -117,-25 -230,-49 C 2168,6881 1340,6466 873,5945 590,5629 459,5322 459,4975 c 0,-324 121,-626 363,-912 648,-764 1961,-1274 3593,-1395 222,-16 948,-16 1170,0 1349,100 2479,463 3214,1032 113,88 299,266 386,370 330,395 436,849 299,1281 -117,370 -432,740 -889,1046 -368,245 -901,477 -1432,623 -135,37 -489,120 -512,120 -6,0 -11,-13 -11,-30 0,-16 -4,-30 -9,-30 -4,0 -62,11 -127,24 -148,30 -273,49 -534,81 -113,14 -213,28 -222,31 -11,3 -18,15 -18,28 0,20 -6,24 -52,30 -29,3 -74,6 -100,6 -41,0 -47,-3 -50,-22 -3,-21 -9,-23 -55,-23 -29,1 -237,2 -463,3 l -410,2 v 25 c 0,27 1,27 -166,18 z m 349,-90 c -35,-2 -91,-2 -125,0 -35,2 -7,3 62,3 69,0 97,-1 63,-3 z m 560,0 c -35,-2 -91,-2 -125,0 -35,2 -7,3 62,3 69,0 97,-1 63,-3 z m -795,-10 c -21,-2 -55,-2 -75,0 -21,2 -4,4 37,4 41,0 58,-2 38,-4 z m 980,0 c -21,-2 -55,-2 -75,0 -21,2 -4,4 37,4 41,0 58,-2 38,-4 z m -1135,-10 c -13,-2 -35,-2 -50,0 -16,2 -5,4 22,4 28,0 40,-2 28,-4 z m 1270,0 c -13,-2 -35,-2 -50,0 -16,2 -5,4 22,4 28,0 40,-2 28,-4 z m -1390,-10 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m 1500,0 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m -1600,-10 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m 1867,-18 c 115,-19 52,-16 -100,5 -99,14 -114,17 -55,13 44,-3 114,-11 155,-18 z m -2020,0 c -47,-7 -96,-13 -110,-13 -40,1 111,26 155,26 23,0 5,-6 -45,-13 z m -157,-22 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m 2300,0 c -7,-2 -21,-2 -30,0 -10,3 -4,5 12,5 17,0 24,-2 18,-5 z m -2360,-10 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m 2420,0 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m -2480,-10 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m 2544,1 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -3077,-74 c 0,-12 7,-20 18,-21 14,-1 -87,-27 -110,-29 -5,0 -8,16 -8,35 v 35 h 50 c 43,0 50,-3 50,-20 z m 3397,14 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 283,-29 v -36 l -37,7 c -50,9 -91,22 -75,23 6,1 12,10 12,21 0,17 7,20 50,20 h 50 z m -3523,19 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 3290,0 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -3330,-10 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -50,-10 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 3470,0 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g14"
+     transform="matrix(0.1,0,0,-0.1,-40.9,739.73854)">
+    <path
+       id="path12"
+       d="m 4408,7273 c -9,-2 -18,-14 -20,-26 -4,-28 -19,-31 -253,-57 -261,-29 -441,-55 -633,-92 -174,-32 -201,-31 -174,12 17,28 13,27 -195,-21 C 2189,6870 1454,6513 976,6042 706,5776 560,5535 492,5246 c -22,-95 -25,-134 -25,-271 0,-137 3,-176 25,-270 65,-276 214,-529 458,-774 618,-622 1673,-1047 3015,-1215 372,-47 864,-68 1307,-55 1329,38 2548,372 3348,917 730,497 1034,1092 876,1714 -96,379 -418,775 -884,1087 -502,335 -1108,573 -1894,744 l -68,15 v -28 c 0,-36 -11,-39 -86,-24 -125,26 -364,64 -569,89 -275,34 -262,30 -269,66 -5,28 -7,29 -63,29 -32,0 -75,3 -95,6 -33,6 -36,5 -31,-14 8,-34 -21,-39 -192,-30 -88,5 -290,7 -450,6 l -290,-3 -10,23 c -9,20 -16,22 -90,21 -44,-1 -88,-3 -97,-6 z m 380,-80 c -38,-2 -98,-2 -135,0 -38,2 -7,3 67,3 74,0 105,-1 68,-3 z m 560,0 c -38,-2 -98,-2 -135,0 -38,2 -7,3 67,3 74,0 105,-1 68,-3 z m -800,-10 c -21,-2 -57,-2 -80,0 -24,2 -7,4 37,4 44,0 63,-2 43,-4 z m 990,0 c -21,-2 -57,-2 -80,0 -24,2 -7,4 37,4 44,0 63,-2 43,-4 z m -1145,-10 c -13,-2 -35,-2 -50,0 -16,2 -5,4 22,4 28,0 40,-2 28,-4 z m 1270,0 c -13,-2 -35,-2 -50,0 -16,2 -5,4 22,4 28,0 40,-2 28,-4 z m -1390,-10 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m 1500,0 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m -1600,-10 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m 1830,-7 c 99,-14 136,-26 81,-26 -42,0 -266,29 -272,35 -10,10 93,5 191,-9 z m -1926,-6 c -38,-12 -194,-24 -185,-16 9,11 95,24 158,24 46,0 50,-1 27,-8 z m -214,-27 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m 2300,0 c -7,-2 -21,-2 -30,0 -10,3 -4,5 12,5 17,0 24,-2 18,-5 z m -2360,-10 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m 2420,0 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m -2480,-10 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m 2544,1 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -3077,-69 c 0,-9 7,-18 16,-22 24,-9 -1,-20 -64,-29 l -52,-7 v 37 36 h 50 c 38,0 50,-4 50,-15 z m 3397,9 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 283,-29 c 0,-39 -14,-44 -81,-25 -35,10 -36,12 -25,35 9,21 18,25 59,25 h 47 z m -3523,19 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 3290,0 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -3330,-10 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -50,-10 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 3470,0 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z" />
+  </g>
+</svg>

media/food/Candies/M&M-Side.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg16"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 918.20001 479.21356"
+   height="479.21356pt"
+   width="918.20001pt"
+   version="1.0">
+  <defs
+     id="defs20" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-40.9,739.73854)">
+    <path
+       id="path4"
+       d="m 4600,7394 c -419,-27 -556,-40 -835,-80 -182,-26 -428,-69 -564,-100 -64,-15 -75,-20 -84,-44 -10,-25 -22,-30 -191,-75 -235,-61 -609,-186 -807,-268 C 1626,6621 1246,6383 951,6096 756,5905 642,5755 550,5565 450,5361 409,5189 409,4975 c 0,-386 155,-725 485,-1064 252,-257 529,-453 911,-644 715,-356 1564,-568 2595,-649 219,-17 981,-17 1200,0 1271,99 2314,413 3060,920 377,256 643,543 795,857 97,201 136,366 136,580 0,150 -19,270 -62,400 -220,662 -950,1233 -2039,1595 -129,43 -316,99 -416,125 -169,45 -181,50 -191,75 -9,24 -20,29 -84,44 -302,68 -699,126 -1109,162 -173,14 -944,28 -1090,18 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g10"
+     transform="matrix(0.1,0,0,-0.1,-40.9,739.73854)">
+    <path
+       id="path8"
+       d="m 4595,7214 c -190,-12 -443,-36 -488,-46 -46,-10 -49,-12 -27,-19 23,-7 23,-7 -7,-8 -18,-1 -116,-14 -218,-31 -102,-16 -192,-30 -200,-30 -11,0 -15,13 -15,56 v 56 l -47,-7 c -27,-3 -136,-24 -244,-45 C 2247,6920 1365,6494 873,5945 590,5629 459,5322 459,4975 c 0,-324 121,-626 363,-912 648,-764 1961,-1274 3593,-1395 222,-16 948,-16 1170,0 1349,100 2479,463 3214,1032 113,88 299,266 386,370 330,395 436,849 299,1281 -117,370 -432,740 -889,1046 -518,345 -1255,619 -2074,768 -120,22 -149,25 -170,14 -52,-24 -262,-22 -571,6 -251,23 -357,27 -710,30 -228,1 -442,1 -475,-1 z m 188,-21 c -35,-2 -91,-2 -125,0 -35,2 -7,3 62,3 69,0 97,-1 63,-3 z m 560,0 c -35,-2 -91,-2 -125,0 -35,2 -7,3 62,3 69,0 97,-1 63,-3 z m -825,-10 c -16,-2 -40,-2 -55,0 -16,2 -3,4 27,4 30,0 43,-2 28,-4 z m 1015,0 c -18,-2 -48,-2 -65,0 -18,2 -4,4 32,4 36,0 50,-2 33,-4 z m -1140,-10 c -13,-2 -35,-2 -50,0 -16,2 -5,4 22,4 28,0 40,-2 28,-4 z m 1270,0 c -13,-2 -35,-2 -50,0 -16,2 -5,4 22,4 28,0 40,-2 28,-4 z m -1390,-10 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m 1500,0 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m -1600,-10 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m 1867,-18 c 115,-19 52,-16 -100,5 -99,14 -114,17 -55,13 44,-3 114,-11 155,-18 z m 123,-22 c -7,-2 -21,-2 -30,0 -10,3 -4,5 12,5 17,0 24,-2 18,-5 z m 60,-10 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m 64,-9 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -3075,-78 c 4,-20 0,-25 -22,-30 -15,-3 -39,-8 -54,-12 -24,-6 -26,-4 -26,30 v 36 h 49 c 43,0 49,-3 53,-24 z m 3395,18 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 283,-30 c 0,-34 -2,-36 -26,-30 -15,4 -39,9 -54,12 -22,5 -26,10 -22,30 4,21 10,24 53,24 h 49 z m -3523,20 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 3290,0 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -3330,-10 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g14"
+     transform="matrix(0.1,0,0,-0.1,-40.9,739.73854)">
+    <path
+       id="path12"
+       d="m 4535,7203 c -43,-3 -363,-31 -398,-34 -7,-1 4,-5 23,-10 30,-7 28,-7 -17,-5 -29,2 -51,0 -48,-4 7,-11 -430,-81 -452,-73 -8,3 -13,24 -13,59 v 54 l -32,-6 C 3270,7125 2874,7032 2635,6956 1925,6734 1363,6424 976,6042 706,5776 560,5535 492,5246 c -22,-95 -25,-134 -25,-271 0,-137 3,-176 25,-270 65,-276 214,-529 458,-774 741,-745 2162,-1223 3772,-1270 928,-27 1785,78 2588,316 1189,352 2036,1016 2195,1718 106,469 -50,919 -460,1329 -533,533 -1388,921 -2493,1131 -160,31 -175,32 -203,18 -46,-23 -250,-24 -484,-2 -110,10 -249,17 -310,15 -71,-2 -89,-1 -50,3 l 60,7 -73,4 c -41,3 -76,2 -79,-2 -2,-5 -64,-7 -136,-6 l -132,2 135,6 c 76,3 -46,6 -280,6 -228,0 -437,-1 -465,-3 z m 253,-10 c -38,-2 -98,-2 -135,0 -38,2 -7,3 67,3 74,0 105,-1 68,-3 z m -265,-10 c -18,-2 -48,-2 -65,0 -18,2 -4,4 32,4 36,0 50,-2 33,-4 z m -130,-10 c -13,-2 -35,-2 -50,0 -16,2 -5,4 22,4 28,0 40,-2 28,-4 z m 1270,0 c -13,-2 -35,-2 -50,0 -16,2 -5,4 22,4 28,0 40,-2 28,-4 z m -1390,-10 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m 1500,0 c -13,-2 -33,-2 -45,0 -13,2 -3,4 22,4 25,0 35,-2 23,-4 z m 230,-17 c 99,-14 136,-26 81,-26 -42,0 -266,29 -272,35 -10,10 93,5 191,-9 z m 160,-33 c -7,-2 -21,-2 -30,0 -10,3 -4,5 12,5 17,0 24,-2 18,-5 z m 60,-10 c -7,-2 -19,-2 -25,0 -7,3 -2,5 12,5 14,0 19,-2 13,-5 z m 64,-9 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -3073,-70 c 11,-28 7,-33 -31,-43 -64,-18 -73,-15 -73,24 v 35 h 49 c 35,0 51,-4 55,-16 z m 3393,10 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 283,-29 c 0,-39 -9,-42 -72,-24 -39,10 -43,15 -32,43 4,12 20,16 55,16 h 49 z m -3523,19 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m 3290,0 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z m -3330,-10 c -3,-3 -12,-4 -19,-1 -8,3 -5,6 6,6 11,1 17,-2 13,-5 z" />
+  </g>
+</svg>

media/food/Candies/M&M-Top.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg18"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 918 918.41034"
+   height="918.41034pt"
+   width="918pt"
+   version="1.0">
+  <defs
+     id="defs22" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-41,959.4103)">
+    <path
+       id="path4"
+       d="M 4870,9593 C 4210,9581 3635,9433 3037,9121 2843,9020 2745,8960 2541,8821 2328,8675 2250,8614 2046,8435 1773,8194 1777,8198 1533,7919 1160,7492 853,6987 667,6493 476,5990 410,5604 410,5000 c 0,-604 66,-990 257,-1493 186,-494 493,-999 866,-1426 244,-279 240,-275 513,-516 204,-179 282,-240 495,-386 334,-228 629,-385 966,-512 503,-191 889,-257 1493,-257 604,0 990,66 1493,257 337,127 632,284 966,512 213,146 291,207 495,386 273,241 269,237 513,516 373,427 680,932 866,1426 191,503 257,889 257,1493 0,604 -66,990 -257,1493 -186,494 -493,999 -866,1426 -244,279 -240,275 -513,516 -204,179 -282,240 -495,386 -204,139 -302,199 -496,300 -670,350 -1277,487 -2093,472 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g12"
+     transform="matrix(0.1,0,0,-0.1,-41,959.4103)">
+    <path
+       id="path8"
+       d="m 4890,9543 c -338,-7 -686,-53 -980,-129 C 3303,9255 2647,8894 2109,8423 1845,8192 1811,8158 1576,7890 1017,7251 631,6476 514,5755 c -38,-235 -54,-453 -54,-755 0,-592 70,-999 256,-1484 125,-326 282,-622 502,-943 144,-210 204,-287 390,-498 121,-138 251,-277 288,-311 365,-323 439,-383 677,-546 647,-442 1286,-682 1987,-743 215,-19 666,-19 880,0 533,47 996,185 1499,448 186,97 289,159 487,295 210,144 290,206 499,389 222,195 271,243 467,467 185,210 247,290 390,499 448,655 693,1318 747,2027 15,186 15,600 0,794 -52,708 -297,1375 -747,2033 -135,197 -209,292 -358,463 -233,266 -268,301 -532,532 -653,571 -1415,947 -2162,1067 -244,39 -561,59 -840,54 z m 54,-3199 c 95,-24 174,-71 253,-151 l 72,-73 72,46 c 99,64 228,127 329,159 112,37 301,46 400,21 206,-53 346,-191 407,-401 16,-54 18,-143 23,-937 5,-869 5,-877 26,-905 11,-15 34,-34 50,-42 65,-31 64,-28 64,-217 0,-144 -3,-175 -16,-188 -14,-14 -67,-16 -439,-16 h -424 l -16,23 c -14,20 -15,103 -9,882 5,649 4,869 -5,896 -23,70 -104,129 -178,129 -66,0 -139,-44 -169,-102 -21,-41 -21,-1306 1,-1348 19,-36 58,-67 96,-75 16,-4 34,-15 39,-25 6,-10 10,-90 10,-177 0,-127 -3,-163 -16,-181 l -15,-22 h -434 -434 l -15,22 c -14,20 -16,122 -16,901 0,961 3,907 -59,960 -94,79 -238,51 -290,-55 -21,-44 -21,-52 -21,-695 0,-641 0,-651 21,-676 11,-15 38,-32 60,-39 65,-19 69,-31 69,-215 0,-150 -2,-165 -20,-183 -19,-19 -33,-20 -510,-20 h -490 l -16,25 c -13,19 -15,47 -12,144 l 3,119 63,65 62,65 v 799 c 0,763 -1,799 -19,829 -17,28 -73,64 -99,64 -6,0 -18,7 -26,16 -14,13 -16,52 -16,274 0,258 0,260 23,274 17,11 107,15 444,20 414,6 423,6 443,-14 15,-15 20,-33 20,-75 0,-30 2,-55 4,-55 2,0 34,18 72,40 75,44 208,95 299,115 85,19 263,19 339,-1 z" />
+    <path
+       id="path10"
+       d="m 6445,4149 c -4,-6 -5,-12 -2,-15 2,-3 7,2 10,11 7,17 1,20 -8,4 z" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g16"
+     transform="matrix(0.1,0,0,-0.1,-41,959.4103)">
+    <path
+       id="path14"
+       d="M 4740,9534 C 3935,9489 3283,9261 2579,8779 2366,8633 2289,8573 2086,8394 1811,8152 1824,8166 1578,7884 1432,7717 1358,7622 1221,7421 782,6779 547,6157 479,5455 c -17,-170 -17,-740 0,-910 51,-526 189,-986 445,-1477 172,-329 412,-680 657,-958 228,-260 248,-280 514,-514 191,-169 272,-231 482,-375 644,-439 1267,-674 1968,-742 170,-17 740,-17 910,0 702,68 1324,303 1966,742 213,146 290,206 493,385 275,242 262,228 508,510 563,643 945,1415 1062,2144 41,253 50,394 50,740 0,186 -5,381 -13,455 -51,526 -189,986 -445,1477 -172,329 -412,680 -657,958 -228,260 -248,280 -514,514 -739,650 -1578,1034 -2435,1116 -118,11 -614,21 -730,14 z m 198,-3183 c 111,-29 178,-67 260,-149 l 73,-73 62,41 c 184,121 410,200 570,200 296,0 503,-154 584,-435 16,-54 18,-146 23,-936 5,-859 5,-877 25,-899 11,-12 37,-31 57,-41 21,-11 42,-28 48,-38 6,-11 10,-90 10,-185 0,-157 -1,-166 -22,-186 -21,-19 -33,-20 -439,-20 -395,0 -418,1 -440,19 l -24,19 3,880 c 3,873 3,881 -17,921 -29,56 -91,91 -163,91 -63,0 -108,-24 -145,-79 l -23,-34 v -658 -657 l 25,-31 c 14,-16 46,-37 70,-47 61,-23 68,-49 63,-237 -3,-142 -4,-150 -27,-168 -22,-18 -45,-19 -451,-19 -421,0 -427,0 -446,21 -18,21 -19,47 -15,888 3,640 1,876 -8,902 -13,41 -64,93 -104,108 -82,31 -183,-2 -224,-74 l -23,-40 v -659 -658 l 28,-25 c 15,-14 43,-31 62,-37 55,-18 61,-40 58,-224 -3,-159 -4,-164 -27,-183 -22,-18 -46,-19 -505,-19 -382,0 -486,3 -500,13 -22,16 -35,79 -36,174 0,92 10,116 73,181 l 52,53 5,787 c 3,433 1,801 -3,819 -9,37 -45,69 -94,82 -62,17 -62,20 -63,297 0,233 1,254 19,275 l 19,24 419,5 c 230,3 429,3 442,1 27,-4 51,-53 51,-103 v -33 l 118,57 c 203,100 413,132 580,89 z" />
+  </g>
+</svg>

media/food/Candies/Mike and Ike-Front.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg16"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 415.80466 919.01917"
+   height="919.01917pt"
+   width="415.80466pt"
+   version="1.0">
+  <defs
+     id="defs20" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-292.07156,959.84414)">
+    <path
+       id="path4"
+       d="m 4865,9589 c -378,-29 -805,-231 -1068,-503 -460,-478 -737,-1690 -837,-3666 -51,-1006 -52,-1984 -5,-2617 63,-832 199,-1389 423,-1727 62,-94 202,-231 303,-299 279,-184 652,-299 1157,-356 157,-17 167,-17 325,0 598,68 1033,224 1299,469 322,294 506,901 583,1913 29,383 38,769 32,1357 -6,541 -12,769 -37,1260 -105,2085 -409,3323 -918,3746 -230,191 -519,336 -787,393 -84,19 -308,43 -355,39 -8,0 -60,-4 -115,-9 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g10"
+     transform="matrix(0.1,0,0,-0.1,-292.07156,959.84414)">
+    <path
+       id="path8"
+       d="m 4885,9539 c -280,-21 -547,-116 -805,-286 -136,-90 -301,-249 -377,-363 -389,-582 -620,-1795 -703,-3695 -46,-1058 -37,-2001 25,-2615 73,-720 215,-1239 411,-1499 62,-82 212,-224 295,-277 256,-166 621,-275 1112,-332 152,-18 162,-18 314,0 280,33 490,75 693,140 146,46 379,158 465,223 89,66 220,201 271,277 198,296 333,832 398,1578 54,620 60,1500 16,2500 -84,1908 -313,3118 -703,3700 -74,111 -242,273 -371,359 -332,221 -677,317 -1041,290 z" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g14"
+     transform="matrix(0.1,0,0,-0.1,-292.07156,959.84414)">
+    <path
+       id="path12"
+       d="m 4820,9529 c -256,-29 -498,-121 -731,-277 -192,-130 -278,-213 -388,-375 -355,-526 -580,-1616 -676,-3272 -76,-1323 -67,-2481 26,-3215 97,-769 256,-1211 525,-1459 260,-240 675,-388 1279,-457 140,-16 158,-16 294,0 703,82 1136,263 1387,580 229,288 381,857 448,1681 62,749 52,1961 -24,3105 -81,1199 -238,2097 -466,2660 -145,357 -304,566 -563,738 -361,241 -720,335 -1111,291 z" />
+  </g>
+</svg>

media/food/Candies/Mike and Ike-Side.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg16"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 415.80466 919.01917"
+   height="919.01917pt"
+   width="415.80466pt"
+   version="1.0">
+  <defs
+     id="defs20" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-292.07156,959.84414)">
+    <path
+       id="path4"
+       d="m 4865,9589 c -378,-29 -805,-231 -1068,-503 -460,-478 -737,-1690 -837,-3666 -51,-1006 -52,-1984 -5,-2617 63,-832 199,-1389 423,-1727 62,-94 202,-231 303,-299 279,-184 652,-299 1157,-356 157,-17 167,-17 325,0 598,68 1033,224 1299,469 322,294 506,901 583,1913 29,383 38,769 32,1357 -6,541 -12,769 -37,1260 -105,2085 -409,3323 -918,3746 -230,191 -519,336 -787,393 -84,19 -308,43 -355,39 -8,0 -60,-4 -115,-9 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g10"
+     transform="matrix(0.1,0,0,-0.1,-292.07156,959.84414)">
+    <path
+       id="path8"
+       d="m 4885,9539 c -280,-21 -547,-116 -805,-286 -136,-90 -301,-249 -377,-363 -389,-582 -620,-1795 -703,-3695 -46,-1058 -37,-2001 25,-2615 73,-720 215,-1239 411,-1499 62,-82 212,-224 295,-277 256,-166 621,-275 1112,-332 152,-18 162,-18 314,0 280,33 490,75 693,140 146,46 379,158 465,223 89,66 220,201 271,277 198,296 333,832 398,1578 54,620 60,1500 16,2500 -84,1908 -313,3118 -703,3700 -74,111 -242,273 -371,359 -332,221 -677,317 -1041,290 z" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g14"
+     transform="matrix(0.1,0,0,-0.1,-292.07156,959.84414)">
+    <path
+       id="path12"
+       d="m 4820,9529 c -256,-29 -498,-121 -731,-277 -192,-130 -278,-213 -388,-375 -355,-526 -580,-1616 -676,-3272 -76,-1323 -67,-2481 26,-3215 97,-769 256,-1211 525,-1459 260,-240 675,-388 1279,-457 140,-16 158,-16 294,0 703,82 1136,263 1387,580 229,288 381,857 448,1681 62,749 52,1961 -24,3105 -81,1199 -238,2097 -466,2660 -145,357 -304,566 -563,738 -361,241 -720,335 -1111,291 z" />
+  </g>
+</svg>

media/food/Candies/Mike and Ike-Top.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg16"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 415 415.13925"
+   height="415.13925pt"
+   width="415pt"
+   version="1.0">
+  <defs
+     id="defs20" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-292.5,707.63923)">
+    <path
+       id="path4"
+       d="m 4750,7074 c -14,-3 -90,-17 -169,-31 -130,-23 -165,-34 -343,-109 -109,-46 -208,-89 -221,-95 -34,-19 -427,-317 -470,-358 -38,-35 -362,-455 -386,-499 -6,-12 -49,-111 -95,-220 -73,-174 -87,-217 -112,-348 -27,-141 -29,-163 -29,-414 0,-251 2,-273 29,-414 25,-131 39,-174 112,-348 46,-109 89,-208 95,-220 24,-44 348,-464 386,-499 43,-41 436,-339 470,-358 13,-6 112,-49 221,-95 174,-73 217,-87 348,-112 141,-27 163,-29 414,-29 251,0 273,2 414,29 132,25 173,39 350,113 111,47 206,87 213,90 6,2 121,87 254,188 l 241,183 183,241 c 101,133 186,248 188,254 3,7 43,102 90,213 74,177 88,218 113,350 27,141 29,163 29,414 0,251 -2,273 -29,414 -25,132 -39,173 -113,350 -47,111 -87,206 -90,213 -2,6 -87,121 -188,254 l -183,241 -241,183 c -133,101 -248,186 -254,188 -7,3 -102,43 -213,90 -174,73 -219,88 -345,112 -131,26 -167,28 -394,31 -137,1 -261,0 -275,-2 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g10"
+     transform="matrix(0.1,0,0,-0.1,-292.5,707.63923)">
+    <path
+       id="path8"
+       d="m 4770,7024 c -19,-3 -100,-16 -180,-31 -131,-23 -163,-34 -350,-113 l -205,-87 -237,-179 -236,-179 -178,-235 -178,-235 -87,-205 c -77,-183 -89,-222 -115,-355 -27,-141 -29,-166 -29,-405 0,-239 2,-264 29,-405 26,-133 38,-172 115,-355 l 87,-205 178,-235 178,-235 236,-179 237,-180 205,-87 c 183,-77 222,-89 355,-115 141,-27 166,-29 405,-29 239,0 264,2 405,29 133,26 172,38 355,115 l 205,87 237,180 236,179 178,235 178,235 87,206 c 79,187 89,220 115,360 27,144 29,171 29,404 0,233 -2,260 -29,400 -26,133 -38,172 -115,355 l -87,205 -178,235 -178,235 -236,179 -237,179 -205,87 c -182,77 -222,90 -350,115 -128,24 -173,28 -375,30 -126,2 -246,1 -265,-1 z" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g14"
+     transform="matrix(0.1,0,0,-0.1,-292.5,707.63923)">
+    <path
+       id="path12"
+       d="m 4840,7019 c -228,-11 -363,-43 -596,-141 l -199,-84 -239,-181 -238,-181 -181,-238 -181,-239 -84,-200 c -78,-184 -87,-213 -114,-360 -27,-147 -29,-179 -29,-395 0,-216 3,-248 29,-395 27,-147 36,-176 114,-360 l 84,-200 183,-242 183,-242 234,-176 234,-177 202,-85 c 187,-79 215,-88 363,-115 147,-27 179,-29 395,-29 216,0 248,2 395,29 147,27 176,36 360,114 l 200,84 239,181 238,181 181,238 181,239 84,200 c 78,184 87,212 114,360 26,147 29,179 29,395 0,216 -3,248 -29,395 -27,147 -36,176 -114,360 l -84,200 -183,242 -183,242 -234,176 -234,177 -202,85 c -187,79 -215,88 -358,113 -171,31 -336,39 -560,29 z" />
+  </g>
+</svg>

presets/characters.js

@@ -7219,7 +7219,7 @@ characterMakers.push(() => makeCharacter(
         },
         fae: {
             height: math.unit(4, "cm"),
-            weight: math.unit(80, "grams"),
+            weight: math.unit(10, "grams"),
             name: "Fae",
             image: {
                 source: "./media/characters/rose/fae.svg",

presets/food.js

@@ -122,7 +122,7 @@ function makeFood() {
 
     results.push(makeModel({"name": "Pizza", "kind": "food", "forms": [{"name": "10 Inch", "views": [{"name": "Top", "height": 0.0254 * 10}]}, {"name": "12 Inch", "views": [{"name": "Top", "height": 0.0254 * 12}]}, {"name": "14 Inch", "views": [{"name": "Top", "height": 0.0254 * 14}]}, {"name": "16 Inch", "views": [{"name": "Top", "height": 0.0254 * 16}]}]}))
 
-    /* ***Candies*** */ results.push(makeModel({"name": "Candies", "kind": "food", "forms": [{"name": "Candy Corn", "views": [{"name": "Front", "height": 0.022001154720783234}, {"name": "Side", "height": 0.022001154720783234}, {"name": "Top", "height": 0.007666293531656265}]}]}));
+    /* ***Candies*** */ results.push(makeModel({"name": "Candies", "kind": "food", "forms": [{"name": "Candy Corn", "views": [{"name": "Front", "height": 0.022001150995492935}, {"name": "Side", "height": 0.022001150995492935}, {"name": "Top", "height": 0.008009850978851318}]}, {"name": "M&M", "views": [{"name": "Front", "height": 0.006873499136418104}, {"name": "Side", "height": 0.006873499136418104}, {"name": "Top", "height": 0.013283314183354378}]}, {"name": "Mike and Ike", "views": [{"name": "Front", "height": 0.021699998527765274}, {"name": "Side", "height": 0.021699998527765274}, {"name": "Top", "height": 0.00970000121742487}]}]}));
     /* ***Crackers*** */ results.push(makeModel({"name": "Crackers", "kind": "food", "forms": [{"name": "Cheez-It", "views": [{"name": "Front", "height": 0.004728816449642181}, {"name": "Side", "height": 0.004728816449642181}, {"name": "Top", "height": 0.024000002071261406}]}]}));
     /* ***INSERT HERE*** */
 

scripts/process-model.py

@@ -19,7 +19,7 @@ def combine(base_path, highlight_path, vivid_path, output_path):
     with open(output_path, "w", encoding="utf-8") as f:
         f.write(vivid_data)
 
-    subprocess.run([INKSCAPE, "--without-gui", "--export-plain-svg=" + output_path.resolve().__str__(), "--export-area-drawing", output_path], shell=True)
+    subprocess.run([INKSCAPE, "--without-gui", "--export-plain-svg=" + output_path.resolve().__str__(), "--export-area-drawing", output_path], shell=False)
 
 configdir = pathlib.Path(__file__).parent
 configpath = configdir.joinpath("config.json")
@@ -66,17 +66,17 @@ for data in all_data["forms"]:
         input_highlight = sourcedir.joinpath(name + "-" + view_name + "-highlight.bmp")
         input_vivid = sourcedir.joinpath(name + "-" + view_name + "-vivid.bmp")
 
-        subprocess.run(["convert", input, base_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_base], shell=True)
-        subprocess.run(["convert", input, highlight_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_highlight], shell=True)
-        subprocess.run(["convert", input, vivid_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_vivid], shell=True)
+        subprocess.run(["magick", "convert", input, base_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_base], shell=False)
+        subprocess.run(["magick", "convert", input, highlight_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_highlight], shell=False)
+        subprocess.run(["magick", "convert", input, vivid_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_vivid], shell=False)
         
         output_base = sourcedir.joinpath(name + "-" + view_name + "-base.svg")
         output_highlight = sourcedir.joinpath(name + "-" + view_name + "-highlight.svg")
         output_vivid = sourcedir.joinpath(name + "-" + view_name + "-vivid.svg")
 
-        subprocess.run([POTRACE, input_base, "-b", "svg", "-o", output_base], shell=True)
-        subprocess.run([POTRACE, input_highlight, "-b", "svg", "-C", "#1a1a1a", "-o", output_highlight], shell=True)
-        subprocess.run([POTRACE, input_vivid, "-b", "svg", "-C", "#333333", "-o", output_vivid], shell=True)
+        subprocess.run([POTRACE, input_base, "-b", "svg", "-o", output_base], shell=False)
+        subprocess.run([POTRACE, input_highlight, "-b", "svg", "-C", "#1a1a1a", "-o", output_highlight], shell=False)
+        subprocess.run([POTRACE, input_vivid, "-b", "svg", "-C", "#333333", "-o", output_vivid], shell=False)
         combine(output_base, output_highlight, output_vivid, result)
         # os.unlink(input_base)
         # os.unlink(input_highlight)