diff --git a/src/Inter-UI-Thin.ufo/glyphs/bracketleft_quill.glif b/src/Inter-UI-Thin.ufo/glyphs/bracketleft_quill.glif
index 49fc88fb5..f43768a92 100644
--- a/src/Inter-UI-Thin.ufo/glyphs/bracketleft_quill.glif
+++ b/src/Inter-UI-Thin.ufo/glyphs/bracketleft_quill.glif
@@ -5,8 +5,8 @@
   <outline>
     <contour>
       <point x="704.0" y="896.0" type="line"/>
-      <point x="352.0" y="896.0" type="line"/>
-      <point x="352.0" y="832.0" type="line"/>
+      <point x="384.0" y="896.0" type="line"/>
+      <point x="384.0" y="832.0" type="line"/>
       <point x="704.0" y="832.0" type="line"/>
     </contour>
     <component base="bracketleft"/>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/braceleft.case.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/braceleft.case.glif
index 63c177e38..79e62ab8c 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/braceleft.case.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/braceleft.case.glif
@@ -2,7 +2,7 @@
 <glyph name="braceleft.case" format="2">
   <advance width="888.0"/>
   <outline>
-    <component base="braceleft" xOffset="20.0" yOffset="116.0"/>
+    <component base="braceleft" xOffset="28.0" yOffset="160.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/braceright.case.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/braceright.case.glif
index 24c6e47d2..ae24b5d06 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/braceright.case.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/braceright.case.glif
@@ -2,7 +2,7 @@
 <glyph name="braceright.case" format="2">
   <advance width="888.0"/>
   <outline>
-    <component base="braceright" xOffset="20.0" yOffset="116.0"/>
+    <component base="braceright" xOffset="28.0" yOffset="160.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/braceright.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/braceright.glif
index 29f6b3ca6..4fa8113ba 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/braceright.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/braceright.glif
@@ -3,7 +3,7 @@
   <advance width="888.0"/>
   <unicode hex="007D"/>
   <outline>
-    <component base="braceleft" xScale="-1.0" yScale="-1.0" xOffset="936.0" yOffset="1816.0"/>
+    <component base="braceleft" xScale="-1.0" yScale="-1.0" xOffset="920.0" yOffset="1728.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft.case.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft.case.glif
index 2a18b8622..ef4a987dd 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft.case.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft.case.glif
@@ -2,7 +2,7 @@
 <glyph name="bracketleft.case" format="2">
   <advance width="888.0"/>
   <outline>
-    <component base="bracketleft" xOffset="24.0" yOffset="116.0"/>
+    <component base="bracketleft" xOffset="28.0" yOffset="160.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft.glif
index 66097152a..4a872f2d4 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft.glif
@@ -4,14 +4,14 @@
   <unicode hex="005B"/>
   <outline>
     <contour>
-      <point x="176.0" y="-388.0" type="line"/>
-      <point x="572.0" y="-388.0" type="line"/>
-      <point x="584.0" y="-316.0" type="line"/>
-      <point x="224.0" y="-316.0" type="line"/>
-      <point x="632.0" y="2128.0" type="line"/>
-      <point x="992.0" y="2128.0" type="line"/>
-      <point x="1000.0" y="2204.0" type="line"/>
-      <point x="608.0" y="2204.0" type="line"/>
+      <point x="156.0" y="-416.0" type="line"/>
+      <point x="508.0" y="-416.0" type="line"/>
+      <point x="520.0" y="-352.0" type="line"/>
+      <point x="232.0" y="-352.0" type="line"/>
+      <point x="632.0" y="2080.0" type="line"/>
+      <point x="920.0" y="2080.0" type="line"/>
+      <point x="932.0" y="2144.0" type="line"/>
+      <point x="580.0" y="2144.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -25,18 +25,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>-516.0</real>
+            <real>-56.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>1.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -45,18 +40,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>4.0</real>
+            <real>2000.0</real>
+            <real>-52.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>5.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -65,18 +55,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>7.0</real>
+            <real>48.0</real>
+            <real>-80.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -85,18 +70,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>7.0</real>
+            <real>-516.0</real>
+            <real>72.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -105,18 +85,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>3.0</real>
+            <real>2000.0</real>
+            <real>76.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft_quill.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft_quill.glif
index 372604850..7b1f3f8ed 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft_quill.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketleft_quill.glif
@@ -4,10 +4,10 @@
   <unicode hex="2045"/>
   <outline>
     <contour>
