diff --git a/src/Inter-UI-Black.ufo/fontinfo.plist b/src/Inter-UI-Black.ufo/fontinfo.plist
index 9a1ff56b6..aa4742ca9 100644
--- a/src/Inter-UI-Black.ufo/fontinfo.plist
+++ b/src/Inter-UI-Black.ufo/fontinfo.plist
@@ -7,8 +7,8 @@
 	<key>capHeight</key>
 	<integer>2048</integer>
 	<key>copyright</key>
-	<string>Original glyphs: Copyright (c) 2017 The Inter UI Project Authors.
-Glyphs from Roboto: Copyright 2011 Google Inc. All Rights Reserved.</string>
+	<string>Copyright (c) 2016-2018 The Inter UI Project Authors.
+Placeholder glyphs from Roboto: Copyright 2011 Google Inc. All Rights Reserved.</string>
 	<key>descender</key>
 	<integer>-660</integer>
 	<key>familyName</key>
diff --git a/src/Inter-UI-Regular.ufo/fontinfo.plist b/src/Inter-UI-Regular.ufo/fontinfo.plist
index 8a8c45ed4..9227e0d9f 100644
--- a/src/Inter-UI-Regular.ufo/fontinfo.plist
+++ b/src/Inter-UI-Regular.ufo/fontinfo.plist
@@ -7,8 +7,8 @@
 	<key>capHeight</key>
 	<integer>2048</integer>
 	<key>copyright</key>
-	<string>Original glyphs: Copyright (c) 2017 The Inter UI Project Authors.
-Glyphs from Roboto: Copyright 2011 Google Inc. All Rights Reserved.</string>
+	<string>Copyright (c) 2016-2018 The Inter UI Project Authors.
+Placeholder glyphs from Roboto: Copyright 2011 Google Inc. All Rights Reserved.</string>
 	<key>descender</key>
 	<integer>-660</integer>
 	<key>familyName</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif b/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
index 81e48fa6a..e04d3a43c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dotlessj.glif
@@ -18,7 +18,7 @@
       <point x="452" y="1536" type="line"/>
     </contour>
     <contour>
-      <point x="336" y="1716" type="move" name="top"/>
+      <point x="332" y="1716" type="move" name="top"/>
     </contour>
     <contour>
       <point x="652" y="0" type="move" name="_right"/>
@@ -41,9 +41,9 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>320</integer>
+          <integer>332</integer>
           <key>y</key>
-          <integer>1516</integer>
+          <integer>1748</integer>
         </dict>
       </array>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/i.glif b/src/Inter-UI-Regular.ufo/glyphs/i.glif
index 1f925e1fd..479e61340 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/i.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/i.glif
@@ -9,10 +9,10 @@
       <point x="332.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="440.0" y="0.0" type="move" name="ogonek"/>
+      <point x="452" y="0" type="move" name="ogonek"/>
     </contour>
     <contour>
-      <point x="328.0" y="2304.0" type="move" name="top"/>
+      <point x="332" y="2304" type="move" name="top"/>
     </contour>
     <contour>
       <point x="672.0" y="2200.0" type="move" name="top_dd"/>
@@ -41,9 +41,9 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>324</integer>
+          <integer>332</integer>
           <key>y</key>
-          <integer>1660</integer>
+          <integer>2136</integer>
         </dict>
       </array>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ibar.glif b/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
index e5f71ac39..80d2cf5ff 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ibar.glif
@@ -6,17 +6,34 @@
     <component base="i" xOffset="88"/>
     <component base="crossbar" xOffset="-216" yOffset="-164"/>
     <contour>
-      <point x="288" y="2200" type="move" name="top"/>
+      <point x="420" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="760" y="2200" type="move" name="top0315"/>
+      <point x="892" y="2200" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="288" y="0" type="move" name="bottom"/>
+      <point x="420" y="0" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>420</integer>
+          <key>y</key>
+          <integer>2148</integer>
+        </dict>
+      </array>
       <key>interface.gridadjust.original</key>
       <string>{'width': 938, 'leftMargin': 27, 'rightMargin': 28}</string>
       <key>interface.width-adjustments</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif b/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
index e820775ef..0a5e317be 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/idieresisacute.glif
@@ -35,9 +35,9 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>364</integer>
+          <integer>360</integer>
           <key>y</key>
-          <integer>1380</integer>
+          <integer>1968</integer>
         </dict>
       </array>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/j.glif b/src/Inter-UI-Regular.ufo/glyphs/j.glif
