diff --git a/sources/fonts/Variable TTF/WorkSans-Italic-VF.ttf b/sources/WorkSans-Italic-VF.ttf
similarity index 98%
rename from sources/fonts/Variable TTF/WorkSans-Italic-VF.ttf
rename to sources/WorkSans-Italic-VF.ttf
index 4d8fb08..be68695 100644
Binary files a/sources/fonts/Variable TTF/WorkSans-Italic-VF.ttf and b/sources/WorkSans-Italic-VF.ttf differ
diff --git a/sources/WorkSans-Italic.glyphs b/sources/WorkSans-Italic.glyphs
index d23065b..cb4c968 100644
--- a/sources/WorkSans-Italic.glyphs
+++ b/sources/WorkSans-Italic.glyphs
@@ -5,7 +5,8 @@ DisplayStrings = (
 "/ldot/lslash  //space\012\012\012L\012HUB/Germandbls EL/Lslash ZFPÞT/Tbar YVWARKXOØQGCS\012naqgudlijfrtoecðsßkxvz\0120917426583\012/zero.osf/one.osf/two.osf/four.osf/seven.osf/five.osf/three.osf/nine.osf/six.osf/eight.osf \012/zerosuperior ¹/foursuperior/sevensuperior/ninesuperior ²/sixsuperior/fivesuperior/eightsuperior ³/zeroinferior/oneinferior/fourinferior/seveninferior/nineinferior/twoinferior/sixinferior/fiveinferior/eightinferior/threeinferior/zerosuperior/sevensuperior/zeroinferior/seveninferior \012.,/quotesinglbase/quoteleft/quoteright ':;-/endash *!?¡¿/exclamdown.case/questiondown.case \012///backslash {}[]()/guilsinglleft/guilsinglright \012#/dagger \012\012R\012HUTZAÆYVWXOØSJ\012hlnijpuaoøðßftgsyvwxz\0120617238954\012/zero.osf/one.osf/two.osf/three.osf/nine.osf/five.osf/four.osf/seven.osf/six.osf/eight.osf \012.,/quotesinglbase/quoteleft/quoteright ':-*!?\012///backslash {}[]()/guilsinglleft/guilsinglright \012#/dagger °\012\012.,:;-/endash/guilsinglleft/guilsinglright {}[]()///backslash *!?&@#\012H, /quoteleft H/quoteright  /quoteleft H/quoteleft  /quoteright H/quoteright  /quotesinglbase H/quoteright  /quotesinglbase H/quoteleft  'H'\012\012L /leftArrow/rightArrow/northEastArrow/southWestArrow/downArrow/upArrow/southEastArrow/northWestArrow/leftHookArrow/anticlockwiseOpenCircleArrow/clockwiseOpenCircleArrow \012R /leftArrow/rightArrow/northEastArrow/southWestArrow/upArrow/downArrow/southEastArrow/northWestArrow/anticlockwiseOpenCircleArrow/clockwiseOpenCircleArrow \012\012Triple:\012h/hbar blnijpruoødqecðagsßftvywxkz\012HOTYAVWXZ",
 "Done:\012/apple.001 \012/cedi/cedi.rvrn ¢/cent.rvrn/colonsign/colonsign.rvrn $/dollar.rvrn/guarani/guarani.rvrn/naira/naira.rvrn/peseta/peseta.rvrn/peso/peso.rvrn/won/won.rvrn/dollar.tf/dollar.tf.rvrn/curvedStemParagraphSignOrnament/curvedStemParagraphSignOrnament.rvrn ¶/paragraph.rvrn ©®/cent.tf/cent.tf.rvrn \012\012Brace:\012æes",
 ";¡¿/semicolon.tf )]/parenrightsuperior/bracketright.case/exclamdown.sc/questiondown.sc/rightanglebracket-math >/rightArrow/downArrow/southWestArrow/downWhiteTriangle/heavySingleCommaQuotationMarkOrnament/heavyDoubleCommaQuotationMarkOrnament/ringhalfright/bracketrightsuperior/colonsign/colonsign.rvrn",
-"/dollar.tf/cent.tf \012/dollar.tf.rvrn/cent.tf.rvrn \012$¢ÄÜÖ\012/dollar.rvrn/cent.rvrn"
+"/dollar.tf/cent.tf \012/dollar.tf.rvrn/cent.tf.rvrn \012$¢ÄÜÖ\012/dollar.rvrn/cent.rvrn",
+"/apple"
 );
 classes = (
 {
@@ -79,7 +80,7 @@ name = vendorID;
 value = WEI;
 }
 );
-date = "2018-11-14 10:39:40 +0000";
+date = "2018-11-15 04:39:21 +0000";
 designer = "Wei Huang";
 designerURL = "http://wweeiihhuuaanngg@gmail.com";
 familyName = "Work Sans";
@@ -99918,67 +99919,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"754 75 LINE SMOOTH",
-"833 75 OFFCURVE",
-"903 91 OFFCURVE",
-"957 125 CURVE",
-"1033 131 LINE",
-"990 190 LINE",
-"1074 203 LINE",
-"1018 253 LINE",
-"1095 284 LINE",
-"1030 326 LINE",
-"1104 360 LINE",
-"1032 400 LINE",
-"1101 440 LINE",
-"1020 461 LINE",
-"1075 516 LINE",
-"987 514 LINE",
-"1023 575 LINE",
-"932 562 LINE",
-"958 628 LINE",
-"873 600 LINE",
-"881 666 LINE",
-"803 625 LINE",
-"807 686 LINE",
-"727 634 LINE",
-"720 690 LINE",
-"641 639 LINE",
-"622 686 LINE",
-"562 625 LINE",
-"535 672 LINE",
-"488 610 LINE",
-"451 643 LINE",
-"413 581 LINE",
-"378 611 LINE",
-"343 548 LINE",
-"306 571 LINE",
-"280 512 LINE",
-"254 539 LINE",
-"224 473 LINE",
-"198 498 LINE",
-"164 418 LINE",
-"164 359 OFFCURVE",
-"117 283 OFFCURVE",
-"69 246 CURVE",
-"66 247 OFFCURVE",
-"62 248 OFFCURVE",
-"58 248 CURVE SMOOTH",
-"36 248 OFFCURVE",
-"17 229 OFFCURVE",
-"17 207 CURVE SMOOTH",
-"17 185 OFFCURVE",
-"36 166 OFFCURVE",
-"58 166 CURVE SMOOTH",
-"63 166 LINE",
-"105 129 OFFCURVE",
-"219 75 OFFCURVE",
-"307 75 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "262 0 LINE SMOOTH",
 "289 0 OFFCURVE",
 "294 10 OFFCURVE",
@@ -100059,6 +99999,67 @@ nodes = (
 "750 0 OFFCURVE",
 "769 0 CURVE SMOOTH"
 );