-      <point x="792.0" y="948.0" type="line"/>
-      <point x="388.0" y="948.0" type="line"/>
-      <point x="376.0" y="868.0" type="line"/>
-      <point x="780.0" y="868.0" type="line"/>
+      <point x="724.0" y="896.0" type="line"/>
+      <point x="404.0" y="896.0" type="line"/>
+      <point x="396.0" y="832.0" type="line"/>
+      <point x="716.0" y="832.0" type="line"/>
     </contour>
     <component base="bracketleft"/>
   </outline>
@@ -17,10 +17,6 @@
       <string>bracketleft</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>bracketleft</string>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -30,34 +26,14 @@
           <integer>0</integer>
           <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>-128.0</real>
+            <real>-128.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>type</key>
           <string>Stem</string>
         </dict>
-        <dict>
-          <key>horizontal</key>
-          <true/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>1.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
-          <key>type</key>
-          <string>Stem</string>
-        </dict>
         <dict>
           <key>horizontal</key>
           <true/>
@@ -65,8 +41,23 @@
           <integer>0</integer>
           <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>832.0</real>
+            <real>64.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>-128.0</real>
+            <real>-128.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -80,7 +71,7 @@
           <integer>4</integer>
           <key>place</key>
           <array>
-            <real>0.0</real>
+            <real>-128.0</real>
             <real>0.0</real>
           </array>
           <key>stem</key>
@@ -93,18 +84,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>832.0</real>
+            <real>64.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -115,7 +101,7 @@
           <integer>4</integer>
           <key>place</key>
           <array>
-            <real>0.0</real>
+            <real>-128.0</real>
             <real>0.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright.case.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright.case.glif
index efc27b171..0c3142915 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright.case.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright.case.glif
@@ -2,7 +2,7 @@
 <glyph name="bracketright.case" format="2">
   <advance width="888.0"/>
   <outline>
-    <component base="bracketright" xOffset="20.0" yOffset="116.0"/>
+    <component base="bracketright" xOffset="28.0" yOffset="160.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright.glif
index c6fd1fd67..0717dd557 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright.glif
@@ -3,7 +3,7 @@
   <advance width="888.0"/>
   <unicode hex="005D"/>
   <outline>
-    <component base="bracketleft" xScale="-1.0" yScale="-1.0" xOffset="936.0" yOffset="1816.0"/>
+    <component base="bracketleft" xScale="-1.0" yScale="-1.0" xOffset="920.0" yOffset="1728.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright_quill.glif b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright_quill.glif
index 14d3a65c9..4f19dd344 100644
--- a/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright_quill.glif
+++ b/src/Inter-UI-ThinItalic.ufo/glyphs/bracketright_quill.glif
@@ -3,7 +3,7 @@
   <advance width="888.0"/>
   <unicode hex="2046"/>
   <outline>
