diff --git a/mawkin_sans.ufo/features.fea b/mawkin_sans.ufo/features.fea
index 1d639b9..8a44ade 100644
--- a/mawkin_sans.ufo/features.fea
+++ b/mawkin_sans.ufo/features.fea
@@ -5,6 +5,10 @@ languagesystem latn dflt;
 @uppercase = [ \A \B \C \D \E \Eacute \Ecircumflex \F \G \H \I \J \K \L \M \N \O \P \Q \R \S \T \U \Uacute \V \W \X \Y \Yacute \Z ];
 @invertible = [ @lowercase @uppercase ];
 
+@lowerinv = [ \a.inv \b.inv \c.inv \d.inv \e.inv \eacute.inv \ecircumflex.inv \f.inv \g.inv \h.inv \i.inv \j.inv \k.inv \l.inv \m.inv \n.inv \o.inv \p.inv \q.inv \r.inv \s.inv \t.inv \u.inv \uacute.inv \v.inv \w.inv \x.inv \y.inv \yacute.inv \z.inv \hyphen.inv ];
+@upperinv = [ \A.inv \B.inv \C.inv \D.inv \E.inv \Eacute.inv \Ecircumflex.inv \F.inv \G.inv \H.inv \I.inv \J.inv \K.inv \L.inv \M.inv \N.inv \O.inv \P.inv \Q.inv \R.inv \S.inv \T.inv \U.inv \Uacute.inv \V.inv \W.inv \X.inv \Y.inv \Yacute.inv \Z.inv ];
+@inverted = [ @lowerinv @upperinv ];
+
 feature liga {
     substitute \period \a by \a.inv;
     substitute \period \b by \b.inv;
@@ -37,7 +41,7 @@ feature liga {
     substitute \period \yacute by \yacute.inv;
     substitute \period \ecircumflex by \ecircumflex.inv;
     substitute \period \hyphen by \hyphen.inv;
-    substitute \period \space by \space.inv;
+    substitute \period \space by \space400;
     substitute \period \A by \A.inv;
     substitute \period \B by \B.inv;
     substitute \period \C by \C.inv;
@@ -132,4 +136,7 @@ feature calt {
     substitute @invertible \Uacute' by \Uacute.inv;
     substitute @invertible \Yacute' by \Yacute.inv;
     substitute @invertible \Ecircumflex' by \Ecircumflex.inv;
+    substitute @invertible \space' @invertible by \space200;
+    substitute @inverted \space' @invertible by \space600 \space600;
+    substitute @invertible \space' @inverted by \space600 \space600;
 } calt;
diff --git a/mawkin_sans.ufo/fontinfo.plist b/mawkin_sans.ufo/fontinfo.plist
index f52f43e..f9357c8 100644
--- a/mawkin_sans.ufo/fontinfo.plist
+++ b/mawkin_sans.ufo/fontinfo.plist
@@ -53,7 +53,7 @@
   <key>versionMajor</key>
   <integer>0</integer>
   <key>versionMinor</key>
-  <integer>6</integer>
+  <integer>7</integer>
   <key>xHeight</key>
   <integer>866</integer>
 </dict>
diff --git a/mawkin_sans.ufo/glyphs/contents.plist b/mawkin_sans.ufo/glyphs/contents.plist
index f029cb5..034eece 100644
--- a/mawkin_sans.ufo/glyphs/contents.plist
+++ b/mawkin_sans.ufo/glyphs/contents.plist
@@ -216,8 +216,12 @@
   <string>s.inv.glif</string>
   <key>space</key>
   <string>space.glif</string>
-  <key>space.inv</key>
-  <string>space.inv.glif</string>
+  <key>space200</key>
+  <string>space200.glif</string>
+  <key>space400</key>
+  <string>space400.glif</string>
+  <key>space600</key>
+  <string>space600.glif</string>
   <key>t</key>
   <string>t.glif</string>
   <key>t.inv</key>
diff --git a/mawkin_sans.ufo/glyphs/space200.glif b/mawkin_sans.ufo/glyphs/space200.glif
new file mode 100644
index 0000000..7107809
--- /dev/null
+++ b/mawkin_sans.ufo/glyphs/space200.glif
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="space200" format="2">
+  <advance width="200"/>
+  <unicode hex="0020"/>
+  <outline/>
+</glyph>
diff --git a/mawkin_sans.ufo/glyphs/space.inv.glif b/mawkin_sans.ufo/glyphs/space400.glif
similarity index 75%
rename from mawkin_sans.ufo/glyphs/space.inv.glif
rename to mawkin_sans.ufo/glyphs/space400.glif
index 8731954..ca63db9 100644
--- a/mawkin_sans.ufo/glyphs/space.inv.glif
+++ b/mawkin_sans.ufo/glyphs/space400.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="space.inv" format="2">
+<glyph name="space400" format="2">
   <advance width="400"/>
   <unicode hex="0020"/>
   <outline/>
diff --git a/mawkin_sans.ufo/glyphs/space600.glif b/mawkin_sans.ufo/glyphs/space600.glif
new file mode 100644
index 0000000..cf850af
--- /dev/null
+++ b/mawkin_sans.ufo/glyphs/space600.glif
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="space600" format="2">
+  <advance width="600"/>
+  <unicode hex="0020"/>
+  <outline/>
+</glyph>
diff --git a/mawkin_sans.ufo/lib.plist b/mawkin_sans.ufo/lib.plist
index 571671a..4ff574f 100644
--- a/mawkin_sans.ufo/lib.plist
+++ b/mawkin_sans.ufo/lib.plist
@@ -5,6 +5,9 @@
   <key>public.glyphOrder</key>
   <array>
     <string>space</string>
+    <string>space200</string>
+    <string>space400</string>
+    <string>space600</string>
     <string>exclam</string>
     <string>quotesingle</string>
     <string>quotedbl</string>
@@ -201,7 +204,6 @@
     <string>quoteleft</string>
     <string>quoteright</string>
     <string>minus</string>
-    <string>space.inv</string>
     <string>hyphen.inv</string>
     <string>period.inv</string>
     <string>A.inv</string>