+},
+{
+closed = 1;
+nodes = (
+"754 75 LINE SMOOTH",
+"833 75 OFFCURVE",
+"903 91 OFFCURVE",
+"957 125 CURVE",
+"1033 131 LINE",
+"990 190 LINE",
+"1074 203 LINE",
+"1018 253 LINE",
+"1095 284 LINE",
+"1030 326 LINE",
+"1104 360 LINE",
+"1032 400 LINE",
+"1101 440 LINE",
+"1020 461 LINE",
+"1075 516 LINE",
+"987 514 LINE",
+"1023 575 LINE",
+"932 562 LINE",
+"958 628 LINE",
+"873 600 LINE",
+"881 666 LINE",
+"803 625 LINE",
+"807 686 LINE",
+"727 634 LINE",
+"720 690 LINE",
+"641 639 LINE",
+"622 686 LINE",
+"562 625 LINE",
+"535 672 LINE",
+"488 610 LINE",
+"451 643 LINE",
+"413 581 LINE",
+"378 611 LINE",
+"343 548 LINE",
+"306 571 LINE",
+"280 512 LINE",
+"254 539 LINE",
+"224 473 LINE",
+"198 498 LINE",
+"164 418 LINE",
+"164 359 OFFCURVE",
+"117 283 OFFCURVE",
+"69 246 CURVE",
+"66 247 OFFCURVE",
+"62 248 OFFCURVE",
+"58 248 CURVE SMOOTH",
+"36 248 OFFCURVE",
+"17 229 OFFCURVE",
+"17 207 CURVE SMOOTH",
+"17 185 OFFCURVE",
+"36 166 OFFCURVE",
+"58 166 CURVE SMOOTH",
+"63 166 LINE",
+"105 129 OFFCURVE",
+"219 75 OFFCURVE",
+"307 75 CURVE SMOOTH"
+);
 }
 );
 width = 1130;
@@ -100897,67 +100898,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"754 81 LINE SMOOTH",
-"833 81 OFFCURVE",
-"903 97 OFFCURVE",
-"957 131 CURVE",
-"1033 137 LINE",
-"990 196 LINE",
-"1074 209 LINE",
-"1018 259 LINE",
-"1095 290 LINE",
-"1030 332 LINE",
-"1104 366 LINE",
-"1032 406 LINE",
-"1101 446 LINE",
-"1020 467 LINE",
-"1075 522 LINE",
-"987 520 LINE",
-"1023 581 LINE",
-"932 568 LINE",
-"958 634 LINE",
-"873 606 LINE",
-"881 672 LINE",
-"803 631 LINE",
-"807 692 LINE",
-"727 640 LINE",
-"720 696 LINE",
-"641 645 LINE",
-"622 692 LINE",
-"562 631 LINE",
-"535 678 LINE",
-"488 616 LINE",
-"451 649 LINE",
-"413 587 LINE",
-"378 617 LINE",
-"343 554 LINE",
-"306 577 LINE",
-"280 518 LINE",
-"254 545 LINE",
-"224 479 LINE",
-"198 504 LINE",
-"164 424 LINE",
-"164 365 OFFCURVE",
-"117 289 OFFCURVE",
-"69 252 CURVE",
-"66 253 OFFCURVE",
-"62 254 OFFCURVE",
-"58 254 CURVE SMOOTH",
-"36 254 OFFCURVE",
-"17 235 OFFCURVE",
-"17 213 CURVE SMOOTH",
-"17 191 OFFCURVE",
-"36 172 OFFCURVE",
-"58 172 CURVE SMOOTH",
-"63 172 LINE",
-"105 135 OFFCURVE",
-"219 81 OFFCURVE",
-"307 81 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "312 0 LINE SMOOTH",
 "339 0 OFFCURVE",
 "350 13 OFFCURVE",
@@ -100988,7 +100928,7 @@ nodes = (
 "351 181 LINE",
 "352 143 LINE",
 "373 65 LINE",
-"362 61 LINE SMOOTH",
+"362 61 LINE",
 "346 53 OFFCURVE",
 "340 40 OFFCURVE",
 "346 25 CURVE SMOOTH",
@@ -101000,7 +100940,7 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"966 36 LINE SMOOTH",
+"966 36 LINE",
 "981 49 OFFCURVE",
 "983 62 OFFCURVE",
 "972 77 CURVE SMOOTH",
@@ -101012,10 +100952,10 @@ nodes = (
 "901 47 LINE SMOOTH",
 "885 36 OFFCURVE",
 "882 22 OFFCURVE",
-"892 9 CURVE SMOOTH",
+"892 9 CURVE",
 "902 -4 OFFCURVE",
 "915 -4 OFFCURVE",
-"930 8 CURVE SMOOTH"
+"930 8 CURVE"
 );
 },
 {
@@ -101038,6 +100978,67 @@ nodes = (
 "763 0 OFFCURVE",
 "782 0 CURVE SMOOTH"
 );
+},
+{
+closed = 1;
+nodes = (
+"754 81 LINE SMOOTH",
+"833 81 OFFCURVE",
+"903 97 OFFCURVE",
+"957 131 CURVE",
+"1027 145 LINE",
+"990 196 LINE",
+"1061 213 LINE",
+"1018 259 LINE",
+"1084 290 LINE",
+"1030 332 LINE",
+"1093 365 LINE",
+"1032 406 LINE",
+"1092 449 LINE",
+"1020 467 LINE",
+"1064 523 LINE",
+"987 520 LINE",
+"1012 582 LINE",
+"932 568 LINE",
+"947 635 LINE",
+"873 606 LINE",
+"870 673 LINE",
+"803 631 LINE",
+"796 693 LINE",
+"727 640 LINE",
+"709 697 LINE",
+"641 645 LINE",
+"611 693 LINE",
+"562 631 LINE",
+"524 679 LINE",
+"488 616 LINE",
+"440 650 LINE",
+"413 587 LINE",
+"367 618 LINE",
+"343 554 LINE",
+"295 578 LINE",
+"280 518 LINE",
+"243 546 LINE",
+"224 479 LINE",
+"187 505 LINE",
+"164 424 LINE",
+"164 365 OFFCURVE",
+"117 289 OFFCURVE",
+"69 252 CURVE",
+"66 253 OFFCURVE",
+"62 254 OFFCURVE",
+"58 254 CURVE SMOOTH",
+"36 254 OFFCURVE",
+"17 235 OFFCURVE",
+"17 213 CURVE SMOOTH",
+"17 191 OFFCURVE",
+"36 172 OFFCURVE",
+"58 172 CURVE SMOOTH",
+"63 172 LINE",
+"105 135 OFFCURVE",
+"219 81 OFFCURVE",
+"307 81 CURVE SMOOTH"
+);
 }
 );
 width = 1130;
@@ -101095,67 +101096,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"754 82 LINE SMOOTH",
-"833 82 OFFCURVE",
-"903 98 OFFCURVE",
-"957 132 CURVE",
-"1033 138 LINE",
-"990 197 LINE",
-"1074 210 LINE",
-"1018 260 LINE",
-"1095 291 LINE",
-"1030 333 LINE",
-"1104 367 LINE",
-"1032 407 LINE",
-"1101 447 LINE",
-"1020 468 LINE",
-"1075 523 LINE",
-"987 521 LINE",
-"1023 582 LINE",
-"932 569 LINE",
-"958 635 LINE",
-"873 607 LINE",
-"881 673 LINE",
-"803 632 LINE",
-"807 693 LINE",
-"727 641 LINE",
-"720 697 LINE",
-"641 646 LINE",
-"622 693 LINE",
-"562 632 LINE",
-"535 679 LINE",
-"488 617 LINE",
-"451 650 LINE",
-"413 588 LINE",
-"378 618 LINE",
-"343 555 LINE",
-"306 578 LINE",
-"280 519 LINE",
-"254 546 LINE",
-"224 480 LINE",
-"198 505 LINE",
-"164 425 LINE",
-"164 366 OFFCURVE",
-"117 290 OFFCURVE",
-"69 253 CURVE",
-"66 254 OFFCURVE",
-"62 255 OFFCURVE",
-"58 255 CURVE SMOOTH",
-"36 255 OFFCURVE",
-"17 236 OFFCURVE",
-"17 214 CURVE SMOOTH",
-"17 192 OFFCURVE",
-"36 173 OFFCURVE",
-"58 173 CURVE SMOOTH",
-"63 173 LINE",
-"105 136 OFFCURVE",
-"219 82 OFFCURVE",
-"307 82 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "318 0 LINE SMOOTH",
 "345 0 OFFCURVE",
 "356 13 OFFCURVE",