-    <component base="bracketleft_quill" xScale="-1.0" yScale="-1.0" xOffset="936.0" yOffset="1816.0"/>
+    <component base="bracketleft_quill" xScale="-1.0" yScale="-1.0" xOffset="920.0" yOffset="1728.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI.glyphs b/src/Inter-UI.glyphs
index 3bcb56d1f..e2de93d7d 100644
--- a/src/Inter-UI.glyphs
+++ b/src/Inter-UI.glyphs
@@ -1,7 +1,8 @@
 {
 .appVersion = "1197";
 DisplayStrings = (
-"¯   /macroncomb    /macrongravecomb.lc    /macronsubnosp    /macronacutecomb.lc    /macrondieresiscomb.lc    \012/macronsub    /macronacutecomb.cn    /macrongravecomb.cn    /macrondieresiscomb.cn    /dotmacroncomb.lc    /dotmacroncomb.cn    /tildemacroncomb.lc    \012   /tildemacroncomb.cn    /dieresismacroncomb.lc    /dieresismacroncomb.cn"
+"¯   /macroncomb    /macrongravecomb.lc    /macronsubnosp    /macronacutecomb.lc    /macrondieresiscomb.lc    \012/macronsub    /macronacutecomb.cn    /macrongravecomb.cn    /macrondieresiscomb.cn    /dotmacroncomb.lc    /dotmacroncomb.cn    /tildemacroncomb.lc    \012   /tildemacroncomb.cn    /dieresismacroncomb.lc    /dieresismacroncomb.cn",
+"()[x]/bracketleft_quill/bracketright_quill {j}\012/parenleft.case/parenright.case/bracketleft.case X/bracketright.case/braceleft.case 3/braceright.case"
 );
 classes = (
 {
@@ -235292,7 +235293,7 @@ userData = {
 },
 {
 glyphname = bracketleft;
-lastChange = "2018-12-27 22:14:49 +0000";
+lastChange = "2019-01-06 19:17:26 +0000";
 layers = (
 {
 background = {
@@ -235462,32 +235463,27 @@ width = 888;
 hints = (
 {
 horizontal = 1;
-origin = "{0, 0}";
-target = "{0, 1}";
+place = "{-516, -56}";
 type = Stem;
 },
 {
 horizontal = 1;
-origin = "{0, 4}";
-target = "{0, 5}";
+place = "{2000, -52}";
 type = Stem;
 },
 {
-origin = "{0, 7}";
-target = "{0, 2}";
+place = "{48, -80}";
 type = Stem;
 },
 {
 horizontal = 1;
-origin = "{0, 7}";
-target = "{0, 2}";
+place = "{-516, 72}";
 type = TTStem;
 options = 4;
 },
 {
 horizontal = 1;
-origin = "{0, 3}";
-target = "{0, 6}";
+place = "{2000, 76}";
 type = TTStem;
 options = 4;
 }
@@ -235497,14 +235493,14 @@ paths = (
 {
 closed = 1;
 nodes = (
-"572 -388 LINE",
-"584 -316 LINE",
-"224 -316 LINE",
-"632 2128 LINE",
-"992 2128 LINE",
-"1000 2204 LINE",
-"608 2204 LINE",
-"176 -388 LINE"
+"508 -416 LINE",
+"520 -352 LINE",
+"232 -352 LINE",
+"632 2080 LINE",
+"920 2080 LINE",
+"932 2144 LINE",
+"580 2144 LINE",
+"156 -416 LINE"
 );
 }
 );
@@ -235518,7 +235514,7 @@ unicode = 005B;
 },
 {
 glyphname = bracketleft_quill;
-lastChange = "2018-12-27 22:15:40 +0000";
+lastChange = "2019-01-06 19:19:39 +0000";
 layers = (
 {
 components = (
@@ -235661,8 +235657,8 @@ paths = (
 {
 closed = 1;
 nodes = (
-"352 896 LINE",
-"352 832 LINE",
+"384 896 LINE",
+"384 832 LINE",
 "704 832 LINE",
 "704 896 LINE"
 );
@@ -235673,43 +235669,40 @@ width = 888;
 {
 components = (
 {
-alignment = -1;
 name = bracketleft;
 }
 );
 hints = (
 {
 horizontal = 1;
-place = "{0, 0}";
+place = "{-128, -128}";
 type = Stem;
 },
 {
 horizontal = 1;
-origin = "{0, 1}";
-target = "{0, 0}";
+place = "{832, 64}";
 type = Stem;
 },
 {
 horizontal = 1;
-place = "{0, 0}";
+place = "{-128, -128}";
 type = Stem;
 },
 {
 horizontal = 1;
-place = "{0, 0}";
+place = "{-128, 0}";
 type = TTStem;
 options = 4;
 },
 {
 horizontal = 1;
-origin = "{0, 1}";
-target = "{0, 0}";
+place = "{832, 64}";
 type = TTStem;
 options = 4;
 },
 {
 horizontal = 1;
-place = "{0, 0}";
+place = "{-128, 0}";
 type = TTStem;
 options = 4;
 }
@@ -235719,10 +235712,10 @@ paths = (
 {
 closed = 1;
 nodes = (
-"388 948 LINE",
-"376 868 LINE",
-"780 868 LINE",
-"792 948 LINE"
+"404 896 LINE",
+"396 832 LINE",
+"716 832 LINE",
+"724 896 LINE"
 );
 }
 );
@@ -235741,7 +235734,7 @@ interface.gridadjust.original = "{'width': 890, 'leftMargin': 289, 'rightMargin'
 },
 {
 glyphname = bracketright;
-lastChange = "2018-12-27 22:14:58 +0000";
+lastChange = "2019-01-06 19:18:35 +0000";
 layers = (
 {
 components = (
@@ -235835,7 +235828,7 @@ components = (
 {
 alignment = -1;
 name = bracketleft;
-transform = "{-1, 0, 0, -1, 936, 1816}";
+transform = "{-1, 0, 0, -1, 920, 1728}";
 }
 );
 hints = (
@@ -235863,7 +235856,7 @@ unicode = 005D;
 },
 {
 glyphname = bracketright_quill;
-lastChange = "2018-12-31 21:21:38 +0000";
+lastChange = "2019-01-06 19:19:58 +0000";
 layers = (
 {
 components = (
@@ -235980,7 +235973,7 @@ components = (
 {
 alignment = -1;
 name = bracketleft_quill;
-transform = "{-1, 0, 0, -1, 936, 1816}";
+transform = "{-1, 0, 0, -1, 920, 1728}";
 }
 );
 hints = (
@@ -236834,7 +236827,7 @@ unicode = 007B;
 },
 {
 glyphname = braceright;
-lastChange = "2018-12-27 22:11:11 +0000";
+lastChange = "2019-01-06 19:20:22 +0000";
 layers = (
 {
 background = {
@@ -236927,7 +236920,7 @@ components = (
 {
 alignment = -1;
 name = braceleft;
-transform = "{-1, 0, 0, -1, 936, 1816}";
+transform = "{-1, 0, 0, -1, 920, 1728}";
 }
 );
 hints = (
@@ -238534,7 +238527,7 @@ userData = {
 {
 color = 4;
 glyphname = bracketleft.case;
-lastChange = "2018-12-31 21:21:38 +0000";
+lastChange = "2019-01-06 19:21:30 +0000";
 layers = (
 {
 components = (
@@ -238592,7 +238585,7 @@ components = (
 {
 alignment = -1;
 name = bracketleft;
-transform = "{1, 0, 0, 1, 24, 116}";
+transform = "{1, 0, 0, 1, 28, 160}";
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -238607,7 +238600,7 @@ rightMetricsKey = bracketleft;
 {
 color = 4;
 glyphname = bracketright.case;
-lastChange = "2018-12-31 21:21:38 +0000";
+lastChange = "2019-01-06 19:21:45 +0000";
 layers = (
 {
 components = (
@@ -238665,7 +238658,7 @@ components = (
 {
 alignment = -1;
 name = bracketright;
-transform = "{1, 0, 0, 1, 20, 116}";
+transform = "{1, 0, 0, 1, 28, 160}";
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -238680,7 +238673,7 @@ rightMetricsKey = bracketright;
 {
 color = 4;
 glyphname = braceleft.case;
-lastChange = "2018-12-31 21:21:38 +0000";
+lastChange = "2019-01-06 19:21:59 +0000";
 layers = (
 {
 components = (
@@ -238738,7 +238731,7 @@ components = (
 {
 alignment = -1;
 name = braceleft;
-transform = "{1, 0, 0, 1, 20, 116}";
+transform = "{1, 0, 0, 1, 28, 160}";
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -238753,7 +238746,7 @@ rightMetricsKey = braceleft;
 {
 color = 4;
 glyphname = braceright.case;
-lastChange = "2018-12-31 21:21:38 +0000";
+lastChange = "2019-01-06 19:22:10 +0000";
 layers = (
 {
 components = (
@@ -238811,7 +238804,7 @@ components = (
 {
 alignment = -1;
 name = braceright;
-transform = "{1, 0, 0, 1, 20, 116}";
+transform = "{1, 0, 0, 1, 28, 160}";
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";