diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/E_th.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/E_th.glif
index 5078aa8bea..69a6797dd8 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/E_th.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/E_th.glif
@@ -4,13 +4,11 @@
-
+
-
-
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/S_chwa.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/S_chwa.glif
index ad52d2b730..3e4ff697bd 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/S_chwa.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/S_chwa.glif
@@ -27,13 +27,9 @@
-
-
-
+
-
-
-
+
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/W_.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/W_.glif
index 710c8a009c..a6a4c624a2 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/W_.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/W_.glif
@@ -19,7 +19,9 @@
-
+
+
+
@@ -27,7 +29,9 @@
-
+
+
+
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/numero.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/numero.glif
index b742b418a9..d91d8809b7 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/numero.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/numero.glif
@@ -13,7 +13,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/q.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/q.glif
index b508aefc48..dba0407354 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/q.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/q.glif
@@ -23,7 +23,9 @@
-
+
+
+
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/servicemark.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/servicemark.glif
index 98db2a3898..ad88493087 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/servicemark.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/servicemark.glif
@@ -46,14 +46,18 @@
-
-
+
+
+
+
-
+
+
+
diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/x.glif b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/x.glif
index 8946ab4e7f..71546647b5 100644
--- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/x.glif
+++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/glyphs/x.glif
@@ -6,19 +6,27 @@
-
-
+
+
+
+
-
+
+
+
-
-
+
+
+
+
-
+
+
+
diff --git a/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/glyphs/numero.glif b/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/glyphs/numero.glif
index fe9c58a42b..d465f263d1 100644
--- a/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/glyphs/numero.glif
+++ b/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/glyphs/numero.glif
@@ -12,7 +12,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
@@ -39,7 +39,7 @@
-
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/E_th.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/E_th.glif
index fa3d648406..5adac0f10e 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/E_th.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/E_th.glif
@@ -3,13 +3,11 @@
-
+
-
-
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/M_.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/M_.glif
index a126328b63..43de1c3319 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/M_.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/M_.glif
@@ -10,11 +10,15 @@
-
+
+
+
-
+
+
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/T_bar.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/T_bar.glif
index dcfe3b15d8..193fa2eca6 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/T_bar.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/T_bar.glif
@@ -4,9 +4,7 @@
-
-
-
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/eight.dnom.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/eight.dnom.glif
index 8aafe680bb..509503ed97 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/eight.dnom.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/eight.dnom.glif
@@ -22,10 +22,8 @@
-
-
-
-
+
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.cap.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.cap.glif
index 4a4aa9602d..ebce063369 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.cap.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.cap.glif
@@ -16,9 +16,7 @@
-
-
-
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.glif
index 9a716a1a75..0af979bb12 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.glif
@@ -16,9 +16,7 @@
-
-
-
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.onum.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.onum.glif
index a6d9179961..6985de6c27 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.onum.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/four.onum.glif
@@ -16,9 +16,7 @@
-
-
-
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numbersign.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numbersign.glif
index e57be50024..4c2708815b 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numbersign.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numbersign.glif
@@ -3,44 +3,28 @@
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numero.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numero.glif
index dc28d0449f..5d04a2d953 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numero.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/numero.glif
@@ -12,7 +12,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/one.a.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/one.a.glif
index 33c414a9a6..51fe4fb976 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/one.a.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/one.a.glif
@@ -17,11 +17,4 @@
-
-
- com.typemytype.robofont.layerData
-
-
-
-
diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/quotereversed.glif b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/quotereversed.glif
index 655830aa15..3bf0fdf812 100644
--- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/quotereversed.glif
+++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/glyphs/quotereversed.glif
@@ -7,8 +7,10 @@
-
-
+
+
+
+
diff --git a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/dezh.glif b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/dezh.glif
index 47ca67a23b..ab61e237d2 100644
--- a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/dezh.glif
+++ b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/dezh.glif
@@ -12,7 +12,7 @@
-
+
diff --git a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/eng.glif b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/eng.glif
index ac8f646c9f..5833b60bda 100644
--- a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/eng.glif
+++ b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/eng.glif
@@ -8,9 +8,7 @@
-
-
-
+
@@ -29,9 +27,7 @@
-
-
-
+
diff --git a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/numero.glif b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/numero.glif
index 5a1d587eeb..cbacec09c3 100644
--- a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/numero.glif
+++ b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/glyphs/numero.glif
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/Roman/Masters/master_1/SourceCode_Regular.ufo/glyphs/numero.glif b/Roman/Masters/master_1/SourceCode_Regular.ufo/glyphs/numero.glif
index bffc0b7d3d..2133dd7c6c 100644
--- a/Roman/Masters/master_1/SourceCode_Regular.ufo/glyphs/numero.glif
+++ b/Roman/Masters/master_1/SourceCode_Regular.ufo/glyphs/numero.glif
@@ -7,7 +7,7 @@
-
+
@@ -15,11 +15,9 @@
-
-
-
+
-
+
@@ -30,19 +28,17 @@
-
+
-
+
-
-
-
+
-
+
diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaabovecmb.glif b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaabovecmb.glif
index 99086657f7..63e085e7b0 100644
--- a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaabovecmb.glif
+++ b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaabovecmb.glif
@@ -20,9 +20,7 @@
-
-
-
+
diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaturnedabovecmb.glif b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaturnedabovecmb.glif
index 03c110eae3..77329cee40 100644
--- a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaturnedabovecmb.glif
+++ b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/commaturnedabovecmb.glif
@@ -14,9 +14,7 @@
-
-
-
+
diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/dezh.glif b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/dezh.glif
index 13d5cb7e30..e0e3c3321a 100644
--- a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/dezh.glif
+++ b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/dezh.glif
@@ -47,7 +47,9 @@
-
+
+
+
@@ -56,7 +58,7 @@
-
+
diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/numero.glif b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/numero.glif
index ea62bb716d..bac66560b5 100644
--- a/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/numero.glif
+++ b/Roman/Masters/master_2/SourceCode_Black.ufo/glyphs/numero.glif
@@ -12,10 +12,10 @@
-
-
-
-
+
+
+
+
@@ -33,10 +33,10 @@
-
-
-
-
+
+
+
+