diff --git a/2022/05-gencant/Rules.md b/2022/05-gencant/Rules.md
index 4e2e558..02f03a5 100644
--- a/2022/05-gencant/Rules.md
+++ b/2022/05-gencant/Rules.md
@@ -3,7 +3,7 @@
 You are all mages competing to put on the flashiest magic display for the festival!
 Arrange the elements to put on a good show.
 
-Take the three border cards and deal each one faceup.
+Shuffle the three nexus cards, flipping some upside down during shuffling, and deal each one faceup.
 Place the left elements in the fixed hexes on the corners in clockwise order from the top.
 Place the right elements in the fixed hexes on the corners in clockwise order from the bottom.
 
@@ -16,6 +16,7 @@ Place the elements in a hex connected to the mage by other filled hexes, in eith
 
 If either of the following elements are touching, cross them out.
 They have nullified each other.
+For reference, these pairs are on the nexus cards.
 
 - Light and Dark
 - Fire and Water
@@ -25,11 +26,11 @@ When all 15 mana cards have been flipped, the festival is over.
 See how the audience liked your display with the following rules.
 Do not count nullified elements.
 
-- Light = 3 points if not touching other Light
+- Light = 3 points for each cluster
     - Light shines brightest on its own
 - Dark = 3 points for each hex in the cluster after the first
     - Darkness tries to swallow everything
-- Fire = 2 points for each adjacent Fire
+- Fire = 2 points for each connection between adjacent fire hexes
     - Fire grows and burns
 - Water = 3 times length for straight line of 3 or more
     - Water flows like a river
diff --git a/2022/05-gencant/data.csv b/2022/05-gencant/data.csv
index 4bd25ae..e018ffd 100644
--- a/2022/05-gencant/data.csv
+++ b/2022/05-gencant/data.csv
@@ -1,19 +1,19 @@
-left,right
-light,dark
-light,fire
-light,water
-light,earth
-light,air
-dark,fire
-dark,water
-dark,earth
-dark,air
-fire,water
-fire,earth
-fire,air
-water,earth
-water,air
-earth,air
-light,dark
-fire,water
-earth,air
\ No newline at end of file
+title,left,right
+mana,light,dark
+mana,light,fire
+mana,light,water
+mana,light,earth
+mana,light,air
+mana,dark,fire
+mana,dark,water
+mana,dark,earth
+mana,dark,air
+mana,fire,water
+mana,fire,earth
+mana,fire,air
+mana,water,earth
+mana,water,air
+mana,earth,air
+nexus,light,dark
+nexus,fire,water
+nexus,earth,air
\ No newline at end of file
diff --git a/2022/05-gencant/deck.rb b/2022/05-gencant/deck.rb
index 2cd200a..588e129 100644
--- a/2022/05-gencant/deck.rb
+++ b/2022/05-gencant/deck.rb
@@ -1,5 +1,14 @@
 require 'squib'
 
+element_descs = {
+  "light" => "3 per cluster",
+  "dark" => "3 each after first in clusters",
+  "fire" => "2 points per connected pair",
+  "water" => "3 times length for straight line of 3+",
+  "earth" => "4 per triangle cluster",
+  "air" => "3 points for each curve in line"
+}
+
 Squib::Deck.new(cards: 18, layout: 'layout.yml', width: '3.5in', height: '2.5in') do
   
   data = csv file: 'data.csv'