index f4ec97224..5bf8c220e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/j.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/j.glif
@@ -6,7 +6,7 @@
     <component base="dotlessj"/>
     <component base="dotaccent"/>
     <contour>
-      <point x="380" y="2304" type="move" name="top"/>
+      <point x="332" y="2304" type="move" name="top"/>
     </contour>
     <contour>
       <point x="256" y="-632" type="move" name="bottom"/>
@@ -35,9 +35,9 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>324</integer>
+          <integer>332</integer>
           <key>y</key>
-          <integer>1584</integer>
+          <integer>2132</integer>
         </dict>
       </array>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif b/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
index 1e17ad139..57b60f799 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/jcrosstail.glif
@@ -31,10 +31,10 @@
     </contour>
     <component base="i" xOffset="308"/>
     <contour>
-      <point x="664" y="2200" type="move" name="top"/>
+      <point x="640" y="2200" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="640" y="-616" type="move" name="bottom"/>
+      <point x="512" y="-632" type="move" name="bottom"/>
     </contour>
     <contour>
       <point x="1084" y="2200" type="move" name="top0315"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/ogonek.glif b/src/Inter-UI-Regular.ufo/glyphs/ogonek.glif
index 58d543d62..86fbd54b0 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/ogonek.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/ogonek.glif
@@ -26,16 +26,16 @@
       <point x="600" y="0" type="curve"/>
     </contour>
     <contour>
-      <point x="600" y="0" type="move" name="_ogonek"/>
+      <point x="600.0" y="0.0" type="move" name="_ogonek"/>
     </contour>
     <contour>
-      <point x="600" y="0" type="move" name="_right"/>
+      <point x="600.0" y="0.0" type="move" name="_right"/>
     </contour>
     <contour>
-      <point x="488" y="0" type="move" name="_bottom"/>
+      <point x="488.0" y="0.0" type="move" name="_bottom"/>
     </contour>
     <contour>
-      <point x="488" y="-600" type="move" name="mkmkbottom_acc"/>
+      <point x="488.0" y="-600.0" type="move" name="mkmkbottom_acc"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
index db001d937..31232151f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0069.ccmp.glif
@@ -17,9 +17,9 @@
     <dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
-        <real>0.87</real>
-        <real>0.87</real>
-        <real>0.87</real>
+        <real>0.9763825535774231</real>
+        <real>0.2888321667515325</real>
+        <real>0.8148636841244352</real>
         <real>1.0</real>
       </array>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
index dcd671857..f642a58df 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni006A_.ccmp.glif
@@ -1,25 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni006A.ccmp" format="1">
-  <advance width="712"/>
+  <advance width="668"/>
   <outline>
-    <component base="dotlessj" xOffset="44"/>
+    <component base="dotlessj"/>
     <contour>
-      <point x="424" y="1716" type="move" name="top"/>
+      <point x="332" y="1716" type="move" name="top"/>
     </contour>
     <contour>
       <point x="776" y="1716" type="move" name="top0315"/>
     </contour>
     <contour>
-      <point x="312" y="-632" type="move" name="bottom"/>
+      <point x="256" y="-632" type="move" name="bottom"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>332</integer>
+          <key>y</key>
+          <integer>1648</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
-        <real>0.87</real>
-        <real>0.87</real>
-        <real>0.87</real>
+        <real>0.8953856825828552</real>
+        <real>0.25325059269374833</real>
+        <real>0.846124574218061</real>
         <real>1.0</real>
       </array>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
index 1c016b3b1..e8d39fd59 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni012F_.ccmp.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni012F.ccmp" format="1">
-  <advance width="752"/>
+  <advance width="668"/>
   <outline>
-    <component base="dotlessi" xOffset="124"/>
-    <component base="ogonek" xOffset="48" yOffset="16"/>
+    <component base="i"/>
+    <component base="ogonek" xOffset="-148"/>
     <contour>
       <point x="488" y="1776" type="move" name="top"/>
     </contour>
@@ -18,9 +18,9 @@
     <dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
-        <real>0.87</real>
-        <real>0.87</real>
-        <real>0.87</real>
+        <real>0.8953856825828552</real>
+        <real>0.229125253643056</real>
+        <real>0.8712183052476337</real>
         <real>1.0</real>
       </array>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
index 27e7032ad..32f8064a1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni0249.ccmp.glif
@@ -18,9 +18,9 @@
     <dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
-        <real>0.87</real>
-        <real>0.87</real>
-        <real>0.87</real>
+        <real>0.8953856825828552</real>
+        <real>0.31748411609599864</real>
+        <real>0.6889154441827888</real>
         <real>1.0</real>
       </array>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
index 5592e7f8e..1337753a3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
@@ -1,51 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni029D.ccmp" format="1">
-  <advance width="1264"/>
+  <advance width="976"/>
   <outline>
     <contour>
-      <point x="1188" y="132" type="line"/>
-      <point x="472" y="132" type="line" smooth="yes"/>
-      <point x="252" y="132"/>
-      <point x="80" y="0"/>
-      <point x="80" y="-236" type="curve" smooth="yes"/>
-      <point x="80" y="-448"/>
-      <point x="248" y="-600"/>
-      <point x="496" y="-600" type="curve" smooth="yes"/>
-      <point x="820" y="-600"/>
-      <point x="928" y="-388"/>
-      <point x="928" y="-168" type="curve" smooth="yes"/>
-      <point x="928" y="312" type="line"/>
-      <point x="656" y="312" type="line"/>
-      <point x="656" y="-228" type="line" smooth="yes"/>
-      <point x="656" y="-316"/>
-      <point x="604" y="-380"/>
-      <point x="492" y="-380" type="curve" smooth="yes"/>
-      <point x="408" y="-380"/>
-      <point x="352" y="-320"/>
-      <point x="352" y="-236" type="curve" smooth="yes"/>
-      <point x="352" y="-156"/>
-      <point x="412" y="-88"/>
-      <point x="508" y="-88" type="curve" smooth="yes"/>
-      <point x="1188" y="-88" type="line"/>
+      <point x="1056" y="156" type="line"/>
+      <point x="372" y="156" type="line" smooth="yes"/>
+      <point x="152" y="156"/>
+      <point x="-36" y="16"/>
+      <point x="-36" y="-212" type="curve" smooth="yes"/>
+      <point x="-36" y="-416"/>
+      <point x="116" y="-576"/>
+      <point x="364" y="-576" type="curve" smooth="yes"/>
+      <point x="616" y="-576"/>
+      <point x="760" y="-412"/>
+      <point x="760" y="-180" type="curve" smooth="yes"/>
+      <point x="760" y="336" type="line"/>
+      <point x="524" y="336" type="line"/>
+      <point x="524" y="-204" type="line" smooth="yes"/>
+      <point x="524" y="-292"/>
+      <point x="472" y="-368"/>
+      <point x="360" y="-368" type="curve" smooth="yes"/>
+      <point x="276" y="-368"/>
+      <point x="212" y="-296"/>
+      <point x="212" y="-212" type="curve" smooth="yes"/>
+      <point x="212" y="-132"/>
+      <point x="280" y="-64"/>
+      <point x="376" y="-64" type="curve" smooth="yes"/>
+      <point x="1056" y="-64" type="line"/>
     </contour>
-    <component base="dotlessi" xOffset="436"/>
+    <component base="dotlessi" xOffset="308"/>
     <contour>
-      <point x="796" y="1776" type="move" name="top"/>
+      <point x="512" y="-632" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="792" y="-632" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1216" y="1776" type="move" name="top0315"/>
+      <point x="640" y="2200" type="move" name="top"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>640</integer>
+          <key>y</key>
+          <integer>2160</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.mark</key>
       <array>
-        <real>0.87</real>
-        <real>0.87</real>
-        <real>0.87</real>
+        <real>0.8953856825828552</real>
+        <real>0.2715440397434941</real>
+        <real>0.8436879515474552</real>
         <real>1.0</real>
       </array>
       <key>interface.gridadjust.original</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/uni1DCE___.glif b/src/Inter-UI-Regular.ufo/glyphs/uni1DCE___.glif
index 0499aa315..2bbb40343 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni1DCE___.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni1DCE___.glif
@@ -3,10 +3,10 @@
   <advance width="0"/>
   <unicode hex="1DCE"/>
   <outline>
+    <component base="ogonek" xScale="-1" yScale="-1" xOffset="-385" yOffset="1466"/>
     <contour>
       <point x="-699" y="1365" type="move" name="_marktop"/>
     </contour>
-    <component base="ogonek" xScale="-1" yScale="-1" xOffset="-385" yOffset="1466"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/kerning.plist b/src/Inter-UI-Regular.ufo/kerning.plist
index c8a744b70..ffe59f540 100644
--- a/src/Inter-UI-Regular.ufo/kerning.plist
+++ b/src/Inter-UI-Regular.ufo/kerning.plist
@@ -884,6 +884,8 @@
 		<integer>40</integer>
 		<key>four</key>
 		<integer>-83</integer>
+		<key>hyphen</key>
+		<integer>-128</integer>
 		<key>periodcentered</key>
 		<integer>-13</integer>
 		<key>seven</key>
@@ -1800,6 +1802,8 @@
 		<integer>-28</integer>
 		<key>@KERN_RIGHT_dagger</key>
 		<integer>-96</integer>
+		<key>@KERN_RIGHT_m</key>
+		<integer>-32</integer>
 		<key>@KERN_RIGHT_one</key>
 		<integer>-69</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
@@ -3321,7 +3325,7 @@
 	</dict>
 	<key>@KERN_LEFT_rthook</key>
 	<dict>
-		<key>j</key>
+		<key>@KERN_RIGHT_dotlessj</key>
 		<integer>256</integer>
 	</dict>
 	<key>@KERN_LEFT_s</key>
@@ -3816,11 +3820,6 @@
 		<key>@KERN_RIGHT_eight.sups</key>
 		<integer>123</integer>
 	</dict>
-	<key>I</key>
-	<dict>
-		<key>b</key>
-		<integer>0</integer>
-	</dict>
 	<key>Idieresis</key>
 	<dict>
 		<key>Idieresis</key>
@@ -3851,11 +3850,6 @@
 		<key>idieresisacute</key>
 		<integer>82</integer>
 	</dict>
-	<key>P</key>
-	<dict>
-		<key>hyphen</key>
-		<integer>-128</integer>
-	</dict>
 	<key>Psi</key>
 	<dict>
 		<key>@KERN_RIGHT_Alphagreek</key>
@@ -4049,11 +4043,6 @@
 		<key>asterisk.case</key>
 		<integer>-32</integer>
 	</dict>
-	<key>a</key>
-	<dict>
-		<key>v</key>
-		<integer>-96</integer>
-	</dict>
 	<key>adieresis</key>
 	<dict>
 		<key>@KERN_RIGHT_T</key>
@@ -4993,11 +4982,6 @@
 		<key>four</key>
 		<integer>-41</integer>
 	</dict>
-	<key>o</key>
-	<dict>
-		<key>p</key>
-		<integer>-32</integer>
-	</dict>
 	<key>odieresis</key>
 	<dict>
 		<key>@KERN_RIGHT_T</key>
diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist
index eb849fc42..e491f50a0 100644
--- a/src/Inter-UI-Regular.ufo/lib.plist
+++ b/src/Inter-UI-Regular.ufo/lib.plist
@@ -455,16 +455,21 @@
 				<string>hturnlthook</string>
 				<string>hturnhook2</string>
 				<string>dotlessi</string>
+				<string>uni0069.ccmp</string>
 				<string>i</string>
 				<string>idieresis</string>
 				<string>idieresisacute</string>
 				<string>itilde</string>
 				<string>itildebelow</string>
 				<string>ibar</string>
+				<string>uni012F.ccmp</string>
 				<string>dotlessj</string>
+				<string>uni006A.ccmp</string>
 				<string>jdotlessbar</string>
 				<string>uni0249</string>
+				<string>uni0249.ccmp</string>
 				<string>j</string>
+				<string>uni029D.ccmp</string>
 				<string>jcrosstail</string>
 				<string>k</string>
 				<string>khook</string>
@@ -961,7 +966,6 @@
 				<string>uni215F</string>
 				<string>macronacutecomb</string>
 				<string>crossbar</string>
-				<string>uni006A.ccmp</string>
 				<string>acutedotcomb.lc</string>
 				<string>tildedieresiscomb.lc</string>
 				<string>underscoredbl</string>
@@ -1086,7 +1090,6 @@
 				<string>uni036D</string>
 				<string>uni036E</string>
 				<string>uni036F</string>
-				<string>uni0249.ccmp</string>
 				<string>uni20B7</string>
 				<string>uni20B6</string>
 				<string>uni20B0</string>
@@ -1256,7 +1259,6 @@
 				<string>uni2B4F</string>
 				<string>rturnascend</string>
 				<string>romanfivehundred</string>
-				<string>uni0069.ccmp</string>
 				<string>caret</string>
 				<string>caretinsertionpoint</string>
 				<string>bridgesubnosp</string>
@@ -1301,7 +1303,6 @@
 				<string>two.sup</string>
 				<string>o_uni02DE</string>
 				<string>finalmem</string>
-				<string>uni012F.ccmp</string>
 				<string>Gsmallcap</string>
 				<string>Esh</string>
 				<string>zero.sup</string>
@@ -1597,7 +1598,6 @@
 				<string>uni1DEC</string>
 				<string>uni1DEB</string>
 				<string>pipedbl</string>
-				<string>uni029D.ccmp</string>
 				<string>controlHT</string>
 				<string>uni1DE8</string>
 				<string>uni1DE5</string>
@@ -1774,16 +1774,21 @@
 		<string>hturnlthook</string>
 		<string>hturnhook2</string>
 		<string>dotlessi</string>
+		<string>uni0069.ccmp</string>
 		<string>i</string>
 		<string>idieresis</string>
 		<string>idieresisacute</string>
 		<string>itilde</string>
 		<string>itildebelow</string>
 		<string>ibar</string>
+		<string>uni012F.ccmp</string>
 		<string>dotlessj</string>
+		<string>uni006A.ccmp</string>
 		<string>jdotlessbar</string>
 		<string>uni0249</string>
+		<string>uni0249.ccmp</string>
 		<string>j</string>
+		<string>uni029D.ccmp</string>
 		<string>jcrosstail</string>
 		<string>k</string>
 		<string>khook</string>
@@ -2280,7 +2285,6 @@
 		<string>uni215F</string>
 		<string>macronacutecomb</string>
 		<string>crossbar</string>
-		<string>uni006A.ccmp</string>
 		<string>acutedotcomb.lc</string>
 		<string>tildedieresiscomb.lc</string>
 		<string>underscoredbl</string>
@@ -2405,7 +2409,6 @@
 		<string>uni036D</string>
 		<string>uni036E</string>
 		<string>uni036F</string>
-		<string>uni0249.ccmp</string>
 		<string>uni20B7</string>
 		<string>uni20B6</string>
 		<string>uni20B0</string>
@@ -2575,7 +2578,6 @@
 		<string>uni2B4F</string>
 		<string>rturnascend</string>
 		<string>romanfivehundred</string>
-		<string>uni0069.ccmp</string>
 		<string>caret</string>
 		<string>caretinsertionpoint</string>
 		<string>bridgesubnosp</string>
@@ -2620,7 +2622,6 @@
 		<string>two.sup</string>
 		<string>o_uni02DE</string>
 		<string>finalmem</string>
-		<string>uni012F.ccmp</string>
 		<string>Gsmallcap</string>
 		<string>Esh</string>
 		<string>zero.sup</string>
@@ -2916,7 +2917,6 @@
 		<string>uni1DEC</string>
 		<string>uni1DEB</string>
 		<string>pipedbl</string>
-		<string>uni029D.ccmp</string>
 		<string>controlHT</string>
 		<string>uni1DE8</string>
 		<string>uni1DE5</string>
diff --git a/src/glyphorder.txt b/src/glyphorder.txt
index 5ca2ad4c0..42a79a31d 100644
--- a/src/glyphorder.txt
+++ b/src/glyphorder.txt
@@ -137,16 +137,21 @@ hturn
 hturnlthook
 hturnhook2
 dotlessi
+uni0069.ccmp
 i
 idieresis
 idieresisacute
 itilde
 itildebelow
 ibar
+uni012F.ccmp
 dotlessj
+uni006A.ccmp
 jdotlessbar
 uni0249
+uni0249.ccmp
 j
+uni029D.ccmp
 jcrosstail
 k
 khook
@@ -641,7 +646,6 @@ uni215A
 uni215F
 macronacutecomb
 crossbar
-uni006A.ccmp
 acutedotcomb.lc
 tildedieresiscomb.lc
 underscoredbl
@@ -766,7 +770,6 @@ uni036C
 uni036D
 uni036E
 uni036F
-uni0249.ccmp
 uni20B7
 uni20B6
 uni20B0
@@ -936,7 +939,6 @@ uni2B4E
 uni2B4F
 rturnascend
 romanfivehundred
-uni0069.ccmp
 caret
 caretinsertionpoint
 bridgesubnosp
@@ -981,7 +983,6 @@ Tonetwo
 two.sup
 o_uni02DE
 finalmem
-uni012F.ccmp
 Gsmallcap
 Esh
 zero.sup
@@ -1277,7 +1278,6 @@ uni1DEA
 uni1DEC
 uni1DEB
 pipedbl
-uni029D.ccmp
 controlHT
 uni1DE8
 uni1DE5