@@ -101186,7 +101126,7 @@ nodes = (
 "351 181 LINE",
 "351 146 LINE",
 "373 67 LINE",
-"362 62 LINE SMOOTH",
+"362 62 LINE",
 "346 53 OFFCURVE",
 "340 40 OFFCURVE",
 "347 25 CURVE SMOOTH",
@@ -101198,7 +101138,7 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"969 38 LINE SMOOTH",
+"969 38 LINE",
 "983 51 OFFCURVE",
 "985 64 OFFCURVE",
 "973 79 CURVE SMOOTH",
@@ -101210,10 +101150,10 @@ nodes = (
 "903 47 LINE SMOOTH",
 "887 36 OFFCURVE",
 "885 21 OFFCURVE",
-"895 9 CURVE SMOOTH",
+"895 9 CURVE",
 "905 -4 OFFCURVE",
 "918 -4 OFFCURVE",
-"933 9 CURVE SMOOTH"
+"933 9 CURVE"
 );
 },
 {
@@ -101236,6 +101176,67 @@ nodes = (
 "764 0 OFFCURVE",
 "783 0 CURVE SMOOTH"
 );
+},
+{
+closed = 1;
+nodes = (
+"754 82 LINE SMOOTH",
+"833 82 OFFCURVE",
+"903 98 OFFCURVE",
+"957 132 CURVE",
+"1026 146 LINE",
+"990 197 LINE",
+"1060 214 LINE",
+"1018 260 LINE",
+"1083 291 LINE",
+"1030 333 LINE",
+"1092 366 LINE",
+"1032 407 LINE",
+"1091 450 LINE",
+"1020 468 LINE",
+"1063 524 LINE",
+"987 521 LINE",
+"1011 583 LINE",
+"932 569 LINE",
+"946 636 LINE",
+"873 607 LINE",
+"869 674 LINE",
+"803 632 LINE",
+"795 694 LINE",
+"727 641 LINE",
+"708 698 LINE",
+"641 646 LINE",
+"610 694 LINE",
+"562 632 LINE",
+"523 680 LINE",
+"488 617 LINE",
+"439 651 LINE",
+"413 588 LINE",
+"366 619 LINE",
+"343 555 LINE",
+"294 579 LINE",
+"280 519 LINE",
+"242 547 LINE",
+"224 480 LINE",
+"186 506 LINE",
+"164 425 LINE",
+"164 366 OFFCURVE",
+"117 290 OFFCURVE",
+"69 253 CURVE",
+"66 254 OFFCURVE",
+"62 255 OFFCURVE",
+"58 255 CURVE SMOOTH",
+"36 255 OFFCURVE",
+"17 236 OFFCURVE",
+"17 214 CURVE SMOOTH",
+"17 192 OFFCURVE",
+"36 173 OFFCURVE",
+"58 173 CURVE SMOOTH",
+"63 173 LINE",
+"105 136 OFFCURVE",
+"219 82 OFFCURVE",
+"307 82 CURVE SMOOTH"
+);
 }
 );
 width = 1130;
@@ -101316,67 +101317,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"754 82 LINE SMOOTH",
-"833 82 OFFCURVE",
-"903 98 OFFCURVE",
-"957 132 CURVE",
-"1033 138 LINE",
-"990 197 LINE",
-"1074 210 LINE",
-"1018 260 LINE",
-"1095 291 LINE",
-"1030 333 LINE",
-"1104 367 LINE",
-"1032 407 LINE",
-"1101 447 LINE",
-"1020 468 LINE",
-"1075 523 LINE",
-"987 521 LINE",
-"1023 582 LINE",
-"932 569 LINE",
-"958 635 LINE",
-"873 607 LINE",
-"881 673 LINE",
-"803 632 LINE",
-"807 693 LINE",
-"727 641 LINE",
-"720 697 LINE",
-"641 646 LINE",
-"622 693 LINE",
-"562 632 LINE",
-"535 679 LINE",
-"488 617 LINE",
-"451 650 LINE",
-"413 588 LINE",
-"378 618 LINE",
-"343 555 LINE",
-"306 578 LINE",
-"280 519 LINE",
-"254 546 LINE",
-"224 480 LINE",
-"198 505 LINE",
-"164 425 LINE",
-"164 366 OFFCURVE",
-"117 290 OFFCURVE",
-"69 253 CURVE",
-"66 254 OFFCURVE",
-"62 255 OFFCURVE",
-"58 255 CURVE SMOOTH",
-"36 255 OFFCURVE",
-"17 236 OFFCURVE",
-"17 214 CURVE SMOOTH",
-"17 192 OFFCURVE",
-"36 173 OFFCURVE",
-"58 173 CURVE SMOOTH",
-"63 173 LINE",
-"105 136 OFFCURVE",
-"219 82 OFFCURVE",
-"307 82 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "358 0 LINE SMOOTH",
 "380 0 OFFCURVE",
 "393 13 OFFCURVE",
@@ -101457,6 +101397,67 @@ nodes = (
 "792 0 OFFCURVE",
 "811 0 CURVE SMOOTH"
 );
+},
+{
+closed = 1;
+nodes = (
+"754 82 LINE SMOOTH",
+"833 82 OFFCURVE",
+"903 98 OFFCURVE",
+"957 132 CURVE",
+"1026 146 LINE",
+"990 197 LINE",
+"1060 214 LINE",
+"1018 260 LINE",
+"1083 291 LINE",
+"1030 333 LINE",
+"1092 366 LINE",
+"1032 407 LINE",
+"1091 450 LINE",
+"1020 468 LINE",
+"1063 524 LINE",
+"987 521 LINE",
+"1011 583 LINE",
+"932 569 LINE",
+"946 636 LINE",
+"873 607 LINE",
+"869 674 LINE",
+"803 632 LINE",
+"795 694 LINE",
+"727 641 LINE",
+"708 698 LINE",
+"641 646 LINE",
+"610 694 LINE",
+"562 632 LINE",
+"523 680 LINE",
+"488 617 LINE",
+"439 651 LINE",
+"413 588 LINE",
+"366 619 LINE",
+"343 555 LINE",
+"294 579 LINE",
+"280 519 LINE",
+"242 547 LINE",
+"224 480 LINE",
+"186 506 LINE",
+"164 425 LINE",
+"164 366 OFFCURVE",
+"117 290 OFFCURVE",
+"69 253 CURVE",
+"66 254 OFFCURVE",
+"62 255 OFFCURVE",
+"58 255 CURVE SMOOTH",
+"36 255 OFFCURVE",
+"17 236 OFFCURVE",
+"17 214 CURVE SMOOTH",
+"17 192 OFFCURVE",
+"36 173 OFFCURVE",
+"58 173 CURVE SMOOTH",
+"63 173 LINE",
+"105 136 OFFCURVE",
+"219 82 OFFCURVE",
+"307 82 CURVE SMOOTH"
+);
 }
 );
 width = 1130;