@@ -11,15 +20,28 @@ Squib::Deck.new(cards: 18, layout: 'layout.yml', width: '3.5in', height: '2.5in'
   text layout: :title, str: 'Border', align: :center, range: (15..17)
 
   svg layout: :leftSymbol, width: 200, file: data.left.map { |elem| "images/#{elem}.svg" }
-  text layout: :leftText, str: data.left, align: :center, ellipsize: :autoscale
+  text layout: :leftText, str: data.left
+  text layout: :leftDescription, str: data.left.map { |elem| element_descs[elem] }
   svg layout: :rightSymbol, width: 200, file: data.right.map { |elem| "images/#{elem}.svg" }
-  text layout: :rightText, str: data.right, align: :center, ellipsize: :autoscale
+  text layout: :rightText, str: data.right
+  text layout: :rightDescription, str: data.right.map { |elem| element_descs[elem] }
 
   save format: :png, prefix: 'card_'
   save_pdf trim: 37.5, file: 'pnp.pdf'
 end
 
-Squib::Deck.new(cards: 1, width: '3in', height: '4in') do
+Squib::Deck.new(cards: 6, width: '3in', height: '4in') do
   rect
+
+  svg x: '0.5in', y: '0.5in', width: '2.0in', height: '2.0in', file: 'images/hexgrid.svg'
+
+  text x: '0.5in', y: '2.75in', width: '2in', height: '0.5in', str: 'Scoring', align: :center
+  (0..6).each do |i|
+    rect x: inches(0.5) + i * inches(2.0/7.0), y: '3.0in', width: '0.25in', height: '0.25in'
+    rect x: inches(0.5) + i * inches(2.0/7.0), y: '3.25in', width: '0.25in', height: '0.25in'
+  end
+  star x: inches(0.5) + 6 * inches(2.0/7.0) + inches(0.125), y: '3.125in',
+      outer_radius: '0.125in', inner_radius: inches(1.0/16.0), angle: '270deg'
+
   save_pdf trim: 37.5, file: 'player.pdf'
 end
\ No newline at end of file
diff --git a/2022/05-gencant/images/hexgrid.png b/2022/05-gencant/images/hexgrid.png
deleted file mode 100644
index 98e893d..0000000
Binary files a/2022/05-gencant/images/hexgrid.png and /dev/null differ
diff --git a/2022/05-gencant/images/hexgrid.svg b/2022/05-gencant/images/hexgrid.svg
new file mode 100644
index 0000000..60ff919
--- /dev/null
+++ b/2022/05-gencant/images/hexgrid.svg
@@ -0,0 +1 @@
+<svg version="1.1" id="svg5" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)" sodipodi:docname="hexgrid.svg" inkscape:export-filename="C:\Users\demos\Pictures\hexgrid.png" inkscape:export-xdpi="191.98618" inkscape:export-ydpi="191.98618" 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" viewBox="79.97 127.62 62.17 61.68">  <sodipodi:namedview id="namedview7" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:document-units="mm" showgrid="false" inkscape:zoom="1.466344" inkscape:cx="198.11177" inkscape:cy="541.14178" inkscape:window-width="1920" inkscape:window-height="1010" inkscape:window-x="-6" inkscape:window-y="-6" inkscape:window-maximized="1" inkscape:current-layer="layer1"></sodipodi:namedview>  <defs id="defs2"></defs>  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">    <path style="fill:#000000;stroke-width:0.264583" d="m 107.12638,188.3867 c -0.30291,-0.49012 -0.55074,-0.96874 -0.55074,-1.06359 0,-0.0949 -0.29916,-0.64635 -0.66478,-1.22554 l -0.66478,-1.05308 h -3.03329 c -3.420738,0 -3.019218,0.23138 -4.591588,-2.64583 l -0.79526,-1.45521 -3.12567,-0.13229 -3.12567,-0.1323 -1.18658,-2.18281 -1.186578,-2.18281 H 85.50119 c -1.887194,0 -2.805678,-0.10542 -3.050377,-0.35012 -0.192567,-0.19257 -0.824796,-1.26035 -1.404952,-2.37284 l -1.05483,-2.02271 1.116194,-2.25063 1.116194,-2.25061 -1.049336,-1.92499 c -0.577134,-1.05873 -1.05101,-2.1091 -1.053057,-2.33413 -0.002,-0.22504 0.410293,-1.17754 0.916311,-2.11667 0.506018,-0.93913 0.922736,-1.92097 0.926042,-2.18186 0.0033,-0.26089 -0.41071,-1.24614 -0.920033,-2.18945 -0.509323,-0.9433 -0.926041,-1.90903 -0.926041,-2.14605 0,-0.23703 0.416718,-1.17612 0.926041,-2.08688 0.509323,-0.91075 0.926042,-1.89351 0.926042,-2.1839 0,-0.29039 -0.416719,-1.29954 -0.926042,-2.24256 -0.509323,-0.94302 -0.926041,-1.89914 -0.926041,-2.12471 0,-0.22557 0.371763,-1.10207 0.82614,-1.94778 1.583779,-2.9478 1.184401,-2.70157 4.518372,-2.78576 l 2.962415,-0.0748 1.11412,-2.09267 c 0.61276,-1.15097 1.27742,-2.18406 1.47702,-2.29576 0.1996,-0.1117 1.61198,-0.18796 3.13862,-0.16945 1.52664,0.0185 2.92495,-0.0586 3.10735,-0.17132 0.1824,-0.11273 0.7393,-1.01446 1.23755,-2.00385 0.49824,-0.98939 1.08034,-1.86583 1.29354,-1.94765 0.213198,-0.0818 1.538178,-0.12025 2.944398,-0.0854 1.4892,0.0369 2.70671,-0.0531 2.91589,-0.21548 0.19752,-0.15335 0.74125,-0.99319 1.20829,-1.86631 0.46704,-0.87313 0.96566,-1.73633 1.10804,-1.91823 0.29983,-0.38304 5.65408,-0.4675 6.23643,-0.0984 0.19459,0.12334 0.8527,1.10379 1.46247,2.17876 l 1.10868,1.9545 3.03118,0.13229 3.03119,0.1323 0.63319,1.19062 c 0.34826,0.65484 0.91483,1.6332 1.25904,2.17413 l 0.62584,0.9835 2.95104,0.0748 2.95105,0.0748 1.1378,2.11667 1.1378,2.11667 3.03128,0.0743 c 1.98697,0.0487 3.11952,0.18544 3.2874,0.39687 0.54067,0.68092 2.17636,3.99506 2.17636,4.40961 0,0.23948 -0.41401,1.20381 -0.92003,2.14294 -0.50602,0.93913 -0.92274,1.92628 -0.92604,2.19368 -0.003,0.2674 0.41071,1.23134 0.92003,2.14209 0.50932,0.91076 0.92153,1.8826 0.91602,2.15966 -0.006,0.27706 -0.47367,1.38569 -1.04034,2.46363 l -1.03032,1.95989 1.07881,2.14115 1.07881,2.14116 -1.14869,2.19709 -1.14868,2.19709 1.07856,2.17473 1.07855,2.17473 -1.20788,2.30891 -1.20789,2.3089 h -3.1045 -3.1045 l -0.57528,0.93083 c -0.31641,0.51196 -0.8415,1.43469 -1.16686,2.05052 l -0.59158,1.11969 -3.08785,0.0745 -3.08785,0.0745 -0.69559,1.38066 c -1.47791,2.93347 -1.31535,2.83588 -4.72363,2.83588 h -3.00154 l -1.22089,2.11667 -1.22089,2.11666 h -3.14631 -3.14631 z m 7.43233,-1.95509 0.97161,-1.78433 -1.01728,-1.85192 -1.01728,-1.85191 h -2.69649 -2.6965 l -0.96044,1.75809 -0.96045,1.75809 0.90945,1.87993 0.90945,1.87993 2.79316,-0.002 2.79315,-0.002 0.97162,-1.78434 z m -9.38617,-2.63596 c 0.0956,-0.25902 0.24209,-0.53048 0.32546,-0.60324 0.0834,-0.0728 0.46444,-0.74197 0.84681,-1.48712 l 0.69521,-1.35483 -0.99171,-1.82017 -0.9917,-1.82018 -2.6523,-0.0751 -2.652288,-0.0751 -0.95382,1.70559 c -0.5246,0.93807 -0.95381,1.89192 -0.95381,2.11965 0,0.49037 1.53019,3.39395 1.91718,3.63791 0.14763,0.0931 1.386358,0.18593 2.752748,0.20637 2.16074,0.0323 2.50699,-0.0242 2.65822,-0.43379 z m 16.86375,0.0379 c 0.24062,-0.24062 0.7785,-1.11303 1.19529,-1.93869 l 0.7578,-1.50119 -0.96781,-1.84177 -0.96781,-1.84178 h -2.77812 -2.77813 l -0.42042,0.84134 c -0.23124,0.46273 -0.61819,1.14315 -0.8599,1.51204 -0.63863,0.97467 -0.55037,1.59567 0.49158,3.45885 l 0.93105,1.66488 2.47949,0.0419 c 1.99262,0.0337 2.56539,-0.044 2.91698,-0.39559 z m -25.397658,-4.12237 c 0.0429,-0.0498 0.50956,-0.91087 1.03709,-1.91337 l 0.95915,-1.82273 -0.85826,-1.47848 c -0.47205,-0.81316 -0.94373,-1.68957 -1.04818,-1.94758 -0.16386,-0.40475 -0.54961,-0.4691 -2.81187,-0.4691 -2.83083,0 -2.87525,0.0202 -3.49114,1.5875 -0.20014,0.50932 -0.51775,1.08337 -0.7058,1.27567 -0.516391,0.52806 -0.41484,1.36594 0.34269,2.82747 1.05153,2.02877 1.23088,2.12068 4.04476,2.07291 1.34948,-0.0229 2.48868,-0.0824 2.53156,-0.13229 z m 18.028608,-1.90047 0.99976,-1.94211 -1.07704,-1.96049 -1.07703,-1.96049 -2.34417,-0.0778 c -2.91546,-0.0968 -3.32812,0.005 -3.74336,0.92719 -0.18288,0.40596 -0.56224,1.15483 -0.84301,1.66416 -0.69706,1.26445 -0.67194,1.48095 0.40782,3.51438 l 0.94374,1.77728 h 2.86676 2.86676 z m 16.83338,0.0726 0.9802,-1.86572 -0.78176,-1.27051 c -0.42997,-0.69879 -0.78176,-1.39943 -0.78176,-1.55698 0,-0.71474 -1.19569,-1.11022 -3.35662,-1.11022 h -2.18055 l -0.671,0.98746 c -0.36905,0.5431 -0.67099,1.12383 -0.67099,1.29052 0,0.16668 -0.1786,0.45128 -0.39688,0.63243 -0.57674,0.47865 -0.50093,0.98057 0.44955,2.97657 l 0.85046,1.78593 2.78958,-0.002 2.78958,-0.002 0.98019,-1.86572 z m 7.37234,-2.34588 c 0.0827,-0.01 0.5812,-0.82778 1.10769,-1.81754 l 0.95724,-1.79957 -0.99506,-1.83845 -0.99507,-1.83845 h -2.71416 -2.71415 l -0.96311,1.80424 -0.9631,1.80425 0.9188,1.76763 0.9188,1.76763 1.5875,0.13229 c 1.29517,0.10793 3.03335,0.11603 3.85462,0.018 z m -50.412373,-0.88114 c 0.295941,-0.47114 0.826628,-1.41295 1.179305,-2.09291 l 0.64123,-1.23628 -0.63718,-1.40955 c -1.018214,-2.25245 -0.99396,-2.23826 -3.937881,-2.30395 l -2.612708,-0.0583 -1.013205,1.96824 -1.013206,1.96823 0.928514,1.81541 0.928515,1.81541 2.366979,0.14843 c 1.301839,0.0816 2.426511,0.16947 2.499271,0.19517 0.07276,0.0257 0.374425,-0.33876 0.670366,-0.8099 z m 17.652313,-1.2535 1.05177,-1.98437 -1.02744,-1.85209 -1.02743,-1.85208 -2.66695,-0.075 c -3.011548,-0.0846 -2.791458,-0.20804 -4.078498,2.28642 l -0.868,1.6823 1.03392,1.96269 1.03391,1.96269 2.748468,-0.0731 2.74847,-0.0731 z m 17.04771,0.20556 c 1.06597,-2.02051 1.05183,-2.28271 -0.23941,-4.43889 l -0.87146,-1.45521 -2.70087,-0.0753 -2.70087,-0.0753 -0.61191,1.00134 c -0.33655,0.55074 -0.84454,1.44888 -1.12886,1.99587 l -0.51695,0.99453 1.01101,1.99048 1.01101,1.99048 2.90492,-0.0746 2.90493,-0.0746 z m -26.348638,-2.77147 c 0.15606,-0.15606 0.66055,-1.04155 1.1211,-1.96777 l 0.83736,-1.68402 -1.00813,-1.91823 c -0.55447,-1.05503 -1.14979,-1.92839 -1.32292,-1.94081 -0.30728,-0.022 -3.88101,-0.0142 -4.69078,0.0103 -0.22795,0.007 -0.83884,0.82601 -1.38755,1.8605 l -0.98032,1.84819 0.92927,1.90944 c 0.5111,1.05019 1.07597,2.00343 1.25526,2.11831 0.4696,0.30089 4.90955,0.10129 5.24671,-0.23587 z m 33.786648,0.20822 c 0.12991,-0.0857 0.63139,-0.87393 1.1144,-1.75159 0.99791,-1.81324 0.97737,-2.13666 -0.27311,-4.30008 l -0.808,-1.39791 -2.80037,0.075 -2.80037,0.075 -1.02248,1.80321 -1.02247,1.80321 0.95316,1.76866 c 0.52424,0.97277 1.08834,1.85827 1.25356,1.96779 0.3454,0.22894 5.05021,0.19128 5.40568,-0.0433 z m -15.85734,-1.91486 0.96037,-1.75902 -0.89316,-1.68057 c -1.30829,-2.46165 -1.10251,-2.34202 -4.0286,-2.34202 h -2.61012 l -0.62348,0.99218 c -0.34291,0.54571 -0.83705,1.44464 -1.09808,1.99763 -0.52212,1.10608 -0.46703,1.34442 0.82436,3.56714 l 0.65827,1.13299 2.92503,-0.0747 2.92503,-0.0747 z m 25.25996,-3.95079 c 0.53363,-0.97576 0.97023,-1.89343 0.97023,-2.03927 0,-0.14584 -0.44163,-1.03749 -0.9814,-1.98146 l -0.98139,-1.71631 -2.58217,0.0398 c -1.4202,0.0219 -2.68896,0.15665 -2.81948,0.29946 -0.13052,0.14282 -0.61013,0.95092 -1.0658,1.79578 -0.92292,1.71119 -0.95154,1.52939 0.68527,4.35189 l 0.6527,1.12549 2.57591,-0.0506 2.57591,-0.0506 z m -33.7843,-0.33114 0.95989,-1.93991 -1.0282,-1.9627 -1.0282,-1.9627 -2.24896,-0.0152 c -3.290008,-0.0223 -3.240948,-0.0454 -4.361568,2.06126 -1.10781,2.08262 -1.10357,2.12085 0.52118,4.69462 l 0.67203,1.06456 h 2.776968 2.77697 z m 16.1632,1.60917 c 0.14238,-0.1819 0.62331,-1.00464 1.06873,-1.8283 l 0.80985,-1.49756 -1.05686,-2.01691 -1.05685,-2.0169 -2.81362,0.0749 -2.81361,0.0749 -1.0114,1.9068 -1.0114,1.90681 0.93845,1.8635 0.93844,1.86351 h 2.8747 c 1.98529,0 2.95478,-0.10232 3.13357,-0.33073 z m -32.920748,-1.80985 1.00772,-1.86701 -0.8634,-1.71821 c -0.474875,-0.94501 -0.97816,-1.78913 -1.118415,-1.87581 -0.464813,-0.28727 -5.175917,-0.15027 -5.551502,0.16144 -0.454118,0.37688 -1.758157,2.86568 -1.758157,3.3555 0,0.20042 0.223186,0.76177 0.495969,1.24744 0.272783,0.48567 0.692559,1.26319 0.932836,1.72784 l 0.436867,0.84481 2.705185,-0.005 2.705185,-0.004 1.007712,-1.86701 z m 24.306888,-2.08373 c 0.0986,-0.005 0.62709,-0.89086 1.17453,-1.96866 l 0.99534,-1.95963 -0.88236,-1.67839 c -1.29724,-2.46755 -1.07277,-2.33984 -4.11253,-2.33984 -1.85621,0 -2.79511,0.10447 -2.97221,0.33073 -0.5151,0.65806 -1.92258,3.41461 -1.92258,3.76536 0,0.19763 0.40851,1.11304 0.9078,2.03423 0.78443,1.44727 1.02714,1.69286 1.78594,1.80718 0.68514,0.10321 3.07162,0.1075 5.02607,0.009 z m 16.97907,-0.10236 c 0.21119,-0.16695 0.76193,-1.04166 1.22386,-1.94382 l 0.83989,-1.64028 -1.01204,-1.9316 -1.01205,-1.93159 -2.64583,-0.067 c -1.45521,-0.0369 -2.7649,0.0226 -2.91042,0.13229 -0.14552,0.10964 -0.6813,1.00004 -1.19062,1.97867 l -0.92605,1.77934 0.64752,1.26337 c 1.43574,2.8013 1.32942,2.73177 4.12288,2.69597 1.41605,-0.0181 2.64352,-0.16192 2.86286,-0.33531 z m -32.817648,-2.15562 1.02007,-1.85209 -1.01105,-1.92887 c -0.65122,-1.24238 -1.20069,-1.96792 -1.54388,-2.03859 -0.29306,-0.0603 -1.46518,-0.0853 -2.60473,-0.0555 -1.72437,0.0451 -2.13864,0.14297 -2.46982,0.58338 -0.56327,0.74907 -1.67599,3.07293 -1.67599,3.50025 0,0.19717 0.38696,1.12748 0.8599,2.06735 l 0.85989,1.70884 2.77277,-0.0663 2.77278,-0.0663 z m 6.889758,-2.13499 c 0.37663,-0.0974 0.90159,-0.8052 1.56055,-2.10415 l 0.993,-1.9574 -0.97813,-1.79652 c -0.53797,-0.98809 -1.10389,-1.884 -1.25758,-1.99091 -0.1537,-0.10691 -1.35102,-0.19439 -2.66071,-0.19439 -1.30968,0 -2.510278,0.0875 -2.667978,0.19439 -0.15771,0.10691 -0.72803,1.00295 -1.26737,1.9912 l -0.98063,1.79681 0.72747,1.37819 c 1.50384,2.84905 1.41096,2.7808 3.819698,2.80659 1.17927,0.0126 2.39953,-0.0431 2.71168,-0.12381 z m 17.56268,-0.18012 c 0.39796,-0.50841 1.92258,-3.37866 1.92258,-3.61944 0,-0.11738 -0.43887,-1.00302 -0.97527,-1.96808 l -0.97527,-1.75466 h -2.94236 -2.94237 l -0.89939,1.85914 -0.8994,1.85913 0.97841,1.97732 0.9784,1.97732 h 2.7479 c 1.88385,0 2.82929,-0.10399 3.00677,-0.33073 z m 17.66733,-1.25677 c 1.20312,-2.14239 1.20179,-2.10745 0.15124,-3.96913 -0.89755,-1.59054 -1.04872,-1.72932 -2.01698,-1.8517 -0.5757,-0.0728 -1.84372,-0.093 -2.81782,-0.045 l -1.77111,0.0873 -0.94933,1.86867 -0.94933,1.86867 0.9345,1.56875 c 0.51397,0.86281 0.9345,1.6833 0.9345,1.82331 0,0.15187 1.14316,0.22428 2.83356,0.17948 l 2.83355,-0.0751 z m -51.408935,0.59532 c 0.220638,-0.25467 0.727277,-1.02963 1.125857,-1.72215 l 0.7247,-1.25911 -0.82506,-1.7107 c -0.453776,-0.94088 -1.031255,-1.81613 -1.283284,-1.94499 -0.252029,-0.12886 -1.565249,-0.22119 -2.918266,-0.20518 l -2.460031,0.0291 -0.484351,0.92605 c -1.460319,2.79202 -1.472268,2.83248 -1.07015,3.62362 0.207427,0.4081 0.649226,1.18849 0.981775,1.73419 l 0.604634,0.99219 h 2.601508 c 2.148413,0 2.671375,-0.0807 3.002668,-0.46302 z m 42.212625,-3.71131 c 0.25466,-0.2586 0.80372,-1.12891 1.22014,-1.93401 l 0.75712,-1.46383 -1.07226,-1.96859 -1.07226,-1.96859 h -2.72757 -2.72757 l -1.03319,1.97232 -1.0332,1.97231 0.88809,1.73185 c 0.48844,0.95252 1.01291,1.81933 1.16548,1.92624 0.15257,0.10691 1.37873,0.19621 2.7248,0.19844 1.99856,0.003 2.53231,-0.0822 2.91042,-0.46614 z m -34.991148,0.0554 c 1.00618,-0.12405 1.10804,-0.22491 2.06698,-2.04676 l 1.00864,-1.91629 -1.05849,-1.97827 -1.05848,-1.97827 -2.4899,-0.0752 c -2.82158,-0.0853 -2.59686,-0.2209 -3.97422,2.39875 l -0.94342,1.79435 0.46245,0.98378 c 0.85923,1.82786 1.48456,2.68356 2.01688,2.75988 1.09496,0.15699 2.94738,0.18409 3.96956,0.0581 z m 18.999568,-1.90571 1.00791,-1.92362 -0.99744,-1.84669 -0.99744,-1.84669 -1.86255,-0.0341 c -1.0244,-0.0188 -2.21974,-0.0596 -2.6563,-0.0907 -1.05529,-0.0752 -1.26703,0.12365 -2.3406,2.19819 -1.01734,1.96586 -1.0459,1.72583 0.53357,4.48383 l 0.64901,1.13327 2.82797,-0.0749 2.82797,-0.0749 z m 8.6153,-4.11194 c 0.45531,-0.84571 0.82138,-1.73868 0.81347,-1.98438 -0.008,-0.2457 -0.46028,-1.22063 -1.00529,-2.16651 l -0.99093,-1.7198 h -2.71447 -2.71448 l -1.06469,1.98438 -1.06469,1.98437 0.99334,1.90948 0.99335,1.90947 2.66664,0.0749 c 1.51771,0.0426 2.79444,-0.0391 2.96327,-0.18968 0.16315,-0.14552 0.66916,-0.95652 1.12448,-1.80223 z m 16.62598,0.25266 c 0.47884,-0.85226 0.87061,-1.79513 0.87061,-2.09527 0,-0.53053 -1.45432,-3.36584 -1.86255,-3.6312 -0.28723,-0.1867 -4.93948,-0.0789 -5.26451,0.12198 -0.14761,0.0912 -0.69383,0.92664 -1.21383,1.85647 l -0.94544,1.69061 0.98386,1.87813 0.98386,1.87814 2.7887,-0.0746 2.78869,-0.0746 z m -50.651348,-0.45913 0.97761,-1.8764 -0.54142,-1.10016 c -0.952698,-1.93585 -1.266463,-2.40378 -1.718077,-2.56219 -0.481124,-0.16877 -5.057598,-0.0757 -5.354279,0.10884 -0.100375,0.0625 -0.417069,0.71989 -0.703766,1.46097 -0.286697,0.74109 -0.614119,1.34743 -0.727604,1.34743 -0.410646,0 -0.191806,1.10488 0.486493,2.45619 1.05812,2.10801 0.931076,2.04173 3.913744,2.04173 h 2.689697 z m 16.976138,0.0991 c 0.51905,-0.9775 0.94374,-1.93488 0.94374,-2.1275 0,-0.46912 -1.56683,-3.45955 -1.93034,-3.68421 -0.15826,-0.0978 -1.48531,-0.15807 -2.94901,-0.13392 -2.978798,0.0491 -2.835348,-0.0345 -4.051178,2.36356 l -0.70346,1.38752 1.00823,1.98591 1.00823,1.98592 h 2.865018 2.86503 z m 8.68333,-4.48272 0.99271,-1.89437 -1.02625,-1.80979 -1.02625,-1.8098 -2.87688,-0.0718 -2.87688,-0.0718 -0.8599,1.66976 c -0.47294,0.91838 -0.85989,1.88476 -0.85989,2.14752 0,0.37851 0.92439,2.30208 1.76715,3.67726 0.0698,0.11394 1.39742,0.17348 2.95022,0.13229 l 2.82325,-0.0749 z m 16.60207,0.17458 0.89598,-1.85208 -0.89598,-1.85208 -0.89598,-1.85209 -2.79315,0.002 -2.79316,0.002 -0.95693,1.78936 -0.95694,1.78936 0.93318,1.91301 0.93317,1.91301 h 2.81691 2.81692 z m -34.967608,1.21696 c 0.18094,-0.11182 0.69309,-0.97395 1.13811,-1.91584 l 0.80912,-1.71252 -0.93418,-1.77086 -0.93418,-1.77086 -2.65486,-0.0753 -2.65487,-0.0753 -0.67055,1.06223 c -0.36881,0.58422 -0.67056,1.14452 -0.67056,1.24509 0,0.10057 -0.20249,0.40661 -0.44997,0.68008 -0.42648,0.47125 -0.404654,0.58643 0.41798,2.20585 0.47738,0.93975 1.01591,1.85648 1.19673,2.03716 0.36503,0.36475 4.84218,0.4395 5.40723,0.0903 z m 8.641568,-4.06528 c 0.14552,-0.10691 0.46174,-0.55157 0.70271,-0.98813 0.24098,-0.43657 0.64696,-1.15821 0.90218,-1.60365 0.45252,-0.78977 0.44752,-0.84567 -0.20114,-2.24896 -1.10645,-2.39366 -1.38717,-2.60412 -3.52042,-2.6393 -3.20279,-0.0528 -3.14477,-0.067 -3.552228,0.86951 -0.20577,0.47294 -0.44319,0.91952 -0.52761,0.99239 -0.0844,0.0729 -0.35981,0.52544 -0.61198,1.00573 -0.45057,0.85816 -0.446,0.89604 0.26459,2.19458 0.39769,0.72674 0.87839,1.61362 1.06823,1.97084 0.328428,0.61799 0.463138,0.64928 2.778128,0.64543 1.33813,-0.002 2.55202,-0.0915 2.69754,-0.19844 z m 17.00799,-0.12824 c 0.14945,-0.1819 0.64637,-1.0151 1.10425,-1.85154 l 0.83252,-1.52082 -1.02725,-1.87703 c -0.56499,-1.03237 -1.10686,-1.86605 -1.20415,-1.85262 -0.0973,0.0134 -1.33776,0.0256 -2.75659,0.0272 l -2.57969,0.003 -0.73105,1.57126 c -0.40208,0.86419 -0.83736,1.63696 -0.9673,1.71727 -0.25809,0.15951 1.02584,2.842 1.7357,3.62639 0.36829,0.40696 0.84637,0.4879 2.88168,0.4879 1.6308,0 2.53027,-0.1097 2.71188,-0.33073 z m -8.51084,-4.10509 c 0.16229,-0.10691 0.38763,-0.49048 0.50075,-0.85237 0.11312,-0.3619 0.50103,-1.10432 0.86203,-1.64983 l 0.65637,-0.99183 -0.88017,-1.78976 c -0.48409,-0.98437 -1.00479,-1.87724 -1.1571,-1.98415 -0.15232,-0.10691 -1.40923,-0.19621 -2.79314,-0.19844 l -2.51619,-0.004 -1.01538,1.88524 -1.01538,1.88524 0.88574,1.75278 c 0.48716,0.96403 1.0048,1.84026 1.15032,1.94717 0.14552,0.10691 1.33615,0.19438 2.64583,0.19438 1.30969,0 2.51404,-0.0875 2.67632,-0.19438 z" id="path21"></path>    <path style="fill:#999999;stroke-width:0.340984" d="m 412.0793,514.82172 c -0.6564,-0.0877 -1.46939,-0.40818 -1.80665,-0.7121 -0.72036,-0.64915 -3.17701,-4.9442 -5.6676,-9.90887 l -1.76815,-3.52458 3.81855,-7.13117 3.81856,-7.13117 4.46822,0.0112 c 2.45752,0.006 6.84527,0.14944 9.75055,0.31843 5.22363,0.30385 5.29093,0.31793 6.05738,1.26752 0.42629,0.52814 2.18431,3.73611 3.90672,7.12883 l 3.13166,6.16858 -1.82225,2.84073 c -1.00224,1.5624 -2.5479,4.39081 -3.43481,6.28535 -0.88691,1.89455 -1.88545,3.67119 -2.21899,3.94809 -0.494,0.41011 -2.12993,0.51229 -8.82309,0.55108 -4.51916,0.0262 -8.75371,-0.0242 -9.4101,-0.1119 z" id="path1301" transform="scale(0.26458333)"></path>    <path style="fill:#999999;stroke-width:0.340984" d="m 404.92561,704.14665 -3.37029,-6.98561 3.49907,-6.40297 3.49908,-6.40296 10.20227,-0.0825 10.20227,-0.0825 3.72001,6.84898 3.72002,6.84897 -1.22889,2.26958 c -0.67589,1.24826 -2.27609,4.18761 -3.55599,6.53188 l -2.32711,4.2623 -10.49507,0.0902 -10.49508,0.0902 z" id="path1340" transform="scale(0.26458333)"></path>    <path style="fill:#999999;stroke-width:0.340984" d="m 324.27589,662.48911 c -3.56329,-0.25062 -7.44738,-0.57364 -8.63132,-0.71781 l -2.15261,-0.26213 -3.44634,-6.66518 -3.44634,-6.66518 3.83098,-7.40057 3.83098,-7.40057 7.05323,0.19638 c 3.87927,0.10802 8.10215,0.3275 9.38416,0.48775 3.98759,0.49844 4.93562,1.55625 8.54206,9.53118 l 1.76674,3.9068 -2.34405,4.44731 c -4.14577,7.86569 -6.31885,11.13598 -7.34072,11.0471 -0.31244,-0.0272 -3.48349,-0.25446 -7.04677,-0.50508 z" id="path1379" transform="scale(0.26458333)"></path>    <path style="fill:#999999;stroke-width:0.340984" d="m 315.62267,563.81652 c -0.63337,-0.14954 -1.54414,-0.56498 -2.02394,-0.9232 -1.93837,-1.4472 -6.12412,-10.16082 -6.46058,-13.44918 -0.1348,-1.31756 -0.0509,-1.64581 0.49556,-1.93825 0.60951,-0.3262 1.26636,-1.59819 4.20347,-8.13996 1.09405,-2.43678 1.117,-2.46004 2.6793,-2.71648 0.86668,-0.14226 5.44113,-0.26378 10.16543,-0.27005 l 8.58963,-0.0114 1.20914,1.17071 c 0.74965,0.72582 2.31918,3.35102 4.13025,6.90823 l 2.92113,5.73753 -3.62263,6.98687 -3.62263,6.98687 -8.75628,-0.0349 c -4.81596,-0.0192 -9.27449,-0.15725 -9.90785,-0.30678 z" id="path1418" transform="scale(0.26458333)"></path>    <path style="fill:#999999;stroke-width:0.340984" d="m 501.60354,558.22961 -3.64534,-7.03066 2.45419,-4.34662 c 3.96373,-7.02019 5.22434,-8.82508 6.33805,-9.07457 1.48929,-0.33363 16.52889,-0.68981 17.94101,-0.42489 1.08564,0.20367 1.43803,0.54551 2.77612,2.69306 2.18966,3.5143 4.70757,8.98184 4.89271,10.62434 0.11553,1.02502 -0.0919,1.99841 -0.76939,3.60964 -0.9487,2.25642 -5.1859,10.1244 -5.57675,10.3554 -0.11916,0.0704 -4.84008,0.23985 -10.49095,0.3765 l -10.27431,0.24847 z" id="path1457" transform="scale(0.26458333)"></path>    <path style="fill:#999999;stroke-width:0.340984" d="m 507.59044,663.01568 c -1.57453,-0.15179 -2.98303,-0.39941 -3.13001,-0.55026 -0.14697,-0.15086 -1.75141,-3.11297 -3.56542,-6.58249 l -3.2982,-6.3082 1.98727,-3.75083 c 1.093,-2.06295 2.68142,-5.05509 3.52983,-6.64919 l 1.54257,-2.89836 10.22952,-0.0794 10.22953,-0.0795 3.67635,6.84262 3.67636,6.84262 -2.60861,4.83029 c -1.43474,2.65666 -3.14927,5.71258 -3.81007,6.79095 l -1.20146,1.96065 -7.19744,-0.0465 c -3.9586,-0.0255 -8.4857,-0.17065 -10.06022,-0.32244 z" id="path1496" transform="scale(0.26458333)"></path>    <path style="fill:#999999;stroke-width:0.340984" d="m 412.39846,614.28112 c -3.05899,-0.29336 -3.61832,-0.55561 -5.24952,-2.4613 -1.64737,-1.92458 -5.98163,-10.61615 -5.97947,-11.99074 0.002,-1.12593 3.70266,-8.79939 5.90199,-12.23724 0.69747,-1.09024 1.67807,-2.15084 2.19625,-2.37543 0.64363,-0.27896 3.76738,-0.40933 9.99622,-0.41721 11.72418,-0.0148 10.46555,-0.75868 15.8401,9.36159 l 2.87319,5.41022 -3.16353,6.07724 c -1.73994,3.34248 -3.52993,6.63045 -3.97776,7.3066 l -0.81424,1.22936 -4.28266,0.21844 c -5.10028,0.26014 -9.8079,0.21726 -13.34057,-0.12153 z" id="path1535" transform="scale(0.26458333)"></path>  </g></svg>
\ No newline at end of file
diff --git a/2022/05-gencant/layout.yml b/2022/05-gencant/layout.yml
index bf1e7bd..c1dca59 100644
--- a/2022/05-gencant/layout.yml
+++ b/2022/05-gencant/layout.yml
@@ -6,27 +6,43 @@ title:
 
 leftSymbol:
   x: 200
-  y: 300
+  y: 200
   width: 200
   height: 200
 
 leftText:
   x: 200
-  y: 500
+  y: 400
   width: 200
   height: 60
+  align: center
+  ellipsize: autoscale
+
+leftDescription:
+  extends: leftText
+  y: += 100
+  align: center
+  ellipsize: autoscale
 
 rightSymbol:
   x: 600
-  y: 300
+  y: 200
   width: 200
   height: 200
 
 rightText:
   x: 600
-  y: 500
+  y: 400
   width: 200
   height: 60
+  align: center
+  ellipsize: autoscale
+
+rightDescription:
+  extends: rightText
+  y: += 100
+  align: center
+  ellipsize: autoscale
 
 # The "cut line", without rounded corners
 cut: