diff --git a/sources/Montserrat-Italic.glyphs b/sources/Montserrat-Italic.glyphs
index fa4d2c205..4b28bdf30 100644
--- a/sources/Montserrat-Italic.glyphs
+++ b/sources/Montserrat-Italic.glyphs
@@ -1,7 +1,8 @@
 {
 .appVersion = "3260";
 DisplayStrings = (
-"/AEmacron"
+"/AEmacron",
+"/U.ss01 U/W.ss01"
 );
 classes = (
 {
@@ -26632,10 +26633,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"121 293 LINE SMOOTH",
-"84 107 OFFCURVE",
-"170 -3 OFFCURVE",
-"347 -3 CURVE SMOOTH",
 "515 -3 OFFCURVE",
 "621 93 OFFCURVE",
 "661 293 CURVE SMOOTH",
@@ -26649,7 +26646,11 @@ nodes = (
 "105 116 OFFCURVE",
 "141 295 CURVE SMOOTH",
 "222 700 LINE",
-"202 700 LINE"
+"202 700 LINE",
+"121 293 LINE SMOOTH",
+"84 107 OFFCURVE",
+"170 -3 OFFCURVE",
+"347 -3 CURVE SMOOTH"
 );
 }
 );
@@ -26679,10 +26680,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"54 315 LINE SMOOTH",
-"14 116 OFFCURVE",
-"132 -16 OFFCURVE",
-"350 -16 CURVE SMOOTH",
 "565 -16 OFFCURVE",
 "692 95 OFFCURVE",
 "734 305 CURVE SMOOTH",
@@ -26696,7 +26693,11 @@ nodes = (
 "271 220 OFFCURVE",
 "291 319 CURVE SMOOTH",
 "367 700 LINE",
-"131 700 LINE"
+"131 700 LINE",
+"54 315 LINE SMOOTH",
+"14 116 OFFCURVE",
+"132 -16 OFFCURVE",
+"350 -16 CURVE SMOOTH"
 );
 }
 );
@@ -26726,10 +26727,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"91 304 LINE SMOOTH",
-"53 112 OFFCURVE",
-"155 -9 OFFCURVE",
-"351 -9 CURVE SMOOTH",
 "535 -9 OFFCURVE",
 "650 93 OFFCURVE",
 "691 298 CURVE SMOOTH",
@@ -26743,7 +26740,11 @@ nodes = (
 "177 163 OFFCURVE",
 "205 305 CURVE SMOOTH",
 "284 700 LINE",
-"170 700 LINE"
+"170 700 LINE",
+"91 304 LINE SMOOTH",
+"53 112 OFFCURVE",
+"155 -9 OFFCURVE",
+"351 -9 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/Montserrat.glyphs b/sources/Montserrat.glyphs
index 08f5fa585..ec02a8107 100644
--- a/sources/Montserrat.glyphs
+++ b/sources/Montserrat.glyphs
@@ -4,7 +4,7 @@ DisplayStrings = (
 "/lambdastroke/lambdastroke.ss01/lambdastroke.sc/lambdastroke.sc.ss01/Lambda/lambda/lambda.sc/Lambdastroke.ss01",
 "/cedillacomb Ç/Ccedillaacute/Ecedilla/Ecedillabreve/Scedilla/Tcedilla/Ecedillabreve.ss01/Tcedilla.ss01 ç/ccedillaacute/ecedilla/ecedillabreve/scedilla/tcedilla/ecedilla.ss01/ecedillabreve.ss01/tcedilla.ss01/ccedilla.sc/ccedillaacute.sc/ecedilla.sc/ecedillabreve.sc/Hcedilla/hcedilla/h.sc/h.sc/hcedilla.sc/scedilla.sc/tcedilla.sc/ecedilla.sc.ss01/ecedillabreve.sc.ss01/tcedilla.sc.ss01/Esdescender-cy.loclCHU/zedescender-cy.loclBSH/esdescender-cy.loclCHU ¸",
 "/Eng.ss01/Eng",
-"/Eng.ss01/eng.sc.ss01/Eng.loclNSM/space/Eng/eng.sc/eng \012p/pmacronbelow \012/Mturned/mturned/mturned.sc \012/Hturned/hturned.sc/hturned \012/schwa/eturned/eturned.sc \012/Vhook/vhook"
+"/U.ss01 U/W.ss01"
 );
 classes = (
 {
diff --git a/sources/MontserratUnderline-Italic.glyphs b/sources/MontserratUnderline-Italic.glyphs
index ee9922edf..9909e13d0 100644
--- a/sources/MontserratUnderline-Italic.glyphs
+++ b/sources/MontserratUnderline-Italic.glyphs
@@ -4,7 +4,8 @@ DisplayStrings = (
 "/lambdastroke/lambdastroke.ss01/lambdastroke.sc/lambdastroke.sc.ss01/Lambda/lambda/lambda.sc/Lambdastroke.ss01",
 "/Sobliquestroke/uniA7CC/sobliquestroke/uniA7CD/sobliquestroke.sc/uniA7CD.sc",
 "/lambdastroke/lambdastroke.ss01/lambdastroke.sc/lambdastroke.sc.ss01/Lambda/lambda/lambda.sc/Lambdastroke.ss01",
-"/Beta-latin \012/Bstroke \012/Ghook \012/Iota-latin \012/Khook \012/Kstroke \012/Lmiddletilde \012/Uogonek \012W\012/Whook \012/Yhook \012/Ystroke \012/Vhook.loclTOD0 \012/Astroke.ss01 \012/Ghook.ss01 \012/Jcrossedtail.ss01 \012/Tdiagonalstroke.ss01 \012/W.ss01 \012/Y.ss01 \012/cbar \012/chook \012/ghook \012/lambdastroke \012/lbelt \012/ubar \012/upsilon-latin \012/jcrossedtail.dotless \012/dtopbar.ss01 \012/lambdastroke.ss01 \012/lbelt.ss01 \012/tbar.ss01 \012/whook.ss01 \012/bhook.sc \012/dcroat.sc \012/dhook.sc \012/dtail.sc \012/ezhreversed.sc \012/glottalstopsmall.sc \012/mturned.sc \012/obarred.sc \012/rtail.sc \012/upsilon-latin.sc \012/vhook.sc \012/whook.sc \012/yhook.sc \012/Vhook.loclTOD0.sc \012/astroke.sc.ss01 \012/ereversed.sc.ss01 \012/istroke.sc.ss01 \012/tretroflexhook.sc.ss01 \012/whook.sc.ss01 \012/Obarred-cy \012/U-cy.ss01 \012/schwa-cy \012/istrokemod \012/istrokemod.dotless \012/periodcentered.loclCAT.sc \012/brevecomb \012/tildecomb_dieresiscomb \012/tildecomb_acutecomb \012/tildecomb_macroncomb \012/macroncomb \012/horncomb \012/doublebrevebelowcomb \012/doublebrevecomb \012/doublemacronbelowcomb \012/breveinverteddoublecomb \012/dieresiscomb_gravecomb.case \012/dieresiscomb_acutecomb.case \012/gravecomb.case \012/gravecomb_macroncomb.case \012/circumflexcomb.case \012/circumflexcomb_tildecomb.case \012/caroncomb.case \012/brevecomb_gravecomb.case \012/brevecomb_acutecomb.case \012/brevecomb_tildecomb.case \012/brevecomb_hookabovecomb.case \012/tildecomb_dieresiscomb.case \012/tildecomb_acutecomb.case \012/macroncomb.case \012/macroncomb_dieresiscomb.case \012/macroncomb_acutecomb.case \012/hookabovecomb.case \012/verticallineabovecomb.case \012/breveinvertedcomb.case \012/strokeshortcomb.case \012/slashlongcomb.case \012/ogonekcomb.i \012/tildecomb.loclVIT \012/ringhalfright \012/uniA7CD \012/uniA7DB \012/verticalbar-cy \012/verticalbar-cy.case \012\012/Cbar \012/Chook \012/Pstroke \012/Ereversed.ss01 \012/glottalstopsmall \012/hhook \012/jdotlessstroke \012/ystroke.ss01 \012/kstroke.sc \012/periodcentered.loclCAT \012/periodcentered.loclCAT.case \012/tildecomb_macroncomb.case \012/slashshortcomb.case \012Æ\012/Dcroat \012/Hbar \012/dhook \012/dhookandtail \012/dtail \012/yhook.ss01 \012/fl \012/fi.ss01 \012/iacute_j.loclNLD.sc \012/ghook.sc \012/zstroke.sc \012/tdiagonalstroke.sc.ss01 \012/yhook.sc.ss01 \012/dieresiscomb.case \012/brevecomb.case \012/uniA7DA \012/uniA7DC \012"
+"/Beta-latin \012/Bstroke \012/Ghook \012/Iota-latin \012/Khook \012/Kstroke \012/Lmiddletilde \012/Uogonek \012W\012/Whook \012/Yhook \012/Ystroke \012/Vhook.loclTOD0 \012/Astroke.ss01 \012/Ghook.ss01 \012/Jcrossedtail.ss01 \012/Tdiagonalstroke.ss01 \012/W.ss01 \012/Y.ss01 \012/cbar \012/chook \012/ghook \012/lambdastroke \012/lbelt \012/ubar \012/upsilon-latin \012/jcrossedtail.dotless \012/dtopbar.ss01 \012/lambdastroke.ss01 \012/lbelt.ss01 \012/tbar.ss01 \012/whook.ss01 \012/bhook.sc \012/dcroat.sc \012/dhook.sc \012/dtail.sc \012/ezhreversed.sc \012/glottalstopsmall.sc \012/mturned.sc \012/obarred.sc \012/rtail.sc \012/upsilon-latin.sc \012/vhook.sc \012/whook.sc \012/yhook.sc \012/Vhook.loclTOD0.sc \012/astroke.sc.ss01 \012/ereversed.sc.ss01 \012/istroke.sc.ss01 \012/tretroflexhook.sc.ss01 \012/whook.sc.ss01 \012/Obarred-cy \012/U-cy.ss01 \012/schwa-cy \012/istrokemod \012/istrokemod.dotless \012/periodcentered.loclCAT.sc \012/brevecomb \012/tildecomb_dieresiscomb \012/tildecomb_acutecomb \012/tildecomb_macroncomb \012/macroncomb \012/horncomb \012/doublebrevebelowcomb \012/doublebrevecomb \012/doublemacronbelowcomb \012/breveinverteddoublecomb \012/dieresiscomb_gravecomb.case \012/dieresiscomb_acutecomb.case \012/gravecomb.case \012/gravecomb_macroncomb.case \012/circumflexcomb.case \012/circumflexcomb_tildecomb.case \012/caroncomb.case \012/brevecomb_gravecomb.case \012/brevecomb_acutecomb.case \012/brevecomb_tildecomb.case \012/brevecomb_hookabovecomb.case \012/tildecomb_dieresiscomb.case \012/tildecomb_acutecomb.case \012/macroncomb.case \012/macroncomb_dieresiscomb.case \012/macroncomb_acutecomb.case \012/hookabovecomb.case \012/verticallineabovecomb.case \012/breveinvertedcomb.case \012/strokeshortcomb.case \012/slashlongcomb.case \012/ogonekcomb.i \012/tildecomb.loclVIT \012/ringhalfright \012/uniA7CD \012/uniA7DB \012/verticalbar-cy \012/verticalbar-cy.case \012\012/Cbar \012/Chook \012/Pstroke \012/Ereversed.ss01 \012/glottalstopsmall \012/hhook \012/jdotlessstroke \012/ystroke.ss01 \012/kstroke.sc \012/periodcentered.loclCAT \012/periodcentered.loclCAT.case \012/tildecomb_macroncomb.case \012/slashshortcomb.case \012Æ\012/Dcroat \012/Hbar \012/dhook \012/dhookandtail \012/dtail \012/yhook.ss01 \012/fl \012/fi.ss01 \012/iacute_j.loclNLD.sc \012/ghook.sc \012/zstroke.sc \012/tdiagonalstroke.sc.ss01 \012/yhook.sc.ss01 \012/dieresiscomb.case \012/brevecomb.case \012/uniA7DA \012/uniA7DC \012",
+"/U.ss01 U/W.ss01"
 );
 classes = (
 {
@@ -30668,10 +30669,10 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"-54 -3 LINE",
 "722 -3 LINE",
 "722 16 LINE",
-"-54 16 LINE"
+"-54 16 LINE",
+"-54 -3 LINE"
 );
 }
 );
@@ -30724,10 +30725,10 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"-50 -17 LINE",
 "726 -17 LINE",
 "726 73 LINE",
-"-50 73 LINE"
+"-50 73 LINE",
+"-50 -17 LINE"
 );
 }
 );