@@ -101701,67 +101702,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"754 75 LINE SMOOTH",
-"833 75 OFFCURVE",
-"903 91 OFFCURVE",
-"957 125 CURVE",
-"1033 131 LINE",
-"990 190 LINE",
-"1074 203 LINE",
-"1018 253 LINE",
-"1095 284 LINE",
-"1030 326 LINE",
-"1104 360 LINE",
-"1032 400 LINE",
-"1101 440 LINE",
-"1020 461 LINE",
-"1075 516 LINE",
-"987 514 LINE",
-"1023 575 LINE",
-"932 562 LINE",
-"958 628 LINE",
-"873 600 LINE",
-"881 666 LINE",
-"803 625 LINE",
-"807 686 LINE",
-"727 634 LINE",
-"720 690 LINE",
-"641 639 LINE",
-"622 686 LINE",
-"562 625 LINE",
-"535 672 LINE",
-"488 610 LINE",
-"451 643 LINE",
-"413 581 LINE",
-"378 611 LINE",
-"343 548 LINE",
-"306 571 LINE",
-"280 512 LINE",
-"254 539 LINE",
-"224 473 LINE",
-"198 498 LINE",
-"164 418 LINE",
-"164 359 OFFCURVE",
-"117 283 OFFCURVE",
-"69 246 CURVE",
-"66 247 OFFCURVE",
-"62 248 OFFCURVE",
-"58 248 CURVE SMOOTH",
-"36 248 OFFCURVE",
-"17 229 OFFCURVE",
-"17 207 CURVE SMOOTH",
-"17 185 OFFCURVE",
-"36 166 OFFCURVE",
-"58 166 CURVE SMOOTH",
-"63 166 LINE",
-"105 129 OFFCURVE",
-"219 75 OFFCURVE",
-"307 75 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "400 0 LINE SMOOTH",
 "427 0 OFFCURVE",
 "445 10 OFFCURVE",
@@ -101842,6 +101782,67 @@ nodes = (
 "883 -5 OFFCURVE",
 "901 3 CURVE SMOOTH"
 );
+},
+{
+closed = 1;
+nodes = (
+"754 75 LINE SMOOTH",
+"833 75 OFFCURVE",
+"903 91 OFFCURVE",
+"957 125 CURVE",
+"1033 131 LINE",
+"990 190 LINE",
+"1074 203 LINE",
+"1018 253 LINE",
+"1095 284 LINE",
+"1030 326 LINE",
+"1104 360 LINE",
+"1032 400 LINE",
+"1101 440 LINE",
+"1020 461 LINE",
+"1075 516 LINE",
+"987 514 LINE",
+"1023 575 LINE",
+"932 562 LINE",
+"958 628 LINE",
+"873 600 LINE",
+"881 666 LINE",
+"803 625 LINE",
+"807 686 LINE",
+"727 634 LINE",
+"720 690 LINE",
+"641 639 LINE",
+"622 686 LINE",
+"562 625 LINE",
+"535 672 LINE",
+"488 610 LINE",
+"451 643 LINE",
+"413 581 LINE",
+"378 611 LINE",
+"343 548 LINE",
+"306 571 LINE",
+"280 512 LINE",
+"254 539 LINE",
+"224 473 LINE",
+"198 498 LINE",
+"164 418 LINE",
+"164 359 OFFCURVE",
+"117 283 OFFCURVE",
+"69 246 CURVE",
+"66 247 OFFCURVE",
+"62 248 OFFCURVE",
+"58 248 CURVE SMOOTH",
+"36 248 OFFCURVE",
+"17 229 OFFCURVE",
+"17 207 CURVE SMOOTH",
+"17 185 OFFCURVE",
+"36 166 OFFCURVE",
+"58 166 CURVE SMOOTH",
+"63 166 LINE",
+"105 129 OFFCURVE",
+"219 75 OFFCURVE",
+"307 75 CURVE SMOOTH"
+);
 }
 );
 width = 1130;
diff --git a/sources/fonts/Variable TTF/WorkSans-VF.ttf b/sources/WorkSans-VF.ttf
similarity index 99%
rename from sources/fonts/Variable TTF/WorkSans-VF.ttf
rename to sources/WorkSans-VF.ttf
index b93fddd..c8793e2 100644
Binary files a/sources/fonts/Variable TTF/WorkSans-VF.ttf and b/sources/WorkSans-VF.ttf differ
diff --git a/sources/WorkSans.glyphs b/sources/WorkSans.glyphs
index 9f56b0f..18c43c4 100644
--- a/sources/WorkSans.glyphs
+++ b/sources/WorkSans.glyphs
@@ -99,7 +99,7 @@ name = vendorID;
 value = WEI;
 }
 );
-date = "2018-11-14 10:39:57 +0000";
+date = "2018-11-15 04:39:32 +0000";
 designer = "Wei Huang";
 designerURL = "http://wweeiihhuuaanngg@gmail.com";
 familyName = "Work Sans";
diff --git a/sources/build.sh b/sources/build.sh
index cad5046..a1766a8 100644
--- a/sources/build.sh
+++ b/sources/build.sh
@@ -2,99 +2,103 @@
 set -e
 
 ### WIP macOS build script for Work Sans Upright and Italic VF, based on a build script by Mike LaGuttuta
-# To add brace trick glyphs, define them in $BraceGlyphs variable, and save the source VF in the same folder as the script
+# To add brace trick glyphs, define them in $BraceGlyphs variable, and export the VF from Glyphs App in the same folder as the script
 
 # Setting the Source and VF name, determine if it's for Italic or Upright source from the argument passed to this script
 
-glyphsSource="WorkSans.glyphs"
-VFname="WorkSans-VF"
-GXname="WorkSansGX"
+glyphsSource="WorkSans.glyphs WorkSans-Italic.glyphs"
 
-if [ "$1" == "Upright" ]; then
-	# Setting which brace glyphs will get copied from the VF generated from glyphs app
-	BraceGlyphs="a,ae,e,s"
-elif [ "$1" == "Italic" ]; then
-	BraceGlyphs="ae,e,s"
-	# Italic
-	glyphsSource=${glyphsSource/".glyphs"/"-Italic.glyphs"}
-	VFname=${VFname/"-VF"/"-Italic-VF"}
-	GXname=${GXname/"GX"/"ItalicGX"}
-fi
+for i in $glyphsSource; do
 
-python tools/makeBuildGlyphsFile.py "${glyphsSource}" "$1"
-glyphsBuildSource=${glyphsSource/".glyphs"/"-build.glyphs"}
+	if [ $i == "WorkSans.glyphs" ]; then
+		style="Upright"
+		VFname="WorkSans-VF"
+		GXname="WorkSansGX"
+		BraceGlyphs="a,ae,e,s"
+	elif [ $i == "WorkSans-Italic.glyphs" ]; then
+		style="Italic"
+		VFname="WorkSans-Italic-VF"
+		GXname="WorkSansItalicGX"
+		BraceGlyphs="ae,e,s"
+	fi
 
-# Call fontmake to generate variable font
-echo "\tBuilding ${glyphsSource}.glyphs..."
-fontmake -o variable -g $glyphsBuildSource
-echo "\t${VFname}.ttf generated"
+	# Generat -build version of .glyphs files with bracket tricks enabled, also add extra OpenType code for featureVariation to work
+	python tools/makeBuildGlyphsFile.py "${i}"
+	glyphsBuildSource=${i/".glyphs"/"-build.glyphs"}
 
-# Clean up files
-mv variable_ttf/${VFname}.ttf ${VFname}.ttf
-rm $glyphsBuildSource
-rm -rf master_ufo
-rm -rf instance_ufo
-rm -rf variable_ttf
+	# Call fontmake to generate variable font
+	echo "\tBuilding ${i}.glyphs..."
+	fontmake -o variable -g $glyphsBuildSource
+	echo "\t${VFname}.ttf generated"
 
