diff --git a/devNotes/QuickList.txt b/devNotes/QuickList.txt
new file mode 100644
index 0000000000000000000000000000000000000000..632cf31284fee54d07a5fa6ffdca26fbe7473353
--- /dev/null
+++ b/devNotes/QuickList.txt
@@ -0,0 +1,37 @@
+
+QuickList is built from the interaction of six parts.
+
+1] The Quick List option enable/disable control.
+2] The list context, basically if there are more than one, and the
+ context is correct, the togle, the table will be available.
+3] The Slave Summary Passage contains the Quick List toggle button,
+ clicking it either shows or hides the quick list table.
+4] The Slave Summary Passage contains the actual quick list table, which
+ if shown has a button for each slave name in the list, in columns up
+ to 5 wide.
+5] The Slave Summary Passage contains invivisible <a> links or any other
+ html element nearby or tied to each slave's name. These are
+ generated with an html attribute id set to "slave-##" where ## is the
+ slave's ID.
+6] The JS code to tie a scroll animation from the visible name buttons
+ in the quick list table down to the invisible links/elements.
+
+The slave summary passage is called in many strange contexts, and for
+this reason, there is some serious complexity in getting consistent
+results. As it stands now, the passage sometimes calls itsefl
+recursively (for facilities), but it doesn't do that for the Main
+penthouse page.
+
+The list context is duplicated, so that we can quickly loop over the
+list context to get the slave names in the list, all without disturbing
+the principal list context for the slave data.
+
+If the list context has more than one slave, and is either the first
+call for the Main/penthous list, or the recursive call for any other
+facility, And we haven't *already* built a quick list table, then we
+procede to build the quick list table.
+
+We use special attributes on the built button to name the invisible
+link to which we'll navigate, the speed that we'll animate our
+navigation and an offset.
+
diff --git a/src/art/vector/Feet.tw b/src/art/vector/Feet.tw
index c22cd40d8914a04bb283ddd79e55ac931657d8ee..de334450c3ad8843fa476ed7ff48de7423725830 100644
--- a/src/art/vector/Feet.tw
+++ b/src/art/vector/Feet.tw
@@ -106,7 +106,7 @@
<<unset _art_outfit >> /* clean up variable possibly already set by prior widget run */
<<switch _artSlave.clothes>> /* select available clothes */
- <<case "a ball gown" "a bunny outfit" "a fallen nuns habit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a latex catsuit" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a nice maid outfit" "a nice nurse outfit" "a red army uniform" "a schutzstaffel uniform" "a slutty schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty qipao" "a succubus outfit" "a toga" "battledress" "body oil" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "nice business attire" "restrictive latex" "slutty business attire" "spats and a tank top" "stretch pants and a crop-top" "Western clothing">>
+ <<case "a ball gown" "a bunny outfit" "a fallen nuns habit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a latex catsuit" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a nice maid outfit" "a nice nurse outfit" "a red army uniform" "a schoolgirl outfit" "a schutzstaffel uniform" "a slutty schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty qipao" "a succubus outfit" "a toga" "battledress" "body oil" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "nice business attire" "restrictive latex" "slutty business attire" "spats and a tank top" "stretch pants and a crop-top" "Western clothing">>
<<set _art_outfit = clothing2artSuffix(_artSlave.clothes) >>
<</switch>>
@@ -120,12 +120,16 @@
<<if def _art_outfit >>
<<if _artSlave.amp != 1>>
- <<if ["a ball gown", "a bunny outfit", "a chattel habit", "a cheerleader outfit", "a fallen nuns habit", "a halter top dress", "a hijab and abaya", "a huipil", "a kimono", "a latex catsuit", "a maternity dress", "a military uniform", "a mini dress", "a monokini", "a nice maid outfit", "a nice nurse outfit", "a red army uniform", "a schoolgirl outfit", "a schutzstaffel uniform", "a slutty schutzstaffel uniform", "slutty business attire", "a slutty maid outfit", "a slutty nurse outfit", "spats and a tank top", "a slave gown", "a succubus outfit", "a toga", "battledress", "body oil", "clubslut netting", "conservative clothing", "cutoffs and a t-shirt", "nice business attire", "restrictive latex", "stretch pants and a crop-top"].includes(_artSlave.clothes)>>
+ <<if ["a ball gown", "a bunny outfit", "a chattel habit", "a fallen nuns habit", "a halter top dress", "a hijab and abaya", "a huipil", "a kimono", "a latex catsuit", "a maternity dress", "a military uniform", "a mini dress", "a monokini", "a nice maid outfit", "a nice nurse outfit", "a red army uniform", "a schoolgirl outfit", "a schutzstaffel uniform", "a slutty schutzstaffel uniform", "slutty business attire", "a slutty maid outfit", "a slutty nurse outfit", "spats and a tank top", "a slave gown", "a succubus outfit", "a toga", "battledress", "body oil", "clubslut netting", "conservative clothing", "cutoffs and a t-shirt", "nice business attire", "restrictive latex", "stretch pants and a crop-top"].includes(_artSlave.clothes)>>
<<set _art = "Art_Vector_Butt_Outfit_"+_art_outfit+"_"+_buttSize >><<include _art >>
<</if>>
- <<set _art = "Art_Vector_Leg_Outfit_"+_art_outfit+"_"+_legSize >><<include _art >>
+ <<if _artSlave.clothes != "a schoolgirl outfit">>
+ <<set _art = "Art_Vector_Leg_Outfit_"+_art_outfit+"_"+_legSize >><<include _art >>
+ <</if>>
<<else>>
- <<set _art = "Art_Vector_Leg_Outfit_"+_art_outfit+"_Stump" >><<include _art >>
+ <<if _artSlave.clothes != "a schoolgirl outfit">>
+ <<set _art = "Art_Vector_Leg_Outfit_"+_art_outfit+"_Stump" >><<include _art >>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_0.tw b/src/art/vector/layers/Butt_Outfit_Schoolgirl_0.tw
similarity index 91%
rename from src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_0.tw
rename to src/art/vector/layers/Butt_Outfit_Schoolgirl_0.tw
index bc16355633e24775b08326c7bd5d569b24290495..947b957517656c60c3a4597ff230992b91ca2298 100644
--- a/src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_0.tw
+++ b/src/art/vector/layers/Butt_Outfit_Schoolgirl_0.tw
@@ -1,3 +1,3 @@
-:: Art_Vector_Butt_Outfit_SchoolgirlUniform_0 [nobr]
+:: Art_Vector_Butt_Outfit_Schoolgirl_0 [nobr]
<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="ccsc" id="path3000" d="m 357.09315,392.04089 c 37.46336,58.0321 29.15789,66.08009 27.98507,76.58709 -0.80061,0.55053 -3.84448,1.89151 -4.67502,1.15487 -6.44265,-5.71419 -19.56417,-72.6451 -23.31005,-77.74196 z" style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#17280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-width:3;stroke:#000000" transform="rotate(-2.1632141,244.88572,817.15994)"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_1.tw b/src/art/vector/layers/Butt_Outfit_Schoolgirl_1.tw
similarity index 91%
rename from src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_1.tw
rename to src/art/vector/layers/Butt_Outfit_Schoolgirl_1.tw
index 832fb1a5171717a23128403ca4ad9ad255841e7d..e85847cca5e7e3bed0ebff74b0b4018091f8995a 100644
--- a/src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_1.tw
+++ b/src/art/vector/layers/Butt_Outfit_Schoolgirl_1.tw
@@ -1,3 +1,3 @@
-:: Art_Vector_Butt_Outfit_SchoolgirlUniform_1 [nobr]
+:: Art_Vector_Butt_Outfit_Schoolgirl_1 [nobr]
<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="cscc" id="path2996" d="m 367.61177,411.02651 c 11.27301,2.98564 29.89855,19.23389 36.56246,42.25176 0.22975,0.79358 -5.15213,4.32272 -5.19729,4.45816 -7.57936,-16.79658 -27.99693,-40.43911 -31.36517,-46.70992 z" style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#17280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-width:3;stroke:#000000" transform="rotate(15.737227,358.78205,354.98403)"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_2.tw b/src/art/vector/layers/Butt_Outfit_Schoolgirl_2.tw
similarity index 95%
rename from src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_2.tw
rename to src/art/vector/layers/Butt_Outfit_Schoolgirl_2.tw
index 466fa5673ab6a0e673c39a421841e5f3e7eb2b99..9a97b20c7849afe8aa8de52898612a9721a08092 100644
--- a/src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_2.tw
+++ b/src/art/vector/layers/Butt_Outfit_Schoolgirl_2.tw
@@ -1,3 +1,3 @@
-:: Art_Vector_Butt_Outfit_SchoolgirlUniform_2 [nobr]
+:: Art_Vector_Butt_Outfit_Schoolgirl_2 [nobr]
<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="cccc" id="path2992" d="m 350.10036,398.53617 c 27.1339,27.98878 32.95468,35.41783 39.26159,78.19122 -2.07409,2.43443 -8.25636,-14.07849 -16.34156,-11.74477 -5.80029,-17.86523 -53.54562,-12.22362 -22.92003,-66.44645 z" style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#17280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-width:3;stroke:#000000" transform="rotate(-2.1632141,381.23216,599.34386)"/><path sodipodi:nodetypes="ccccc" id="path2793-4-24-4" d="m 377.93763,447.71698 c -0.17346,-0.002 -2.52496,0.71106 -2.52496,0.71106 l -6.60349,-13.17597 c 0,0 3.24494,-0.95588 3.40994,-1.20474 1.09203,1.06153 5.46838,12.33306 5.71851,13.66965 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_3.tw b/src/art/vector/layers/Butt_Outfit_Schoolgirl_3.tw
similarity index 96%
rename from src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_3.tw
rename to src/art/vector/layers/Butt_Outfit_Schoolgirl_3.tw
index 9a68d311e4dae37a55e4fd5956f99e1569f84ae8..1050ae9945e2b78f96208be33de0a7f6f4103f0a 100644
--- a/src/art/vector/layers/Butt_Outfit_SchoolgirlUniform_3.tw
+++ b/src/art/vector/layers/Butt_Outfit_Schoolgirl_3.tw
@@ -1,3 +1,3 @@
-:: Art_Vector_Butt_Outfit_SchoolgirlUniform_3 [nobr]
+:: Art_Vector_Butt_Outfit_Schoolgirl_3 [nobr]
<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="cscc" id="path2988" d="m 346.22171,393.05965 c 29.09645,31.28075 41.14501,53.15658 35.87939,79.95794 -0.0745,0.37898 -15.70414,-8.89316 -17.28128,-8.67758 -5.80029,-17.86523 -24.53535,-64.68096 -18.59811,-71.28036 z" style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#17280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-width:3;stroke:#000000" transform="rotate(-4.2183723,384.23206,440.44436)"/><path sodipodi:nodetypes="ccccc" id="path2793-4-24-4-3" d="m 381.57011,445.93998 c -0.17346,-0.002 -6.43121,2.55481 -6.43121,2.55481 l -6.60349,-13.17597 c 0,0 6.52619,-2.26838 6.69119,-2.51724 1.09203,1.06153 6.09338,11.80181 6.34351,13.1384 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="cccc" id="path2793-4-24-4-3-7" d="m 360.48612,413.41677 c -0.17346,-0.002 -3.71246,1.05481 -3.71246,1.05481 l -9.19724,-14.26972 c 2.37766,1.65341 12.10448,12.4163 12.9097,13.21491 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Hourglass.tw b/src/art/vector/layers/Torso_Outfit_Schoolgirl_Hourglass.tw
similarity index 99%
rename from src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Hourglass.tw
rename to src/art/vector/layers/Torso_Outfit_Schoolgirl_Hourglass.tw
index 351b9b87ba9d76c67e5585832f377f4a28a40102..bef26346179de7f9d44463b08841123c4b97466c 100644
--- a/src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Hourglass.tw
+++ b/src/art/vector/layers/Torso_Outfit_Schoolgirl_Hourglass.tw
@@ -1,3 +1,3 @@
-:: Art_Vector_Torso_Outfit_SchoolgirlUniform_Hourglass [nobr]
+:: Art_Vector_Torso_Outfit_Schoolgirl_Hourglass [nobr]
<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path sodipodi:nodetypes="cscccssssssccccscscsccc" id="path3053" d="m 368.45236,268.83602 c 0.40069,1.40387 -0.93027,12.32141 -7.95134,37.24886 -4.54325,16.13025 -10.12644,23.75672 -17.08678,35.1143 -14.83302,25.62305 -11.40054,29.58195 -2.11717,51.63906 0,0 -43.93643,22.23243 -55.44565,50.5698 -2.06147,4.01155 -2.1084,11.81811 -3.46792,16.10443 -0.27859,0.87834 -1.00697,6.35332 -3.50565,8.26757 -0.26944,0.20641 -1.13656,1.14752 -4.58251,0.28177 -0.17413,-0.0437 -1.37345,0.71664 -3.61847,0.0361 -5.83439,-1.76869 -6.66978,-8.86034 -6.76649,-9.28816 -1.98539,-8.78313 -6.24957,-28.02971 -9.43291,-34.24779 -14.19124,-27.72004 -21.20533,-26.69883 -22.51317,-29.03516 7.88498,-17.78649 12.96746,-43.00285 10.9764,-77.23211 -0.10903,-0.84586 -4.14283,-11.7431 -5.92518,-28.16955 1.2935,-80.38873 29.94971,-37.60983 52.03358,-56.96199 0.97617,-2.02088 1.68499,-20.51561 -12.22524,-27.79509 -0.63873,-0.33426 5.49532,-2.25669 10.01985,-4.65903 0.39347,0.18171 3.15985,-2.78518 4.04836,-2.71348 7.89162,0.63679 24.23359,-2.19734 27.21341,0.5742 1.50252,1.12706 9.10193,4.89722 7.88644,5.69617 -25.72677,16.91039 -30.9022,28.84774 -29.45936,29.06832 3.13994,1.52155 66.54554,33.43249 67.65165,34.25705 z" style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="cssscccsscsccsccsc" id="path3055" d="m 368.47602,268.56519 c -0.77107,3.92168 -3.9552,21.95053 -9.3715,38.96484 -3.58791,11.27077 -13.51708,26.63343 -15.76094,30.64203 -1.56731,2.79998 -12.91359,18.93921 -11.71678,29.27793 1.81089,15.64347 6.31737,20.40651 10.96987,26.77185 1.40254,1.90805 4.4197,7.29784 7.43331,11.15298 52.7389,95.93321 -178.91391,134.86246 -118.09353,-8.25058 8.69383,-19.49647 8.91566,-28.94894 10.35172,-34.00948 5.17717,-18.24376 1.92316,-40.73168 1.51078,-45.94078 -0.30148,-3.80824 -4.82961,-14.60553 -5.71864,-27.14289 0.41686,-18.21466 2.24062,-30.72799 5.26681,-40.47792 4.74982,-15.30322 13.15259,-34.64266 33.589,-43.57206 0.49229,-0.51848 5.43756,-2.25669 9.91452,-4.65903 1.60336,-0.39771 5.45807,-5.67543 5.61806,-5.90225 0.71447,-1.01286 19.82997,-0.34514 25.3151,3.76297 1.48672,1.12706 18.23182,7.00546 18.7637,8.34782 16.36241,-0.34204 27.21487,10.68827 31.59706,24.79945 3.70801,11.9402 2.33969,26.22823 0.33146,36.23512 z" style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path style="display:inline;fill-opacity:1;fill:#17280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 389.75048,479.5035 c 0.0218,0.0352 1.0853,3.08403 1.00804,3.13019 -0.65016,0.38847 -2.25374,1.05942 -3.45208,1.4977 -0.11447,0.0419 -2.60411,-2.6977 -2.71885,-2.65607 -4.27881,1.55252 -8.73882,2.97465 -13.33844,4.27159 -0.14587,0.0411 -0.0106,6.20714 -0.15679,6.24802 -5.90081,1.65048 -8.17335,2.99738 -14.45125,4.011 -0.12954,0.0209 -4.38403,-5.7371 -4.51347,-5.71144 -6.02034,1.19334 -12.16746,2.20809 -18.3642,3.05386 -0.21287,0.0291 -0.98829,6.43291 -1.20127,6.46156 -6.3312,0.85182 -9.56248,1.27794 -15.87283,1.37345 -0.22843,0.003 -3.08247,-5.6736 -3.31214,-5.6555 -6.46262,0.50767 -12.8877,0.8439 -19.18837,1.01951 -0.17706,0.005 -1.41654,5.416 -1.59343,5.42068 -6.35406,0.16818 -10.09123,0.0167 -16.12724,-0.13068 -0.094,-0.002 -1.34423,-5.255 -1.43814,-5.257 -6.2547,-0.15783 -12.29156,-0.47926 -18.01651,-0.95187 -0.14841,-0.0123 -1.24639,3.491 -1.39361,3.48278 -5.44524,-0.30417 -8.924,-1.42407 -13.7992,-2.22416 -0.0778,-0.0128 -0.68588,-3.87031 -0.76355,-3.88283 -5.08329,-0.81964 -9.70966,-2.45079 -13.97008,-3.60642 -0.09,-0.0244 -1.68235,3.02261 -1.77192,2.99805 -4.68813,-1.28512 -7.67978,-2.31877 -11.06999,-4.13779 -0.0815,-0.0437 0.0834,-3.4682 0.001,-3.50886 -2.51321,-1.24065 -4.61555,-2.58593 -6.35499,-4.03294 -0.37587,-0.31268 -3.45047,-0.9982 -4.25668,-1.77098 -0.15151,-0.14522 -2.25898,3.02021 -2.41758,3.08855 0,0 -1.74414,-0.71421 -1.82019,-0.84059 6.79014,-22.90337 27.25574,-74.3893 35.82111,-94.20895 60.81168,14.65699 63.968,7.60759 104.72028,2.48341 3.23209,2.93017 32.42334,45.66928 49.81237,90.03575 z" id="path3057" sodipodi:nodetypes="cssssssssssssssssssssssssssccccc"/><path style="fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 203.55359,478.92173 c 8.51492,-28.38984 24.90566,-58.3362 35.05005,-89.27979 l 1.51993,0.57841 c -8.38453,32.41858 -18.87908,63.04264 -25.84818,94.53961 -4.19544,-1.96694 -6.85801,-3.20798 -10.7218,-5.83823 z" id="path3059" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 226.95769,489.464 c 7.24497,-32.07307 17.36955,-64.50147 26.93716,-96.11001 l 2.03771,0.43067 c -7.35074,32.55411 -9.7067,66.76448 -14.70238,99.31859 -4.43458,-0.94634 -9.83791,-2.1253 -14.27249,-3.63925 z" id="path3061" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 256.96016,495.62277 c 4.12528,-33.29707 11.21077,-67.27028 17.20686,-99.63194 l 1.98474,0.31888 c -1.1273,33.48562 1.58175,67.71877 -0.94699,100.73724 -5.90886,-0.17424 -12.66842,-0.58459 -18.24461,-1.42418 z" id="path3063" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 293.97995,497.23072 c -0.55795,-32.66775 1.13471,-66.01338 1.96298,-100.52941 l 2.53771,-0.0997 c 3.73482,35.86669 11.87469,67.7164 15.34931,99.64702 -6.4873,0.7737 -15.28559,1.51121 -19.85,0.98209 z" id="path3065" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 333.58147,494.15658 c -7.04711,-32.54953 -12.39888,-65.66548 -16.83289,-99.52156 l 1.96578,-0.25435 c 5.55226,34.08301 23.32978,64.51357 34.0336,96.4501 -5.88931,1.26555 -12.94565,2.47467 -19.16649,3.32581 z" id="path3067" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 371.13216,486.30077 c -15.12415,-30.24903 -25.05372,-61.32185 -35.32911,-95.09726 l 2.09577,-0.90902 c 5.05362,15.805 27.87694,64.14372 46.67297,91.17249 -4.07146,1.82226 -9.20346,3.50567 -13.43963,4.83379 z" id="path3069" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 340.95788,390.7864 c -40.86096,10.78471 -73.70088,9.18049 -106.39563,-1.96889 l 2.19684,-5.53337 c 47.7592,14.94425 68.1724,7.34549 99.76318,1.55769 0.11976,0.26161 3.13612,3.83594 4.43561,5.94457 z" id="path3071" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 356.82205,414.47941 c -63.82717,21.90257 -105.72801,11.41992 -133.62718,1.39712 1.76517,-4.76502 4.61062,-11.20595 6.43829,-15.23119 35.33835,11.44808 59.76698,17.09062 117.93982,-0.59678 4.10725,5.18477 9.11004,14.101 9.24907,14.43085 z" id="path3073" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 375.67723,448.31229 c -63.82716,21.90257 -137.5909,11.52061 -165.49008,1.49781 1.76517,-4.76502 3.92561,-11.25015 5.75328,-15.27539 35.33836,11.44808 94.67855,18.40128 152.85138,0.71388 3.46643,5.62672 6.74639,12.73385 6.88542,13.0637 z" id="path3075" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 389.51673,479.18301 c -52.86701,22.4329 -145.70291,26.4922 -189.15843,-1.91538 1.76517,-4.76502 2.98562,-9.83095 4.81329,-13.85619 39.05066,26.4741 110.3586,24.04405 179.31482,3.52822 3.41975,6.37227 4.89129,11.9135 5.03032,12.24335 z" id="path3077" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 232.17646,418.94752 c -0.17346,-0.002 -3.23213,-0.92613 -4.17688,-1.38887 l 6.18903,-15.4628 c 0,0 2.52863,0.8004 2.53738,0.77029 -0.1896,0.57539 -4.5124,15.98223 -4.54953,16.08138 z" id="path3079" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 250.40744,423.81644 c -0.17346,-0.002 -4.39619,-0.78551 -5.34094,-1.24825 l 4.7485,-15.92777 c 0,0 3.34623,0.87774 3.35498,0.84763 -0.1896,0.57539 -2.72541,16.22924 -2.76254,16.32839 z" id="path3081" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 276.00119,427.26956 c -0.17346,-0.002 -6.79463,-0.17613 -7.73938,-0.63887 l 3.10995,-16.04832 c 0,0 4.53947,0.42475 4.54822,0.39464 -0.1896,0.57539 0.11834,16.1934 0.0812,16.29255 z" id="path3083" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 302.65744,426.67581 c -0.17346,-0.002 -6.82588,0.98012 -7.77063,0.51738 l 0.56403,-16.43155 c 0,0 4.77863,-0.35585 4.78738,-0.38596 -0.1896,0.57539 2.45635,16.20098 2.41922,16.30013 z" id="path3085" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 326.12783,423.02113 c -0.17346,-0.002 -4.38118,1.48245 -5.32593,1.01971 l -2.31981,-16.68545 c 0,0 2.90363,-0.4496 2.91238,-0.47971 -0.1896,0.57539 4.77049,16.0463 4.73336,16.14545 z" id="path3087" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 349.09317,417.01723 c -0.17346,-0.002 -3.93924,1.90229 -4.88399,1.43955 l -5.03629,-16.12571 c 0,0 3.01476,-0.81269 3.02351,-0.8428 -0.1896,0.57539 6.9339,15.42981 6.89677,15.52896 z" id="path3089" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 222.34662,453.61905 c -0.17346,-0.002 -7.60735,-2.11937 -8.5521,-2.58211 l 6.32161,-15.33022 c 0,0 6.28514,1.81687 6.64744,1.83095 -0.1896,0.57539 -4.37982,15.98223 -4.41695,16.08138 z" id="path3091" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 245.93869,458.17581 c -0.17346,-0.002 -9.76338,-1.33238 -10.70813,-1.79512 l 4.40778,-15.8378 c 0,0 8.24738,1.64415 8.25613,1.61404 -0.1896,0.57539 -1.91865,15.91973 -1.95578,16.01888 z" id="path3093" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 241.3254,493.12165 c -0.17346,-0.002 -13.13163,-2.6055 -14.51832,-3.73116 l 3.49319,-14.22536 c 0,0 13.13523,3.45205 13.14398,3.42194 -0.1896,0.57539 -2.08172,14.43543 -2.11885,14.53458 z" id="path3095" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 214.34494,484.80081 c -0.17346,-0.002 -9.98213,-4.67613 -11.05188,-5.70137 l 4.84528,-13.86905 c 0,0 9.62238,5.14415 9.63113,5.11404 -0.1896,0.57539 -3.3874,14.35723 -3.42453,14.45638 z" id="path3097" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 275.29767,497.03066 c -0.17346,-0.002 -11.23128,0.002 -18.49579,-1.52145 l 1.99058,-14.26956 c 0,0 16.80335,1.37493 17.25404,1.34482 -0.1896,0.57539 -0.7117,14.34704 -0.74883,14.44619 z" id="path3099" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 313.99352,496.27936 c -0.17346,-0.002 -11.27547,1.54875 -20.26356,0.99762 l -0.0865,-14.84408 c 0,0 17.81982,-1.09995 18.40309,-1.08587 -0.1896,0.57539 1.98415,14.83318 1.94702,14.93233 z" id="path3101" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 352.95062,490.80189 c -0.17346,-0.002 -18.6117,3.71426 -19.55645,3.25152 l -3.26852,-14.88828 c 0,0 17.37787,-3.0003 17.38662,-3.03041 -0.1896,0.57539 5.47548,14.56802 5.43835,14.66717 z" id="path3103" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 384.80548,481.4167 c -0.17346,-0.002 -12.95485,5.21686 -13.8996,4.75412 l -6.45051,-13.87181 c 0,0 12.16296,-3.13288 12.17171,-3.16299 -0.1896,0.57539 8.21553,12.18153 8.1784,12.28068 z" id="path3105" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 366.38881,451.33932 c -0.17346,-0.002 -9.45754,2.45704 -9.6068,2.55778 l -5.39367,-14.19796 c 0,0 7.84113,-1.5746 8.00613,-1.82346 -0.1896,0.57539 7.03147,13.36449 6.99434,13.46364 z" id="path3107" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 339.81369,457.42581 c -0.17346,-0.002 -12.20088,2.32387 -13.14563,1.86113 l -2.65472,-14.93155 c 0,0 9.80988,-1.29335 9.81863,-1.32346 -0.1896,0.57539 6.01885,14.29473 5.98172,14.39388 z" id="path3109" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 308.68416,460.95484 c -0.17346,-0.002 -13.79454,0.88583 -14.73929,0.42309 l 0.44379,-15.50699 c 0,0 11.58843,-0.17188 11.59718,-0.20199 -0.1896,0.57539 2.73545,15.18674 2.69832,15.28589 z" id="path3111" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 276.51214,461.13162 c -0.17346,-0.002 -13.3526,-0.70516 -14.29735,-1.1679 l 2.78608,-15.4628 c 0,0 10.57197,0.7562 11.33202,0.81448 -0.1896,0.57539 0.21638,15.71707 0.17925,15.81622 z" id="path3113" sodipodi:nodetypes="ccccc"/><path style="display:inline;fill-opacity:1;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 291.59598,204.88954 c -0.007,-0.15238 5.39726,-10.80323 5.46415,-10.99796 0,0 -4.71541,-2.02563 -4.85767,-1.83113 -0.86438,1.18176 -2.48505,4.21861 -3.88833,5.92157 0.099,0.227 3.28185,6.90752 3.28185,6.90752 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-1-4-1-6-1" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 291.37199,204.48619 c -0.007,-0.14941 5.24298,-10.59292 5.30796,-10.78386 0,0 -4.58062,-1.9862 -4.71882,-1.79549 -0.83967,1.15876 -2.41401,4.13649 -3.77718,5.8063 0.0962,0.22258 3.18804,6.77305 3.18804,6.77305 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-7-2-7-9" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 302.35934,205.13171 c 0.007,-0.15238 -4.12803,-10.81395 -4.19492,-11.00868 0,0 16.75554,-2.71313 16.8978,-2.51863 0.86438,1.18176 2.6413,5.37486 3.07583,6.04657 -0.099,0.227 -15.77871,7.48074 -15.77871,7.48074 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-7-4-5-3-7" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 302.32893,204.87389 c 0.007,-0.14856 -3.50116,-10.71524 -3.56706,-10.90509 0,0 15.63782,-2.64512 15.77799,-2.4555 0.85164,1.15214 2.60238,5.24014 3.03051,5.89501 -0.0975,0.22131 -15.24144,7.46558 -15.24144,7.46558 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-8" sodipodi:nodetypes="csscc"/><path sodipodi:nodetypes="ccc" id="path3280-7-2-6-6-6-6" class="shadow" d="m 329.88728,425.7106 c -15.4791,1.19068 -42.03653,26.26041 -44.60913,30.99635 10.29989,-9.14088 29.75951,-26.28541 44.60913,-30.99635 z"/><path sodipodi:nodetypes="ccc" id="path3282-5-4-0-8-6-9" class="shadow" d="m 262.14519,457.55889 c -6.81704,-9.41592 -28.83006,-31.99347 -34.93819,-34.15183 5.05404,5.44075 26.5203,25.35081 34.93819,34.15183 z"/><path style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#0b1728;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 368.776,268.56519 c -0.77461,3.92168 -3.97339,21.95053 -9.41466,38.96484 -9.58543,26.63525 -31.9174,49.66917 -26.49032,67.01615 -15.6007,11.79561 -89.48153,7.18733 -92.15843,-3.60905 6.09478,-35.2798 3.22665,-48.55405 2.8124,-53.76315 -0.30291,-3.80824 -4.85188,-14.60553 -5.74499,-27.14289 1.22918,-53.46254 15.03742,-58.37216 39.03469,-84.04998 0.49457,-0.51848 5.4626,-2.25669 9.96015,-4.65903 -8.51882,16.39017 21.62806,22.5736 34.27218,-0.90184 1.49356,1.12706 15.11916,5.76802 15.65345,7.11038 5.62277,13.25538 5.63445,25.94395 12.84849,37.87473 7.35938,13.63251 13.76196,21.31242 19.22704,23.15984 z" id="path3119-7-5" sodipodi:nodetypes="ccccsccccccc"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 367.84923,272.33673 c -23.06236,-5.36348 -33.45947,-66.06356 -33.52537,-66.25341 0,0 1.9906,1.00368 2.18424,1.13825 1.9123,1.32892 12.74364,49.96783 32.08688,61.2293 -0.0975,0.22131 -0.74575,3.88586 -0.74575,3.88586 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6-8" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 245.3392,242.36227 c 4.11594,-11.96703 31.74542,-36.46223 31.67952,-36.65208 0,0 5.7406,-2.62132 5.93424,-2.48675 1.9123,1.32892 -25.9628,24.20428 -39.44345,44.88907 -0.0975,0.22131 1.82969,-5.75024 1.82969,-5.75024 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6-2-0" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 240.7384,369.45827 c 43.61544,16.95575 91.66715,1.85363 91.60125,1.66375 0,0 0.6026,3.29624 0.45417,3.47947 -6.66137,8.22321 -75.5781,12.86912 -92.30875,-2.38359 -0.0975,0.22131 0.25333,-2.75967 0.25333,-2.75967 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6-2-4-6" sodipodi:nodetypes="cssccc"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Normal.tw b/src/art/vector/layers/Torso_Outfit_Schoolgirl_Normal.tw
similarity index 99%
rename from src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Normal.tw
rename to src/art/vector/layers/Torso_Outfit_Schoolgirl_Normal.tw
index d8eae8bd8639ab717cd5bc19d5c8ca6f8eb045ec..030e331444ce9f8c01d2aa938e99c3dfdb260ed0 100644
--- a/src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Normal.tw
+++ b/src/art/vector/layers/Torso_Outfit_Schoolgirl_Normal.tw
@@ -1,3 +1,3 @@
-:: Art_Vector_Torso_Outfit_SchoolgirlUniform_Normal [nobr]
+:: Art_Vector_Torso_Outfit_Schoolgirl_Normal [nobr]
<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 368.45236,268.83602 c 0.40069,1.40387 0.46989,12.75894 -7.95134,37.24886 -5.49742,15.98712 -10.67261,22.74804 -14.18253,34.62318 -3.34569,13.43051 -4.67275,33.91328 -1.48589,53.19084 0,0 -47.47196,21.17177 -58.98118,49.50914 -2.06147,4.01155 -2.1084,11.81811 -3.46792,16.10443 -0.27859,0.87834 -1.00697,6.35332 -3.50565,8.26757 -0.26944,0.20641 -1.13656,1.14752 -4.58251,0.28177 -0.17413,-0.0437 -1.37345,0.71664 -3.61847,0.0361 -5.83439,-1.76869 -6.66978,-8.86034 -6.76649,-9.28816 -1.98539,-8.78313 -6.24957,-28.02971 -9.43291,-34.24779 -14.19124,-27.72004 -21.20533,-26.69883 -22.51317,-29.03516 1.83125,-7.53342 6.04042,-23.55478 6.04585,-24.03842 0.35179,-31.36774 1.32635,-40.95037 4.577,-53.9008 -0.10903,-0.84586 -3.78928,-11.03599 -5.57163,-27.46244 1.2935,-80.38873 29.94971,-37.60983 52.03358,-56.96199 0.97617,-2.02088 1.90374,-19.85936 -12.00649,-27.13884 -0.63873,-0.33426 5.27657,-2.91294 9.8011,-5.31528 0.80337,0.003 3.61162,-2.97443 3.83593,-3.00193 11.59967,-1.42228 20.37057,-3.37369 27.42584,0.86265 1.50252,1.12706 9.10193,4.89722 7.88644,5.69617 -25.72677,16.91039 -30.9022,28.84774 -29.45936,29.06832 3.13994,1.52155 66.54554,33.43249 67.65165,34.25705 z" id="path3117" sodipodi:nodetypes="cscccsssssscscccscscsccc"/><path style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 368.47602,268.56519 c -0.77107,3.92168 -3.9552,21.95053 -9.3715,38.96484 -3.58791,11.27077 -13.20083,27.26932 -14.13594,31.76703 -0.19231,0.92498 -3.78859,24.43921 -3.59178,28.65293 0.73474,15.73079 0.19237,21.15651 1.96987,26.39685 1.40254,1.90805 3.6697,7.17284 6.68331,11.02798 34.58055,95.29315 -179.98991,135.2691 -118.28103,-7.56308 6.57635,-18.38141 7.72377,-25.36711 7.71079,-26.2117 -0.61985,-40.31794 4.75159,-49.21696 4.33921,-54.42606 -0.30148,-3.80824 -4.82961,-14.60553 -5.71864,-27.14289 0.46504,-20.31975 3.58701,-33.33363 6.6909,-43.7239 5.61134,-18.78396 14.33729,-32.77544 32.16491,-40.32608 0.49229,-0.51848 5.43756,-2.25669 9.91452,-4.65903 0.37256,0.46341 3.60261,-2.27567 3.86731,-2.74775 3.66329,-6.53333 11.51313,-1.80615 22.17871,-2.85245 0.24969,-0.0245 4.71008,3.61598 4.88714,3.46092 1.48672,1.12706 18.23182,7.00546 18.7637,8.34782 10.94112,-0.42928 25.50214,5.68255 31.23355,24.77875 2.69327,8.97356 1.97583,21.20389 0.69497,36.25582 z" id="path3119" sodipodi:nodetypes="cssscccsscsccssccsc"/><path style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#0b1728;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 368.776,268.56519 c -0.77461,3.92168 -3.97339,21.95053 -9.41466,38.96484 -3.60442,11.27077 -13.26158,27.26932 -14.20101,31.76703 -0.19321,0.92498 -3.36207,29.0354 -3.16431,33.24912 -15.6007,11.79561 -100.15333,9.85024 -102.83023,-0.94614 -0.62273,-40.31794 4.77345,-49.21696 4.3592,-54.42606 -0.30291,-3.80824 -4.85188,-14.60553 -5.74499,-27.14289 1.22918,-53.46254 15.03742,-58.37216 39.03469,-84.04998 0.49457,-0.51848 5.4626,-2.25669 9.96015,-4.65903 -8.51882,16.39017 21.62806,22.5736 34.27218,-0.90184 1.49356,1.12706 15.11916,5.76802 15.65345,7.11038 5.62277,13.25538 5.63445,25.94395 12.84849,37.87473 7.35938,13.63251 13.76196,21.31242 19.22704,23.15984 z" id="path3119-7" sodipodi:nodetypes="cssccsccccccc"/><path sodipodi:nodetypes="csssssssssssssssssssssssssscsccscc" id="path3121" d="m 389.75048,479.5035 c 0.0218,0.0352 1.0853,3.08403 1.00804,3.13019 -0.65016,0.38847 -2.25374,1.05942 -3.45208,1.4977 -0.11447,0.0419 -2.60411,-2.6977 -2.71885,-2.65607 -4.27881,1.55252 -8.73882,2.97465 -13.33844,4.27159 -0.14587,0.0411 -0.0106,6.20714 -0.15679,6.24802 -5.90081,1.65048 -8.17335,2.99738 -14.45125,4.011 -0.12954,0.0209 -4.38403,-5.7371 -4.51347,-5.71144 -6.02034,1.19334 -12.16746,2.20809 -18.3642,3.05386 -0.21287,0.0291 -0.98829,6.43291 -1.20127,6.46156 -6.3312,0.85182 -9.56248,1.27794 -15.87283,1.37345 -0.22843,0.003 -3.08247,-5.6736 -3.31214,-5.6555 -6.46262,0.50767 -12.8877,0.8439 -19.18837,1.01951 -0.17706,0.005 -1.41654,5.416 -1.59343,5.42068 -6.35406,0.16818 -10.09123,0.0167 -16.12724,-0.13068 -0.094,-0.002 -1.34423,-5.255 -1.43814,-5.257 -6.2547,-0.15783 -12.29156,-0.47926 -18.01651,-0.95187 -0.14841,-0.0123 -1.24639,3.491 -1.39361,3.48278 -5.44524,-0.30417 -8.924,-1.42407 -13.7992,-2.22416 -0.0778,-0.0128 -0.68588,-3.87031 -0.76355,-3.88283 -5.08329,-0.81964 -9.70966,-2.45079 -13.97008,-3.60642 -0.09,-0.0244 -1.68235,3.02261 -1.77192,2.99805 -4.68813,-1.28512 -7.67978,-2.31877 -11.06999,-4.13779 -0.0815,-0.0437 0.0834,-3.4682 0.001,-3.50886 -2.51321,-1.24065 -4.61555,-2.58593 -6.35499,-4.03294 -0.37587,-0.31268 -3.45047,-0.9982 -4.25668,-1.77098 -0.15151,-0.14522 -2.25898,3.02021 -2.41758,3.08855 0,0 -1.74414,-0.71421 -1.82019,-0.84059 6.22483,-20.99656 23.57319,-66.0054 33.07946,-88.62588 0.86332,-2.05429 1.27031,-4.13723 1.74035,-5.8536 60.81168,14.65699 68.7818,7.00312 109.53408,1.87894 0.72316,0.65561 1.83271,8.39288 1.83271,8.39288 10.21621,14.1931 30.66884,48.07818 44.16716,82.51787 z" style="display:inline;fill-opacity:1;fill:#17280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3123" d="m 203.55359,478.92173 c 8.51492,-28.38984 24.90566,-58.3362 35.05005,-89.27979 l 1.51993,0.57841 c -8.38453,32.41858 -18.87908,63.04264 -25.84818,94.53961 -4.19544,-1.96694 -6.85801,-3.20798 -10.7218,-5.83823 z" style="fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3125" d="m 226.95769,489.464 c 7.24497,-32.07307 17.36955,-64.50147 26.93716,-96.11001 l 2.03771,0.43067 c -7.35074,32.55411 -9.7067,66.76448 -14.70238,99.31859 -4.43458,-0.94634 -9.83791,-2.1253 -14.27249,-3.63925 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3127" d="m 256.96016,495.62277 c 4.12528,-33.29707 11.21077,-67.27028 17.20686,-99.63194 l 1.98474,0.31888 c -1.1273,33.48562 1.58175,67.71877 -0.94699,100.73724 -5.90886,-0.17424 -12.66842,-0.58459 -18.24461,-1.42418 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3129" d="m 293.97995,497.23072 c -0.55795,-32.66775 1.13471,-66.01338 1.96298,-100.52941 l 2.53771,-0.0997 c 3.73482,35.86669 11.87469,67.7164 15.34931,99.64702 -6.4873,0.7737 -15.28559,1.51121 -19.85,0.98209 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3131" d="m 333.58147,494.15658 c -7.04711,-32.54953 -12.39888,-65.66548 -16.83289,-99.52156 l 1.96578,-0.25435 c 5.55226,34.08301 23.32978,64.51357 34.0336,96.4501 -5.88931,1.26555 -12.94565,2.47467 -19.16649,3.32581 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3133" d="m 371.13216,486.30077 c -15.12415,-30.24903 -25.05372,-61.32185 -35.32911,-95.09726 l 2.09577,-0.90902 c 5.05362,15.805 27.87694,64.14372 46.67297,91.17249 -4.07146,1.82226 -9.20346,3.50567 -13.43963,4.83379 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3135" d="m 344.30163,390.0989 c -40.86096,10.78471 -77.9004,9.52738 -110.59515,-1.622 l 1.48973,-5.81684 c 47.7592,14.94425 76.64153,7.03207 108.23231,1.24427 0.11976,0.26161 0.63612,4.46094 0.87311,6.19457 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3137" d="m 356.82205,414.47941 c -63.82717,21.90257 -105.72801,11.41992 -133.62718,1.39712 1.76517,-4.76502 4.61062,-11.20595 6.43829,-15.23119 35.33835,11.44808 59.76698,17.09062 117.93982,-0.59678 4.10725,5.18477 9.11004,14.101 9.24907,14.43085 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3139" d="m 375.67723,448.31229 c -63.82716,21.90257 -137.5909,11.52061 -165.49008,1.49781 1.76517,-4.76502 3.92561,-11.25015 5.75328,-15.27539 35.33836,11.44808 94.83323,18.31289 153.00606,0.62549 3.46643,5.62672 6.59171,12.82224 6.73074,13.15209 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3141" d="m 389.51673,479.18301 c -52.86701,22.4329 -145.70291,26.4922 -189.15843,-1.91538 1.76517,-4.76502 2.98562,-9.83095 4.81329,-13.85619 39.05066,26.4741 110.3586,24.04405 179.31482,3.52822 3.41975,6.37227 4.89129,11.9135 5.03032,12.24335 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3143" d="m 232.17646,418.94752 c -0.17346,-0.002 -3.23213,-0.92613 -4.17688,-1.38887 l 6.18903,-15.4628 c 0,0 2.52863,0.8004 2.53738,0.77029 -0.1896,0.57539 -4.5124,15.98223 -4.54953,16.08138 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3145" d="m 250.40744,423.81644 c -0.17346,-0.002 -4.39619,-0.78551 -5.34094,-1.24825 l 4.7485,-15.92777 c 0,0 3.34623,0.87774 3.35498,0.84763 -0.1896,0.57539 -2.72541,16.22924 -2.76254,16.32839 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3147" d="m 276.00119,427.26956 c -0.17346,-0.002 -6.79463,-0.17613 -7.73938,-0.63887 l 3.10995,-16.04832 c 0,0 4.53947,0.42475 4.54822,0.39464 -0.1896,0.57539 0.11834,16.1934 0.0812,16.29255 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3149" d="m 302.65744,426.67581 c -0.17346,-0.002 -6.82588,0.98012 -7.77063,0.51738 l 0.56403,-16.43155 c 0,0 4.77863,-0.35585 4.78738,-0.38596 -0.1896,0.57539 2.45635,16.20098 2.41922,16.30013 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3151" d="m 326.12783,423.02113 c -0.17346,-0.002 -4.38118,1.48245 -5.32593,1.01971 l -2.31981,-16.68545 c 0,0 2.90363,-0.4496 2.91238,-0.47971 -0.1896,0.57539 4.77049,16.0463 4.73336,16.14545 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3153" d="m 349.09317,417.01723 c -0.17346,-0.002 -3.93924,1.90229 -4.88399,1.43955 l -5.03629,-16.12571 c 0,0 3.01476,-0.81269 3.02351,-0.8428 -0.1896,0.57539 6.9339,15.42981 6.89677,15.52896 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3155" d="m 222.34662,453.61905 c -0.17346,-0.002 -7.60735,-2.11937 -8.5521,-2.58211 l 6.32161,-15.33022 c 0,0 6.28514,1.81687 6.64744,1.83095 -0.1896,0.57539 -4.37982,15.98223 -4.41695,16.08138 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3157" d="m 245.93869,458.17581 c -0.17346,-0.002 -9.76338,-1.33238 -10.70813,-1.79512 l 4.40778,-15.8378 c 0,0 8.24738,1.64415 8.25613,1.61404 -0.1896,0.57539 -1.91865,15.91973 -1.95578,16.01888 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3159" d="m 241.3254,493.12165 c -0.17346,-0.002 -13.13163,-2.6055 -14.51832,-3.73116 l 3.49319,-14.22536 c 0,0 13.13523,3.45205 13.14398,3.42194 -0.1896,0.57539 -2.08172,14.43543 -2.11885,14.53458 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3161" d="m 214.34494,484.80081 c -0.17346,-0.002 -9.98213,-4.67613 -11.05188,-5.70137 l 4.84528,-13.86905 c 0,0 9.62238,5.14415 9.63113,5.11404 -0.1896,0.57539 -3.3874,14.35723 -3.42453,14.45638 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3163" d="m 275.29767,497.03066 c -0.17346,-0.002 -11.23128,0.002 -18.49579,-1.52145 l 1.99058,-14.26956 c 0,0 16.80335,1.37493 17.25404,1.34482 -0.1896,0.57539 -0.7117,14.34704 -0.74883,14.44619 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3165" d="m 313.99352,496.27936 c -0.17346,-0.002 -11.27547,1.54875 -20.26356,0.99762 l -0.0865,-14.84408 c 0,0 17.81982,-1.09995 18.40309,-1.08587 -0.1896,0.57539 1.98415,14.83318 1.94702,14.93233 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3167" d="m 352.95062,490.80189 c -0.17346,-0.002 -18.6117,3.71426 -19.55645,3.25152 l -3.26852,-14.88828 c 0,0 17.37787,-3.0003 17.38662,-3.03041 -0.1896,0.57539 5.47548,14.56802 5.43835,14.66717 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3169" d="m 384.80548,481.4167 c -0.17346,-0.002 -12.95485,5.21686 -13.8996,4.75412 l -6.45051,-13.87181 c 0,0 12.16296,-3.13288 12.17171,-3.16299 -0.1896,0.57539 8.21553,12.18153 8.1784,12.28068 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3171" d="m 366.38881,451.33932 c -0.17346,-0.002 -9.45754,2.45704 -9.6068,2.55778 l -5.39367,-14.19796 c 0,0 7.84113,-1.5746 8.00613,-1.82346 -0.1896,0.57539 7.03147,13.36449 6.99434,13.46364 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3173" d="m 339.81369,457.42581 c -0.17346,-0.002 -12.20088,2.32387 -13.14563,1.86113 l -2.65472,-14.93155 c 0,0 9.80988,-1.29335 9.81863,-1.32346 -0.1896,0.57539 6.01885,14.29473 5.98172,14.39388 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3175" d="m 308.68416,460.95484 c -0.17346,-0.002 -13.79454,0.88583 -14.73929,0.42309 l 0.44379,-15.50699 c 0,0 11.58843,-0.17188 11.59718,-0.20199 -0.1896,0.57539 2.73545,15.18674 2.69832,15.28589 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path3177" d="m 276.51214,461.13162 c -0.17346,-0.002 -13.3526,-0.70516 -14.29735,-1.1679 l 2.78608,-15.4628 c 0,0 10.57197,0.7562 11.33202,0.81448 -0.1896,0.57539 0.21638,15.71707 0.17925,15.81622 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path style="display:inline;fill-opacity:1;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 291.59045,204.88403 c -0.007,-0.15238 5.39726,-10.80323 5.46415,-10.99796 0,0 -4.71541,-2.02563 -4.85767,-1.83113 -0.86438,1.18176 -2.48505,4.21861 -3.88833,5.92157 0.099,0.227 3.28185,6.90752 3.28185,6.90752 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-1-4-1-6" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 291.36646,204.48068 c -0.007,-0.14941 5.24298,-10.59292 5.30796,-10.78386 0,0 -4.58062,-1.9862 -4.71882,-1.79549 -0.83967,1.15876 -2.41401,4.13649 -3.77718,5.8063 0.0962,0.22258 3.18804,6.77305 3.18804,6.77305 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-7-2-7" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 302.35381,205.30298 c 0.007,-0.15238 -3.99545,-11.03492 -4.06234,-11.22965 0,0 16.62296,-2.66894 16.76522,-2.47444 0.86438,1.18176 2.6413,5.37486 3.07583,6.04657 -0.099,0.227 -15.77871,7.65752 -15.77871,7.65752 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-7-4-5-3" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 302.3234,204.86838 c 0.007,-0.14856 -3.50116,-10.71524 -3.56706,-10.90509 0,0 15.63782,-2.64512 15.77799,-2.4555 0.85164,1.15214 2.60238,5.24014 3.03051,5.89501 -0.0975,0.22131 -15.24144,7.46558 -15.24144,7.46558 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3" sodipodi:nodetypes="csscc"/><path sodipodi:nodetypes="ccc" id="path3280-7-2-6-6-6-5" class="shadow" d="m 329.87921,425.71197 c -15.4791,1.19068 -42.03653,26.26041 -44.60913,30.99635 10.29989,-9.14088 29.75951,-26.28541 44.60913,-30.99635 z"/><path sodipodi:nodetypes="ccc" id="path3282-5-4-0-8-6-46" class="shadow" d="m 262.13712,457.56026 c -6.81704,-9.41592 -28.83006,-31.99347 -34.93819,-34.15183 5.05404,5.44075 26.5203,25.35081 34.93819,34.15183 z"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 367.84923,272.33673 c -23.06236,-5.36348 -33.45947,-66.06356 -33.52537,-66.25341 0,0 1.9906,1.00368 2.18424,1.13825 1.9123,1.32892 12.74364,49.96783 32.08688,61.2293 -0.0975,0.22131 -0.74575,3.88586 -0.74575,3.88586 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 245.82534,242.49485 c 4.11594,-11.96703 31.25928,-36.59481 31.19338,-36.78466 0,0 5.7406,-2.62132 5.93424,-2.48675 1.9123,1.32892 -25.43247,23.23201 -38.91312,43.9168 -0.0975,0.22131 1.7855,-4.64539 1.7855,-4.64539 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6-2" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 238.97063,369.81183 c 43.61544,16.95575 103.23042,-0.10217 103.16452,-0.29202 0,0 -0.1929,2.89849 -0.34133,3.08172 -6.66137,8.22321 -85.81554,15.0459 -102.54619,-0.20681 -0.0975,0.22131 -0.277,-2.58289 -0.277,-2.58289 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6-2-4" sodipodi:nodetypes="csscc"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Unnatural.tw b/src/art/vector/layers/Torso_Outfit_Schoolgirl_Unnatural.tw
similarity index 99%
rename from src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Unnatural.tw
rename to src/art/vector/layers/Torso_Outfit_Schoolgirl_Unnatural.tw
index ae67dc58ecaca1b7a8f61189f7b89a397d5c062d..c9dd5c120606db0d0ba9c7b159e124c09341fa78 100644
--- a/src/art/vector/layers/Torso_Outfit_SchoolgirlUniform_Unnatural.tw
+++ b/src/art/vector/layers/Torso_Outfit_Schoolgirl_Unnatural.tw
@@ -1,3 +1,3 @@
-:: Art_Vector_Torso_Outfit_SchoolgirlUniform_Unnatural [nobr]
+:: Art_Vector_Torso_Outfit_Schoolgirl_Unnatural [nobr]
<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 368.45236,268.83602 c 0.40069,1.40387 -0.93027,12.32141 -7.95134,37.24886 -4.54325,16.13025 -11.37644,22.38172 -18.33678,33.7393 -18.83302,27.12305 -15.40054,29.58195 -0.86717,53.01406 0,0 -43.93643,22.23243 -55.44565,50.5698 -2.06147,4.01155 -2.1084,11.81811 -3.46792,16.10443 -0.27859,0.87834 -1.00697,6.35332 -3.50565,8.26757 -0.26944,0.20641 -1.13656,1.14752 -4.58251,0.28177 -0.17413,-0.0437 -1.37345,0.71664 -3.61847,0.0361 -5.83439,-1.76869 -6.66978,-8.86034 -6.76649,-9.28816 -1.98539,-8.78313 -6.24957,-28.02971 -9.43291,-34.24779 -14.19124,-27.72004 -21.20533,-26.69883 -22.51317,-29.03516 7.88498,-17.78649 12.96746,-43.00285 10.9764,-77.23211 -0.10903,-0.84586 -4.14283,-11.7431 -5.92518,-28.16955 1.2935,-80.38873 29.94971,-37.60983 52.03358,-56.96199 0.97617,-2.02088 1.68499,-20.51561 -12.22524,-27.79509 -0.63873,-0.33426 5.49532,-2.25669 10.01985,-4.65903 1.48879,-0.83469 3.44052,-3.05824 3.71301,-3.55796 1.2882,-2.36242 20.23842,-3.47211 27.54876,1.41868 1.50252,1.12706 9.10193,4.89722 7.88644,5.69617 -25.72677,16.91039 -30.9022,28.84774 -29.45936,29.06832 3.13994,1.52155 66.54554,33.43249 67.65165,34.25705 z" id="path2773" sodipodi:nodetypes="cscccssssssccccscscsccc"/><path style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 368.47602,268.56519 c -0.77107,3.92168 -3.9552,21.95053 -9.3715,38.96484 -3.58791,11.27077 -14.76708,25.38343 -17.01094,29.39203 -1.56731,2.79998 -15.78859,20.06421 -14.59178,30.40293 1.81089,15.64347 13.31737,21.65651 15.09487,26.89685 1.40254,1.90805 4.4197,7.29784 7.43331,11.15298 47.18003,88.8032 -178.90208,118.17904 -118.34353,-8.18808 8.69383,-19.49647 9.16566,-29.01144 10.60172,-34.07198 5.17717,-18.24376 1.92316,-40.73168 1.51078,-45.94078 -0.30148,-3.80824 -4.82961,-14.60553 -5.71864,-27.14289 0.40696,-17.78205 3.38367,-29.81816 5.37738,-39.69457 5.758,-28.52386 25.53331,-40.9025 33.47843,-44.35541 0.49229,-0.51848 5.43756,-2.25669 9.91452,-4.65903 1.85906,-0.36258 5.08557,-6.42821 7.79062,-6.36106 7.3176,0.18167 15.98562,-0.41234 23.14254,4.22178 1.48672,1.12706 18.23182,7.00546 18.7637,8.34782 10.20145,-0.35655 26.23873,4.60973 31.9578,25.30834 2.41879,8.75414 1.60628,20.93821 -0.0293,35.72623 z" id="path2775" sodipodi:nodetypes="cssscccsscsccsccsc"/><path sodipodi:nodetypes="cssssssssssssssssssssssssssccccc" id="path2777" d="m 389.75048,479.5035 c 0.0218,0.0352 1.0853,3.08403 1.00804,3.13019 -0.65016,0.38847 -2.25374,1.05942 -3.45208,1.4977 -0.11447,0.0419 -2.60411,-2.6977 -2.71885,-2.65607 -4.27881,1.55252 -8.73882,2.97465 -13.33844,4.27159 -0.14587,0.0411 -0.0106,6.20714 -0.15679,6.24802 -5.90081,1.65048 -8.17335,2.99738 -14.45125,4.011 -0.12954,0.0209 -4.38403,-5.7371 -4.51347,-5.71144 -6.02034,1.19334 -12.16746,2.20809 -18.3642,3.05386 -0.21287,0.0291 -0.98829,6.43291 -1.20127,6.46156 -6.3312,0.85182 -9.56248,1.27794 -15.87283,1.37345 -0.22843,0.003 -3.08247,-5.6736 -3.31214,-5.6555 -6.46262,0.50767 -12.8877,0.8439 -19.18837,1.01951 -0.17706,0.005 -1.41654,5.416 -1.59343,5.42068 -6.35406,0.16818 -10.09123,0.0167 -16.12724,-0.13068 -0.094,-0.002 -1.34423,-5.255 -1.43814,-5.257 -6.2547,-0.15783 -12.29156,-0.47926 -18.01651,-0.95187 -0.14841,-0.0123 -1.24639,3.491 -1.39361,3.48278 -5.44524,-0.30417 -8.924,-1.42407 -13.7992,-2.22416 -0.0778,-0.0128 -0.68588,-3.87031 -0.76355,-3.88283 -5.08329,-0.81964 -9.70966,-2.45079 -13.97008,-3.60642 -0.09,-0.0244 -1.68235,3.02261 -1.77192,2.99805 -4.68813,-1.28512 -7.67978,-2.31877 -11.06999,-4.13779 -0.0815,-0.0437 0.0834,-3.4682 0.001,-3.50886 -2.51321,-1.24065 -4.61555,-2.58593 -6.35499,-4.03294 -0.37587,-0.31268 -3.45047,-0.9982 -4.25668,-1.77098 -0.15151,-0.14522 -2.25898,3.02021 -2.41758,3.08855 0,0 -1.74414,-0.71421 -1.82019,-0.84059 6.79014,-22.90337 27.25574,-74.3893 35.82111,-94.20895 60.81168,14.65699 63.968,7.60759 104.72028,2.48341 3.23209,2.93017 32.42334,45.66928 49.81237,90.03575 z" style="display:inline;fill-opacity:1;fill:#17280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2781" d="m 203.55359,478.92173 c 8.51492,-28.38984 24.90566,-58.3362 35.05005,-89.27979 l 1.51993,0.57841 c -8.38453,32.41858 -18.87908,63.04264 -25.84818,94.53961 -4.19544,-1.96694 -6.85801,-3.20798 -10.7218,-5.83823 z" style="fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2783" d="m 226.95769,489.464 c 7.24497,-32.07307 17.36955,-64.50147 26.93716,-96.11001 l 2.03771,0.43067 c -7.35074,32.55411 -9.7067,66.76448 -14.70238,99.31859 -4.43458,-0.94634 -9.83791,-2.1253 -14.27249,-3.63925 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2785" d="m 256.96016,495.62277 c 4.12528,-33.29707 11.21077,-67.27028 17.20686,-99.63194 l 1.98474,0.31888 c -1.1273,33.48562 1.58175,67.71877 -0.94699,100.73724 -5.90886,-0.17424 -12.66842,-0.58459 -18.24461,-1.42418 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2787" d="m 293.97995,497.23072 c -0.55795,-32.66775 1.13471,-66.01338 1.96298,-100.52941 l 2.53771,-0.0997 c 3.73482,35.86669 11.87469,67.7164 15.34931,99.64702 -6.4873,0.7737 -15.28559,1.51121 -19.85,0.98209 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2789" d="m 333.58147,494.15658 c -7.04711,-32.54953 -12.39888,-65.66548 -16.83289,-99.52156 l 1.96578,-0.25435 c 5.55226,34.08301 23.32978,64.51357 34.0336,96.4501 -5.88931,1.26555 -12.94565,2.47467 -19.16649,3.32581 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2791" d="m 371.13216,486.30077 c -15.12415,-30.24903 -25.05372,-61.32185 -35.32911,-95.09726 l 2.09577,-0.90902 c 5.05362,15.805 27.87694,64.14372 46.67297,91.17249 -4.07146,1.82226 -9.20346,3.50567 -13.43963,4.83379 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793" d="m 340.95788,390.7864 c -40.86096,10.78471 -73.70088,9.18049 -106.39563,-1.96889 l 2.19684,-5.53337 c 47.7592,14.94425 68.1724,7.34549 99.76318,1.55769 0.11976,0.26161 3.13612,3.83594 4.43561,5.94457 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2779-1" d="m 356.82205,414.47941 c -63.82717,21.90257 -105.72801,11.41992 -133.62718,1.39712 1.76517,-4.76502 4.61062,-11.20595 6.43829,-15.23119 35.33835,11.44808 59.76698,17.09062 117.93982,-0.59678 4.10725,5.18477 9.11004,14.101 9.24907,14.43085 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2779-1-1" d="m 375.67723,448.31229 c -63.82716,21.90257 -137.5909,11.52061 -165.49008,1.49781 1.76517,-4.76502 3.92561,-11.25015 5.75328,-15.27539 35.33836,11.44808 94.67855,18.40128 152.85138,0.71388 3.46643,5.62672 6.74639,12.73385 6.88542,13.0637 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2779-1-4" d="m 389.51673,479.18301 c -52.86701,22.4329 -145.70291,26.4922 -189.15843,-1.91538 1.76517,-4.76502 2.98562,-9.83095 4.81329,-13.85619 39.05066,26.4741 110.3586,24.04405 179.31482,3.52822 3.41975,6.37227 4.89129,11.9135 5.03032,12.24335 z" style="display:inline;fill-opacity:1;fill:#1c1f24;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4" d="m 232.17646,418.94752 c -0.17346,-0.002 -3.23213,-0.92613 -4.17688,-1.38887 l 6.18903,-15.4628 c 0,0 2.52863,0.8004 2.53738,0.77029 -0.1896,0.57539 -4.5124,15.98223 -4.54953,16.08138 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-6" d="m 250.40744,423.81644 c -0.17346,-0.002 -4.39619,-0.78551 -5.34094,-1.24825 l 4.7485,-15.92777 c 0,0 3.34623,0.87774 3.35498,0.84763 -0.1896,0.57539 -2.72541,16.22924 -2.76254,16.32839 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-5" d="m 276.00119,427.26956 c -0.17346,-0.002 -6.79463,-0.17613 -7.73938,-0.63887 l 3.10995,-16.04832 c 0,0 4.53947,0.42475 4.54822,0.39464 -0.1896,0.57539 0.11834,16.1934 0.0812,16.29255 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-1" d="m 302.65744,426.67581 c -0.17346,-0.002 -6.82588,0.98012 -7.77063,0.51738 l 0.56403,-16.43155 c 0,0 4.77863,-0.35585 4.78738,-0.38596 -0.1896,0.57539 2.45635,16.20098 2.41922,16.30013 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-9" d="m 326.12783,423.02113 c -0.17346,-0.002 -4.38118,1.48245 -5.32593,1.01971 l -2.31981,-16.68545 c 0,0 2.90363,-0.4496 2.91238,-0.47971 -0.1896,0.57539 4.77049,16.0463 4.73336,16.14545 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-65" d="m 349.09317,417.01723 c -0.17346,-0.002 -3.93924,1.90229 -4.88399,1.43955 l -5.03629,-16.12571 c 0,0 3.01476,-0.81269 3.02351,-0.8428 -0.1896,0.57539 6.9339,15.42981 6.89677,15.52896 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-17" d="m 222.34662,453.61905 c -0.17346,-0.002 -7.60735,-2.11937 -8.5521,-2.58211 l 6.32161,-15.33022 c 0,0 6.28514,1.81687 6.64744,1.83095 -0.1896,0.57539 -4.37982,15.98223 -4.41695,16.08138 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-54" d="m 245.93869,458.17581 c -0.17346,-0.002 -9.76338,-1.33238 -10.70813,-1.79512 l 4.40778,-15.8378 c 0,0 8.24738,1.64415 8.25613,1.61404 -0.1896,0.57539 -1.91865,15.91973 -1.95578,16.01888 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-8" d="m 241.3254,493.12165 c -0.17346,-0.002 -13.13163,-2.6055 -14.51832,-3.73116 l 3.49319,-14.22536 c 0,0 13.13523,3.45205 13.14398,3.42194 -0.1896,0.57539 -2.08172,14.43543 -2.11885,14.53458 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-69" d="m 214.34494,484.80081 c -0.17346,-0.002 -9.98213,-4.67613 -11.05188,-5.70137 l 4.84528,-13.86905 c 0,0 9.62238,5.14415 9.63113,5.11404 -0.1896,0.57539 -3.3874,14.35723 -3.42453,14.45638 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-3" d="m 275.29767,497.03066 c -0.17346,-0.002 -11.23128,0.002 -18.49579,-1.52145 l 1.99058,-14.26956 c 0,0 16.80335,1.37493 17.25404,1.34482 -0.1896,0.57539 -0.7117,14.34704 -0.74883,14.44619 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-98" d="m 313.99352,496.27936 c -0.17346,-0.002 -11.27547,1.54875 -20.26356,0.99762 l -0.0865,-14.84408 c 0,0 17.81982,-1.09995 18.40309,-1.08587 -0.1896,0.57539 1.98415,14.83318 1.94702,14.93233 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-2" d="m 352.95062,490.80189 c -0.17346,-0.002 -18.6117,3.71426 -19.55645,3.25152 l -3.26852,-14.88828 c 0,0 17.37787,-3.0003 17.38662,-3.03041 -0.1896,0.57539 5.47548,14.56802 5.43835,14.66717 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-4" d="m 384.80548,481.4167 c -0.17346,-0.002 -12.95485,5.21686 -13.8996,4.75412 l -6.45051,-13.87181 c 0,0 12.16296,-3.13288 12.17171,-3.16299 -0.1896,0.57539 8.21553,12.18153 8.1784,12.28068 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-24" d="m 366.38881,451.33932 c -0.17346,-0.002 -9.45754,2.45704 -9.6068,2.55778 l -5.39367,-14.19796 c 0,0 7.84113,-1.5746 8.00613,-1.82346 -0.1896,0.57539 7.03147,13.36449 6.99434,13.46364 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-66" d="m 339.81369,457.42581 c -0.17346,-0.002 -12.20088,2.32387 -13.14563,1.86113 l -2.65472,-14.93155 c 0,0 9.80988,-1.29335 9.81863,-1.32346 -0.1896,0.57539 6.01885,14.29473 5.98172,14.39388 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-99" d="m 308.68416,460.95484 c -0.17346,-0.002 -13.79454,0.88583 -14.73929,0.42309 l 0.44379,-15.50699 c 0,0 11.58843,-0.17188 11.59718,-0.20199 -0.1896,0.57539 2.73545,15.18674 2.69832,15.28589 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path sodipodi:nodetypes="ccccc" id="path2793-4-88" d="m 276.51214,461.13162 c -0.17346,-0.002 -13.3526,-0.70516 -14.29735,-1.1679 l 2.78608,-15.4628 c 0,0 10.57197,0.7562 11.33202,0.81448 -0.1896,0.57539 0.21638,15.71707 0.17925,15.81622 z" style="display:inline;fill-opacity:1;fill:#0b280b;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000"/><path style="display:inline;fill-opacity:1;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 291.60068,204.89371 c -0.007,-0.15238 5.39726,-10.80323 5.46415,-10.99796 0,0 -4.71541,-2.02563 -4.85767,-1.83113 -0.86438,1.18176 -2.48505,4.21861 -3.88833,5.92157 0.099,0.227 3.28185,6.90752 3.28185,6.90752 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-1-4-1-6-1-1" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 291.37669,204.49036 c -0.007,-0.14941 5.24298,-10.59292 5.30796,-10.78386 0,0 -4.58062,-1.9862 -4.71882,-1.79549 -0.83967,1.15876 -2.41401,4.13649 -3.77718,5.8063 0.0962,0.22258 3.18804,6.77305 3.18804,6.77305 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-7-2-7-9-8" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#000000;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 302.4859,205.46891 c 0.007,-0.15238 -4.34456,-11.10815 -4.41145,-11.30288 0,0 16.85021,-2.75196 16.99247,-2.55746 0.86438,1.18176 2.6413,5.37486 3.07583,6.04657 -0.099,0.227 -15.65685,7.81377 -15.65685,7.81377 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-7-4-5-3-7-4" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#c8c8c8;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 302.33363,204.87806 c 0.007,-0.14856 -3.50116,-10.71524 -3.56706,-10.90509 0,0 15.63782,-2.64512 15.77799,-2.4555 0.85164,1.15214 2.60238,5.24014 3.03051,5.89501 -0.0975,0.22131 -15.24144,7.46558 -15.24144,7.46558 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-8-1" sodipodi:nodetypes="csscc"/><path sodipodi:nodetypes="ccc" id="path3280-7-2-6-6-6-4" class="shadow" d="m 329.90155,425.67965 c -15.4791,1.19068 -42.03653,26.26041 -44.60913,30.99635 10.29989,-9.14088 29.75951,-26.28541 44.60913,-30.99635 z"/><path sodipodi:nodetypes="ccc" id="path3282-5-4-0-8-6-97" class="shadow" d="m 262.15946,457.52794 c -6.81704,-9.41592 -28.83006,-31.99347 -34.93819,-34.15183 5.05404,5.44075 26.5203,25.35081 34.93819,34.15183 z"/><path style="display:inline;fill-opacity:1;fill-rule:evenodd;fill:#0b1728;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 368.776,268.56519 c -0.77461,3.92168 -3.97339,21.95053 -9.41466,38.96484 -9.58543,26.63525 -38.2299,46.66917 -29.92782,67.89115 -15.6007,11.79561 -86.2429,6.26814 -88.9198,-4.52824 6.09478,-35.2798 3.42552,-48.50986 3.01127,-53.71896 -0.30291,-3.80824 -4.85188,-14.60553 -5.74499,-27.14289 1.22918,-53.46254 15.03742,-58.37216 39.03469,-84.04998 0.49457,-0.51848 5.4626,-2.25669 9.96015,-4.65903 -8.51882,16.39017 21.62806,22.5736 34.27218,-0.90184 1.49356,1.12706 15.11916,5.76802 15.65345,7.11038 5.62277,13.25538 5.63445,25.94395 12.84849,37.87473 7.35938,13.63251 13.76196,21.31242 19.22704,23.15984 z" id="path3119-7-5-5" sodipodi:nodetypes="ccccsccccccc"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 367.84923,272.33673 c -23.06236,-5.36348 -33.45947,-66.06356 -33.52537,-66.25341 0,0 1.9906,1.00368 2.18424,1.13825 1.9123,1.32892 12.74364,49.96783 32.08688,61.2293 -0.0975,0.22131 -0.74575,3.88586 -0.74575,3.88586 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6-8-4" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 245.3392,242.36227 c 4.11594,-11.96703 31.74542,-36.46223 31.67952,-36.65208 0,0 5.7406,-2.62132 5.93424,-2.48675 1.9123,1.32892 -25.9628,24.20428 -39.44345,44.88907 -0.0975,0.22131 1.82969,-5.75024 1.82969,-5.75024 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6-2-0-1" sodipodi:nodetypes="csscc"/><path style="display:inline;fill-opacity:1;fill:#214478;opacity:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-width:0;stroke:#000000" d="m 240.7384,369.45827 c 43.61544,16.95575 88.35259,3.13526 88.28669,2.94538 0,0 0.6026,3.29624 0.45417,3.47947 -6.66137,8.22321 -72.26354,11.58749 -88.99419,-3.66522 -0.0975,0.22131 0.25333,-2.75967 0.25333,-2.75967 z" id="path2246-4-41-0-9-4-9-2-8-6-8-4-2-9-5-3-6-2-4-6-0" sodipodi:nodetypes="cssccc"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index f74359b4764d39c527c1a5e7d6fe3ad178ec6e3b..b22fca3376b1b0943cead2a30c1aa01198305cfa 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -90,12 +90,18 @@
<<capture _ssi>>
<<if $useSlaveListInPageJSNavigation == 1>>
- <<set _Count = _indexSlavesIdxs.length>>
- <<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag)) || ($Flag == 1)))>>
- <<set _indexed = 1, _counter = 0, _buttons = []>>
- <style>
- .hidden {display:none;}
- table.quicklist {
+ <<set _Count = _indexSlavesIdxs.length>>
+ /* Useful for finding weird combinations -- usages of this passage that don't yet generate the quick index.
+ * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
+ */
+ <<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag)) || ($Flag == 1)))>>
+ <<set _indexed = 1, _counter = 0, _buttons = [], _offset = -50>>
+ <<if (/Select/i.test(_Pass))>>
+ <<set _offset = -25>>
+ <</if>>
+ <style>
+ .hidden { display:none; }
+ table.quicklist {
table-layout: fixed;
text-align: center;
border-collapse: separate;
@@ -103,62 +109,68 @@
border-style: hidden;
empty-cells: hide;
width: 70%;
- }
+ }
table.quicklist td { margin: 1px; }
table.quicklist col { width: 8%; }
- </style>
+ </style>
<br />
<button data-quick-index="1">Quick Index</button>
- <div id="list_index" class="hidden">
- <<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>>
- <<set _IndexSlave = $slaves[_ssii]>>
- <<if $surnameOrder != 1>>
- <<if ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(_Slave.nationality)>>
- <<set _indexSlaveName = [_IndexSlave.slaveSurname || "", _IndexSlave.slaveName].join(" ").trim()>>
- <<else>>
- <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
- <</if>>
- <<else>>
- <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
- <</if>>
- <<set _buttons.push('<button data-scroll-to="#slave-' + _IndexSlave.ID + '" data-scroll-offset="300">' + _indexSlaveName + '</button>'); >>
- <</for>>
+ <div id="list_index" class="hidden">
+ <<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>>
+ <<set _IndexSlave = $slaves[_ssii]>>
+ <<if $surnameOrder != 1>>
+ <<if ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(_IndexSlave.nationality)>>
+ <<set _indexSlaveName = [_IndexSlave.slaveSurname || "", _IndexSlave.slaveName].join(" ").trim()>>
+ <<else>>
+ <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
+ <</if>>
+ <<else>>
+ <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
+ <</if>>
+ <<set _buttons.push('<button data-scroll-to="#slave-' + _IndexSlave.ID + '" data-scroll-offset="' + _offset + '">' + _indexSlaveName + '</button>'); >>
+ <</for>>
<<if !_.isUndefined(_buttons[0])>>
- <table class="quicklist">
+ <table class="quicklist">
<<for !_.isUndefined(_buttons[0])>>
<tr>
- <<for _cols = 0; _cols <= 4; _cols++>>
- <<set _button = _buttons.shift()>>
- <<if !_.isUndefined(_button)>>
- <td></td>
+ <<for _cols = 0; _cols <= 4; _cols++>>
+ <<set _button = _buttons.shift()>>
+ <<if !_.isUndefined(_button)>>
+ <td></td>
<td colspan="10">
- <<print _button>>
- </td>
- <</if>>
- <</for>>
- <td></td>
- </tr>
- <</for>>
+ <<print _button>>
+ </td>
+ <</if>>
+ <</for>>
+ <td></td>
+ </tr>
+ <</for>>
</table>
- <script>
+ <script>
/*
* Use javascript scrollTop animation for in page navigation.
*/
- $("[data-quick-index]").click(function() {
- var $quick = $('div#list_index');
- $quick.toggleClass("hidden");
- });
- $("[data-scroll-to]").click(function() {
- var $this = $(this);
- var $toElement = $this.attr('data-scroll-to'), $offset = $this.attr('data-scroll-offset') || 0, $speed = $this.attr('data-scroll-speed') || 900;
- $('html, body').animate( {
- scrollTop: $($toElement).offset().top + $offset
- }, $speed);
+ $("[data-quick-index]").click(function () {
+ var $quick = $('div#list_index');
+ $quick.toggleClass("hidden");
+ });
+ $("[data-scroll-to]").click(function() {
+ var $this = $(this), $toElement = $this.attr('data-scroll-to'),
+ /*
+ * note the *1 enforces $offset to be an integer, without
+ * it we scroll to True, which goes nowhere fast.
+ */
+ $offset = $this.attr('data-scroll-offset') * 1 || 0,
+ $speed = $this.attr('data-scroll-speed') * 1 || 500;
+ $('html, body').animate({
+ scrollTop: $($toElement).offset().top + $offset
+ }, $speed);
+
});
- </script>
- <</if>>
- </div>
- <</if>>
+ </script>
+ <</if>>
+ </div>
+ <</if>>
<</if>>
<<switch _Pass>>
<<case "Main">>
@@ -213,7 +225,6 @@
<<elseif "guard you" == _Slave.assignment>>''@@.lightcoral;BG@@''
<</if>>
<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == _Slave.ID; }) != -1>>''@@.lightcoral;PA@@''<</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */
<<case "Personal Attention Select">>
@@ -252,7 +263,6 @@
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Subordinate Targeting">>
@@ -275,7 +285,6 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -301,11 +310,10 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Madam Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -327,7 +335,6 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -348,11 +355,10 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Nurse Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -374,7 +380,6 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -429,7 +434,6 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -450,7 +454,6 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -463,7 +466,7 @@
<<if $Flag == 0>>
<<if $masterSuite <= $masterSuiteSlaves>><<continue>><</if>>
<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName is not sufficiently broken for the master suite//
@@ -471,7 +474,6 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -493,7 +495,6 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -520,7 +521,6 @@
<</if>>
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Pit">>
@@ -574,7 +574,6 @@
<</if>>
<<case "Matchmaking">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</switch>>
@@ -748,7 +747,8 @@ will
<</if>> /* closes _numFacilities */
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+<<print '<span id="slave-' + $slaves[_ssi].ID + '"> </span><br/>'>>
+<<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<SlaveSummary _Slave>>