@@ -30780,10 +30781,10 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"-55 -10 LINE",
 "722 -10 LINE",
 "722 40 LINE",
-"-55 40 LINE"
+"-55 40 LINE",
+"-55 -10 LINE"
 );
 }
 );
diff --git a/sources/MontserratUnderline.glyphs b/sources/MontserratUnderline.glyphs
index dbc3acf80..596c27891 100644
--- a/sources/MontserratUnderline.glyphs
+++ b/sources/MontserratUnderline.glyphs
@@ -3,7 +3,7 @@
 DisplayStrings = (
 "/Cbar/space/space/space \012/Ghook/space/space/space \012/Iota-latin/space/space/space \012/Kstroke/space/space/space \012/Ghook.ss01/space/space/space \012/Ystroke.ss01/space/space/space \012/tbar.ss01/space/space/space \012/eopen.sc/space/space/space \012/ghook.sc/space/space/space \012/hturned.sc/space/space/space \012/vhook.sc/space/space/space \012/Vhook.loclTOD0.sc/space/space/space \012/ereversed.sc.ss01/space/space/space \012/whook.sc.ss01/space/space/space \012/yhook.sc.ss01/space/space/space \012/we-cy/space/space/space \012/ubarmod/space/space/space \012/doublebrevebelowcomb/space/space/space \012/doublebrevecomb/space/space/space \012/doublemacronbelowcomb/space/space/space \012/breveinverteddoublecomb/space/space/space \012/uniA7CD/space/space/space \012/Bstroke/space/space/space \012/Chook/space/space/space \012/Tdiagonalstroke.ss01/space/space/space \012/glottalstopsmall/space/space/space \012/rtail/space/space/space \012/Vhook.loclTOD0.sc.ss01/space/space/space \012/schwa-cy/space/space/space \012/istrokemod/space/space/space \012/istrokemod.dotless/space/space/space \012/periodcentered.loclCAT.case/space/space/space \012/Dcroat/space/space/space \012/Hbar/space/space/space \012/Lmiddletilde/space/space/space \012/Qhooktail/space/space/space \012/dhook/space/space/space \012/ghook/space/space/space \012k/space/space/space \012/qhooktail/space/space/space \012/lbelt.ss01/space/space/space \012/whook.ss01/space/space/space \012/fl/space/space/space \012/fi.ss01/space/space/space \012/dtail.sc/space/space/space \012/gstroke.sc/space/space/space \012/hbar.sc/space/space/space \012/eOpenmod/space/space/space \012\012",
 "/tdiagonalstroke.sc.ss01/tdiagonalstroke.sc/estroke/estroke.ss01/astroke/astroke.sc/astroke.sc.ss01",
-"/Eng.ss01/eng.sc.ss01/Eng.loclNSM/space/Eng/eng.sc/eng \012p/pmacronbelow \012/Mturned/mturned/mturned.sc \012/Hturned/hturned.sc/hturned \012/schwa/eturned/eturned.sc \012/Vhook/vhook"
+"/U.ss01 U/W.ss01"
 );
 classes = (
 {
@@ -30446,10 +30446,10 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"-2 -3 LINE",
 "796 -3 LINE",
 "796 16 LINE",
-"-2 16 LINE"
+"-2 16 LINE",
+"-2 -3 LINE"
 );
 }
 );
@@ -30506,10 +30506,10 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"-12 -17 LINE",
 "796 -17 LINE",
 "796 73 LINE",
-"-12 73 LINE"
+"-12 73 LINE",
+"-12 -17 LINE"
 );
 }
 );
@@ -30566,10 +30566,10 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"-5 -10 LINE",
 "795 -10 LINE",
 "795 40 LINE",
-"-5 40 LINE"
+"-5 40 LINE",
+"-5 -10 LINE"
 );
 }
 );