-ttx ${VFname}.ttf
-rm ${VFname}.ttf
-ttx ${GXname}.ttf
-mv ${GXname}.ttx tools/${GXname}.ttx
+	# Clean up files
+	mv variable_ttf/${VFname}.ttf ${VFname}.ttf
+	rm $glyphsBuildSource
+	rm -rf master_ufo
+	rm -rf instance_ufo
+	rm -rf variable_ttf
 
-# Copy brace glyphs from variable font generated from Glyphs App
-# Run script to find and copy TTGlyph and glyphVariations elements from source file and copy into target file
-# Could probablh be done just with fonttools...
-echo "\tAdding brace glyphs..."
-xml tr tools/replaceBraceGlyphs.xsl \
-    -s replacements=${GXname}.ttx \
-    -s replacenames=$BraceGlyphs \
-    ${VFname}.ttx > ${VFname}-brace.ttx
+	ttx ${VFname}.ttf
+	rm ${VFname}.ttf
+	ttx ${GXname}.ttf
+	mv ${GXname}.ttx tools/${GXname}.ttx
 
-# Clean up files
-rm tools/${GXname}.ttx
-rm ${VFname}.ttx
-ttx ${VFname}-brace.ttx
-rm ${VFname}-brace.ttx
-mv ${VFname}-brace.ttf ${VFname}.ttf
+	# Copy brace glyphs from variable font generated from Glyphs App
+	# Run script to find and copy TTGlyph and glyphVariations elements from source file and copy into target file
+	# Could probablh be done just with fonttools...
+	echo "\tAdding brace glyphs..."
+	xml tr tools/replaceBraceGlyphs.xsl \
+	    -s replacements=${GXname}.ttx \
+	    -s replacenames=$BraceGlyphs \
+	    ${VFname}.ttx > ${VFname}-brace.ttx
 
-# Add featureVariation for bracket trick glyphs
-echo "\tAdding bracket glyphs..."
-python tools/replaceBracketTrick.py ${VFname}.ttf "$1"
-mv ${VFname}-swap.ttf ${VFname}.ttf
+	# Clean up files
+	rm tools/${GXname}.ttx
+	rm ${VFname}.ttx
+	ttx ${VFname}-brace.ttx
+	rm ${VFname}-brace.ttx
+	mv ${VFname}-brace.ttf ${VFname}.ttf
 
-# Fix non-hinting, DSIG and GASP table
-gftools fix-nonhinting ${VFname}.ttf ${VFname}.ttf
-gftools fix-gasp ${VFname}.ttf
-echo "nonhinting, gasp fixed"
+	# Add featureVariation for bracket trick glyphs
+	echo "\tAdding bracket glyphs..."
+	python tools/replaceBracketTrick.py ${VFname}.ttf "$1"
+	mv ${VFname}-swap.ttf ${VFname}.ttf
 
-# Clean up files
-rm ${VFname}-backup-fonttools-prep-gasp.ttf
-# rm ${GXname}.ttf
+	# Fix non-hinting and GASP table
+	echo "\tFixing non-hinting and GASP table"
+	gftools fix-nonhinting ${VFname}.ttf ${VFname}.ttf
+	gftools fix-gasp ${VFname}.ttf
 
-# # Fix VF Metadata
-# python tools/gftools-fix-vf-meta.py ${VFname}.ttf
-# echo "vf-meta fixed"
-# # Clean up and rename VF
-# rm ${VFname}.ttf
-# mv ${VFname}.ttf.fix ${VFname}.ttf
+	# Clean up files
+	rm ${VFname}-backup-fonttools-prep-gasp.ttf
+	rm ${GXname}.ttf
+done
+
+
+# Fix VF Metadata
+VFfonts=""
+for i in *.ttf; do
+	VFfonts+="$i "
+done
+echo "\tFixing VF Family Metadata..."
+python tools/gftools-fix-vf-meta.py $VFfonts
+
+
+# Clean up VFs
+for i in $VFfonts; do
+	rm "$i"
+done
+
+
+# Rename VFs
+for i in *.fix; do
+	mv $i ${i/".ttf.fix"/".ttf"}
+done
 
-# # Correct nameID 6 (remove space)
-# python tools/NAMEpatch.py ${VFname}.ttf
-# rm ${VFname}.ttf
-# mv ${VFname}#1.ttf ${VFname}.ttf
-# echo "nameID 6 fixed"
 
 # Fix DSIG
-gftools fix-dsig --autofix ${VFname}.ttf
-
-# if [ "$1" = "Italic" ]; then
-# 	# Rename *-ItalicItalic to -Italic
-# 	for i in *.ttf; do
-# 	    mv "$i" "${i//ItalicItalic/Italic}"
-# 	done
-# fi
-
-# fontbakery check-googlefonts ${VFname}.ttf --ghmarkdown fontbakery-report.md
-
-## move font into folder of dist/, with timestamp, then fontbake the font
-# python3 tools/distdate-and-fontbake.py ${VFname}.ttf
\ No newline at end of file
+for i in *.ttf; do
+	echo "\tFixing DSIG $i..."
+	# Fix DSIG
+	gftools fix-dsig --autofix "$i"
+done
\ No newline at end of file
diff --git a/sources/fonts/Desktop OTF/WorkSans-Black.otf b/sources/fonts/WorkSans-Black.otf
similarity index 90%
rename from sources/fonts/Desktop OTF/WorkSans-Black.otf
rename to sources/fonts/WorkSans-Black.otf
index 47d5cd8..af23bd7 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-Black.otf and b/sources/fonts/WorkSans-Black.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-Black.ttf b/sources/fonts/WorkSans-Black.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-Black.ttf
rename to sources/fonts/WorkSans-Black.ttf
index b8ac077..ec2962f 100644
Binary files a/sources/fonts/Web TTF/WorkSans-Black.ttf and b/sources/fonts/WorkSans-Black.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-BlackItalic.otf b/sources/fonts/WorkSans-BlackItalic.otf
similarity index 90%
rename from sources/fonts/Desktop OTF/WorkSans-BlackItalic.otf
rename to sources/fonts/WorkSans-BlackItalic.otf
index 80f375c..c7059cd 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-BlackItalic.otf and b/sources/fonts/WorkSans-BlackItalic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-BlackItalic.ttf b/sources/fonts/WorkSans-BlackItalic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-BlackItalic.ttf
rename to sources/fonts/WorkSans-BlackItalic.ttf
index da58205..b83033e 100644
Binary files a/sources/fonts/Web TTF/WorkSans-BlackItalic.ttf and b/sources/fonts/WorkSans-BlackItalic.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-Bold.otf b/sources/fonts/WorkSans-Bold.otf
similarity index 91%
rename from sources/fonts/Desktop OTF/WorkSans-Bold.otf
rename to sources/fonts/WorkSans-Bold.otf
index 35dd7c8..302a518 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-Bold.otf and b/sources/fonts/WorkSans-Bold.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-Bold.ttf b/sources/fonts/WorkSans-Bold.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-Bold.ttf
rename to sources/fonts/WorkSans-Bold.ttf
index 7f5c9c1..b10f297 100644
Binary files a/sources/fonts/Web TTF/WorkSans-Bold.ttf and b/sources/fonts/WorkSans-Bold.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-BoldItalic.otf b/sources/fonts/WorkSans-BoldItalic.otf
similarity index 89%
rename from sources/fonts/Desktop OTF/WorkSans-BoldItalic.otf
rename to sources/fonts/WorkSans-BoldItalic.otf
index 353e9b2..3404006 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-BoldItalic.otf and b/sources/fonts/WorkSans-BoldItalic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-BoldItalic.ttf b/sources/fonts/WorkSans-BoldItalic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-BoldItalic.ttf
rename to sources/fonts/WorkSans-BoldItalic.ttf
index 619de7f..6f552e2 100644
Binary files a/sources/fonts/Web TTF/WorkSans-BoldItalic.ttf and b/sources/fonts/WorkSans-BoldItalic.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-ExtraBold.otf b/sources/fonts/WorkSans-ExtraBold.otf
similarity index 90%
rename from sources/fonts/Desktop OTF/WorkSans-ExtraBold.otf
rename to sources/fonts/WorkSans-ExtraBold.otf
index 56d94ae..e5663c8 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-ExtraBold.otf and b/sources/fonts/WorkSans-ExtraBold.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-ExtraBold.ttf b/sources/fonts/WorkSans-ExtraBold.ttf
similarity index 98%
rename from sources/fonts/Web TTF/WorkSans-ExtraBold.ttf
rename to sources/fonts/WorkSans-ExtraBold.ttf
index 969acef..535f6ca 100644
Binary files a/sources/fonts/Web TTF/WorkSans-ExtraBold.ttf and b/sources/fonts/WorkSans-ExtraBold.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-ExtraBoldItalic.otf b/sources/fonts/WorkSans-ExtraBoldItalic.otf
similarity index 91%
rename from sources/fonts/Desktop OTF/WorkSans-ExtraBoldItalic.otf
rename to sources/fonts/WorkSans-ExtraBoldItalic.otf
index caf8e8c..4fa0f10 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-ExtraBoldItalic.otf and b/sources/fonts/WorkSans-ExtraBoldItalic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-ExtraBoldItalic.ttf b/sources/fonts/WorkSans-ExtraBoldItalic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-ExtraBoldItalic.ttf
rename to sources/fonts/WorkSans-ExtraBoldItalic.ttf
index b864fb7..6752871 100644
Binary files a/sources/fonts/Web TTF/WorkSans-ExtraBoldItalic.ttf and b/sources/fonts/WorkSans-ExtraBoldItalic.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-ExtraLight.otf b/sources/fonts/WorkSans-ExtraLight.otf
similarity index 89%
rename from sources/fonts/Desktop OTF/WorkSans-ExtraLight.otf
rename to sources/fonts/WorkSans-ExtraLight.otf
index bd7ac8f..7f8c285 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-ExtraLight.otf and b/sources/fonts/WorkSans-ExtraLight.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-ExtraLight.ttf b/sources/fonts/WorkSans-ExtraLight.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-ExtraLight.ttf
rename to sources/fonts/WorkSans-ExtraLight.ttf
index 4e97683..f305063 100644
Binary files a/sources/fonts/Web TTF/WorkSans-ExtraLight.ttf and b/sources/fonts/WorkSans-ExtraLight.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-ExtraLightItalic.otf b/sources/fonts/WorkSans-ExtraLightItalic.otf
similarity index 90%
rename from sources/fonts/Desktop OTF/WorkSans-ExtraLightItalic.otf
rename to sources/fonts/WorkSans-ExtraLightItalic.otf
index 2b0af85..0158625 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-ExtraLightItalic.otf and b/sources/fonts/WorkSans-ExtraLightItalic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-ExtraLightItalic.ttf b/sources/fonts/WorkSans-ExtraLightItalic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-ExtraLightItalic.ttf
rename to sources/fonts/WorkSans-ExtraLightItalic.ttf
index c17e247..a0b9061 100644
Binary files a/sources/fonts/Web TTF/WorkSans-ExtraLightItalic.ttf and b/sources/fonts/WorkSans-ExtraLightItalic.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-Italic.otf b/sources/fonts/WorkSans-Italic.otf
similarity index 87%
rename from sources/fonts/Desktop OTF/WorkSans-Italic.otf
rename to sources/fonts/WorkSans-Italic.otf
index 83e0572..30803a7 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-Italic.otf and b/sources/fonts/WorkSans-Italic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-Italic.ttf b/sources/fonts/WorkSans-Italic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-Italic.ttf
rename to sources/fonts/WorkSans-Italic.ttf
index 7afa148..347ecc2 100644
Binary files a/sources/fonts/Web TTF/WorkSans-Italic.ttf and b/sources/fonts/WorkSans-Italic.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-Light.otf b/sources/fonts/WorkSans-Light.otf
similarity index 90%
rename from sources/fonts/Desktop OTF/WorkSans-Light.otf
rename to sources/fonts/WorkSans-Light.otf
index a6ae82f..3e2d359 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-Light.otf and b/sources/fonts/WorkSans-Light.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-Light.ttf b/sources/fonts/WorkSans-Light.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-Light.ttf
rename to sources/fonts/WorkSans-Light.ttf
index cd2b0d3..b80185e 100644
Binary files a/sources/fonts/Web TTF/WorkSans-Light.ttf and b/sources/fonts/WorkSans-Light.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-LightItalic.otf b/sources/fonts/WorkSans-LightItalic.otf
similarity index 63%
rename from sources/fonts/Desktop OTF/WorkSans-LightItalic.otf
rename to sources/fonts/WorkSans-LightItalic.otf
index c38da42..194c648 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-LightItalic.otf and b/sources/fonts/WorkSans-LightItalic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-LightItalic.ttf b/sources/fonts/WorkSans-LightItalic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-LightItalic.ttf
rename to sources/fonts/WorkSans-LightItalic.ttf
index 537fa73..b5e782c 100644
Binary files a/sources/fonts/Web TTF/WorkSans-LightItalic.ttf and b/sources/fonts/WorkSans-LightItalic.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-Medium.otf b/sources/fonts/WorkSans-Medium.otf
similarity index 90%
rename from sources/fonts/Desktop OTF/WorkSans-Medium.otf
rename to sources/fonts/WorkSans-Medium.otf
index 9e2be2f..0cdfc62 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-Medium.otf and b/sources/fonts/WorkSans-Medium.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-Medium.ttf b/sources/fonts/WorkSans-Medium.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-Medium.ttf
rename to sources/fonts/WorkSans-Medium.ttf
index 81d6aa4..a39f38c 100644
Binary files a/sources/fonts/Web TTF/WorkSans-Medium.ttf and b/sources/fonts/WorkSans-Medium.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-MediumItalic.otf b/sources/fonts/WorkSans-MediumItalic.otf
similarity index 91%
rename from sources/fonts/Desktop OTF/WorkSans-MediumItalic.otf
rename to sources/fonts/WorkSans-MediumItalic.otf
index 7a4936d..9282871 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-MediumItalic.otf and b/sources/fonts/WorkSans-MediumItalic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-MediumItalic.ttf b/sources/fonts/WorkSans-MediumItalic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-MediumItalic.ttf
rename to sources/fonts/WorkSans-MediumItalic.ttf
index dc657d7..6e3f4d9 100644
Binary files a/sources/fonts/Web TTF/WorkSans-MediumItalic.ttf and b/sources/fonts/WorkSans-MediumItalic.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-Regular.otf b/sources/fonts/WorkSans-Regular.otf
similarity index 89%
rename from sources/fonts/Desktop OTF/WorkSans-Regular.otf
rename to sources/fonts/WorkSans-Regular.otf
index c8714ff..26cc5f0 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-Regular.otf and b/sources/fonts/WorkSans-Regular.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-Regular.ttf b/sources/fonts/WorkSans-Regular.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-Regular.ttf
rename to sources/fonts/WorkSans-Regular.ttf
index b4e99f6..495802a 100644
Binary files a/sources/fonts/Web TTF/WorkSans-Regular.ttf and b/sources/fonts/WorkSans-Regular.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-SemiBold.otf b/sources/fonts/WorkSans-SemiBold.otf
similarity index 90%
rename from sources/fonts/Desktop OTF/WorkSans-SemiBold.otf
rename to sources/fonts/WorkSans-SemiBold.otf
index bdf20ef..fa892cf 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-SemiBold.otf and b/sources/fonts/WorkSans-SemiBold.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-SemiBold.ttf b/sources/fonts/WorkSans-SemiBold.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-SemiBold.ttf
rename to sources/fonts/WorkSans-SemiBold.ttf
index 58a431f..a8c804d 100644
Binary files a/sources/fonts/Web TTF/WorkSans-SemiBold.ttf and b/sources/fonts/WorkSans-SemiBold.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-SemiBoldItalic.otf b/sources/fonts/WorkSans-SemiBoldItalic.otf
similarity index 91%
rename from sources/fonts/Desktop OTF/WorkSans-SemiBoldItalic.otf
rename to sources/fonts/WorkSans-SemiBoldItalic.otf
index b90c766..38a2ba3 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-SemiBoldItalic.otf and b/sources/fonts/WorkSans-SemiBoldItalic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-SemiBoldItalic.ttf b/sources/fonts/WorkSans-SemiBoldItalic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-SemiBoldItalic.ttf
rename to sources/fonts/WorkSans-SemiBoldItalic.ttf
index 0cc1bc6..cf17a7c 100644
Binary files a/sources/fonts/Web TTF/WorkSans-SemiBoldItalic.ttf and b/sources/fonts/WorkSans-SemiBoldItalic.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-Thin.otf b/sources/fonts/WorkSans-Thin.otf
similarity index 89%
rename from sources/fonts/Desktop OTF/WorkSans-Thin.otf
rename to sources/fonts/WorkSans-Thin.otf
index 710f4b4..3441aaf 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-Thin.otf and b/sources/fonts/WorkSans-Thin.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-Thin.ttf b/sources/fonts/WorkSans-Thin.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-Thin.ttf
rename to sources/fonts/WorkSans-Thin.ttf
index fbdc401..c65e2a2 100644
Binary files a/sources/fonts/Web TTF/WorkSans-Thin.ttf and b/sources/fonts/WorkSans-Thin.ttf differ
diff --git a/sources/fonts/Desktop OTF/WorkSans-ThinItalic.otf b/sources/fonts/WorkSans-ThinItalic.otf
similarity index 90%
rename from sources/fonts/Desktop OTF/WorkSans-ThinItalic.otf
rename to sources/fonts/WorkSans-ThinItalic.otf
index 688adb3..e8fe776 100644
Binary files a/sources/fonts/Desktop OTF/WorkSans-ThinItalic.otf and b/sources/fonts/WorkSans-ThinItalic.otf differ
diff --git a/sources/fonts/Web TTF/WorkSans-ThinItalic.ttf b/sources/fonts/WorkSans-ThinItalic.ttf
similarity index 99%
rename from sources/fonts/Web TTF/WorkSans-ThinItalic.ttf
rename to sources/fonts/WorkSans-ThinItalic.ttf
index 0859754..b795544 100644
Binary files a/sources/fonts/Web TTF/WorkSans-ThinItalic.ttf and b/sources/fonts/WorkSans-ThinItalic.ttf differ
diff --git a/sources/test.sh b/sources/test.sh
new file mode 100644
index 0000000..9e9b2c9
--- /dev/null
+++ b/sources/test.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+glyphsSource="WorkSans.glyphs WorkSans-Italic.glyphs"
+
+for i in $glyphsSource; do
+	if [ $i == "WorkSans.glyphs" ]; then
+		echo $i
+	elif [ $i == "WorkSans-Italic.glyphs" ]; then
+		echo $i
+	fi
+
+done
\ No newline at end of file
diff --git a/sources/test/fontbakery.sh b/sources/test/fontbakery.sh
new file mode 100644
index 0000000..e8746c9
--- /dev/null
+++ b/sources/test/fontbakery.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# for i in *.ttf; do
+#     fontbakery check-googlefonts "$i" --ghmarkdown $i-fontbakery-report.md
+#     echo "Processing $i"
+# done
+
+# fontbakery check-googlefonts "WorkSans-VF.ttf" --ghmarkdown WorkSans-VF-fontbakery-report.md
+fontbakery check-googlefonts "WorkSans-Italic-VF.ttf" --ghmarkdown WorkSans-Italic-VF-fontbakery-report.md
+
+## move font into folder of dist/, with timestamp, then fontbake the font
+# python3 tools/distdate-and-fontbake.py ${VFname}.ttf
\ No newline at end of file
diff --git a/sources/tools/makeBuildGlyphsFile.py b/sources/tools/makeBuildGlyphsFile.py
index 686c5e5..3626040 100644
--- a/sources/tools/makeBuildGlyphsFile.py
+++ b/sources/tools/makeBuildGlyphsFile.py
@@ -11,7 +11,7 @@ file = sys.argv[1]
 font = GSFont(file)
 print "\tPreparing %s" % file
 
-# Glyphs to re-enable export, in the Glyphs App static fonts export these are not active but get swapped with a custom parameter, for the VFs though it needs to be exported
+# List of Glyphs which should have export enabled - in the Glyphs App static fonts export these are not active but get swapped with a custom parameter, for the VFs though they needs to be exported
 italicBracketGlyphs = [
 "cedi.rvrn",
 "colonsign.rvrn",
@@ -62,11 +62,10 @@ for instance in font.instances:
 	if deavtivateThisInstance == True:
 		instance.active = 0
 
-style = sys.argv[2]
-if style == "Italic":
+if "Italic" in file:
 	glyphsToActivateExport = italicBracketGlyphs
 	appendFeatureCode = italicFeaCode
-elif style == "Upright":
+else:
 	glyphsToActivateExport = uprightBracketGlyphs
 	appendFeatureCode = uprightFeaCode
 
diff --git a/sources/tools/old/buildOld2.sh b/sources/tools/old/buildOld2.sh
new file mode 100644
index 0000000..cad5046
--- /dev/null
+++ b/sources/tools/old/buildOld2.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+set -e
+
+### WIP macOS build script for Work Sans Upright and Italic VF, based on a build script by Mike LaGuttuta
+# To add brace trick glyphs, define them in $BraceGlyphs variable, and save the source VF in the same folder as the script
+
+# Setting the Source and VF name, determine if it's for Italic or Upright source from the argument passed to this script
+
+glyphsSource="WorkSans.glyphs"
+VFname="WorkSans-VF"
+GXname="WorkSansGX"
+
+if [ "$1" == "Upright" ]; then
+	# Setting which brace glyphs will get copied from the VF generated from glyphs app
+	BraceGlyphs="a,ae,e,s"
+elif [ "$1" == "Italic" ]; then
+	BraceGlyphs="ae,e,s"
+	# Italic
+	glyphsSource=${glyphsSource/".glyphs"/"-Italic.glyphs"}
+	VFname=${VFname/"-VF"/"-Italic-VF"}
+	GXname=${GXname/"GX"/"ItalicGX"}
+fi
+
+python tools/makeBuildGlyphsFile.py "${glyphsSource}" "$1"
+glyphsBuildSource=${glyphsSource/".glyphs"/"-build.glyphs"}
+
+# Call fontmake to generate variable font
+echo "\tBuilding ${glyphsSource}.glyphs..."
+fontmake -o variable -g $glyphsBuildSource
+echo "\t${VFname}.ttf generated"
+
+# Clean up files
+mv variable_ttf/${VFname}.ttf ${VFname}.ttf
+rm $glyphsBuildSource
+rm -rf master_ufo
+rm -rf instance_ufo
+rm -rf variable_ttf
+
+ttx ${VFname}.ttf
+rm ${VFname}.ttf
+ttx ${GXname}.ttf
+mv ${GXname}.ttx tools/${GXname}.ttx
+
+# Copy brace glyphs from variable font generated from Glyphs App
+# Run script to find and copy TTGlyph and glyphVariations elements from source file and copy into target file
+# Could probablh be done just with fonttools...
+echo "\tAdding brace glyphs..."
+xml tr tools/replaceBraceGlyphs.xsl \
+    -s replacements=${GXname}.ttx \
+    -s replacenames=$BraceGlyphs \
+    ${VFname}.ttx > ${VFname}-brace.ttx
+
+# Clean up files
+rm tools/${GXname}.ttx
+rm ${VFname}.ttx
+ttx ${VFname}-brace.ttx
+rm ${VFname}-brace.ttx
+mv ${VFname}-brace.ttf ${VFname}.ttf
+
+# Add featureVariation for bracket trick glyphs
+echo "\tAdding bracket glyphs..."
+python tools/replaceBracketTrick.py ${VFname}.ttf "$1"
+mv ${VFname}-swap.ttf ${VFname}.ttf
+
+# Fix non-hinting, DSIG and GASP table
+gftools fix-nonhinting ${VFname}.ttf ${VFname}.ttf
+gftools fix-gasp ${VFname}.ttf
+echo "nonhinting, gasp fixed"
+
+# Clean up files
+rm ${VFname}-backup-fonttools-prep-gasp.ttf
+# rm ${GXname}.ttf
+
+# # Fix VF Metadata
+# python tools/gftools-fix-vf-meta.py ${VFname}.ttf
+# echo "vf-meta fixed"
+# # Clean up and rename VF
+# rm ${VFname}.ttf
+# mv ${VFname}.ttf.fix ${VFname}.ttf
+
+# # Correct nameID 6 (remove space)
+# python tools/NAMEpatch.py ${VFname}.ttf
+# rm ${VFname}.ttf
+# mv ${VFname}#1.ttf ${VFname}.ttf
+# echo "nameID 6 fixed"
+
+# Fix DSIG
+gftools fix-dsig --autofix ${VFname}.ttf
+
+# if [ "$1" = "Italic" ]; then
+# 	# Rename *-ItalicItalic to -Italic
+# 	for i in *.ttf; do
+# 	    mv "$i" "${i//ItalicItalic/Italic}"
+# 	done
+# fi
+
+# fontbakery check-googlefonts ${VFname}.ttf --ghmarkdown fontbakery-report.md
+
+## move font into folder of dist/, with timestamp, then fontbake the font
+# python3 tools/distdate-and-fontbake.py ${VFname}.ttf
\ No newline at end of file
diff --git a/sources/post-build.sh b/sources/tools/old/post-build.sh
similarity index 100%
rename from sources/post-build.sh
rename to sources/tools/old/post-build.sh
diff --git a/sources/tools/old/test.sh b/sources/tools/old/test.sh
new file mode 100644
index 0000000..8d61ba0
--- /dev/null
+++ b/sources/tools/old/test.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+
+# Fix VF Metadata
+VFfonts=""
+for i in *.ttf; do
+	VFfonts+="$i "
+done
+echo "\tFixing VF Family Metadata..."
+python tools/gftools-fix-vf-meta.py $VFfonts
+
+
+# Clean up VFs
+for i in $VFfonts; do
+	rm "$i"
+done
+
+
+# Rename VFs
+for i in *.fix; do
+	mv $i ${i/".ttf.fix"/".ttf"}
+done
+
+
+# Fix DSIG
+for i in *.ttf; do
+	echo "\tFixing DSIG $i..."
+	# Fix DSIG
+	gftools fix-dsig --autofix "$i"
+done
\ No newline at end of file
diff --git a/sources/tools/replaceBracketTrick.py b/sources/tools/replaceBracketTrick.py
index 327723d..699987c 100755
--- a/sources/tools/replaceBracketTrick.py
+++ b/sources/tools/replaceBracketTrick.py
@@ -7,10 +7,30 @@ from fontTools.ttLib import TTFont
 from fontTools.varLib.featureVars import addFeatureVariations
 
 inputTTF = sys.argv[1]
-style = sys.argv[2]
+# style = sys.argv[2]
 
 f = TTFont(inputTTF)
-if style == "Upright":
+
+
+if "Italic" in inputTTF:
+    condSubst = [
+        # A list of (Region, Substitution) tuples.
+        ([{"wght": (.8134, 1)}], {"uni20B5": "uni20B5.rvrn", # cedi
+                                  "cent": "cent.rvrn",
+                                  "dollar": "dollar.rvrn",
+                                  "uni20B2": "uni20B2.rvrn", # guarani
+                                  "dollar.tf": "dollar.tf.rvrn",
+                                  "cent.tf": "cent.tf.rvrn"}),
+        ([{"wght": (0.6, 1)}], {"peseta": "peseta.rvrn",
+                                 "uni20A9": "uni20A9.rvrn", # won
+                                 "uni2761": "uni2761.rvrn", # curvedStemParagraphSignOrnament
+                                 "paragraph": "paragraph.rvrn"}), # won
+        ([{"wght": (0.38, 1)}], {"uni20A6": "uni20A6.rvrn", # naira,
+                                  "colonmonetary": "colonmonetary.rvrn"}),
+        ([{"wght": (0.18, 1)}], {"uni20B1": "uni20B1.rvrn"})  # peso
+    ]
+
+else:
     condSubst = [
         # A list of (Region, Substitution) tuples.
         ([{"wght": (-.46, .18)}], {"uniF8FF": "uniF8FF.rvrn"}), # apple
@@ -35,25 +55,6 @@ if style == "Upright":
         ([{"wght": (0.178, 1)}], {"uni20B1": "uni20B1.rvrn"})  # peso
     ]
 
-elif style == "Italic":
-    condSubst = [
-        # A list of (Region, Substitution) tuples.
-        ([{"wght": (.8134, 1)}], {"uni20B5": "uni20B5.rvrn", # cedi
-                                  "cent": "cent.rvrn",
-                                  "dollar": "dollar.rvrn",
-                                  "uni20B2": "uni20B2.rvrn", # guarani
-                                  "dollar.tf": "dollar.tf.rvrn",
-                                  "cent.tf": "cent.tf.rvrn"}),
-        ([{"wght": (0.6, 1)}], {"peseta": "peseta.rvrn",
-                                 "uni20A9": "uni20A9.rvrn", # won
-                                 "uni2761": "uni2761.rvrn", # curvedStemParagraphSignOrnament
-                                 "paragraph": "paragraph.rvrn"}), # won
-        ([{"wght": (0.38, 1)}], {"uni20A6": "uni20A6.rvrn", # naira,
-                                  "colonmonetary": "colonmonetary.rvrn"}),
-        ([{"wght": (0.18, 1)}], {"uni20B1": "uni20B1.rvrn"})  # peso
-    ]
-
-
 addFeatureVariations(f, condSubst)
 
 outputTTF = inputTTF.replace('.ttf', '-swap.ttf')